wrap-java revamp and add generic methods, types, and supertypes support (#397)

Author: ktoso

Package.swift

@@ -14,6 +14,9 @@ func findJavaHome() -> String {
     print("JAVA_HOME = \(home)")
     return home
   }
+  if let opts = ProcessInfo.processInfo.environment["SWIFT_JAVA_JAVA_OPTS"] {
+    print("SWIFT_JAVA_JAVA_OPTS = \(opts)")
+  }
 
   // This is a workaround for envs (some IDEs) which have trouble with
   // picking up env variables during the build process
@@ -420,7 +423,6 @@ let package = Package(
     .executableTarget(
       name: "SwiftJavaTool",
       dependencies: [
-        .product(name: "Logging", package: "swift-log"),
         .product(name: "SwiftBasicFormat", package: "swift-syntax"),
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

@@ -165,6 +165,11 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
       log("No dependencies to fetch for target \(sourceModule.name)")
     }
 
+    // Add all the core Java stdlib modules as --depends-on
+    let javaStdlibModules = getExtractedJavaStdlibModules()
+    log("Include Java standard library SwiftJava modules: \(javaStdlibModules)")
+    arguments += javaStdlibModules.flatMap { ["--depends-on", $0] }
+
     if !outputSwiftFiles.isEmpty {
       arguments += [ configFile.path(percentEncoded: false) ]
 
@@ -236,3 +241,29 @@ extension SwiftJavaBuildToolPlugin {
     outputDirectory(context: context, generated: generated).appending(path: filename)
   }
 }
+
+func getExtractedJavaStdlibModules() -> [String] {
+  let fileManager = FileManager.default
+  let sourcesPath = URL(fileURLWithPath: #filePath)
+    .deletingLastPathComponent()
+    .deletingLastPathComponent()
+    .appendingPathComponent("Sources")
+    .appendingPathComponent("JavaStdlib")
+
+  guard let stdlibDirContents = try? fileManager.contentsOfDirectory(
+    at: sourcesPath,
+    includingPropertiesForKeys: [.isDirectoryKey],
+    options: [.skipsHiddenFiles]
+  ) else {
+    return []
+  }
+
+  return stdlibDirContents.compactMap { url in
+    guard let resourceValues = try? url.resourceValues(forKeys: [.isDirectoryKey]),
+          let isDirectory = resourceValues.isDirectory,
+          isDirectory else {
+      return nil
+    }
+    return url.lastPathComponent
+  }.sorted()
+}

Samples/JavaDependencySampleApp/Sources/JavaCommonsCSV/swift-java.config

@@ -1,11 +1,13 @@
 {
   "classes" : {
     "org.apache.commons.io.FilenameUtils" : "FilenameUtils",
-    "org.apache.commons.io.IOCase" : "IOCase",
     "org.apache.commons.csv.CSVFormat" : "CSVFormat",
     "org.apache.commons.csv.CSVParser" : "CSVParser",
     "org.apache.commons.csv.CSVRecord" : "CSVRecord"
   },
+  "filterExclude" : [
+    "org.apache.commons.csv.CSVFormat$Predefined",
+  ],
   "dependencies" : [
     "org.apache.commons:commons-csv:1.12.0"
   ]

Samples/JavaDependencySampleApp/ci-validate.sh

@@ -4,7 +4,9 @@ set -e
 set -x
 
 # invoke resolve as part of a build run
-swift run --disable-sandbox
+swift build \
+  --disable-experimental-prebuilts \
+  --disable-sandbox
 
 # explicitly invoke resolve without explicit path or dependency
 # the dependencies should be uses from the --swift-module

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/NestedTypes.swift

@@ -44,4 +44,4 @@ public enum NestedEnum {
   public struct OneStruct {
     public init() {}
   }
-}
+}

Samples/SwiftJavaExtractJNISampleApp/src/main/java/com/example/swift/HelloJava2SwiftJNI.java

@@ -16,8 +16,6 @@
 
 // Import swift-extract generated sources
 
-// Import javakit/swiftkit support libraries
-
 import org.swift.swiftkit.core.SwiftArena;
 import org.swift.swiftkit.core.SwiftLibraries;
 

Sources/JavaStdlib/JavaLangReflect/Method+Utilities.swift

@@ -13,23 +13,41 @@
 //===----------------------------------------------------------------------===//
 
 extension Method {
+  
   /// Whether this is a 'public' method.
   public var isPublic: Bool {
-    return (getModifiers() & 1) != 0
+    return (getModifiers() & 0x00000001) != 0
+  }
+
+  /// Whether this is a 'private' method.
+  public var isPrivate: Bool {
+    return (getModifiers() & 0x00000002) != 0
   }
 
   /// Whether this is a 'protected' method.
   public var isProtected: Bool {
-    return (getModifiers() & 4) != 0
+    return (getModifiers() & 0x00000004) != 0
+  }
+
+  /// Whether this is a 'package' method.
+  /// 
+  /// The "default" access level in Java is 'package', it is signified by lack of a different access modifier.
+  public var isPackage: Bool { 
+    return !isPublic && !isPrivate && !isProtected
   }
 
   /// Whether this is a 'static' method.
   public var isStatic: Bool {
-    return (getModifiers() & 0x08) != 0
+    return (getModifiers() & 0x00000008) != 0
   }
 
   /// Whether this is a 'native' method.
   public var isNative: Bool {
-    return (getModifiers() & 256) != 0
+    return (getModifiers() & 0x00000100) != 0
+  }
+  
+  /// Whether this is a 'final' method.
+  public var isFinal: Bool {
+    return (getModifiers() & 0x00000010) != 0
   }
 }

Sources/JavaStdlib/JavaLangReflect/TypeVariable+Extensions.swift

@@ -0,0 +1,63 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 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
+//
+//===----------------------------------------------------------------------===//
+
+import CSwiftJavaJNI
+import SwiftJava
+
+// FIXME: all interfaces should ahve these https://github.com/swiftlang/swift-java/issues/430
+extension TypeVariable {  
+
+  @JavaMethod
+  public func toString() -> String
+  
+  @JavaMethod
+  public func getClass() -> JavaClass<JavaObject>!
+
+  @JavaMethod
+  public func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  public func hashCode() -> Int32
+
+}
+
+// FIXME: All Java objects are Hashable, we should handle that accordingly.
+extension TypeVariable: Hashable {
+
+  public func hash(into hasher: inout Hasher) {
+    guard let pojo = self.as(JavaObject.self) else {
+      return 
+    }
+
+    hasher.combine(pojo.hashCode())
+  }
+
+  public static func == (lhs: TypeVariable<D>, rhs: TypeVariable<D>) -> Bool {
+    guard let lhpojo: JavaObject = lhs.as(JavaObject.self) else {
+      return false
+    }
+    guard let rhpojo: JavaObject = rhs.as(JavaObject.self) else {
+      return false
+    }
+
+    return lhpojo.equals(rhpojo)
+  }
+
+}
+
+extension TypeVariable {
+  public var description: String { 
+    toString()
+  }
+}

Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift

@@ -11,9 +11,6 @@ open class Executable: AccessibleObject {
   @JavaMethod
   open func getModifiers() -> Int32
 
-  @JavaMethod
-  open func getTypeParameters() -> [TypeVariable<JavaObject>?]
-
   @JavaMethod
   open func getParameterTypes() -> [JavaClass<JavaObject>?]
 

Sources/JavaStdlib/JavaLangReflect/generated/ParameterizedType.swift

@@ -16,3 +16,24 @@ public struct ParameterizedType {
   @JavaMethod
   public func getTypeName() -> String
 }
+
+extension ParameterizedType {  
+
+  @JavaMethod
+  public func toString() -> String
+  
+  @JavaMethod
+  public func getClass() -> JavaClass<JavaObject>!
+
+  @JavaMethod
+  public func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  public func hashCode() -> Int32
+}
+
+extension ParameterizedType: CustomStringConvertible { 
+  public var description: String { 
+    toString()
+  }
+}