Java2Swift: Don't omit "extends" clause when it's extending JavaObject

Sources/Java2SwiftLib/JavaClassTranslator.swift

@@ -110,10 +110,7 @@ struct JavaClassTranslator {
     self.nestedClasses = translator.nestedClasses[fullName] ?? []
 
     // Superclass.
-    if !javaClass.isInterface(),
-      let javaSuperclass = javaClass.getSuperclass(),
-      javaSuperclass.getName() != "java.lang.Object"
-    {
+    if !javaClass.isInterface(), let javaSuperclass = javaClass.getSuperclass() {
       do {
         self.swiftSuperclass = try translator.getSwiftTypeName(javaSuperclass).swiftName
       } catch {

Sources/JavaKit/generated/JavaBoolean.swift

@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaRuntime
 
-@JavaClass("java.lang.Boolean")
+@JavaClass("java.lang.Boolean", extends: JavaObject.self)
 public struct JavaBoolean {
   @JavaMethod
   public init(_ arg0: Bool, environment: JNIEnvironment? = nil)

Sources/JavaKit/generated/JavaCharacter.swift

@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaRuntime
 
-@JavaClass("java.lang.Character")
+@JavaClass("java.lang.Character", extends: JavaObject.self)
 public struct JavaCharacter {
   @JavaMethod
   public init(_ arg0: UInt16, environment: JNIEnvironment? = nil)
@@ -3147,7 +3147,7 @@ extension JavaClass<JavaCharacter.UnicodeScript> {
   public func of(_ arg0: Int32) -> JavaCharacter.UnicodeScript!
 }
 extension JavaCharacter {
-  @JavaClass("java.lang.Character$Subset")
+  @JavaClass("java.lang.Character$Subset", extends: JavaObject.self)
   public struct Subset {
   @JavaMethod
   public func equals(_ arg0: JavaObject?) -> Bool

Sources/JavaKit/generated/JavaClass.swift

@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaRuntime
 
-@JavaClass("java.lang.Class")
+@JavaClass("java.lang.Class", extends: JavaObject.self)
 public struct JavaClass<T: AnyJavaObject> {
   @JavaMethod
   public func getName() -> String

Sources/JavaKit/generated/JavaNumber.swift

@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaRuntime
 
-@JavaClass("java.lang.Number")
+@JavaClass("java.lang.Number", extends: JavaObject.self)
 public struct JavaNumber {
   @JavaMethod
   public init(environment: JNIEnvironment? = nil)

Sources/JavaKit/generated/JavaVoid.swift

@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaRuntime
 
-@JavaClass("java.lang.Void")
+@JavaClass("java.lang.Void", extends: JavaObject.self)
 public struct JavaVoid {
   @JavaMethod
   public func equals(_ arg0: JavaObject?) -> Bool

Sources/JavaKit/generated/Throwable.swift

@@ -1,7 +1,7 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaRuntime
 
-@JavaClass("java.lang.Throwable")
+@JavaClass("java.lang.Throwable", extends: JavaObject.self)
 public struct Throwable {
   @JavaMethod
   public init(_ arg0: Throwable?, environment: JNIEnvironment? = nil)

Sources/JavaKitCollection/generated/BitSet.swift

@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.BitSet")
+@JavaClass("java.util.BitSet", extends: JavaObject.self)
 public struct BitSet {
   @JavaMethod
   public init(environment: JNIEnvironment? = nil)

Sources/JavaKitCollection/generated/HashMap.swift

@@ -88,6 +88,92 @@ public struct HashMap<K: AnyJavaObject, V: AnyJavaObject> {
   @JavaMethod
   public func wait() throws
 }
+extension HashMap {
+  @JavaClass("java.util.AbstractMap$SimpleImmutableEntry", extends: JavaObject.self)
+  public struct SimpleImmutableEntry<K: AnyJavaObject, V: AnyJavaObject> {
+  @JavaMethod
+  public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
+
+  @JavaMethod
+  public func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  public func toString() -> String
+
+  @JavaMethod
+  public func hashCode() -> Int32
+
+  @JavaMethod
+  public func getValue() -> JavaObject!
+
+  @JavaMethod
+  public func getKey() -> JavaObject!
+
+  @JavaMethod
+  public func setValue(_ arg0: JavaObject?) -> JavaObject!
+
+  @JavaMethod
+  public func getClass() -> JavaClass<JavaObject>!
+
+  @JavaMethod
+  public func notify()
+
+  @JavaMethod
+  public func notifyAll()
+
+  @JavaMethod
+  public func wait(_ arg0: Int64) throws
+
+  @JavaMethod
+  public func wait(_ arg0: Int64, _ arg1: Int32) throws
+
+  @JavaMethod
+  public func wait() throws
+  }
+}
+extension HashMap {
+  @JavaClass("java.util.AbstractMap$SimpleEntry", extends: JavaObject.self)
+  public struct SimpleEntry<K: AnyJavaObject, V: AnyJavaObject> {
+  @JavaMethod
+  public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
+
+  @JavaMethod
+  public func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  public func toString() -> String
+
+  @JavaMethod
+  public func hashCode() -> Int32
+
+  @JavaMethod
+  public func getValue() -> JavaObject!
+
+  @JavaMethod
+  public func getKey() -> JavaObject!
+
+  @JavaMethod
+  public func setValue(_ arg0: JavaObject?) -> JavaObject!
+
+  @JavaMethod
+  public func getClass() -> JavaClass<JavaObject>!
+
+  @JavaMethod
+  public func notify()
+
+  @JavaMethod
+  public func notifyAll()
+
+  @JavaMethod
+  public func wait(_ arg0: Int64) throws
+
+  @JavaMethod
+  public func wait(_ arg0: Int64, _ arg1: Int32) throws
+
+  @JavaMethod
+  public func wait() throws
+  }
+}
 extension JavaClass {
   @JavaStaticMethod
   public func newHashMap<K: AnyJavaObject, V: AnyJavaObject>(_ arg0: Int32) -> HashMap<JavaObject, JavaObject>! where ObjectType == HashMap<K, V>

Sources/JavaKitCollection/generated/JavaDictionary.swift

@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.Dictionary")
+@JavaClass("java.util.Dictionary", extends: JavaObject.self)
 public struct JavaDictionary<K: AnyJavaObject, V: AnyJavaObject> {
   @JavaMethod
   public init(environment: JNIEnvironment? = nil)

Sources/JavaKitCollection/generated/TreeMap.swift

@@ -106,89 +106,3 @@ public struct TreeMap<K: AnyJavaObject, V: AnyJavaObject> {
   @JavaMethod
   public func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject!
 }
-extension TreeMap {
-  @JavaClass("java.util.AbstractMap$SimpleImmutableEntry")
-  public struct SimpleImmutableEntry<K: AnyJavaObject, V: AnyJavaObject> {
-  @JavaMethod
-  public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
-
-  @JavaMethod
-  public func equals(_ arg0: JavaObject?) -> Bool
-
-  @JavaMethod
-  public func toString() -> String
-
-  @JavaMethod
-  public func hashCode() -> Int32
-
-  @JavaMethod
-  public func getValue() -> JavaObject!
-
-  @JavaMethod
-  public func getKey() -> JavaObject!
-
-  @JavaMethod
-  public func setValue(_ arg0: JavaObject?) -> JavaObject!
-
-  @JavaMethod
-  public func getClass() -> JavaClass<JavaObject>!
-
-  @JavaMethod
-  public func notify()
-
-  @JavaMethod
-  public func notifyAll()
-
-  @JavaMethod
-  public func wait(_ arg0: Int64) throws
-
-  @JavaMethod
-  public func wait(_ arg0: Int64, _ arg1: Int32) throws
-
-  @JavaMethod
-  public func wait() throws
-  }
-}
-extension TreeMap {
-  @JavaClass("java.util.AbstractMap$SimpleEntry")
-  public struct SimpleEntry<K: AnyJavaObject, V: AnyJavaObject> {
-  @JavaMethod
-  public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
-
-  @JavaMethod
-  public func equals(_ arg0: JavaObject?) -> Bool
-
-  @JavaMethod
-  public func toString() -> String
-
-  @JavaMethod
-  public func hashCode() -> Int32
-
-  @JavaMethod
-  public func getValue() -> JavaObject!
-
-  @JavaMethod
-  public func getKey() -> JavaObject!
-
-  @JavaMethod
-  public func setValue(_ arg0: JavaObject?) -> JavaObject!
-
-  @JavaMethod
-  public func getClass() -> JavaClass<JavaObject>!
-
-  @JavaMethod
-  public func notify()
-
-  @JavaMethod
-  public func notifyAll()
-
-  @JavaMethod
-  public func wait(_ arg0: Int64) throws
-
-  @JavaMethod
-  public func wait(_ arg0: Int64, _ arg1: Int32) throws
-
-  @JavaMethod
-  public func wait() throws
-  }
-}

Sources/JavaKitJar/generated/Attributes.swift

@@ -3,7 +3,7 @@ import JavaKit
 import JavaKitCollection
 import JavaRuntime
 
-@JavaClass("java.util.jar.Attributes")
+@JavaClass("java.util.jar.Attributes", extends: JavaObject.self)
 public struct Attributes {
   @JavaMethod
   public init(_ arg0: Attributes?, environment: JNIEnvironment? = nil)
@@ -99,7 +99,7 @@ public struct Attributes {
   public func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject!
 }
 extension Attributes {
-  @JavaClass("java.util.jar.Attributes$Name")
+  @JavaClass("java.util.jar.Attributes$Name", extends: JavaObject.self)
   public struct Name {
   @JavaMethod
   public init(_ arg0: String, environment: JNIEnvironment? = nil)

Sources/JavaKitJar/generated/Manifest.swift

@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.jar.Manifest")
+@JavaClass("java.util.jar.Manifest", extends: JavaObject.self)
 public struct Manifest {
   @JavaMethod
   public init(_ arg0: Manifest?, environment: JNIEnvironment? = nil)

Sources/JavaKitNetwork/generated/URI.swift

@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.net.URI")
+@JavaClass("java.net.URI", extends: JavaObject.self)
 public struct URI {
   @JavaMethod
   public init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: String, _ arg4: String, environment: JNIEnvironment? = nil) throws

Sources/JavaKitNetwork/generated/URL.swift

@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.net.URL")
+@JavaClass("java.net.URL", extends: JavaObject.self)
 public struct URL {
   @JavaMethod
   public init(_ arg0: URL?, _ arg1: String, environment: JNIEnvironment? = nil) throws

Sources/JavaKitReflection/generated/AccessibleObject.swift

@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.lang.reflect.AccessibleObject")
+@JavaClass("java.lang.reflect.AccessibleObject", extends: JavaObject.self)
 public struct AccessibleObject {
   @JavaMethod
   public func isAnnotationPresent(_ arg0: JavaClass<Annotation>?) -> Bool

Sources/JavaKitReflection/generated/Parameter.swift

@@ -3,7 +3,7 @@ import JavaKit
 import JavaKitCollection
 import JavaRuntime
 
-@JavaClass("java.lang.reflect.Parameter")
+@JavaClass("java.lang.reflect.Parameter", extends: JavaObject.self)
 public struct Parameter {
   @JavaMethod
   public func getName() -> String

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -69,7 +69,7 @@ class Java2SwiftTests: XCTestCase {
       expectedChunks: [
         "import JavaKit",
         """
-        @JavaClass("java.lang.Class")
+        @JavaClass("java.lang.Class", extends: JavaObject.self)
         public struct MyJavaClass<T: AnyJavaObject> {
         """,
         """