fix rendering of inheritance clause when parameterized superclass

Author: ktoso

Sources/SwiftJavaToolLib/JavaClassTranslator.swift

@@ -356,10 +356,10 @@ extension JavaClassTranslator {
     // Compute the "extends" clause for the superclass (of the struct
     // formulation) or the inheritance clause (for the class
     // formulation).
-    let extends: String
+    let extendsClause: String
     let inheritanceClause: String
     if translateAsClass {
-      extends = ""
+      extendsClause = ""
       inheritanceClause = 
         if let swiftSuperclass, swiftSuperclass.typeArguments.isEmpty {
            ": \(swiftSuperclass.name)" 
@@ -369,7 +369,12 @@ extension JavaClassTranslator {
           "" 
         }
     } else {
-      extends = swiftSuperclass.map { ", extends: \($0).self" } ?? ""
+      extendsClause = 
+        if let swiftSuperclass {
+          ", extends: \(swiftSuperclass.render()).self" 
+        } else {
+          ""
+        }
       inheritanceClause = ""
     }
 
@@ -394,7 +399,7 @@ extension JavaClassTranslator {
     let introducer = translateAsClass ? "open class" : "public struct"
     var classDecl: DeclSyntax =
       """
-      @\(raw: classOrInterface)(\(literal: javaClass.getName())\(raw: extends)\(raw: interfacesStr))
+      @\(raw: classOrInterface)(\(literal: javaClass.getName())\(raw: extendsClause)\(raw: interfacesStr))
       \(raw: introducer) \(raw: swiftInnermostTypeName)\(raw: genericParameterClause)\(raw: inheritanceClause) {
       \(raw: members.map { $0.description }.joined(separator: "\n\n"))
       }

Sources/SwiftJavaToolLib/JavaParameterizedType.swift

@@ -25,4 +25,14 @@ struct SwiftJavaParameterizedType {
     self.name = name
     self.typeArguments = typeArguments
   }
+
+  func render() -> String {
+    if typeArguments.isEmpty {
+      name
+    } else {
+      "\(name)<\(typeArguments.joined(separator: ", "))>"
+    }
+  }
+
+
 }

Tests/SwiftJavaToolLibTests/Java2SwiftTests.swift

@@ -262,8 +262,8 @@ class Java2SwiftTests: XCTestCase {
         public struct MyJavaObjects {
         """,
         """
-          @JavaStaticMethod
-          public func requireNonNull(_ arg0: JavaObject?, _ arg1: MySupplier<JavaString>?) -> JavaObject!
+        @JavaStaticMethod
+        public func requireNonNull<T: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: MySupplier<JavaString>?) -> T
         """,
       ]
     )
@@ -675,8 +675,19 @@ func assertTranslatedClass<JavaClassType: AnyJavaObject>(
       \(translatedDecls.map { $0.description }.joined(separator: "\n"))
       """
 
+    // Helper function to normalize whitespace by trimming leading whitespace from each line
+    func normalizeWhitespace(_ text: String) -> String {
+      return text.components(separatedBy: .newlines)
+        .map { $0.trimmingCharacters(in: .whitespaces) }
+        .joined(separator: "\n")
+    }
+    
+    let normalizedSwiftFileText = normalizeWhitespace(swiftFileText)
+    
     for expectedChunk in expectedChunks {
-      if swiftFileText.contains(expectedChunk) {
+      let normalizedExpectedChunk = normalizeWhitespace(expectedChunk)
+      
+      if normalizedSwiftFileText.contains(normalizedExpectedChunk) {
         continue
       }