From ba32c2753c769d044c3f8463b2c463c7f49ed402 Mon Sep 17 00:00:00 2001
From: OlivierHecart <olivier.hecart@adlinktech.com>
Date: Tue, 5 Nov 2024 17:27:46 +0100
Subject: [PATCH] Expose and use ke macro

---
 commons/zenoh-macros/src/lib.rs |  2 +-
 zenoh/src/api/admin.rs          | 28 ++++++++++++++--------------
 zenoh/src/lib.rs                |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/commons/zenoh-macros/src/lib.rs b/commons/zenoh-macros/src/lib.rs
index 2047c424cf..cc6f4a2295 100644
--- a/commons/zenoh-macros/src/lib.rs
+++ b/commons/zenoh-macros/src/lib.rs
@@ -515,7 +515,7 @@ pub fn ke(tokens: TokenStream) -> TokenStream {
     let value: LitStr = syn::parse(tokens).unwrap();
     let ke = value.value();
     match zenoh_keyexpr::keyexpr::new(&ke) {
-        Ok(_) => quote!(unsafe {::zenoh::key_expr::keyexpr::from_str_unchecked(#ke)}).into(),
+        Ok(_) => quote!(unsafe { zenoh::key_expr::keyexpr::from_str_unchecked(#ke)}).into(),
         Err(e) => panic!("{}", e),
     }
 }
diff --git a/zenoh/src/api/admin.rs b/zenoh/src/api/admin.rs
index b0d0bed0f7..74960e68f7 100644
--- a/zenoh/src/api/admin.rs
+++ b/zenoh/src/api/admin.rs
@@ -19,6 +19,7 @@ use std::{
 
 use zenoh_core::{Result as ZResult, Wait};
 use zenoh_keyexpr::keyexpr;
+use zenoh_macros::ke;
 #[cfg(feature = "unstable")]
 use zenoh_protocol::core::Reliability;
 use zenoh_protocol::{core::WireExpr, network::NetworkMessage};
@@ -26,6 +27,7 @@ use zenoh_transport::{
     TransportEventHandler, TransportMulticastEventHandler, TransportPeer, TransportPeerEventHandler,
 };
 
+use crate as zenoh;
 use crate::{
     api::{
         encoding::Encoding,
@@ -38,17 +40,15 @@ use crate::{
     handlers::Callback,
 };
 
-lazy_static::lazy_static!(
-    static ref KE_STARSTAR: &'static keyexpr = unsafe { keyexpr::from_str_unchecked("**") };
-    static ref KE_PREFIX: &'static keyexpr = unsafe { keyexpr::from_str_unchecked("@") };
-    static ref KE_SESSION: &'static keyexpr = unsafe { keyexpr::from_str_unchecked("session") };
-    static ref KE_TRANSPORT_UNICAST: &'static keyexpr = unsafe { keyexpr::from_str_unchecked("transport/unicast") };
-    static ref KE_LINK: &'static keyexpr = unsafe { keyexpr::from_str_unchecked("link") };
-);
+static KE_STARSTAR: &keyexpr = ke!("**");
+static KE_PREFIX: &keyexpr = ke!("@");
+static KE_SESSION: &keyexpr = ke!("session");
+static KE_TRANSPORT_UNICAST: &keyexpr = ke!("transport/unicast");
+static KE_LINK: &keyexpr = ke!("link");
 
 pub(crate) fn init(session: WeakSession) {
     if let Ok(own_zid) = keyexpr::new(&session.zid().to_string()) {
-        let admin_key = KeyExpr::from(*KE_PREFIX / own_zid / *KE_SESSION / *KE_STARSTAR)
+        let admin_key = KeyExpr::from(KE_PREFIX / own_zid / KE_SESSION / KE_STARSTAR)
             .to_wire(&session)
             .to_owned();
 
@@ -68,7 +68,7 @@ pub(crate) fn on_admin_query(session: &WeakSession, query: Query) {
     fn reply_peer(own_zid: &keyexpr, query: &Query, peer: TransportPeer) {
         let zid = peer.zid.to_string();
         if let Ok(zid) = keyexpr::new(&zid) {
-            let key_expr = *KE_PREFIX / own_zid / *KE_SESSION / *KE_TRANSPORT_UNICAST / zid;
+            let key_expr = KE_PREFIX / own_zid / KE_SESSION / KE_TRANSPORT_UNICAST / zid;
             if query.key_expr().intersects(&key_expr) {
                 match serde_json::to_vec(&peer) {
                     Ok(bytes) => {
@@ -82,12 +82,12 @@ pub(crate) fn on_admin_query(session: &WeakSession, query: Query) {
                 let mut s = DefaultHasher::new();
                 link.hash(&mut s);
                 if let Ok(lid) = keyexpr::new(&s.finish().to_string()) {
-                    let key_expr = *KE_PREFIX
+                    let key_expr = KE_PREFIX
                         / own_zid
-                        / *KE_SESSION
-                        / *KE_TRANSPORT_UNICAST
+                        / KE_SESSION
+                        / KE_TRANSPORT_UNICAST
                         / zid
-                        / *KE_LINK
+                        / KE_LINK
                         / lid;
                     if query.key_expr().intersects(&key_expr) {
                         match serde_json::to_vec(&link) {
@@ -156,7 +156,7 @@ impl TransportMulticastEventHandler for Handler {
         if let Ok(own_zid) = keyexpr::new(&self.session.zid().to_string()) {
             if let Ok(zid) = keyexpr::new(&peer.zid.to_string()) {
                 let expr = WireExpr::from(
-                    &(*KE_PREFIX / own_zid / *KE_SESSION / *KE_TRANSPORT_UNICAST / zid),
+                    &(KE_PREFIX / own_zid / KE_SESSION / KE_TRANSPORT_UNICAST / zid),
                 )
                 .to_owned();
                 let info = DataInfo {
diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
index 701e13fc94..298ce6f1f6 100644
--- a/zenoh/src/lib.rs
+++ b/zenoh/src/lib.rs
@@ -172,7 +172,7 @@ pub mod key_expr {
     #[zenoh_macros::unstable]
     pub mod format {
         pub use zenoh_keyexpr::format::*;
-        pub use zenoh_macros::{kedefine, keformat, kewrite};
+        pub use zenoh_macros::{ke, kedefine, keformat, kewrite};
         pub mod macro_support {
             pub use zenoh_keyexpr::format::macro_support::*;
         }