fix: method arguments not being parsed properly (#30)

* fixed constructor arguments getting truncated
* fixed fields containing null values throwing errors
* fixed an issue where passing class instances representing primitives caused the method/constructor to not be found
* fixed public properties not being added to class instances
* made long return types always return bigint

Author: MarkusJx

.gitignore

@@ -196,4 +196,5 @@ $RECYCLE.BIN/
 *.node
 native.d.ts
 native.js
-docs/
+docs/
+test.js

Cargo.lock

@@ -1,17 +1,17 @@
 [package]
 edition = "2021"
 name = "java"
-version = "2.1.4"
+version = "2.1.6"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = { version = "2.9.0", default-features = false, features = ["napi6", "tokio_rt"] }
-napi-derive = "2.9.0"
+napi = { version = "2.10.0", default-features = false, features = ["napi6", "tokio_rt"] }
+napi-derive = "2.9.1"
 libloading = "0.7.3"
-tokio = "1.2.0"
-futures = "0.3.21"
+tokio = "1.21.2"
+futures = "0.3.25"
 java-locator = "0.1.2"
 lazy_static = "1.4.0"
 rand = "0.8.5"

Cargo.toml

@@ -1,6 +1,6 @@
 {
     "name": "java-bridge",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "main": "dist/index.prod.min.js",
     "types": "dist/ts-src/index.d.ts",
     "description": "A bridge between Node.js and Java APIs",

package-lock.json

@@ -187,6 +187,10 @@ impl<'a> JavaEnv<'a> {
         self.0.append_class_path(paths)
     }
 
+    pub fn replace_class_loader(&self, class_loader: GlobalJavaObject) -> ResultType<()> {
+        self.0.replace_class_loader(class_loader)
+    }
+
     pub(in crate::jni) fn thread_set_context_classloader(&self) -> ResultType<()> {
         if self.get_class_loader().is_err() {
             return Ok(());

package.json

@@ -1286,12 +1286,16 @@ impl<'a> JavaEnvWrapper<'a> {
         )?;
 
         let res = GlobalJavaObject::try_from(class_loader)?;
+        self.replace_class_loader(res)
+    }
+
+    pub fn replace_class_loader(&self, loader: GlobalJavaObject) -> ResultType<()> {
         self.jvm
             .as_ref()
             .ok_or("The jvm was unset".to_string())?
             .lock()
             .unwrap()
-            .set_class_loader(res);
+            .set_class_loader(loader);
 
         Ok(())
     }

src/jni/java_env.rs

@@ -3,6 +3,7 @@ use crate::jni::java_env::JavaEnv;
 use crate::jni::java_type::{JavaType, Type};
 use crate::jni::objects::class::{GlobalJavaClass, JavaClass};
 use crate::jni::objects::java_object::JavaObject;
+use crate::jni::traits::IsNull;
 use crate::jni::util::util::ResultType;
 use crate::{define_field, sys};
 use std::marker::PhantomData;
@@ -217,6 +218,17 @@ impl<'a> JavaObjectField<'a> {
     }
 }
 
+fn get_field_value(object: JavaObject, inner: &JavaField) -> ResultType<JavaCallResult> {
+    Ok(if object.is_null() {
+        JavaCallResult::Null
+    } else {
+        JavaCallResult::Object {
+            object: object.into_global()?,
+            signature: inner.field_type.clone(),
+        }
+    })
+}
+
 impl<'a> JavaFieldValues for JavaObjectField<'a> {
     fn set(&self, obj: &JavaObject<'_>, value: JavaCallResult) -> ResultType<()> {
         match value {
@@ -227,10 +239,7 @@ impl<'a> JavaFieldValues for JavaObjectField<'a> {
 
     fn get(&self, obj: &JavaObject<'_>) -> ResultType<JavaCallResult> {
         let object = self.get(obj)?;
-        Ok(JavaCallResult::Object {
-            object: object.into_global()?,
-            signature: self.0.field_type.clone(),
-        })
+        get_field_value(object, &self.0)
     }
 }
 
@@ -290,10 +299,7 @@ impl<'a> StaticJavaFieldValues for StaticJavaObjectField<'a> {
 
     fn get(&self) -> ResultType<JavaCallResult> {
         let object = self.get()?;
-        Ok(JavaCallResult::Object {
-            object: object.into_global()?,
-            signature: self.0.field_type.clone(),
-        })
+        get_field_value(object, &self.0)
     }
 }