PR feedback

Author: madsodgaard

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -59,48 +59,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     let outputJavaDirectory = context.outputJavaDirectory
     let outputSwiftDirectory = context.outputSwiftDirectory
 
-    /// Find the manifest files from other swift-java executions in any targets
-    /// this target depends on.
-    var dependentConfigFiles: [(String, URL)] = []
-    func searchForConfigFiles(in target: any Target) {
-      // log("Search for config files in target: \(target.name)")
-      let dependencyURL = URL(filePath: target.directory.string)
-
-      // Look for a config file within this target.
-      let dependencyConfigURL = dependencyURL
-        .appending(path: SwiftJavaConfigFileName)
-      let dependencyConfigString = dependencyConfigURL
-        .path(percentEncoded: false)
-
-      if FileManager.default.fileExists(atPath: dependencyConfigString) {
-        dependentConfigFiles.append((target.name, dependencyConfigURL))
-      }
-    }
-
-    // Process direct dependencies of this target.
-    for dependency in target.dependencies {
-      switch dependency {
-      case .target(let target):
-        // log("Dependency target: \(target.name)")
-        searchForConfigFiles(in: target)
-
-      case .product(let product):
-        // log("Dependency product: \(product.name)")
-        for target in product.targets {
-          // log("Dependency product: \(product.name), target: \(target.name)")
-          searchForConfigFiles(in: target)
-        }
-
-      @unknown default:
-        break
-      }
-    }
-
-    // Process indirect target dependencies.
-    for dependency in target.recursiveTargetDependencies {
-      // log("Recursive dependency target: \(dependency.name)")
-      searchForConfigFiles(in: dependency)
-    }
+    let dependentConfigFiles = searchForDependentConfigFiles(in: target)
 
     var arguments: [String] = [
       /*subcommand=*/"jextract",
@@ -172,5 +131,53 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
       )
     ]
   }
+
+  /// Find the manifest files from other swift-java executions in any targets
+  /// this target depends on.
+  func searchForDependentConfigFiles(in target: any Target) -> [(String, URL)] {
+    var dependentConfigFiles = [(String, URL)]()
+
+    func _searchForConfigFiles(in target: any Target) {
+      // log("Search for config files in target: \(target.name)")
+      let dependencyURL = URL(filePath: target.directory.string)
+
+      // Look for a config file within this target.
+      let dependencyConfigURL = dependencyURL
+        .appending(path: SwiftJavaConfigFileName)
+      let dependencyConfigString = dependencyConfigURL
+        .path(percentEncoded: false)
+
+      if FileManager.default.fileExists(atPath: dependencyConfigString) {
+        dependentConfigFiles.append((target.name, dependencyConfigURL))
+      }
+    }
+
+    // Process direct dependencies of this target.
+    for dependency in target.dependencies {
+      switch dependency {
+      case .target(let target):
+        // log("Dependency target: \(target.name)")
+        _searchForConfigFiles(in: target)
+
+      case .product(let product):
+        // log("Dependency product: \(product.name)")
+        for target in product.targets {
+          // log("Dependency product: \(product.name), target: \(target.name)")
+          _searchForConfigFiles(in: target)
+        }
+
+      @unknown default:
+        break
+      }
+    }
+
+    // Process indirect target dependencies.
+    for dependency in target.recursiveTargetDependencies {
+      // log("Recursive dependency target: \(dependency.name)")
+      _searchForConfigFiles(in: dependency)
+    }
+
+    return dependentConfigFiles
+  }
 }
 

Samples/JExtractJNISampleApp/src/test/java/com/example/swift/MySwiftClassTest.java

@@ -144,7 +144,7 @@ void copy() {
     void addXWithJavaLong() {
         try (var arena = new ConfinedSwiftMemorySession()) {
             MySwiftClass c1 = MySwiftClass.init(20, 10, arena);
-            Long javaLong = new Long(50);
+            Long javaLong = 50L;
             assertEquals(70, c1.addXWithJavaLong(javaLong));
         }
     }

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift

@@ -42,7 +42,7 @@ extension JNISwift2JavaGenerator {
   struct JavaTranslation {
     let swiftModuleName: String
     let javaPackage: String
-    let javaClassLookupTable: [String: String]
+    let javaClassLookupTable: JavaClassLookupTable
 
     func translate(_ decl: ImportedFunc) throws -> TranslatedFunctionDecl {
       let nativeTranslation = NativeJavaTranslation(

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift

@@ -18,7 +18,7 @@ extension JNISwift2JavaGenerator {
 
   struct NativeJavaTranslation {
     let javaPackage: String
-    let javaClassLookupTable: [String: String]
+    let javaClassLookupTable: JavaClassLookupTable
 
     /// Translates a Swift function into the native JNI method signature.
     func translate(

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift

@@ -14,6 +14,10 @@
 
 import JavaTypes
 
+/// A table that where keys are Swift class names and the values are
+/// the fully qualified canoical names.
+package typealias JavaClassLookupTable = [String: String]
+
 package class JNISwift2JavaGenerator: Swift2JavaGenerator {
   let analysis: AnalysisResult
   let swiftModuleName: String
@@ -22,9 +26,7 @@ package class JNISwift2JavaGenerator: Swift2JavaGenerator {
   let swiftOutputDirectory: String
   let javaOutputDirectory: String
 
-  /// A lookup table for any JavaKit generated Swift types
-  /// that wrap Java classes.
-  let javaClassLookupTable: [String: String]
+  let javaClassLookupTable: JavaClassLookupTable
 
   var javaPackagePath: String {
     javaPackage.replacingOccurrences(of: ".", with: "/")
@@ -44,7 +46,7 @@ package class JNISwift2JavaGenerator: Swift2JavaGenerator {
     javaPackage: String,
     swiftOutputDirectory: String,
     javaOutputDirectory: String,
-    javaClassLookupTable: [String: String]
+    javaClassLookupTable: JavaClassLookupTable
   ) {
     self.logger = Logger(label: "jni-generator", logLevel: translator.log.logLevel)
     self.analysis = translator.result

Sources/JExtractSwiftLib/Swift2Java.swift

@@ -85,7 +85,7 @@ public struct SwiftToJava {
       fatalError("Missing --output-java directory!")
     }
 
-    let wrappedJavaClassesLookupTable: [String: String] = dependentConfigs.compactMap(\.classes).reduce(into: [:]) {
+    let wrappedJavaClassesLookupTable: JavaClassLookupTable = dependentConfigs.compactMap(\.classes).reduce(into: [:]) {
       for (canonicalName, javaClass) in $1 {
         $0[javaClass] = canonicalName
       }

Sources/JExtractSwiftLib/Swift2JavaTranslator.swift

@@ -39,7 +39,7 @@ public final class Swift2JavaTranslator {
 
   var inputs: [Input] = []
 
-  /// A list of used Swift class names that live in dependencies
+  /// A list of used Swift class names that live in dependencies, e.g. `JavaInteger`
   package var dependenciesClasses: [String] = []
 
   // ==== Output state