Add Tests for Subclasses

Author: jrosen081

Sources/Java2Swift/JavaToSwift.swift

@@ -229,10 +229,26 @@ struct JavaToSwift: ParsableCommand {
       // Note that we will be translating this Java class, so it is a known class.
       translator.translatedClasses[javaClassName] = (translatedSwiftName, nil, true)
 
-      for internalClass in javaClass.getClasses() {
+      var classes: [(classToImport: JavaClass<JavaObject>?, prefix: String)] = javaClass.getClasses().map { ($0, translatedSwiftName) }
+
+      // Go through all subclasses to find all of the classes to translate
+      while let (internalClass, prefix) = classes.popLast() {
         if let internalClass {
           let (javaName, swiftName) = names(from: internalClass.getCanonicalName())
-          translator.translatedClasses[internalClass.getCanonicalName()] = (swiftName.replacing("$", with: "."), nil, true)
+          // If we have already been through this class, don't go through it again
+          guard translator.translatedClasses[javaName] == nil else { continue }
+          let currentClassName: String
+          // If the prefix is the part of the canonical name, continue (else use the same)
+          // This is needed since `java.lang.Enum.EnumDesc` is one of the declared classes of all of the enums
+          if (internalClass.getCanonicalName().contains(prefix)) {
+            currentClassName = "\(prefix).\(swiftName)"
+          } else {
+            currentClassName = swiftName
+          }
+
+          let currentSanitizedClassName = currentClassName.replacing("$", with: ".")
+          classes.append(contentsOf: internalClass.getClasses().map { ($0, currentSanitizedClassName) })
+          translator.translatedClasses[javaName] = (currentSanitizedClassName, nil, true)
         }
       }
     }

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -193,6 +193,15 @@ extension JavaTranslator {
   package func translateClass(_ javaClass: JavaClass<JavaObject>) -> [DeclSyntax] {
     let fullName = javaClass.getCanonicalName()
     let swiftTypeName = try! getSwiftTypeNameFromJavaClassName(fullName)
+    let (swiftParentType, swiftInnermostTypeName) = swiftTypeName.splitSwiftTypeName()
+
+    // If the swift parent type has not been translated, don't try to translate this one
+    if let swiftParentType,
+       !translatedClasses.contains(where: { _, value in value.swiftType == swiftParentType })
+    {
+      logUntranslated("Unable to translate '\(fullName)' parent class: \(swiftParentType) not found")
+      return []
+    }
 
     // Superclass.
     let extends: String
@@ -356,13 +365,12 @@ extension JavaTranslator {
       staticMemberWhereClause = ""
     }
 
-    // Emit the struct declaration describing the java class.
-    let (swiftParentType, swiftInnermostTypeName) = swiftTypeName.splitSwiftTypeName()
+    // Emit the struct declaration describing the java class. Add backticks to the name since the type might interfere with Swift type names
     let classOrInterface: String = javaClass.isInterface() ? "JavaInterface" : "JavaClass";
     var classDecl =
       """
       @\(raw:classOrInterface)(\(literal: fullName)\(raw: extends)\(raw: interfacesStr))
-      public struct \(raw: swiftInnermostTypeName)\(raw: genericParameterClause) {
+      public struct `\(raw: swiftInnermostTypeName)`\(raw: genericParameterClause) {
       \(raw: members.map { $0.description }.joined(separator: "\n\n"))
       }
       """ as DeclSyntax
@@ -382,6 +390,7 @@ extension JavaTranslator {
     classDecl = classDecl.formatted(using: format).cast(DeclSyntax.self)
 
     topLevelDecls.append(classDecl)
+
     let subClassDecls = javaClass.getClasses().compactMap {
       $0.flatMap { clazz in
         return translateClass(clazz)
@@ -391,7 +400,6 @@ extension JavaTranslator {
     topLevelDecls.append(
       contentsOf: subClassDecls
     )
-
     // Translate static members.
     var staticMembers: [DeclSyntax] = []
 

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -37,7 +37,7 @@ class Java2SwiftTests: XCTestCase {
         "import JavaKit",
         """
         @JavaClass("java.lang.Object")
-        public struct MyJavaObject {
+        public struct `MyJavaObject` {
         """,
         """
           @JavaMethod
@@ -127,7 +127,16 @@ class Java2SwiftTests: XCTestCase {
       ],
       expectedChunks: [
         "import JavaKit",
-        ""
+        """
+        extension ProcessBuilder {
+          @JavaClass("java.lang.ProcessBuilder.Redirect")
+          public struct `Redirect` {
+        """,
+        """
+        extension ProcessBuilder.Redirect {
+          @JavaClass("java.lang.ProcessBuilder.Redirect.Type")
+          public struct `Type` {
+        """
       ]
     )
   }
@@ -179,7 +188,6 @@ func assertTranslatedClass<JavaClassType: AnyJavaObject>(
     """
 
   for expectedChunk in expectedChunks {
-    print(swiftFileText)
     if swiftFileText.contains(expectedChunk) {
       continue
     }