WIP: need the parameterized parent types

Author: ktoso

Sources/SwiftJava/generated/JavaClass.swift

@@ -30,6 +30,9 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
   @JavaMethod
   open func isHidden() -> Bool
 
+  @JavaMethod
+  open func getGenericSuperclass() -> JavaType
+  
   @JavaMethod
   open func getSuperclass() -> JavaClass<JavaObject>!
 

Sources/SwiftJava/generated/JavaReflectParameterizedType.swift

@@ -0,0 +1,8 @@
+// Auto-generated by Java-to-Swift wrapper generator.
+import CSwiftJavaJNI
+
+@JavaClass("java.reflect.Type")
+open class JavaReflectParameterizedType: JavaObject {
+  @JavaMethod
+  open func getTypeName() -> String
+}

Sources/SwiftJava/generated/JavaType.swift

@@ -0,0 +1,8 @@
+// Auto-generated by Java-to-Swift wrapper generator.
+import CSwiftJavaJNI
+
+@JavaClass("java.reflect.Type")
+open class JavaReflectType: JavaObject {
+  @JavaMethod
+  open func getTypeName() -> String
+}

Sources/SwiftJava/swift-java.config

@@ -5,6 +5,8 @@
     "java.lang.Byte" : "JavaByte",
     "java.lang.Character" : "JavaCharacter",
     "java.lang.Class" : "JavaClass",
+    "java.lang.reflect.Type" : "JavaType",
+    "java.lang.reflect.ParameterizedType" : "JavaParameterizedType",
     "java.lang.ClassLoader" : "JavaClassLoader",
     "java.lang.Double" : "JavaDouble",
     "java.lang.Error" : "JavaError",

Sources/SwiftJavaToolLib/JavaClassTranslator.swift

@@ -113,6 +113,8 @@ struct JavaClassTranslator {
   /// Prepare translation for the given Java class (or interface).
   init(javaClass: JavaClass<JavaObject>, translator: JavaTranslator) throws {
     let fullName = javaClass.getName()
+    print("TRANSLATE = \(fullName)")
+    
     self.javaClass = javaClass
     self.translator = translator
     self.translateAsClass = translator.translateAsClass && !javaClass.isInterface()

Tests/SwiftJavaToolLibTests/WrapJavaTests.swift

@@ -15,6 +15,7 @@
 @_spi(Testing) import SwiftJava
 import SwiftJavaToolLib
 import JavaUtilJar
+import SwiftJavaShared
 import _Subprocess
 import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
 
@@ -69,16 +70,19 @@ class WrapJavaTests: XCTestCase {
       package com.example;
 
       class ByteArray {}
-      // class CompressingStore extends AbstractStore<ByteArray, byte[], byte[]> {}
-      abstract class AbstractStore<K, V, T> implements Store<K, V, T> {}
-      interface Store<K, V, T> {}
+      class CompressingStore extends AbstractStore<ByteArray, byte[], byte[]> {}
+      abstract class AbstractStore<K, V, T> {} // implements Store<K, V, T> {}
+      // interface Store<K, V, T> {}
 
       """)
 
     try assertWrapJavaOutput(
       javaClassNames: [
         "com.example.ByteArray",
-        "com.example.Store",
+        // TODO: what if we visit in other order, does the wrap-java handle it
+        // "com.example.Store",
+        "com.example.AbstractStore",
+        "com.example.CompressingStore",
       ],
       classpath: [classpathURL],
       expectedChunks: [
@@ -93,6 +97,10 @@ class WrapJavaTests: XCTestCase {
         """
         @JavaInterface("com.example.Store")
         public struct Store<K: AnyJavaObject, V: AnyJavaObject, T: AnyJavaObject> {
+        """,
+        """
+        @JavaClass("com.example.CompressingStore")
+        open class CompressingStore: AbstractStore {
         """
       ]
     )
@@ -133,6 +141,7 @@ func compileJava(_ sourceText: String) async throws -> URL {
     "ERROR: \(errString)")
   }
 
+  print("Compiled java sources to: \(classesDirectory)")
   return classesDirectory
 }
 
@@ -189,10 +198,11 @@ func assertWrapJavaOutput(
 
   let swiftFileText = 
     """
+    // ---------------------------------------------------------------------------
     // Auto-generated by Java-to-Swift wrapper generator.
     \(importDecls.map { $0.description }.joined())
     \(swiftClassDecls.map { $0.description }.joined(separator: "\n"))
-
+    \n
     """
     swiftCompleteOutputText += swiftFileText
   }
@@ -202,10 +212,13 @@ func assertWrapJavaOutput(
       continue
     }
 
-    XCTFail("Expected chunk '\(expectedChunk)' not found in '\(swiftCompleteOutputText)'",
+    XCTFail("Expected chunk: \n" +
+    "\(expectedChunk.yellow)" + 
+    "\n" + 
+    "not found in:\n" +
+    "\(swiftCompleteOutputText)",
      file: file, line: line)
   }
 
-  print("=============================================")
   print(swiftCompleteOutputText)
 }