correct configuration and some compile issues

Author: ktoso

Samples/SwiftKitSampleApp/src/test/java/com/example/swift/UnsignedNumbersTest.java

@@ -23,15 +23,15 @@ public class UnsignedNumbersTest {
     void take_uint32() {
         try (var arena = AllocatingSwiftArena.ofConfined()) {
             var c = MySwiftClass.init(1, 2, arena);
-            c.takeUnsignedInt(UnsignedInteger.valueOf(128));
+            c.takeUnsignedInt(128);
         }
     }
 
     @Test
     void take_uint64() {
         try (var arena = AllocatingSwiftArena.ofConfined()) {
             var c = MySwiftClass.init(1, 2, arena);
-            c.takeUnsignedLong(UnsignedLong.MAX_VALUE);
+            c.takeUnsignedLong(Long.MAX_VALUE);
         }
     }
 }

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -321,8 +321,8 @@ extension FFMSwift2JavaGenerator {
       methodName: String
     ) throws -> TranslatedParameter {
 
-      // If we need to handle unsigned integers "safely" do so here
-      if config.unsignedNumbersMode.needsConversion {
+      // If we need to handle unsigned integers do so here
+      if config.effectiveUnsignedNumbersMode.needsConversion {
         if let unsignedWrapperType = JavaType.unsignedWrapper(for: swiftType) /* and we're in safe wrapper mode */ {
           return TranslatedParameter(
             javaParameters: [
@@ -583,15 +583,15 @@ extension FFMSwift2JavaGenerator {
     ) throws -> TranslatedResult {
       let swiftType = swiftResult.type
 
-      // If we need to handle unsigned integers "safely" do so here
-      if config.unsignedNumbersMode.needsConversion {
+      // If we need to handle unsigned integers do so here
+      if config.effectiveUnsignedNumbersMode.needsConversion {
         if let unsignedWrapperType = JavaType.unsignedWrapper(for: swiftType) /* and we're in safe wrapper mode */ {
           return TranslatedResult(
             javaResultType: unsignedWrapperType,
             outParameters: [],
             conversion: unsignedResultConversion(
                 swiftType, to: unsignedWrapperType,
-                mode: self.config.unsignedNumbersMode)
+                mode: self.config.effectiveUnsignedNumbersMode)
           )
         }
       }

Sources/JavaKitConfigurationShared/Configuration.swift

@@ -42,7 +42,10 @@ public struct Configuration: Codable {
 
   public var writeEmptyFiles: Bool? // FIXME: default it to false, but that plays not nice with Codable
 
-  public var unsignedNumbersMode: JExtractUnsignedIntegerMode = .default
+  public var unsignedNumbersMode: JExtractUnsignedIntegerMode?
+  public var effectiveUnsignedNumbersMode: JExtractUnsignedIntegerMode {
+    unsignedNumbersMode ?? .default
+  }
 
   // ==== java 2 swift ---------------------------------------------------------
 

…tConfigurationShared/JExtractModes.swift …ConfigurationShared/GenerationMode.swiftSources/JavaKitConfigurationShared/JExtractModes.swift renamed to Sources/JavaKitConfigurationShared/GenerationMode.swift Sources/JavaKitConfigurationShared/JExtractModes.swift renamed to Sources/JavaKitConfigurationShared/GenerationMode.swift

@@ -1,5 +1,18 @@
-package org.swift.swiftkit.core.annotations;
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
 
+package org.swift.swiftkit.core.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

SwiftKitCore/src/main/java/org/swift/swiftkit/core/annotations/NonNull.java

@@ -1,5 +1,18 @@
-package org.swift.swiftkit.core.annotations;
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
 
+package org.swift.swiftkit.core.annotations;
 
 import static java.lang.annotation.ElementType.TYPE_USE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;