rename genericResult: param to typeErasedResult:

Author: ktoso

Sources/SwiftJava/Macros.swift

@@ -134,14 +134,14 @@ public macro JavaStaticField(_ javaFieldName: String? = nil, isFinal: Bool = fal
 /// In order to mark a generic return type you must indicate it to the @JavaMethod macro like this:
 /// ```swift
 /// // Java: class Test<T> { public <T> get(); }
-/// @JavaMethod(genericResult: "T!")
+/// @JavaMethod(typeErasedResult: "T!")
 /// func get() -> T!
 /// ```
 /// This allows the macro to form a call into the get() method, which at runtime, will have an `java.lang.Object` 
 /// returning method signature, and then, convert the result to the expected `T` type on the Swift side.
 @attached(body)
 public macro JavaMethod(
-  genericResult: String? = nil
+  typeErasedResult: String? = nil
 ) = #externalMacro(module: "SwiftJavaMacros", type: "JavaMethodMacro")
 
 /// Attached macro that turns a Swift method on JavaClass into one that wraps
@@ -155,7 +155,7 @@ public macro JavaMethod(
 /// ```
 @attached(body)
 public macro JavaStaticMethod(
-  genericResult: String? = nil
+  typeErasedResult: String? = nil
 ) = #externalMacro(module: "SwiftJavaMacros", type: "JavaMethodMacro")
 
 /// Macro that marks extensions to specify that all of the @JavaMethod

Sources/SwiftJava/generated/JavaOptional.swift

@@ -3,7 +3,7 @@ import CSwiftJavaJNI
 
 @JavaClass("java.util.Optional")
 open class JavaOptional<T: AnyJavaObject>: JavaObject {
-  @JavaMethod(genericResult: "T")
+  @JavaMethod(typeErasedResult: "T")
   open func get() -> T!
 
   @JavaMethod

Sources/SwiftJavaMacros/JavaMethodMacro.swift

@@ -62,7 +62,15 @@ extension JavaMethodMacro: BodyMacro {
           .as(StringLiteralExprSyntax.self),
         stringLiteral.segments.count == 1,
         case let .stringSegment(wrapperName)? = stringLiteral.segments.first {
-          "\(wrapperName)"
+          // TODO: Improve this unwrapping a bit;
+          // Trim the trailing ! and ? from the type for purposes 
+          // of initializing the type wrapper in the method body
+          if "\(wrapperName)".hasSuffix("!") ||
+             "\(wrapperName)".hasSuffix("?") {
+            String("\(wrapperName)".dropLast())
+          } else {
+            "\(wrapperName)"
+          }
       } else {
         nil
       }

Sources/SwiftJavaToolLib/JavaClassTranslator.swift

@@ -683,7 +683,7 @@ extension JavaClassTranslator {
         // Do we need to record any generic information, in order to enable type-erasure for the upcalls?
         var parameters: [String] = []
         if hasTypeEraseGenericResultType {
-          parameters.append("genericResult: \"\(resultType)\"")
+          parameters.append("typeErasedResult: \"\(resultType)\"")
         }
         // TODO: generic parameters?
 

Tests/SwiftJavaMacrosTests/JavaClassMacroTests.swift

@@ -301,7 +301,7 @@ class JavaKitMacroTests: XCTestCase {
     assertMacroExpansion("""
         @JavaClass("java.lang.Optional")
         open class JavaOptional<T: AnyJavaObject>: JavaObject {
-          @JavaMethod(genericResult: "T")
+          @JavaMethod(typeErasedResult: "T")
           open func get() -> T!
         }
       """,

Tests/SwiftJavaToolLibTests/Java2SwiftTests.swift

@@ -262,7 +262,7 @@ class Java2SwiftTests: XCTestCase {
         public struct MyJavaObjects {
         """,
         """
-        @JavaStaticMethod(genericResult: "T!")
+        @JavaStaticMethod(typeErasedResult: "T!")
         public func requireNonNull<T: AnyJavaObject>(_ arg0: T?, _ arg1: MySupplier<JavaString>?) -> T
         """,
       ]
@@ -475,7 +475,7 @@ class Java2SwiftTests: XCTestCase {
         public struct MyJavaIntFunction<R: AnyJavaObject> {
         """,
         """
-        @JavaMethod(genericResult: "R!")
+        @JavaMethod(typeErasedResult: "R!")
         public func apply(_ arg0: Int32) -> R!
         """,
       ]

Tests/SwiftJavaToolLibTests/WrapJavaTests/GenericsWrapJavaTests.swift

@@ -62,7 +62,7 @@ final class GenericsWrapJavaTests: XCTestCase {
         open class ExampleSimpleClass: JavaObject {
         """,
         """
-        @JavaMethod(genericResult: "KeyType!")
+        @JavaMethod(typeErasedResult: "KeyType!")
         open func getGeneric<KeyType: AnyJavaObject>(_ arg0: Item<KeyType>?) -> KeyType!
         """,
       ]
@@ -100,7 +100,7 @@ final class GenericsWrapJavaTests: XCTestCase {
       classpath: [classpathURL],
       expectedChunks: [
         """
-        @JavaMethod(genericResult: "KeyType!")
+        @JavaMethod(typeErasedResult: "KeyType!")
         open func getGeneric<KeyType: AnyJavaObject>() -> KeyType!
         """,
       ]
@@ -194,11 +194,11 @@ final class GenericsWrapJavaTests: XCTestCase {
       classpath: [classpathURL],
       expectedChunks: [
         """
-        @JavaMethod(genericResult: "T!")
+        @JavaMethod(typeErasedResult: "T!")
         open func getClassGeneric() -> T!
         """,
         """
-        @JavaMethod(genericResult: "M!")
+        @JavaMethod(typeErasedResult: "M!")
         open func getMethodGeneric<M: AnyJavaObject>() -> M!
         """,
         """
@@ -292,7 +292,7 @@ final class GenericsWrapJavaTests: XCTestCase {
         """
         @JavaClass("com.example.Kappa")
         open class Kappa<T: AnyJavaObject>: JavaObject {
-          @JavaMethod(genericResult: "T!")
+          @JavaMethod(typeErasedResult: "T!")
           open func get() -> T!
         }
         """
@@ -331,11 +331,43 @@ final class GenericsWrapJavaTests: XCTestCase {
         }
         """,
         """
-        @JavaStaticMethod(genericResult: "T!")
+        @JavaStaticMethod(typeErasedResult: "T!")
         public func nonNull<T: AnyJavaObject>(_ arg0: T?) -> T! where ObjectType == Optional<T>
         """
       ]
     )
   }
+
+  // TODO: this should be improved some more, we need to generated a `: Map` on the Swift side
+  func test_wrapJava_genericMethodTypeErasure_genericExtendsMap() async throws {
+    let classpathURL = try await compileJava(
+      """
+      package com.example;
+      
+      final class Map<T, U> {}
+      
+      final class Something {
+        public <M extends Map<String, String>> M putIn(M map) { return null; }
+      }
+      """)
+
+    try assertWrapJavaOutput(
+      javaClassNames: [
+        "com.example.Map",
+        "com.example.Something",
+      ],
+      classpath: [classpathURL],
+      expectedChunks: [
+        """
+        @JavaClass("com.example.Something")
+        open class Something: JavaObject {
+        """,
+        """
+        @JavaMethod(typeErasedResult: "M!")
+        open func putIn<M: AnyJavaObject>(_ arg0: M?) -> M!
+        """,
+      ]
+    )
+  }
 
 }