Small fixes for optionals

Author: jrosen081

Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift

@@ -89,6 +89,13 @@ extension HelloSwift: HelloSwiftNativeMethods {
     let text: JavaString? = helper.textOptional
     let value: String? = helper.getValueOptional(Optional<JavaString>.none)
     let textFunc: JavaString? = helper.getTextOptional()
+    let doubleOpt: Double? = helper.valOptional
+    let longOpt: Int64? = helper.fromOptional(21 as Int32?)
+    print("Optional text = \(text)")
+    print("Optional string value = \(value)")
+    print("Optional text function returned \(textFunc)")
+    print("Optional double function returned \(doubleOpt)")
+    print("Optional long function returned \(longOpt)")
   }
 
   @JavaMethod

Samples/JavaKitSampleApp/Sources/JavaKitExample/com/example/swift/ThreadSafeHelperClass.java

@@ -15,18 +15,27 @@
 package com.example.swift;
 
 import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.OptionalInt;
+import java.util.OptionalDouble;
 
 @ThreadSafe
 public class ThreadSafeHelperClass {
     public ThreadSafeHelperClass() { }
 
     public Optional<String> text = Optional.of("");
 
+    public final OptionalDouble val = OptionalDouble.of(2);
+
     public String getValue(Optional<String> name) {
         return name.orElse("");
     }
 
     public Optional<String> getText() {
         return text;
     }
+
+    public OptionalLong from(OptionalInt value) {
+        return OptionalLong.of(value.getAsInt());
+    }
 }

Sources/Java2SwiftLib/StringExtras.swift

@@ -41,11 +41,11 @@ extension String {
   }
 
   public func optionalWrappedType() -> String? {
-    if self == "JavaOptionalInt!" {
+    if self == "JavaOptionalInt!" || self == "JavaOptionalInt?" {
       return "Int32?"
-    } else if self == "JavaOptionalLong!" {
+    } else if self == "JavaOptionalLong!" || self == "JavaOptionalLong?" {
       return "Int64?"
-    } else if self == "JavaOptionalDouble!" {
+    } else if self == "JavaOptionalDouble!" || self == "JavaOptionalDouble?" {
       return "Double?"
     } else if hasPrefix("JavaOptional<") {
       let offsetCount = "JavaOptional<".count