renaming

Author: milyin

zenoh-flat-jni/build.rs

@@ -205,7 +205,7 @@ fn main() {
         .class_fun(pq!(z_query_reply_success))
         .class_fun(pq!(z_query_reply_error))
         .class_fun(pq!(z_query_reply_delete))
-        .class_fun(pq!(query_take))
+        .class_fun(pq!(z_query_expand))
         .data_class(pq!(Query))
         .into_sources(
             pq!(ZBytes),

zenoh-flat-jni/generated-kotlin/io/zenoh/jni/JNINative.kt

@@ -81,7 +81,6 @@ internal object JNINative {
     external fun keyexprJoin(a: Any, b: String): KeyExpr
     external fun keyexprRelationTo(a: Any, b: Any): Int
     external fun keyexprTryFrom(s: String): KeyExpr
-    external fun queryTake(query: Long): Query
     external fun scout(whatami: Int, config: Long, callback: HelloCallback, onClose: Callback): Long
     external fun tryInitZenohLogsFromEnv()
     external fun zConfigDefault(): Long
@@ -160,6 +159,7 @@ internal object JNINative {
     external fun zKeyexprTryFrom(s: String): Long
     external fun zPublisherDelete(publisher: Long, attachment: Any?)
     external fun zPublisherPut(publisher: Long, payload: Any, encoding: Any, attachment: Any?)
+    external fun zQueryExpand(query: Long): Query
     external fun zQueryReplyDelete(query: Long, keyExpr: Any, timestampNtp64: Long?, attachment: Any?, express: Boolean)
     external fun zQueryReplyError(query: Long, payload: Any, encoding: Any)
     external fun zQueryReplySuccess(query: Long, keyExpr: Any, payload: Any, encoding: Any, timestampNtp64: Long?, attachment: Any?, express: Boolean)

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

@@ -155,12 +155,12 @@ public class ZQuery(initialPtr: Long) : AutoCloseable {
     }
 
     @Throws(JniBindingError::class)
-    public fun queryTake(): Query {
+    public fun zQueryExpand(): Query {
         synchronized(this) {
             val query_ptr = this.ptr
             if (query_ptr == 0L) throw JniBindingError("Operation on a closed native handle.")
             return try {
-                JNINative.queryTake(query_ptr)
+                JNINative.zQueryExpand(query_ptr)
             } finally {
                 ptr = 0L
             }

zenoh-flat/src/query/query.rs

@@ -31,6 +31,6 @@ impl From<ZQuery> for Query {
 /// Consume an opaque [`ZQuery`] handle and repack it into the decoded
 /// [`Query`] data class (re-embedding the same native query for replies).
 #[prebindgen]
-pub fn query_take(query: ZQuery) -> Query {
+pub fn z_query_expand(query: ZQuery) -> Query {
     Query::from(query)
 }