allow passing Int64 aka JavaFloat through JNI

Author: michaelknoch

Sources/JNI/JNIFields.swift

@@ -49,6 +49,13 @@ public extension JNI {
         return result
     }
 
+    public func GetInt64Field(of javaObject: JavaObject, id: JavaFieldID) throws -> JavaLong {
+        let _env = self._env
+        let result = _env.pointee.pointee.GetLongField(_env, javaObject, id)
+        try checkAndThrowOnJNIError()
+        return result
+    }
+
     public func GetDoubleField(of javaObject: JavaObject, id: JavaFieldID) throws -> JavaDouble {
         let _env = self._env
         let result = _env.pointee.pointee.GetDoubleField(_env, javaObject, id)
@@ -86,6 +93,13 @@ public extension JNI {
         return result
     }
 
+    public func GetStaticInt64Field(of javaClass: JavaClass, id: JavaFieldID) throws -> JavaLong {
+        let _env = self._env
+        let result = _env.pointee.pointee.GetStaticLongField(_env, javaClass, id)
+        try checkAndThrowOnJNIError()
+        return result
+    }
+
     public func GetStaticDoubleField(of javaClass: JavaClass, id: JavaFieldID) throws -> JavaDouble {
         let _env = self._env
         let result = _env.pointee.pointee.GetStaticDoubleField(_env, javaClass, id)

Sources/JNI/JNIMethods.swift

@@ -123,6 +123,14 @@ extension JNI {
         return result
     }
 
+    public func CallInt64Method(_ method: JavaMethodID, on object: JavaObject, parameters: [JavaParameter]) throws -> JavaLong {
+        let _env = self._env
+        var methodArgs = parameters
+        let result = _env.pointee.pointee.CallLongMethod(_env, object, method, &methodArgs)
+        try checkAndThrowOnJNIError()
+        return result
+    }
+
     public func CallDoubleMethod(_ method: JavaMethodID, on object: JavaObject, parameters: [JavaParameter]) throws -> JavaDouble {
         let _env = self._env
         var methodArgs = parameters
@@ -168,6 +176,14 @@ extension JNI {
         return result
     }
 
+    public func CallStaticInt64Method(_ method: JavaMethodID, on javaClass: JavaClass, parameters: [JavaParameter]) throws -> JavaLong {
+        let _env = self._env
+        var methodArgs = parameters
+        let result = _env.pointee.pointee.CallStaticLongMethodA(_env, javaClass, method, &methodArgs)
+        try checkAndThrowOnJNIError()
+        return result
+    }
+
     public func CallStaticFloatMethod(_ method: JavaMethodID, on javaClass: JavaClass, parameters: [JavaParameter]) throws -> JavaFloat {
         let _env = self._env
         var methodArgs = parameters

Sources/JNI/JavaParameterConvertible+Primitives.swift

@@ -107,3 +107,29 @@ extension Float: JavaParameterConvertible, JavaInitializableFromMethod, JavaInit
         return try jni.GetFloatField(of: javaObject, id: fieldID)
     }
 }
+
+// Int64 aka JavaLong
+
+extension Int64: JavaParameterConvertible, JavaInitializableFromMethod, JavaInitializableFromField {
+    public static let asJNIParameterString = "J"
+
+    public func toJavaParameter() -> JavaParameter {
+        return JavaParameter(long: Int64(self))
+    }
+
+    public static func fromStaticField(_ fieldID: JavaFieldID, of javaClass: JavaClass) throws -> Int64 {
+        return try Int64(jni.GetStaticInt64Field(of: javaClass, id: fieldID))
+    }
+
+    public static func fromMethod(calling methodID: JavaMethodID, on object: JavaObject, args: [JavaParameter]) throws -> Int64 {
+        return try jni.CallInt64Method(methodID, on: object, parameters: args)
+    }
+
+    public static func fromStaticMethod(calling methodID: JavaMethodID, on javaClass: JavaClass, args: [JavaParameter]) throws -> Int64 {
+        return try jni.CallStaticInt64Method(methodID, on: javaClass, parameters: args)
+    }
+
+    public static func fromField(_ fieldID: JavaFieldID, on javaObject: JavaObject) throws -> Int64 {
+        return try jni.GetInt64Field(of: javaObject, id: fieldID)
+    }
+}