Fix build + feedback

Author: jrosen081

Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift

@@ -80,13 +80,17 @@ extension HelloSwift: HelloSwiftNativeMethods {
     let helper = ThreadSafeHelperClass(environment: javaEnvironment)
     let threadSafe: Sendable = helper
 
-    let text: String? = helper.textOptional
-    let value: String? = helper.getValueOptional(Optional<String>.none)
-    let textFunc: String? = helper.getTextOptional()
+    checkOptionals(helper: helper)
 
     return i * j
   }
 
+  func checkOptionals(helper: ThreadSafeHelperClass) {
+    let text: JavaString? = helper.textOptional
+    let value: String? = helper.getValueOptional(Optional<JavaString>.none)
+    let textFunc: JavaString? = helper.getTextOptional()
+  }
+
   @JavaMethod
   func throwMessageFromSwift(_ message: String) throws -> String {
     throw SwiftWrappedError.message(message)

Sources/Java2SwiftLib/JavaClassTranslator.swift

@@ -573,7 +573,7 @@ extension JavaClassTranslator {
         let name = param.secondName!.trimmedDescription
 
         return if let optionalType = param.type.trimmedDescription.optionalWrappedType() {
-          (clause: FunctionParameterSyntax(firstName: "_", secondName: "\(raw: name)", type: TypeSyntax(stringLiteral: "\(optionalType)")), passedArg: "\(name)?.toJavaOptional()")
+          (clause: "_ \(raw: name): \(raw: optionalType)", passedArg: "\(name).toJavaOptional()")
         } else {
           (clause: param, passedArg: "\(name)")
         }
@@ -613,15 +613,17 @@ extension JavaClassTranslator {
     let fieldAttribute: AttributeSyntax = javaField.isStatic ? "@JavaStaticField" : "@JavaField";
     let swiftFieldName = javaField.getName().escapedSwiftName
 
-    if let optionalType = swiftTypeName.optionalWrappedType() {
+    if let optionalType = typeName.optionalWrappedType() {
       let setter = if !javaField.isFinal {
       """
       
         set {
-          \(swiftFieldName) = newValue?.toJavaOptional()
+          \(swiftFieldName) = newValue.toJavaOptional()
         }
       """
-      } else { "" }
+      } else {
+        ""
+      }
       return """
       \(fieldAttribute)(isFinal: \(raw: javaField.isFinal))
       public var \(raw: swiftFieldName): \(raw: typeName)

Sources/Java2SwiftLib/StringExtras.swift

@@ -43,12 +43,13 @@ extension String {
   public func optionalWrappedType() -> String? {
     if self == "JavaOptionalInt!" {
       return "Int32?"
-    } else if self == "JavaOptionalDouble!" {
-      return "Double?"
     } else if self == "JavaOptionalLong!" {
       return "Int64?"
+    } else if self == "JavaOptionalDouble!" {
+      return "Double?"
     } else if hasPrefix("JavaOptional<") {
-      return "\(String(self[index(startIndex, offsetBy: 13)..<lastIndex(of: ">")!]))?"
+      let offsetCount = "JavaOptional<".count
+      return "\(String(self[index(startIndex, offsetBy: offsetCount)..<lastIndex(of: ">")!]))?"
     } else {
       return nil
     }

Sources/JavaKit/Optional+JavaOptional.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-extension Optional where Wrapped: AnyJavaObject {
+public extension Optional where Wrapped: AnyJavaObject {
   func toJavaOptional() -> JavaOptional<Wrapped> {
     return try! JavaClass<JavaOptional<Wrapped>>().ofNullable(self?.as(JavaObject.self)).as(JavaOptional<Wrapped>.self)!
   }
@@ -26,7 +26,7 @@ extension Optional where Wrapped: AnyJavaObject {
   }
 }
 
-extension Optional where Wrapped == Double {
+public extension Optional where Wrapped == Double {
   func toJavaOptional() -> JavaOptionalDouble {
     if let self {
       return try! JavaClass<JavaOptionalDouble>().of(self)!
@@ -44,7 +44,7 @@ extension Optional where Wrapped == Double {
   }
 }
 
-extension Optional where Wrapped == Int32 {
+public extension Optional where Wrapped == Int32 {
   func toJavaOptional() -> JavaOptionalInt {
     if let self {
       return try! JavaClass<JavaOptionalInt>().of(self)!
@@ -62,7 +62,7 @@ extension Optional where Wrapped == Int32 {
   }
 }
 
-extension Optional where Wrapped == Int64 {
+public extension Optional where Wrapped == Int64 {
   func toJavaOptional() -> JavaOptionalLong {
     if let self {
       return try! JavaClass<JavaOptionalLong>().of(self)!