unifinshed

zenoh/src/primitives.rs → zenoh/src/api.rs

@@ -18,14 +18,14 @@ mod admin;
 pub mod session;
 #[macro_use]
 pub mod encoding;
-mod handlers;
+pub mod handlers;
 mod info;
 pub mod key_expr;
 #[cfg(feature = "unstable")]
 mod liveliness;
 pub mod payload;
-mod publication;
-mod query;
+pub mod publication;
+pub mod query;
 pub mod queryable;
 pub mod sample;
 mod scouting;

zenoh/src/primitives/admin.rs → zenoh/src/api/admin.rs

@@ -11,7 +11,7 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     key_expr::KeyExpr,
     payload::Payload,

zenoh/src/primitives/encoding.rs → zenoh/src/api/encoding.rs

@@ -11,7 +11,7 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-use crate::primitives::payload::Payload;
+use crate::api::payload::Payload;
 use phf::phf_map;
 use std::{borrow::Cow, convert::Infallible, fmt, str::FromStr};
 use zenoh_buffers::{ZBuf, ZSlice};

zenoh/src/primitives/handlers.rs → zenoh/src/api/handlers.rs

@@ -13,7 +13,7 @@
 //
 
 //! Callback handler trait.
-use crate::primitives::session::API_DATA_RECEPTION_CHANNEL_SIZE;
+use crate::api::session::API_DATA_RECEPTION_CHANNEL_SIZE;
 use std::sync::{Arc, Mutex, Weak};
 use zenoh_collections::RingBuffer as RingBufferInner;
 use zenoh_result::ZResult;

zenoh/src/primitives/info.rs → zenoh/src/api/info.rs

@@ -13,7 +13,7 @@
 //
 
 //! Tools to access information about the current zenoh [`Session`](crate::Session).
-use crate::primitives::session::SessionRef;
+use crate::api::session::SessionRef;
 use std::future::Ready;
 use zenoh_core::{AsyncResolve, Resolvable, SyncResolve};
 use zenoh_protocol::core::{WhatAmI, ZenohId};

zenoh/src/primitives/key_expr.rs → zenoh/src/api/key_expr.rs

@@ -43,11 +43,11 @@
 //! [`kedefine`] also allows you to define formats at compile time, allowing a more performant, but more importantly safer and more convenient use of said formats,
 //! as the [`keformat`] and [`kewrite`] macros will be able to tell you if you're attempting to set fields of the format that do not exist.
 
