jni parameter removed

Author: milyin

zenoh-flat/src/ext.rs

@@ -29,7 +29,7 @@ use crate::errors::{ZError, ZResult};
 use crate::zerror;
 
 /// Flat cache configuration for an [`zenoh_ext::AdvancedPublisher`].
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 #[derive(Debug, Clone)]
 pub struct CacheConfig {
     pub max_samples: i64,
@@ -41,7 +41,7 @@ pub struct CacheConfig {
 /// Flat history configuration for an [`zenoh_ext::AdvancedSubscriber`].
 ///
 /// `max_samples <= 0` and `max_age_seconds <= 0.0` mean "unlimited".
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 #[derive(Debug, Clone)]
 pub struct HistoryConfig {
     pub detect_late_publishers: bool,
@@ -55,7 +55,7 @@ pub struct HistoryConfig {
 /// `period_ms` — sporadic if `is_sporadic`, regular otherwise. When
 /// `enable_heartbeat` is `false`, the other fields are ignored and
 /// [`zenoh_ext::MissDetectionConfig::default`] is used as-is.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 #[derive(Debug, Clone)]
 pub struct MissDetectionConfig {
     pub enable_heartbeat: bool,
@@ -67,7 +67,7 @@ pub struct MissDetectionConfig {
 ///
 /// When `is_heartbeat` is `true`, `period_ms` is ignored; otherwise
 /// `period_ms` is the `periodic_queries` period in milliseconds.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 #[derive(Debug, Clone)]
 pub struct RecoveryConfig {
     pub is_heartbeat: bool,

zenoh-flat/src/session.rs

@@ -53,7 +53,7 @@ impl<F: FnOnce()> Drop for CallOnDrop<F> {
 }
 
 /// Open a Zenoh session using a borrowed configuration.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn open_session(config: &Config) -> ZResult<Session> {
     zenoh::open(config.clone())
         .wait()
@@ -68,7 +68,7 @@ pub fn open_session(config: &Config) -> ZResult<Session> {
 }
 
 /// Declare a publisher through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_publisher(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -96,7 +96,7 @@ pub fn declare_publisher(
 }
 
 /// Declare a key expression through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_key_expr(session: &Session, key_expr: String) -> ZResult<KeyExpr<'static>> {
     let key_expr_clone = key_expr.clone();
     session
@@ -123,7 +123,7 @@ pub fn declare_key_expr(session: &Session, key_expr: String) -> ZResult<KeyExpr<
 ///
 /// Takes the `KeyExpr` by value so the caller can relinquish ownership. After
 /// this call the original JNI-side raw pointer is invalid.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn undeclare_key_expr(session: &Session, key_expr: KeyExpr<'static>) -> ZResult<()> {
     let key_expr_string = key_expr.to_string();
     session
@@ -146,7 +146,7 @@ pub fn undeclare_key_expr(session: &Session, key_expr: KeyExpr<'static>) -> ZRes
 }
 
 /// Declare a subscriber through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_subscriber(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -173,7 +173,7 @@ pub fn declare_subscriber(
 }
 
 /// Declare a querier through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_querier(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -207,7 +207,7 @@ pub fn declare_querier(
 }
 
 /// Declare a queryable through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_queryable(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -245,7 +245,7 @@ pub fn declare_queryable(
 ///
 /// Parameter order matches the JNI calling convention so the wrapper can be
 /// generated by `zenoh_flat::jni_converter` without reordering.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn get(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -303,7 +303,7 @@ pub fn get(
 }
 
 /// Perform a put operation through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn put(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -340,7 +340,7 @@ pub fn put(
 }
 
 /// Perform a delete operation through an existing Zenoh session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn delete(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -374,25 +374,25 @@ pub fn delete(
 }
 
 /// Return the Zenoh ID of the session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn get_zid(session: &Session) -> ZResult<ZenohId> {
     Ok(session.info().zid().wait())
 }
 
 /// Return the Zenoh IDs of the peers connected to this session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn get_peers_zid(session: &Session) -> ZResult<Vec<ZenohId>> {
     Ok(session.info().peers_zid().wait().collect())
 }
 
 /// Return the Zenoh IDs of the routers connected to this session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn get_routers_zid(session: &Session) -> ZResult<Vec<ZenohId>> {
     Ok(session.info().routers_zid().wait().collect())
 }
 
 /// Close a Zenoh session using a reference to the session.
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn close_session(session: &Session) -> ZResult<()> {
     session
         .close()
@@ -413,7 +413,7 @@ pub fn close_session(session: &Session) -> ZResult<()> {
 /// `HistoryConfig` / `RecoveryConfig` from primitive arguments and pass them
 /// here.
 #[cfg(feature = "zenoh-ext")]
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_advanced_subscriber(
     session: &Session,
     key_expr: KeyExpr<'static>,
@@ -463,7 +463,7 @@ pub fn declare_advanced_subscriber(
 /// `CacheConfig` / `MissDetectionConfig` from primitive arguments and pass
 /// them here.
 #[cfg(feature = "zenoh-ext")]
-#[prebindgen_proc_macro::prebindgen("jni")]
+#[prebindgen_proc_macro::prebindgen]
 pub fn declare_advanced_publisher(
     session: &Session,
     key_expr: KeyExpr<'static>,