Add friends

Author: jrosen081

Sources/Java2SwiftLib/StringExtras.swift

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

Sources/JavaKit/Optional+JavaOptional.swift

@@ -25,3 +25,57 @@ extension Optional where Wrapped: AnyJavaObject {
     }
   }
 }
+
+extension Optional where Wrapped == Double {
+  func toJavaOptional() -> JavaOptionalDouble {
+    if let self {
+      return try! JavaClass<JavaOptionalDouble>().of(self)!
+    } else {
+      return try! JavaClass<JavaOptionalDouble>().empty()!
+    }
+  }
+
+  init(javaOptional: JavaOptionalDouble?) {
+    if let javaOptional {
+      self = javaOptional.isPresent() ? javaOptional.getAsDouble() : nil
+    } else {
+      self = nil
+    }
+  }
+}
+
+extension Optional where Wrapped == Int32 {
+  func toJavaOptional() -> JavaOptionalInt {
+    if let self {
+      return try! JavaClass<JavaOptionalInt>().of(self)!
+    } else {
+      return try! JavaClass<JavaOptionalInt>().empty()!
+    }
+  }
+
+  init(javaOptional: JavaOptionalInt?) {
+    if let javaOptional {
+      self = javaOptional.isPresent() ? javaOptional.getAsInt() : nil
+    } else {
+      self = nil
+    }
+  }
+}
+
+extension Optional where Wrapped == Int64 {
+  func toJavaOptional() -> JavaOptionalLong {
+    if let self {
+      return try! JavaClass<JavaOptionalLong>().of(self)!
+    } else {
+      return try! JavaClass<JavaOptionalLong>().empty()!
+    }
+  }
+
+  init(javaOptional: JavaOptionalLong?) {
+    if let javaOptional {
+      self = javaOptional.isPresent() ? javaOptional.getAsLong() : nil
+    } else {
+      self = nil
+    }
+  }
+}

Sources/JavaKit/generated/JavaOptionalDouble.swift

@@ -0,0 +1,44 @@
+// Auto-generated by Java-to-Swift wrapper generator.
+import JavaRuntime
+
+@JavaClass("java.util.OptionalDouble")
+open class JavaOptionalDouble: JavaObject {
+  @JavaMethod
+  open override func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  open override func toString() -> String
+
+  @JavaMethod
+  open override func hashCode() -> Int32
+
+  @JavaMethod
+  open func isEmpty() -> Bool
+
+  @JavaMethod
+  open func isPresent() -> Bool
+
+  @JavaMethod
+  open func orElse(_ arg0: Double) -> Double
+
+  @JavaMethod
+  open func orElseThrow() -> Double
+
+  @JavaMethod
+  open func getAsDouble() -> Double
+}
+extension JavaClass<JavaOptionalDouble> {
+  @JavaStaticMethod
+  public func of(_ arg0: Double) -> JavaOptionalDouble!
+
+  public func ofOptional(_ arg0: Double) -> Double? {
+    Optional(javaOptional: of(arg0))
+  }
+
+  @JavaStaticMethod
+  public func empty() -> JavaOptionalDouble!
+
+  public func emptyOptional() -> Double? {
+    Optional(javaOptional: empty())
+  }
+}

Sources/JavaKit/generated/JavaOptionalInt.swift

@@ -0,0 +1,44 @@
+// Auto-generated by Java-to-Swift wrapper generator.
+import JavaRuntime
+
+@JavaClass("java.util.OptionalInt")
+open class JavaOptionalInt: JavaObject {
+  @JavaMethod
+  open override func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  open override func toString() -> String
+
+  @JavaMethod
+  open override func hashCode() -> Int32
+
+  @JavaMethod
+  open func isEmpty() -> Bool
+
+  @JavaMethod
+  open func isPresent() -> Bool
+
+  @JavaMethod
+  open func orElse(_ arg0: Int32) -> Int32
+
+  @JavaMethod
+  open func orElseThrow() -> Int32
+
+  @JavaMethod
+  open func getAsInt() -> Int32
+}
+extension JavaClass<JavaOptionalInt> {
+  @JavaStaticMethod
+  public func of(_ arg0: Int32) -> JavaOptionalInt!
+
+  public func ofOptional(_ arg0: Int32) -> Int32? {
+    Optional(javaOptional: of(arg0))
+  }
+
+  @JavaStaticMethod
+  public func empty() -> JavaOptionalInt!
+
+  public func emptyOptional() -> Int32? {
+    Optional(javaOptional: empty())
+  }
+}

Sources/JavaKit/generated/JavaOptionalLong.swift

@@ -0,0 +1,44 @@
+// Auto-generated by Java-to-Swift wrapper generator.
+import JavaRuntime
+
+@JavaClass("java.util.OptionalLong")
+open class JavaOptionalLong: JavaObject {
+  @JavaMethod
+  open override func equals(_ arg0: JavaObject?) -> Bool
+
+  @JavaMethod
+  open override func toString() -> String
+
+  @JavaMethod
+  open override func hashCode() -> Int32
+
+  @JavaMethod
+  open func isEmpty() -> Bool
+
+  @JavaMethod
+  open func isPresent() -> Bool
+
+  @JavaMethod
+  open func orElse(_ arg0: Int64) -> Int64
+
+  @JavaMethod
+  open func orElseThrow() -> Int64
+
+  @JavaMethod
+  open func getAsLong() -> Int64
+}
+extension JavaClass<JavaOptionalLong> {
+  @JavaStaticMethod
+  public func of(_ arg0: Int64) -> JavaOptionalLong!
+
+  public func ofOptional(_ arg0: Int64) -> Int64? {
+    Optional(javaOptional: of(arg0))
+  }
+
+  @JavaStaticMethod
+  public func empty() -> JavaOptionalLong!
+
+  public func emptyOptional() -> Int64? {
+    Optional(javaOptional: empty())
+  }
+}

Sources/JavaKit/swift-java.config

@@ -19,6 +19,9 @@
     "java.lang.String" : "JavaString",
     "java.lang.Throwable" : "Throwable",
     "java.lang.Void" : "JavaVoid",
-    "java.util.Optional": "JavaOptional"
+    "java.util.Optional": "JavaOptional",
+    "java.util.OptionalDouble": "JavaOptionalDouble",
+    "java.util.OptionalInt": "JavaOptionalInt",
+    "java.util.OptionalLong": "JavaOptionalLong"
   }
 }