cargo fmt

Author: milyin

zenoh-jni/build.rs

@@ -14,15 +14,27 @@ fn main() {
         .string_decoder("crate::utils::decode_string")
         .byte_array_decoder("crate::utils::decode_byte_array")
         .encoding_decoder("crate::utils::decode_encoding")
-        .enum_decoder("CongestionControl", "crate::utils::decode_congestion_control")
+        .enum_decoder(
+            "CongestionControl",
+            "crate::utils::decode_congestion_control",
+        )
         .enum_decoder("Priority", "crate::utils::decode_priority")
         .enum_decoder("Reliability", "crate::utils::decode_reliability")
         .enum_decoder("QueryTarget", "crate::utils::decode_query_target")
         .enum_decoder("ConsolidationMode", "crate::utils::decode_consolidation")
         .enum_decoder("ReplyKeyExpr", "crate::utils::decode_reply_key_expr")
-        .callback_decoder("Sample", "crate::sample_callback::process_kotlin_sample_callback")
-        .callback_decoder("Query", "crate::sample_callback::process_kotlin_query_callback")
-        .callback_decoder("Reply", "crate::sample_callback::process_kotlin_reply_callback")
+        .callback_decoder(
+            "Sample",
+            "crate::sample_callback::process_kotlin_sample_callback",
+        )
+        .callback_decoder(
+            "Query",
+            "crate::sample_callback::process_kotlin_query_callback",
+        )
+        .callback_decoder(
+            "Reply",
+            "crate::sample_callback::process_kotlin_reply_callback",
+        )
         .consume_arg("close_session", "session")
         .consume_arg("undeclare_key_expr", "key_expr")
         .return_wrapper(

zenoh-jni/src/config.rs

@@ -21,8 +21,8 @@ use jni::{
 };
 use zenoh::Config;
 
-use crate::owned_object::OwnedObject;
 use crate::errors::ZResult;
+use crate::owned_object::OwnedObject;
 use crate::{throw_exception, utils::decode_string};
 
 /// Loads the default configuration, returning a raw pointer to it.

zenoh-jni/src/errors.rs

@@ -17,13 +17,11 @@ use jni::JNIEnv;
 #[macro_export]
 macro_rules! throw_exception {
     ($env:expr, $err:expr) => {{
-        let _ = <crate::errors::ZError as crate::errors::ThrowOnJvm>::throw_on_jvm(
-            &$err,
-            &mut $env,
-        )
-        .map_err(|err| {
-            tracing::error!("Unable to throw exception: {}", err);
-        });
+        let _ =
+            <crate::errors::ZError as crate::errors::ThrowOnJvm>::throw_on_jvm(&$err, &mut $env)
+                .map_err(|err| {
+                    tracing::error!("Unable to throw exception: {}", err);
+                });
     }};
 }
 

zenoh-jni/src/ext/advanced_subscriber.rs

@@ -141,7 +141,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNIAdvancedSubscriber_declareDetectPu
         let detect_publishers_subscriber = advanced_subscriber
             .detect_publishers()
             .history(history != 0)
-            .callback(process_kotlin_sample_callback(&mut env, callback, on_close)?)
+            .callback(process_kotlin_sample_callback(
+                &mut env, callback, on_close,
+            )?)
             .wait()
             .map_err(|err| zerror!("Unable to declare detect publishers subscriber: {}", err))?;
 
@@ -197,7 +199,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNIAdvancedSubscriber_declareBackgrou
         advanced_subscriber
             .detect_publishers()
             .history(history != 0)
-            .callback(process_kotlin_sample_callback(&mut env, callback, on_close)?)
+            .callback(process_kotlin_sample_callback(
+                &mut env, callback, on_close,
+            )?)
             .background()
             .wait()
             .map_err(|err| {

zenoh-jni/src/key_expr.rs

@@ -21,8 +21,8 @@ use zenoh::key_expr::KeyExpr;
 
 use crate::errors::ZResult;
 use crate::owned_object::OwnedObject;
-use crate::utils::decode_string;
 use crate::throw_exception;
+use crate::utils::decode_string;
 
 /// Validates the provided `key_expr` to be a valid key expression, returning it back
 /// in case of success or throwing an exception in case of failure.

zenoh-jni/src/liveliness.rs

@@ -154,7 +154,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_declareLivelinessSubscribe
             .liveliness()
             .declare_subscriber(key_expr.to_owned())
             .history(history != 0)
-            .callback(process_kotlin_sample_callback(&mut env, callback, on_close)?)
+            .callback(process_kotlin_sample_callback(
+                &mut env, callback, on_close,
+            )?)
             .wait()
             .map_err(|err| zerror!("Unable to declare liveliness subscriber: {}", err))?;
 

zenoh-jni/src/sample_callback.rs

@@ -19,7 +19,11 @@ use jni::{
     sys::{jint, jlong},
     JNIEnv,
 };
-use zenoh::{query::{Query, Reply, ReplyError, ReplyKeyExpr}, sample::Sample, session::EntityGlobalId};
+use zenoh::{
+    query::{Query, Reply, ReplyError, ReplyKeyExpr},
+    sample::Sample,
+    session::EntityGlobalId,
+};
 
 use crate::{errors::ZResult, utils::*};
 
@@ -183,11 +187,11 @@ pub(crate) unsafe fn process_kotlin_sample_callback(
     Ok(move |sample: Sample| {
         on_close.noop();
         let _ = || -> ZResult<()> {
-            let mut env = java_vm.attach_current_thread_as_daemon().map_err(|err| {
-                zerror!("Unable to attach thread for sample callback: {}", err)
-            })?;
-            let byte_array = bytes_to_java_array(&env, sample.payload())
-                .map(|array| env.auto_local(array))?;
+            let mut env = java_vm
+                .attach_current_thread_as_daemon()
+                .map_err(|err| zerror!("Unable to attach thread for sample callback: {}", err))?;
+            let byte_array =
+                bytes_to_java_array(&env, sample.payload()).map(|array| env.auto_local(array))?;
 
             let encoding_id: jint = sample.encoding().id() as jint;
             let encoding_schema = match sample.encoding().schema() {
@@ -257,9 +261,9 @@ pub(crate) unsafe fn process_kotlin_reply_callback(
         || -> ZResult<()> {
             on_close.noop();
             tracing::debug!("Receiving reply through JNI: {:?}", reply);
-            let mut env = java_vm
-                .attach_current_thread_as_daemon()
-                .map_err(|err| zerror!("Unable to attach thread for GET query callback: {}", err))?;
+            let mut env = java_vm.attach_current_thread_as_daemon().map_err(|err| {
+                zerror!("Unable to attach thread for GET query callback: {}", err)
+            })?;
             match reply.result() {
                 Ok(sample) => crate::sample_callback::on_reply_success(
                     &mut env,
@@ -390,5 +394,3 @@ fn on_query(mut env: JNIEnv, query: Query, callback_global_ref: &GlobalRef) -> Z
         });
     result
 }
-
-

zenoh-jni/src/session.rs

@@ -39,20 +39,10 @@ use zenoh_ext::{
     RepliesConfig,
 };
 
-use crate::{
-    errors::ZResult, key_expr::process_kotlin_key_expr, throw_exception, utils::*,
-};
+use crate::{errors::ZResult, key_expr::process_kotlin_key_expr, throw_exception, utils::*};
 
 include!(concat!(env!("OUT_DIR"), "/zenoh_flat_jni.rs"));
 
-
-
-
-
-
-
-
-
 /// Declare an advanced Zenoh subscriber via JNI.
 ///
 /// # Parameters:
@@ -108,7 +98,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_declareAdvancedSubscriberV
         tracing::debug!("Declaring advanced subscriber on '{}'...", key_expr);
         let mut builder = session
             .declare_subscriber(key_expr.to_owned())
-            .callback(process_kotlin_sample_callback(&mut env, callback, on_close)?)
+            .callback(process_kotlin_sample_callback(
+                &mut env, callback, on_close,
+            )?)
             .advanced();
         tracing::debug!("Advanced subscriber declared on '{}'.", key_expr);