use optionals instead

Author: madsodgaard

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -89,18 +89,6 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
       arguments += ["--java-package", javaPackage]
     }
 
-    if let unsignedNumbersMode = configuration.unsignedNumbersMode {
-      arguments += ["--unsigned-numbers", unsignedNumbersMode.rawValue]
-    }
-
-    if let minimumInputAccessLevelMode = configuration.minimumInputAccessLevelMode {
-      arguments += ["--minimum-input-access-level", minimumInputAccessLevelMode.rawValue]
-    }
-
-    if let memoryManagementMode = configuration.memoryManagementMode {
-      arguments += ["--memory-management-mode", memoryManagementMode.rawValue]
-    }
-
     let swiftFiles = sourceModule.sourceFiles.map { $0.url }.filter {
       $0.pathExtension == "swift"
     }

Sources/SwiftJavaConfigurationShared/Configuration.swift

@@ -39,6 +39,9 @@ public struct Configuration: Codable {
   public var outputJavaDirectory: String?
 
   public var mode: JExtractGenerationMode?
+  public var effectiveMode: JExtractGenerationMode {
+    mode ?? .default
+  }
 
   public var writeEmptyFiles: Bool? // FIXME: default it to false, but that plays not nice with Codable
 

Sources/SwiftJavaConfigurationShared/GenerationMode.swift

@@ -19,6 +19,10 @@ public enum JExtractGenerationMode: String, Codable {
 
   /// Java Native Interface
   case jni
+
+  public static var `default`: JExtractGenerationMode {
+    .ffm
+  }
 }
 
 /// Configures how Swift unsigned integers should be extracted by jextract.

Sources/SwiftJavaTool/Commands/JExtractCommand.swift

@@ -62,13 +62,13 @@ extension SwiftJava {
     var writeEmptyFiles: Bool = false
 
     @Option(help: "The mode of generation to use for the output files. Used with jextract mode. By default, unsigned Swift types are imported as their bit-width compatible signed Java counterparts, and annotated using the '@Unsigned' annotation. You may choose the 'wrapGuava' mode in order to import types as class wrapper types (`UnsignedInteger` et al) defined by the Google Guava library's `com.google.common.primitives' package. that ensure complete type-safety with regards to unsigned values, however they incur an allocation and performance overhead.")
-    var unsignedNumbers: JExtractUnsignedIntegerMode = .default
+    var unsignedNumbers: JExtractUnsignedIntegerMode?
 
     @Option(help: "The lowest access level of Swift declarations that should be extracted, defaults to 'public'.")
-    var minimumInputAccessLevel: JExtractMinimumAccessLevelMode = .default
+    var minimumInputAccessLevel: JExtractMinimumAccessLevelMode?
 
     @Option(help: "The memory management mode to use for the generated code. By default, the user must explicitly provide `SwiftArena` to all calls that require it. By choosing `allowGlobalAutomatic`, user can omit this parameter and a global GC-based arena will be used.")
-    var memoryManagementMode: JExtractMemoryManagementMode = .default
+    var memoryManagementMode: JExtractMemoryManagementMode?
 
     @Option(
       help: """
@@ -86,18 +86,14 @@ extension SwiftJava.JExtractCommand {
     if let javaPackage {
       config.javaPackage = javaPackage
     }
-    if let mode {
-      config.mode = mode
-    } else if config.mode == nil {
-      config.mode = .ffm
-    }
+    configure(&config.mode, overrideWith: mode)
     config.swiftModule = self.effectiveSwiftModule
     config.outputJavaDirectory = outputJava
     config.outputSwiftDirectory = outputSwift
     config.writeEmptyFiles = writeEmptyFiles
-    config.unsignedNumbersMode = unsignedNumbers
-    config.minimumInputAccessLevelMode = minimumInputAccessLevel
-    config.memoryManagementMode = memoryManagementMode
+    configure(&config.unsignedNumbersMode, overrideWith: unsignedNumbers)
+    configure(&config.minimumInputAccessLevelMode, overrideWith: minimumInputAccessLevelMode)
+    configure(&config.memoryManagementMode, overrideWith: memoryManagementMode)
 
     try checkModeCompatibility()
 
@@ -132,6 +128,12 @@ extension SwiftJava.JExtractCommand {
       }
     }
   }
+
+  func configure<T>(_ setting: inout T, overrideWith value: T?) {
+    if let value {
+      setting = value
+    }
+  }
 }
 
 struct IncompatibleModeError: Error {