querier/queriable ported

Author: milyin

zenoh-flat-jni/build.rs

@@ -197,6 +197,9 @@ fn main() {
         .class_fun(pq!(z_publisher_put))
         .class_fun(pq!(z_publisher_delete))
         .ptr_class(pq!(ZSubscriber))
+        .package("query")
+        .ptr_class(pq!(ZQueryable))
+        .ptr_class(pq!(ZQuerier))
         .into_sources(
             pq!(ZBytes),
             [

zenoh-flat-jni/generated-kotlin/io/zenoh/jni/query/ZQuerier.kt

@@ -0,0 +1,31 @@
+// Auto-generated by JniExt — do not edit by hand.
+package io.zenoh.jni.query
+
+/** Typed handle for a native Zenoh `ZQuerier`. */
+public class ZQuerier(initialPtr: Long) : AutoCloseable {
+    @Volatile internal var ptr: Long = initialPtr
+
+    public fun peek(): Long = ptr
+    public fun isClosed(): Boolean = ptr == 0L
+
+    @Synchronized
+    override fun close() {
+        val p = ptr
+        if (p != 0L) {
+            ptr = 0L
+            freePtr(p)
+        }
+    }
+
+    @Synchronized
+    public fun take(): ZQuerier {
+        val p = ptr
+        ptr = 0L
+        return ZQuerier(p)
+    }
+
+    public companion object {
+        @JvmStatic
+        external fun freePtr(ptr: Long)
+    }
+}

zenoh-flat-jni/generated-kotlin/io/zenoh/jni/query/ZQueryable.kt

@@ -0,0 +1,31 @@
+// Auto-generated by JniExt — do not edit by hand.
+package io.zenoh.jni.query
+
+/** Typed handle for a native Zenoh `ZQueryable`. */
+public class ZQueryable(initialPtr: Long) : AutoCloseable {
+    @Volatile internal var ptr: Long = initialPtr
+
+    public fun peek(): Long = ptr
+    public fun isClosed(): Boolean = ptr == 0L
+
+    @Synchronized
+    override fun close() {
+        val p = ptr
+        if (p != 0L) {
+            ptr = 0L
+            freePtr(p)
+        }
+    }
+
+    @Synchronized
+    public fun take(): ZQueryable {
+        val p = ptr
+        ptr = 0L
+        return ZQueryable(p)
+    }
+
+    public companion object {
+        @JvmStatic
+        external fun freePtr(ptr: Long)
+    }
+}

zenoh-flat-jni/src/outdated/mod.rs

@@ -5,6 +5,5 @@ pub mod liveliness;
 pub mod logger;
 pub mod querier;
 pub mod query;
-pub mod queryable;
 pub mod session;
 pub mod zenoh_id;

zenoh-flat-jni/src/outdated/querier.rs

@@ -26,11 +26,3 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNIQuerier_getViaJNI(
     zenoh_jni::querier::Java_io_zenoh_jni_JNIQuerier_getViaJNI(env, _class, querier_ptr, key_expr_ptr, key_expr_str, selector_params, callback, on_close, attachment, payload, encoding_id, encoding_schema)
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn Java_io_zenoh_jni_JNIQuerier_freePtrViaJNI(
-    _env: JNIEnv,
-    _class: JClass,
-    querier_ptr: *const Querier<'static>,
-) {
-    zenoh_jni::querier::Java_io_zenoh_jni_JNIQuerier_freePtrViaJNI(_env, _class, querier_ptr)
-}

zenoh-flat-jni/src/outdated/queryable.rs

@@ -43,4 +43,6 @@ pub type ZScout = zenoh::scouting::Scout<()>;
 pub type ZZBytes = zenoh::bytes::ZBytes;
 pub type ZEncoding = zenoh::bytes::Encoding;
 pub type ZPublisher = zenoh::pubsub::Publisher<'static>;
-pub type ZSubscriber = zenoh::pubsub::Subscriber<()>;
+pub type ZSubscriber = zenoh::pubsub::Subscriber<()>;
+pub type ZQueryable = zenoh::query::Queryable<()>;
+pub type ZQuerier = zenoh::query::Querier<'static>;

zenoh-flat/src/lib.rs

@@ -114,10 +114,6 @@ internal class JNIQuerier(val ptr: Long) {
         return receiver
     }
 
-    fun close() {
-        freePtrViaJNI(ptr)
-    }
-
     @Throws(ZError::class)
     private external fun getViaJNI(
         querierPtr: Long,
@@ -132,6 +128,4 @@ internal class JNIQuerier(val ptr: Long) {
         encodingSchema: String?,
     )
 
-    private external fun freePtrViaJNI(ptr: Long)
-
 }

zenoh-java/src/commonMain/kotlin/io/zenoh/jni/JNIQuerier.kt

@@ -170,7 +170,7 @@ internal class JNISession(val sessionPtr: Long) {
             fun() {},
             config.complete
         )
-        return CallbackQueryable(keyExpr, JNIQueryable(queryableRawPtr))
+        return CallbackQueryable(keyExpr, io.zenoh.jni.query.ZQueryable(queryableRawPtr))
     }
 
     @Throws(ZError::class)
@@ -206,7 +206,7 @@ internal class JNISession(val sessionPtr: Long) {
             handler::onClose,
             config.complete
         )
-        return HandlerQueryable(keyExpr, JNIQueryable(queryableRawPtr), handler.receiver())
+        return HandlerQueryable(keyExpr, io.zenoh.jni.query.ZQueryable(queryableRawPtr), handler.receiver())
     }
 
     @OptIn(Unstable::class)
@@ -233,7 +233,7 @@ internal class JNISession(val sessionPtr: Long) {
                 priority = options.priority,
                 express = options.express
             ),
-            JNIQuerier(querierRawPtr)
+            io.zenoh.jni.query.ZQuerier(querierRawPtr)
         )
     }