java-sdk fix limit_depth_level and trigger_count as Integer

Author: sunli829

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [3.0.21]
+
+- java-sdk: fix `limit_depth_level` and `trigger_count` being correctly passed and read as `Integer` in submit/replace order options and order detail.
+
 # [3.0.20]
 
 - add `limit_depth_level`, `trigger_count`, `monitor_price` to `OrderDetail`, 'Order' types.

java/crates/macros/src/lib.rs

@@ -14,8 +14,14 @@ struct FieldArgs {
     objarray: bool,
     #[darling(default)]
     priarray: bool,
+    /// Rust type used for set_field: must implement IntoJValue and
+    /// From<FieldType>.
     #[darling(default)]
-    derivative_types: bool,
+    set_as: Option<Path>,
+    /// Like set_as but for Option<T> fields: wrapper type with
+    /// From<Option<FieldType>>.
+    #[darling(default)]
+    set_as_opt: Option<Path>,
 }
 
 #[derive(FromMeta, Debug, Default)]
@@ -122,9 +128,15 @@ pub fn impl_java_class(input: TokenStream) -> TokenStream {
         };
         let java_field = ident.to_string().to_camel_case();
 
-        if args.derivative_types {
+        if let Some(set_type) = args.set_as_opt.as_ref() {
+            // Option<T> field: pass ident.map(set_type::from) as Option<set_type>, which
+            // implements IntoJValue
+            set_fields.push(quote! {
+                crate::types::set_field(env, &obj, #java_field, #ident.map(#set_type::from))?;
+            });
+        } else if let Some(set_type) = args.set_as.as_ref() {
             set_fields.push(quote! {
-                crate::types::set_field(env, &obj, #java_field, crate::types::enum_types::DerivativeTypes::from(#ident))?;
+                crate::types::set_field(env, &obj, #java_field, #set_type::from(#ident))?;
             });
         } else if args.objarray {
             set_fields.push(quote! {

java/src/init.rs

@@ -8,6 +8,7 @@ use jni::{
 
 use crate::types::ClassLoader;
 
+pub(crate) static INTEGER_CLASS: OnceLock<GlobalRef> = OnceLock::new();
 pub(crate) static LONG_CLASS: OnceLock<GlobalRef> = OnceLock::new();
 pub(crate) static STRING_CLASS: OnceLock<GlobalRef> = OnceLock::new();
 pub(crate) static DECIMAL_CLASS: OnceLock<GlobalRef> = OnceLock::new();
@@ -59,6 +60,7 @@ pub extern "system" fn Java_com_longport_SdkNative_init<'a>(
 ) {
     init_class!(
         env,
+        (INTEGER_CLASS, "java/lang/Integer"),
         (LONG_CLASS, "java/lang/Long"),
         (STRING_CLASS, "java/lang/String"),
         (DECIMAL_CLASS, "java/math/BigDecimal"),

java/src/trade_context.rs

@@ -23,7 +23,7 @@ use crate::{
     async_util,
     error::jni_result,
     init::TRADE_CONTEXT_CLASS,
-    types::{FromJValue, IntoJValue, ObjectArray, get_field, set_field},
+    types::{FromJValue, IntoJValue, JavaInteger, ObjectArray, get_field, set_field},
 };
 
 #[derive(Default)]
@@ -350,13 +350,13 @@ pub unsafe extern "system" fn Java_com_longport_SdkNative_tradeContextReplaceOrd
         if let Some(trailing_percent) = trailing_percent {
             new_opts = new_opts.trailing_percent(trailing_percent);
         }
-        let limit_depth_level: Option<i32> = get_field(env, &opts, "limitDepthLevel")?;
+        let limit_depth_level: Option<JavaInteger> = get_field(env, &opts, "limitDepthLevel")?;
         if let Some(limit_depth_level) = limit_depth_level {
-            new_opts = new_opts.limit_depth_level(limit_depth_level);
+            new_opts = new_opts.limit_depth_level(limit_depth_level.into());
         }
-        let trigger_count: Option<i32> = get_field(env, &opts, "triggerCount")?;
+        let trigger_count: Option<JavaInteger> = get_field(env, &opts, "triggerCount")?;
         if let Some(trigger_count) = trigger_count {
-            new_opts = new_opts.trigger_count(trigger_count);
+            new_opts = new_opts.trigger_count(trigger_count.into());
         }
         let monitor_price: Option<Decimal> = get_field(env, &opts, "monitorPrice")?;
         if let Some(monitor_price) = monitor_price {
@@ -419,13 +419,13 @@ pub unsafe extern "system" fn Java_com_longport_SdkNative_tradeContextSubmitOrde
         if let Some(outside_rth) = outside_rth {
             new_opts = new_opts.outside_rth(outside_rth);
         }
-        let limit_depth_level: Option<i32> = get_field(env, &opts, "limitDepthLevel")?;
+        let limit_depth_level: Option<JavaInteger> = get_field(env, &opts, "limitDepthLevel")?;
         if let Some(limit_depth_level) = limit_depth_level {
-            new_opts = new_opts.limit_depth_level(limit_depth_level);
+            new_opts = new_opts.limit_depth_level(limit_depth_level.into());
         }
-        let trigger_count: Option<i32> = get_field(env, &opts, "triggerCount")?;
+        let trigger_count: Option<JavaInteger> = get_field(env, &opts, "triggerCount")?;
         if let Some(trigger_count) = trigger_count {
-            new_opts = new_opts.trigger_count(trigger_count);
+            new_opts = new_opts.trigger_count(trigger_count.into());
         }
         let monitor_price: Option<Decimal> = get_field(env, &opts, "monitorPrice")?;
         if let Some(monitor_price) = monitor_price {

java/src/types/classes.rs

@@ -123,7 +123,7 @@ impl_java_class!(
         eps_ttm,
         bps,
         dividend_yield,
-        #[java(derivative_types)]
+        #[java(set_as = crate::types::enum_types::DerivativeTypes)]
         stock_derivatives,
         board,
     ]
@@ -652,7 +652,9 @@ impl_java_class!(
         trigger_status,
         currency,
         outside_rth,
+        #[java(set_as_opt = crate::types::JavaInteger)]
         limit_depth_level,
+        #[java(set_as_opt = crate::types::JavaInteger)]
         trigger_count,
         monitor_price,
         remark
@@ -915,7 +917,9 @@ impl_java_class!(
         trigger_status,
         currency,
         outside_rth,
+        #[java(set_as_opt = crate::types::JavaInteger)]
         limit_depth_level,
+        #[java(set_as_opt = crate::types::JavaInteger)]
         trigger_count,
         monitor_price,
         remark,

java/src/types/mod.rs

@@ -25,6 +25,7 @@ pub(crate) use self::{
     },
     object_array::ObjectArray,
     primary_array::PrimaryArray,
+    primary_types::JavaInteger,
 };
 
 pub(crate) trait ClassLoader {

java/src/types/primary_types.rs

@@ -2,7 +2,10 @@ use std::borrow::Cow;
 
 use jni::{JNIEnv, errors::Result, objects::JValueOwned};
 
-use crate::types::{FromJValue, IntoJValue, JSignature};
+use crate::{
+    init::INTEGER_CLASS,
+    types::{FromJValue, IntoJValue, JSignature},
+};
 
 impl JSignature for i32 {
     fn signature() -> Cow<'static, str> {
@@ -83,3 +86,44 @@ impl IntoJValue for f64 {
         Ok(JValueOwned::from(self))
     }
 }
+
+pub(crate) struct JavaInteger(i32);
+
+impl From<i32> for JavaInteger {
+    #[inline]
+    fn from(value: i32) -> Self {
+        JavaInteger(value)
+    }
+}
+
+impl From<JavaInteger> for i32 {
+    #[inline]
+    fn from(value: JavaInteger) -> Self {
+        value.0
+    }
+}
+
+impl JSignature for JavaInteger {
+    fn signature() -> Cow<'static, str> {
+        "Ljava/lang/Integer;".into()
+    }
+}
+
+impl FromJValue for JavaInteger {
+    fn from_jvalue(env: &mut JNIEnv, value: JValueOwned) -> Result<Self> {
+        let obj = value.l()?;
+        let value = env.call_method(obj, "intValue", "()I", &[])?;
+        Ok(JavaInteger(value.i()?))
+    }
+}
+
+impl IntoJValue for JavaInteger {
+    fn into_jvalue<'a>(self, env: &mut JNIEnv<'a>) -> Result<JValueOwned<'a>> {
+        let obj = env.new_object(
+            INTEGER_CLASS.get().unwrap(),
+            "(I)V",
+            &[JValueOwned::from(self.0).borrow()],
+        )?;
+        Ok(JValueOwned::from(obj))
+    }
+}