Add return values

jrosen081 · jrosen081 · commit f44a6ace0cdb · 2024-11-26T22:34:46.000-05:00
diff --git a/Sources/Java2SwiftLib/JavaClassTranslator.swift b/Sources/Java2SwiftLib/JavaClassTranslator.swift
@@ -568,14 +568,14 @@ extension JavaClassTranslator {
       ? "override "
       : ""
 
-    if let resultOptional = resultTypeStr.optionalWrappedType() {
+    if let resultOptional = resultType.optionalWrappedType() {
       let parameters = parameters.map { "\($0.secondName!.trimmedDescription)" }.joined(separator: ", ")
       return """
-        \(methodAttribute)\(raw: accessModifier)\(raw: overrideOpt)func __\(raw: swiftMethodName)\(raw: genericParameterClause)(\(raw: parametersStr))\(raw: throwsStr)\(raw: resultTypeStr)\(raw: whereClause)
+        \(methodAttribute)\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)\(raw: genericParameterClause)(\(raw: parametersStr))\(raw: throwsStr)\(raw: resultTypeStr)\(raw: whereClause)
         
-        \(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)\(raw: genericParameterClause)(\(raw: parametersStr))\(raw: throwsStr)\(raw: resultOptional)\(raw: whereClause) {
-            \(raw: javaMethod.throwsCheckedException ? "try " : "")__\(raw: swiftMethodName)(\(raw: parameters))?.toJavaOptional()
-          }
+        \(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)Optional\(raw: genericParameterClause)(\(raw: parametersStr))\(raw: throwsStr) -> \(raw: resultOptional)\(raw: whereClause) {
+          Optional(javaOptional: \(raw: javaMethod.throwsCheckedException ? "try " : "")\(raw: swiftMethodName)(\(raw: parameters)))
+        }
         """
     } else {
       return """
@@ -605,13 +605,13 @@ extension JavaClassTranslator {
       """
       } else { "" }
       return """
-      \(fieldAttribute)(isFinal: \(raw: javaField.isFinal))
+      \(fieldAttribute)("\(raw: swiftFieldName)", isFinal: \(raw: javaField.isFinal))
       public var __\(raw: swiftFieldName): \(raw: typeName)
 
       
       public var \(raw: swiftFieldName): \(raw: optionalType)? {
         get {
-          .init(__\(raw: swiftFieldName))
+          Optional(javaOptional: __\(raw: swiftFieldName))
         }\(raw: setter)
       }
       """
diff --git a/Sources/Java2SwiftLib/StringExtras.swift b/Sources/Java2SwiftLib/StringExtras.swift
@@ -41,9 +41,8 @@ extension String {
   }
 
   public func optionalWrappedType() -> String? {
-    print("\(self) printing this thing")
-    if starts(with: "JavaOptional<") {
-      return String(self[index(startIndex, offsetBy: 13)..<index(before: endIndex)])
+    if hasPrefix("JavaOptional<") {
+      return "\(String(self[index(startIndex, offsetBy: 13)..<lastIndex(of: ">")!]))?"
     } else {
       return nil
     }
diff --git a/Sources/JavaKit/AnyJavaObject.swift b/Sources/JavaKit/AnyJavaObject.swift
@@ -56,12 +56,6 @@ public protocol CustomJavaClassLoader: AnyJavaObject {
   static func getJavaClassLoader(in environment: JNIEnvironment) throws -> JavaClassLoader!
 }
 
-/// Add getClassLoader() to JavaObject as it is otherwise recursively defined
-extension JavaObject {
-  @JavaMethod
-  public func getClassLoader() throws -> JavaClassLoader!
-}
-
 extension AnyJavaObject {
   /// Retrieve the underlying Java object.
   public var javaThis: jobject {
diff --git a/Sources/JavaKit/Optional+JavaOptional.swift b/Sources/JavaKit/Optional+JavaOptional.swift
@@ -17,7 +17,11 @@ extension Optional where Wrapped: AnyJavaObject {
     return try! JavaClass<JavaOptional<Wrapped>>().ofNullable(self?.as(JavaObject.self)).as(JavaOptional<Wrapped>.self)!
   }
 
-  init?(_ javaOptional: JavaOptional<Wrapped>) {
-    self = javaOptional.isPresent() ? javaOptional.get().as(Wrapped.self) : Optional<Wrapped>.none
+  init(javaOptional: JavaOptional<Wrapped>?) {
+    if let javaOptional {
+      self = javaOptional.isPresent() ? javaOptional.get().as(Wrapped.self) : Optional<Wrapped>.none
+    } else {
+      self = nil
+    }
   }
 }
diff --git a/Sources/JavaKit/generated/JavaClass.swift b/Sources/JavaKit/generated/JavaClass.swift
@@ -133,6 +133,9 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {
   open func isSealed() -> Bool
 }
 extension JavaClass {
+  @JavaStaticMethod
+  public func forName<T: AnyJavaObject>(_ arg0: String, _ arg1: Bool, _ arg2: JavaClassLoader?) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>
+
   @JavaStaticMethod
   public func forName<T: AnyJavaObject>(_ arg0: String) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>
 
diff --git a/Sources/JavaKit/generated/JavaClassLoader.swift b/Sources/JavaKit/generated/JavaClassLoader.swift
@@ -31,10 +31,10 @@ open class JavaClassLoader: JavaObject {
   open func resolveClass(_ arg0: JavaClass<JavaObject>?)
 
   @JavaMethod
-  open func defineClass(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> JavaClass<JavaObject>!
+  open func defineClass(_ arg0: String, _ arg1: [Int8], _ arg2: Int32, _ arg3: Int32) throws -> JavaClass<JavaObject>!
 
   @JavaMethod
-  open func defineClass(_ arg0: String, _ arg1: [Int8], _ arg2: Int32, _ arg3: Int32) throws -> JavaClass<JavaObject>!
+  open func defineClass(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> JavaClass<JavaObject>!
 
   @JavaMethod
   open func findLibrary(_ arg0: String) -> String
diff --git a/Sources/JavaKit/generated/JavaDouble.swift b/Sources/JavaKit/generated/JavaDouble.swift
@@ -48,6 +48,10 @@ open class JavaDouble: JavaNumber {
   @JavaMethod
   open func describeConstable() -> JavaOptional<JavaDouble>!
 
+  open func describeConstableOptional() -> JavaDouble? {
+    Optional(javaOptional: describeConstable())
+  }
+
   @JavaMethod
   open func isNaN() -> Bool
 }
diff --git a/Sources/JavaKit/generated/JavaFloat.swift b/Sources/JavaKit/generated/JavaFloat.swift
@@ -51,6 +51,10 @@ open class JavaFloat: JavaNumber {
   @JavaMethod
   open func describeConstable() -> JavaOptional<JavaFloat>!
 
+  open func describeConstableOptional() -> JavaFloat? {
+    Optional(javaOptional: describeConstable())
+  }
+
   @JavaMethod
   open func isNaN() -> Bool
 }
diff --git a/Sources/JavaKit/generated/JavaInteger.swift b/Sources/JavaKit/generated/JavaInteger.swift
@@ -44,6 +44,10 @@ open class JavaInteger: JavaNumber {
 
   @JavaMethod
   open func describeConstable() -> JavaOptional<JavaInteger>!
+
+  open func describeConstableOptional() -> JavaInteger? {
+    Optional(javaOptional: describeConstable())
+  }
 }
 extension JavaClass<JavaInteger> {
   @JavaStaticField(isFinal: true)
diff --git a/Sources/JavaKit/generated/JavaLong.swift b/Sources/JavaKit/generated/JavaLong.swift
@@ -44,6 +44,10 @@ open class JavaLong: JavaNumber {
 
   @JavaMethod
   open func describeConstable() -> JavaOptional<JavaLong>!
+
+  open func describeConstableOptional() -> JavaLong? {
+    Optional(javaOptional: describeConstable())
+  }
 }
 extension JavaClass<JavaLong> {
   @JavaStaticField(isFinal: true)
diff --git a/Sources/JavaKit/generated/JavaOptional.swift b/Sources/JavaKit/generated/JavaOptional.swift
@@ -31,9 +31,21 @@ extension JavaClass {
   @JavaStaticMethod
   public func of<T: AnyJavaObject>(_ arg0: JavaObject?) -> JavaOptional<JavaObject>! where ObjectType == JavaOptional<T>
 
+  public func ofOptional<T: AnyJavaObject>(_ arg0: JavaObject?) -> JavaObject? where ObjectType == JavaOptional<T> {
+    Optional(javaOptional: of(arg0))
+  }
+
   @JavaStaticMethod
   public func empty<T: AnyJavaObject>() -> JavaOptional<JavaObject>! where ObjectType == JavaOptional<T>
 
+  public func emptyOptional<T: AnyJavaObject>() -> JavaObject? where ObjectType == JavaOptional<T> {
+    Optional(javaOptional: empty())
+  }
+
   @JavaStaticMethod
   public func ofNullable<T: AnyJavaObject>(_ arg0: JavaObject?) -> JavaOptional<JavaObject>! where ObjectType == JavaOptional<T>
+
+  public func ofNullableOptional<T: AnyJavaObject>(_ arg0: JavaObject?) -> JavaObject? where ObjectType == JavaOptional<T> {
+    Optional(javaOptional: ofNullable(arg0))
+  }
 }
diff --git a/Sources/JavaKit/generated/JavaString.swift b/Sources/JavaKit/generated/JavaString.swift
@@ -209,6 +209,10 @@ open class JavaString: JavaObject {
 
   @JavaMethod
   open func describeConstable() -> JavaOptional<JavaString>!
+
+  open func describeConstableOptional() -> JavaString? {
+    Optional(javaOptional: describeConstable())
+  }
 }
 extension JavaClass<JavaString> {
   @JavaStaticMethod
diff --git a/Sources/JavaKitCollection/generated/HashMap.swift b/Sources/JavaKitCollection/generated/HashMap.swift
@@ -61,6 +61,56 @@ open class HashMap<K: AnyJavaObject, V: AnyJavaObject>: JavaObject {
   @JavaMethod
   open func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject!
 }
+extension HashMap {
+  @JavaClass("java.util.AbstractMap$SimpleEntry")
+  open class SimpleEntry<K: AnyJavaObject, V: AnyJavaObject>: JavaObject {
+  @JavaMethod
+  @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
+
+  @JavaMethod
+  open override func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  open override func toString() -> String
+
+  @JavaMethod
+  open override func hashCode() -> Int32
+
+  @JavaMethod
+  open func getValue() -> JavaObject!
+
+  @JavaMethod
+  open func getKey() -> JavaObject!
+
+  @JavaMethod
+  open func setValue(_ arg0: JavaObject?) -> JavaObject!
+  }
+}
+extension HashMap {
+  @JavaClass("java.util.AbstractMap$SimpleImmutableEntry")
+  open class SimpleImmutableEntry<K: AnyJavaObject, V: AnyJavaObject>: JavaObject {
+  @JavaMethod
+  @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
+
+  @JavaMethod
+  open override func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  open override func toString() -> String
+
+  @JavaMethod
+  open override func hashCode() -> Int32
+
+  @JavaMethod
+  open func getValue() -> JavaObject!
+
+  @JavaMethod
+  open func getKey() -> JavaObject!
+
+  @JavaMethod
+  open func setValue(_ arg0: JavaObject?) -> JavaObject!
+  }
+}
 extension JavaClass {
   @JavaStaticMethod
   public func newHashMap<K: AnyJavaObject, V: AnyJavaObject>(_ arg0: Int32) -> HashMap<JavaObject, JavaObject>! where ObjectType == HashMap<K, V>
diff --git a/Sources/JavaKitCollection/generated/TreeMap.swift b/Sources/JavaKitCollection/generated/TreeMap.swift
@@ -70,53 +70,3 @@ open class TreeMap<K: AnyJavaObject, V: AnyJavaObject>: JavaObject {
   @JavaMethod
   open func lastKey() -> JavaObject!
 }
-extension TreeMap {
-  @JavaClass("java.util.AbstractMap$SimpleEntry")
-  open class SimpleEntry<K: AnyJavaObject, V: AnyJavaObject>: JavaObject {
-  @JavaMethod
-  @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
-
-  @JavaMethod
-  open override func equals(_ arg0: JavaObject?) -> Bool
-
-  @JavaMethod
-  open override func toString() -> String
-
-  @JavaMethod
-  open override func hashCode() -> Int32
-
-  @JavaMethod
-  open func getValue() -> JavaObject!
-
-  @JavaMethod
-  open func getKey() -> JavaObject!
-
-  @JavaMethod
-  open func setValue(_ arg0: JavaObject?) -> JavaObject!
-  }
-}
-extension TreeMap {
-  @JavaClass("java.util.AbstractMap$SimpleImmutableEntry")
-  open class SimpleImmutableEntry<K: AnyJavaObject, V: AnyJavaObject>: JavaObject {
-  @JavaMethod
-  @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
-
-  @JavaMethod
-  open override func equals(_ arg0: JavaObject?) -> Bool
-
-  @JavaMethod
-  open override func toString() -> String
-
-  @JavaMethod
-  open override func hashCode() -> Int32
-
-  @JavaMethod
-  open func getValue() -> JavaObject!
-
-  @JavaMethod
-  open func getKey() -> JavaObject!
-
-  @JavaMethod
-  open func setValue(_ arg0: JavaObject?) -> JavaObject!
-  }
-}
diff --git a/Sources/JavaKitNetwork/generated/URLClassLoader.swift b/Sources/JavaKitNetwork/generated/URLClassLoader.swift
@@ -27,6 +27,9 @@ open class URLClassLoader: JavaObject {
   open func getURLs() -> [URL?]
 }
 extension JavaClass<URLClassLoader> {
+  @JavaStaticMethod
+  public func newInstance(_ arg0: [URL?], _ arg1: JavaClassLoader?) -> URLClassLoader!
+
   @JavaStaticMethod
   public func newInstance(_ arg0: [URL?]) -> URLClassLoader!
 }

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,8 @@ extension String {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public func optionalWrappedType() -> String? {`
`44`		`- print("\(self) printing this thing")`
`45`		`- if starts(with: "JavaOptional<") {`
`46`		`- return String(self[index(startIndex, offsetBy: 13)..<index(before: endIndex)])`
	`44`	`+ if hasPrefix("JavaOptional<") {`
	`45`	`+ return "\(String(self[index(startIndex, offsetBy: 13)..<lastIndex(of: ">")!]))?"`
`47`	`46`	`} else {`
`48`	`47`	`return nil`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@ extension Optional where Wrapped: AnyJavaObject {`
`17`	`17`	`return try! JavaClass<JavaOptional<Wrapped>>().ofNullable(self?.as(JavaObject.self)).as(JavaOptional<Wrapped>.self)!`
`18`	`18`	`}`
`19`	`19`
`20`		`- init?(_ javaOptional: JavaOptional<Wrapped>) {`
`21`		`- self = javaOptional.isPresent() ? javaOptional.get().as(Wrapped.self) : Optional<Wrapped>.none`
	`20`	`+ init(javaOptional: JavaOptional<Wrapped>?) {`
	`21`	`+ if let javaOptional {`
	`22`	`+ self = javaOptional.isPresent() ? javaOptional.get().as(Wrapped.self) : Optional<Wrapped>.none`
	`23`	`+ } else {`
	`24`	`+ self = nil`
	`25`	`+ }`
`22`	`26`	`}`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,9 @@ open class JavaClass<T: AnyJavaObject>: JavaObject {`
`133`	`133`	`open func isSealed() -> Bool`
`134`	`134`	`}`
`135`	`135`	`extension JavaClass {`
	`136`	`+ @JavaStaticMethod`
	`137`	`+ public func forName<T: AnyJavaObject>(_ arg0: String, _ arg1: Bool, _ arg2: JavaClassLoader?) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>`
	`138`	`+`
`136`	`139`	`@JavaStaticMethod`
`137`	`140`	`public func forName<T: AnyJavaObject>(_ arg0: String) throws -> JavaClass<JavaObject>! where ObjectType == JavaClass<T>`
`138`	`141`