-use crate::net::primitives::Primitives;
-use crate::primitives::{
+use crate::api::{
     selector::Selector,
     session::{Session, Undeclarable},
 };
+use crate::net::primitives::Primitives;
 use std::{
     convert::{TryFrom, TryInto},
     future::Ready,

zenoh/src/primitives/liveliness.rs → zenoh/src/api/liveliness.rs

@@ -15,7 +15,7 @@
 //! Liveliness primitives.
 //!
 //! see [`Liveliness`]
-use crate::primitives::{
+use crate::api::{
     handlers::{locked, DefaultHandler, IntoHandler},
     key_expr::KeyExpr,
     query::{QueryConsolidation, QueryTarget, Reply},

zenoh/src/primitives/publication.rs → zenoh/src/api/publication.rs

@@ -13,8 +13,7 @@
 //
 
 //! Publishing primitives.
-use crate::net::primitives::Primitives;
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     handlers::{locked, Callback, DefaultHandler, IntoHandler},
     key_expr::{KeyExpr, KeyExprInner},
@@ -27,6 +26,7 @@ use crate::primitives::{
     value::Value,
     Id,
 };
+use crate::net::primitives::Primitives;
 use std::future::Ready;
 use zenoh_core::{zread, AsyncResolve, Resolvable, Resolve, SyncResolve};
 use zenoh_keyexpr::keyexpr;

zenoh/src/primitives/query.rs → zenoh/src/api/query.rs

@@ -13,7 +13,7 @@
 //
 
 //! Query primitives.
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     handlers::{locked, Callback, DefaultHandler, IntoHandler},
     key_expr::KeyExpr,

zenoh/src/primitives/queryable.rs → zenoh/src/api/queryable.rs

@@ -13,8 +13,7 @@
 //
 
 //! Queryable primitives.
-use crate::net::primitives::Primitives;
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     handlers::{locked, DefaultHandler, IntoHandler},
     key_expr::KeyExpr,
@@ -33,6 +32,7 @@ use crate::primitives::{
     value::Value,
     Id,
 };
+use crate::net::primitives::Primitives;
 use std::fmt;
 use std::future::Ready;
 use std::ops::Deref;

zenoh/src/primitives/sample.rs → zenoh/src/api/sample.rs

@@ -13,7 +13,7 @@
 //
 
 //! Sample primitives
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     key_expr::KeyExpr,
     payload::Payload,

zenoh/src/primitives/sample/builder.rs → zenoh/src/api/sample/builder.rs

@@ -11,7 +11,7 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     key_expr::KeyExpr,
     payload::Payload,

zenoh/src/primitives/scouting.rs → zenoh/src/api/scouting.rs

@@ -11,8 +11,8 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
+use crate::api::handlers::{locked, Callback, DefaultHandler, IntoHandler};
 use crate::net::runtime::{orchestrator::Loop, Runtime};
-use crate::primitives::handlers::{locked, Callback, DefaultHandler, IntoHandler};
 
 use futures::StreamExt;
 use std::{fmt, future::Ready, net::SocketAddr, ops::Deref};

zenoh/src/primitives/selector.rs → zenoh/src/api/selector.rs

@@ -14,9 +14,7 @@
 
 //! [Selector](https://github.com/eclipse-zenoh/roadmap/tree/main/rfcs/ALL/Selectors) to issue queries
 
-use crate::primitives::{
-    key_expr::KeyExpr, query::_REPLY_KEY_EXPR_ANY_SEL_PARAM, queryable::Query,
-};
+use crate::api::{key_expr::KeyExpr, query::_REPLY_KEY_EXPR_ANY_SEL_PARAM, queryable::Query};
 use std::{
     borrow::{Borrow, Cow},
     collections::HashMap,

zenoh/src/primitives/session.rs → zenoh/src/api/session.rs

@@ -11,9 +11,8 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-use crate::net::{primitives::Primitives, routing::dispatcher::face::Face, runtime::Runtime};
-use crate::primitives::liveliness::PREFIX_LIVELINESS;
-use crate::primitives::{
+use crate::api::liveliness::PREFIX_LIVELINESS;
+use crate::api::{
     admin,
     encoding::Encoding,
     handlers::{Callback, DefaultHandler},
@@ -32,6 +31,7 @@ use crate::primitives::{
     value::Value,
     Id,
 };
+use crate::net::{primitives::Primitives, routing::dispatcher::face::Face, runtime::Runtime};
 use log::{error, trace, warn};
 use std::collections::HashMap;
 use std::convert::TryFrom;
@@ -1228,7 +1228,7 @@ impl Session {
         &self,
         key_expr: &KeyExpr,
     ) -> ZResult<Arc<LivelinessTokenState>> {
-        use crate::primitives::liveliness::KE_PREFIX_LIVELINESS;
+        use crate::api::liveliness::KE_PREFIX_LIVELINESS;
 
         let mut state = zwrite!(self.state);
         log::trace!("declare_liveliness({:?})", key_expr);

zenoh/src/primitives/subscriber.rs → zenoh/src/api/subscriber.rs

@@ -13,7 +13,7 @@
 //
 
 //! Subscribing primitives.
-use crate::primitives::{
+use crate::api::{
     handlers::{locked, Callback, DefaultHandler, IntoHandler},
     key_expr::KeyExpr,
     sample::{Locality, Sample},

zenoh/src/primitives/value.rs → zenoh/src/api/value.rs

@@ -13,7 +13,7 @@
 //
 
 //! Value primitives.
-use crate::primitives::{encoding::Encoding, payload::Payload, sample::builder::ValueBuilderTrait};
+use crate::api::{encoding::Encoding, payload::Payload, sample::builder::ValueBuilderTrait};
 
 /// A zenoh [`Value`] contains a `payload` and an [`Encoding`] that indicates how the [`Payload`] should be interpreted.
 #[non_exhaustive]

zenoh/src/lib.rs

@@ -110,25 +110,54 @@ pub const FEATURES: &str = concat_enabled_features!(
 pub mod prelude;
 pub use prelude::common::*;
 
+mod api;
 mod net;
 mod plugins;
-mod primitives;
+
+pub use zenoh_result::ZResult as Result;
 
 pub mod session {
-    pub use crate::primitives::session::open;
-    pub use crate::primitives::session::Session;
-    pub use crate::primitives::session::SessionDeclarations;
+    pub use crate::api::session::open;
+    pub use crate::api::session::Session;
+    pub use crate::api::session::SessionDeclarations;
+}
+
+pub mod key_expr {
+    pub use zenoh_keyexpr::*;
+    pub use zenoh_macros::kedefine;
+    pub use zenoh_macros::keformat;
 }
 
 pub mod sample {
-    pub use crate::primitives::sample::builder::{
+    pub use crate::api::sample::builder::{
         QoSBuilderTrait, SampleBuilderTrait, TimestampBuilderTrait, ValueBuilderTrait,
     };
     #[zenoh_macros::unstable]
-    pub use crate::primitives::sample::Attachment;
+    pub use crate::api::sample::Attachment;
     #[zenoh_macros::unstable]
-    pub use crate::primitives::sample::Locality;
+    pub use crate::api::sample::Locality;
     #[zenoh_macros::unstable]
-    pub use crate::primitives::sample::SourceInfo;
-    pub use crate::primitives::sample::{Sample, SampleKind};
+    pub use crate::api::sample::SourceInfo;
+    pub use crate::api::sample::{Sample, SampleKind};
+}
+
+pub mod queryable {
+    pub use crate::api::queryable::Query;
+}
+
+pub mod query {
+    pub use crate::api::query::Reply;
+}
+
+pub mod publication {
+    pub use crate::api::publication::Priority;
+}
+
+pub mod handlers {
+    pub use crate::api::handlers::IntoHandler;
+    pub use crate::api::handlers::RingBuffer;
+}
+
+pub mod config {
+    pub use zenoh_config::*;
 }

zenoh/src/net/routing/dispatcher/face.rs

@@ -14,9 +14,9 @@
 use super::super::router::*;
 use super::tables::TablesLock;
 use super::{resource::*, tables};
+use crate::api::key_expr::KeyExpr;
 use crate::net::primitives::{McastMux, Mux, Primitives};
 use crate::net::routing::interceptor::{InterceptorTrait, InterceptorsChain};
-use crate::primitives::key_expr::KeyExpr;
 use std::any::Any;
 use std::collections::HashMap;
 use std::fmt;

zenoh/src/net/routing/interceptor/mod.rs

@@ -19,8 +19,8 @@
 //! [Click here for Zenoh's documentation](../zenoh/index.html)
 use super::RoutingContext;
 use crate::{
+    api::key_expr::KeyExpr,
     net::routing::interceptor::downsampling::downsampling_interceptor_factories,
-    primitives::key_expr::KeyExpr,
 };
 use std::any::Any;
 use zenoh_config::Config;

zenoh/src/net/runtime/adminspace.rs

@@ -12,16 +12,16 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 use super::routing::dispatcher::face::Face;
 use super::Runtime;
-use crate::net::primitives::Primitives;
-use crate::plugins::sealed as plugins;
-use crate::primitives::{
+use crate::api::{
     encoding::Encoding,
     key_expr::KeyExpr,
     payload::Payload,
     queryable::{Query, QueryInner},
     sample::builder::ValueBuilderTrait,
     value::Value,
 };
+use crate::net::primitives::Primitives;
+use crate::plugins::sealed as plugins;
 use log::{error, trace};
 use serde_json::json;
 use std::collections::HashMap;

zenoh/src/plugins/sealed.rs

@@ -14,7 +14,7 @@
 
 //! `zenohd`'s plugin system. For more details, consult the [detailed documentation](https://github.com/eclipse-zenoh/roadmap/blob/main/rfcs/ALL/Plugins/Zenoh%20Plugins.md).
 
-use crate::{net::runtime::Runtime, primitives::selector::Selector};
+use crate::{api::selector::Selector, net::runtime::Runtime};
 use zenoh_core::zconfigurable;
 
 use zenoh_plugin_trait::{

zenoh/src/prelude.rs

@@ -23,13 +23,22 @@
 //! ```
 
 pub(crate) mod common {
+    pub use crate::config::{Config, ValidatedMap};
+
     #[zenoh_macros::unstable]
     pub use crate::sample::Attachment;
     pub use crate::sample::{
-        QoSBuilderTrait, SampleBuilderTrait, TimestampBuilderTrait, ValueBuilderTrait,
+        Locality, QoSBuilderTrait, Sample, SampleBuilderTrait, SampleKind, SourceInfo,
+        TimestampBuilderTrait, ValueBuilderTrait,
     };
+
+    pub use crate::query::Reply;
+
     pub use crate::session::{open, Session, SessionDeclarations};
-    pub use zenoh_config::Config;
+
+    pub use crate::publication::Priority;
+
+    pub use crate::key_expr::kedefine;
 
     //     /// A zenoh error.
     //     // pub use zenoh_result::Error;

zenoh/tests/connection_retry.rs

@@ -1,5 +1,6 @@
 use zenoh::config::ConnectionRetryConf;
 use zenoh::prelude::sync::*;
+use zenoh_link::EndPoint;
 
 #[test]
 fn retry_config_overriding() {

zenoh/tests/events.rs

@@ -12,7 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use std::time::Duration;
-use zenoh::prelude::r#async::*;
+use zenoh::{config, prelude::r#async::*};
 use zenoh_core::ztimeout;
 
 const TIMEOUT: Duration = Duration::from_secs(10);

zenoh/tests/formatters.rs

@@ -13,6 +13,7 @@
 //
 #[test]
 fn reuse() {
+    use zenoh::prelude::r#async::*;
     zenoh::kedefine!(
         pub gkeys: "zenoh/${group:*}/${member:*}",
     );

zenoh/tests/liveliness.rs

@@ -12,6 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 //
 use std::time::Duration;
+use zenoh::config;
 use zenoh::prelude::r#async::*;
 use zenoh_core::ztimeout;
 

zenoh/tests/matching.rs

@@ -15,7 +15,7 @@ use std::str::FromStr;
 use std::time::Duration;
 use zenoh::prelude::r#async::*;
 use zenoh_core::ztimeout;
-use zenoh_result::ZResult as Result;
+use zenoh_link::Locator;
 
 const TIMEOUT: Duration = Duration::from_secs(60);
 const RECV_TIMEOUT: Duration = Duration::from_secs(1);

zenoh/tests/qos.rs

@@ -13,8 +13,6 @@
 //
 use std::time::Duration;
 use zenoh::prelude::r#async::*;
-use zenoh::sample::builder::QoSBuilderTrait;
-use zenoh::{publication::Priority, SessionDeclarations};
 use zenoh_core::ztimeout;
 
 const TIMEOUT: Duration = Duration::from_secs(60);