Omit typeErasedResultBound parameter if it can

Author: sidepelican

Sources/JavaStdlib/JavaLangReflect/generated/Constructor.swift

@@ -73,7 +73,7 @@ open class Constructor<T: AnyJavaObject>: Executable {
   /// ```java
   /// public T java.lang.reflect.Constructor.newInstance(java.lang.Object...) throws java.lang.InstantiationException,java.lang.IllegalAccessException,java.lang.IllegalArgumentException,java.lang.reflect.InvocationTargetException
   /// ```
-  @JavaMethod(typeErasedResult: "T!", typeErasedResultBound: JavaObject?.self)
+  @JavaMethod(typeErasedResult: "T!")
   open func newInstance(_ arg0: [JavaObject?]) throws -> T!
 
   /// Java method `getParameterTypes`.

Sources/SwiftJavaToolLib/JavaClassTranslator.swift

@@ -989,21 +989,24 @@ extension JavaClassTranslator {
       }
       if hasTypeEraseGenericResultType {
         let returnType = javaMethod.getReturnType()!
-        var boundType = try translator.getSwiftTypeNameAsString(
-          method: javaMethod,
-          returnType.as(Type.self),
-          substitution: substitution,
-          preferValueTypes: true,
-          outerOptional: .nonoptional
-        )
-        // `getSwiftTypeNameAsString` does not include generic parameters for non parameterized type
-        if let returnClass = returnType.as(JavaClass<JavaObject>.self) {
-          let typeParameters = returnClass.getTypeParameters()
-          if !typeParameters.isEmpty {
-            boundType += "<\([String](repeating: "JavaObject", count: typeParameters.count).joined(separator: ", "))>"
+        parameters.append(#"typeErasedResult: "\#(resultType)""#)
+        if returnType.getName() != "java.lang.Object" {
+          var boundType = try translator.getSwiftTypeNameAsString(
+            method: javaMethod,
+            returnType.as(Type.self),
+            substitution: substitution,
+            preferValueTypes: true,
+            outerOptional: .nonoptional
+          )
+          // `getSwiftTypeNameAsString` does not include generic parameters for non parameterized type
+          if let returnClass = returnType.as(JavaClass<JavaObject>.self) {
+            let typeParameters = returnClass.getTypeParameters()
+            if !typeParameters.isEmpty {
+              boundType += "<\([String](repeating: "JavaObject", count: typeParameters.count).joined(separator: ", "))>"
+            }
           }
+          parameters.append(#"typeErasedResultBound: \#(boundType)?.self"#)
         }
-        parameters.append(#"typeErasedResult: "\#(resultType)", typeErasedResultBound: \#(boundType)?.self"#)
       }
 
       if !parameters.isEmpty {

Tests/SwiftJavaToolLibTests/Java2SwiftTests.swift

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

Tests/SwiftJavaToolLibTests/WrapJavaTests/BasicWrapJavaTests.swift

@@ -272,7 +272,7 @@ final class BasicWrapJavaTests: XCTestCase {
           /// ```java
           /// public abstract ValueType com.example.CallMe.apply(ValueType,ValueType)
           /// ```
-          @JavaMethod(typeErasedResult: "ValueType!", typeErasedResultBound: JavaObject?.self)
+          @JavaMethod(typeErasedResult: "ValueType!")
             public func apply(_ arg0: ValueType?, _ arg1: ValueType?) -> ValueType!
           }
         """

Tests/SwiftJavaToolLibTests/WrapJavaTests/GenericsSubstitutionWrapJavaTests.swift

@@ -48,15 +48,15 @@ final class GenericsSubstitutionWrapJavaTests: XCTestCase {
         public struct MyFunction<T: AnyJavaObject, R: AnyJavaObject> {
         """,
         """
-        @JavaMethod(typeErasedResult: "R!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "R!")
         public func apply(_ arg0: T?) -> R!
         """,
         """
         @JavaInterface("com.example.MyUnaryOperator", extends: MyFunction<JavaObject, JavaObject>.self)
         public struct MyUnaryOperator<T: AnyJavaObject> {
         """,
         """
-        @JavaMethod(typeErasedResult: "T!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "T!")
         public func apply(_ arg0: T?) -> T!
         """,
       ]
@@ -90,15 +90,15 @@ final class GenericsSubstitutionWrapJavaTests: XCTestCase {
         open class ClassFunction<T: AnyJavaObject, R: AnyJavaObject>: JavaObject {
         """,
         """
-        @JavaMethod(typeErasedResult: "R!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "R!")
         open func apply(_ arg0: T?) -> R!
         """,
         """
         @JavaClass("com.example.ClassUnaryOperator")
         open class ClassUnaryOperator<T: AnyJavaObject>: ClassFunction<T, T> {
         """,
         """
-        @JavaMethod(typeErasedResult: "T!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "T!")
         open override func apply(_ arg0: T?) -> T!
         """,
       ]

Tests/SwiftJavaToolLibTests/WrapJavaTests/GenericsWrapJavaTests.swift

@@ -63,7 +63,7 @@ final class GenericsWrapJavaTests: XCTestCase {
         open class ExampleSimpleClass: JavaObject {
         """,
         """
-        @JavaMethod(typeErasedResult: "KeyType!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "KeyType!")
         open func getGeneric<KeyType: AnyJavaObject>(_ arg0: Item<KeyType>?) -> KeyType!
         """,
       ]
@@ -102,7 +102,7 @@ final class GenericsWrapJavaTests: XCTestCase {
       classpath: [classpathURL],
       expectedChunks: [
         """
-        @JavaMethod(typeErasedResult: "KeyType!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "KeyType!")
         open func getGeneric<KeyType: AnyJavaObject>() -> KeyType!
         """
       ]
@@ -200,11 +200,11 @@ final class GenericsWrapJavaTests: XCTestCase {
       classpath: [classpathURL],
       expectedChunks: [
         """
-        @JavaMethod(typeErasedResult: "T!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "T!")
         open func getClassGeneric() -> T!
         """,
         """
-        @JavaMethod(typeErasedResult: "M!", typeErasedResultBound: JavaObject?.self)
+        @JavaMethod(typeErasedResult: "M!")
         open func getMethodGeneric<M: AnyJavaObject>() -> M!
         """,
         """
@@ -377,7 +377,7 @@ final class GenericsWrapJavaTests: XCTestCase {
         open class Kappa<T: AnyJavaObject>: JavaObject {
         """,
         """
-          @JavaMethod(typeErasedResult: "T!", typeErasedResultBound: JavaObject?.self)
+          @JavaMethod(typeErasedResult: "T!")
           open func get() -> T!
         }
         """,
@@ -416,7 +416,7 @@ final class GenericsWrapJavaTests: XCTestCase {
         public func ofNullable<T: AnyJavaObject>(_ arg0: T?) -> Optional<T>! where ObjectType == Optional<T>
         """,
         """
-        @JavaStaticMethod(typeErasedResult: "T!", typeErasedResultBound: JavaObject?.self)
+        @JavaStaticMethod(typeErasedResult: "T!")
         public func nonNull<T: AnyJavaObject>(_ arg0: T?) -> T! where ObjectType == Optional<T>
         """,
       ]