separate module

eclipse-zenoh · Mar 28, 2024 · ddb93a2 · ddb93a2
1 parent 48cb96b
commit ddb93a2
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 34 deletions.
diff --git a/examples/examples/z_ping.rs b/examples/examples/z_ping.rs
@@ -16,7 +16,7 @@ use std::time::{Duration, Instant};
 use zenoh::config::Config;
 use zenoh::prelude::sync::*;
 use zenoh::publication::CongestionControl;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh_examples::CommonArgs;
 
 fn main() {

diff --git a/examples/examples/z_pong.rs b/examples/examples/z_pong.rs
@@ -15,7 +15,7 @@ use clap::Parser;
 use zenoh::config::Config;
 use zenoh::prelude::sync::*;
 use zenoh::publication::CongestionControl;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh_examples::CommonArgs;
 
 fn main() {

diff --git a/examples/examples/z_pub.rs b/examples/examples/z_pub.rs
@@ -16,7 +16,7 @@ use clap::Parser;
 use std::time::Duration;
 use zenoh::config::Config;
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::SampleBuilderTrait;
+use zenoh::sample::builder::SampleBuilderTrait;
 use zenoh_examples::CommonArgs;
 
 #[async_std::main]

diff --git a/examples/examples/z_pub_shm_thr.rs b/examples/examples/z_pub_shm_thr.rs
@@ -15,7 +15,7 @@ use clap::Parser;
 use zenoh::config::Config;
 use zenoh::prelude::r#async::*;
 use zenoh::publication::CongestionControl;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh::shm::SharedMemoryManager;
 use zenoh_examples::CommonArgs;
 

diff --git a/examples/examples/z_pub_thr.rs b/examples/examples/z_pub_thr.rs
@@ -16,7 +16,7 @@ use clap::Parser;
 use std::convert::TryInto;
 use zenoh::prelude::sync::*;
 use zenoh::publication::CongestionControl;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh_examples::CommonArgs;
 
 fn main() {

diff --git a/plugins/zenoh-plugin-rest/examples/z_serve_sse.rs b/plugins/zenoh-plugin-rest/examples/z_serve_sse.rs
@@ -15,7 +15,7 @@ use clap::{arg, Command};
 use std::time::Duration;
 use zenoh::prelude::r#async::*;
 use zenoh::publication::CongestionControl;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh::{config::Config, key_expr::keyexpr};
 
 const HTML: &str = r#"

diff --git a/plugins/zenoh-plugin-rest/src/lib.rs b/plugins/zenoh-plugin-rest/src/lib.rs
@@ -34,7 +34,7 @@ use zenoh::plugins::{RunningPluginTrait, ZenohPlugin};
 use zenoh::prelude::r#async::*;
 use zenoh::query::{QueryConsolidation, Reply};
 use zenoh::runtime::Runtime;
-use zenoh::sample_builder::ValueBuilderTrait;
+use zenoh::sample::builder::ValueBuilderTrait;
 use zenoh::selector::TIME_RANGE_KEY;
 use zenoh::Session;
 use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin, PluginControl};

diff --git a/plugins/zenoh-plugin-storage-manager/src/replica/align_queryable.rs b/plugins/zenoh-plugin-storage-manager/src/replica/align_queryable.rs
@@ -20,8 +20,8 @@ use std::str;
 use std::str::FromStr;
 use zenoh::payload::StringOrBase64;
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::TimestampBuilderTrait;
-use zenoh::sample_builder::ValueBuilderTrait;
+use zenoh::sample::builder::TimestampBuilderTrait;
+use zenoh::sample::builder::ValueBuilderTrait;
 use zenoh::time::Timestamp;
 use zenoh::Session;
 

diff --git a/plugins/zenoh-plugin-storage-manager/src/replica/aligner.rs b/plugins/zenoh-plugin-storage-manager/src/replica/aligner.rs
@@ -21,7 +21,7 @@ use std::str;
 use zenoh::key_expr::{KeyExpr, OwnedKeyExpr};
 use zenoh::payload::StringOrBase64;
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::{PutSampleBuilder, TimestampBuilderTrait, ValueBuilderTrait};
+use zenoh::sample::builder::{PutSampleBuilder, TimestampBuilderTrait, ValueBuilderTrait};
 use zenoh::time::Timestamp;
 use zenoh::Session;
 

diff --git a/plugins/zenoh-plugin-storage-manager/src/replica/storage.rs b/plugins/zenoh-plugin-storage-manager/src/replica/storage.rs
@@ -26,10 +26,10 @@ use zenoh::buffers::ZBuf;
 use zenoh::key_expr::KeyExpr;
 use zenoh::prelude::r#async::*;
 use zenoh::query::{ConsolidationMode, QueryTarget};
-use zenoh::sample::{Sample, SampleKind};
-use zenoh::sample_builder::{
+use zenoh::sample::builder::{
     DeleteSampleBuilder, PutSampleBuilder, SampleBuilder, TimestampBuilderTrait, ValueBuilderTrait,
 };
+use zenoh::sample::{Sample, SampleKind};
 use zenoh::time::{new_reception_timestamp, Timestamp, NTP64};
 use zenoh::value::Value;
 use zenoh::{Result as ZResult, Session, SessionDeclarations};

diff --git a/zenoh-ext/src/group.rs b/zenoh-ext/src/group.rs
@@ -29,7 +29,7 @@ use zenoh::payload::PayloadReader;
 use zenoh::prelude::r#async::*;
 use zenoh::publication::Publisher;
 use zenoh::query::ConsolidationMode;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh::Error as ZError;
 use zenoh::Result as ZResult;
 use zenoh::Session;

diff --git a/zenoh-ext/src/querying_subscriber.rs b/zenoh-ext/src/querying_subscriber.rs
@@ -20,7 +20,7 @@ use std::time::Duration;
 use zenoh::handlers::{locked, DefaultHandler};
 use zenoh::prelude::r#async::*;
 use zenoh::query::{QueryConsolidation, QueryTarget, ReplyKeyExpr};
-use zenoh::sample_builder::{SampleBuilder, TimestampBuilderTrait};
+use zenoh::sample::builder::{SampleBuilder, TimestampBuilderTrait};
 use zenoh::subscriber::{Reliability, Subscriber};
 use zenoh::time::{new_reception_timestamp, Timestamp};
 use zenoh::Result as ZResult;

diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -145,7 +145,6 @@ pub mod publication;
 pub mod query;
 pub mod queryable;
 pub mod sample;
-pub mod sample_builder;
 pub mod subscriber;
 pub mod value;
 #[cfg(feature = "shared-memory")]

diff --git a/zenoh/src/net/runtime/adminspace.rs b/zenoh/src/net/runtime/adminspace.rs
@@ -20,7 +20,7 @@ use crate::plugins::sealed::{self as plugins};
 use crate::prelude::sync::SyncResolve;
 use crate::queryable::Query;
 use crate::queryable::QueryInner;
-use crate::sample_builder::ValueBuilderTrait;
+use crate::sample::builder::ValueBuilderTrait;
 use crate::value::Value;
 use async_std::task;
 use log::{error, trace};

diff --git a/zenoh/src/prelude.rs b/zenoh/src/prelude.rs
@@ -60,6 +60,10 @@ pub(crate) mod common {
     #[zenoh_macros::unstable]
     pub use crate::publication::PublisherDeclarations;
     pub use zenoh_protocol::core::{CongestionControl, Reliability, WhatAmI};
+
+    pub use crate::sample::builder::{
+        QoSBuilderTrait, SampleBuilderTrait, TimestampBuilderTrait, ValueBuilderTrait,
+    };
 }
 
 /// Prelude to import when using Zenoh's sync API.

diff --git a/zenoh/src/publication.rs b/zenoh/src/publication.rs
@@ -15,12 +15,12 @@
 //! Publishing primitives.
 use crate::net::primitives::Primitives;
 use crate::prelude::*;
+use crate::sample::builder::{
+    QoSBuilderTrait, SampleBuilderTrait, TimestampBuilderTrait, ValueBuilderTrait,
+};
 #[zenoh_macros::unstable]
 use crate::sample::Attachment;
 use crate::sample::{DataInfo, QoS, Sample, SampleFields, SampleKind};
-use crate::sample_builder::{
-    QoSBuilderTrait, SampleBuilderTrait, TimestampBuilderTrait, ValueBuilderTrait,
-};
 use crate::SessionRef;
 use crate::Undeclarable;
 #[cfg(feature = "unstable")]
@@ -73,7 +73,7 @@ pub struct DeleteBuilder<'a, 'b> {
 /// # async_std::task::block_on(async {
 /// use zenoh::prelude::r#async::*;
 /// use zenoh::publication::CongestionControl;
-/// use zenoh::sample_builder::{ValueBuilderTrait, QoSBuilderTrait};
+/// use zenoh::sample::builder::{ValueBuilderTrait, QoSBuilderTrait};
 ///
 /// let session = zenoh::open(config::peer()).res().await.unwrap();
 /// session
@@ -932,7 +932,7 @@ impl<'a> Sink<Sample> for Publisher<'a> {
 /// # async_std::task::block_on(async {
 /// use zenoh::prelude::r#async::*;
 /// use zenoh::publication::CongestionControl;
-/// use zenoh::sample_builder::QoSBuilderTrait;
+/// use zenoh::sample::builder::QoSBuilderTrait;
 ///
 /// let session = zenoh::open(config::peer()).res().await.unwrap();
 /// let publisher = session

diff --git a/zenoh/src/query.rs b/zenoh/src/query.rs
@@ -15,10 +15,10 @@
 //! Query primitives.
 use crate::handlers::{locked, Callback, DefaultHandler};
 use crate::prelude::*;
+use crate::sample::builder::{QoSBuilderTrait, SampleBuilderTrait, ValueBuilderTrait};
 #[zenoh_macros::unstable]
 use crate::sample::Attachment;
 use crate::sample::QoSBuilder;
-use crate::sample_builder::{QoSBuilderTrait, SampleBuilderTrait, ValueBuilderTrait};
 use crate::Session;
 use std::collections::HashMap;
 use std::future::Ready;

diff --git a/zenoh/src/queryable.rs b/zenoh/src/queryable.rs
@@ -18,11 +18,11 @@ use crate::encoding::Encoding;
 use crate::handlers::{locked, DefaultHandler};
 use crate::net::primitives::Primitives;
 use crate::prelude::*;
-use crate::sample::SourceInfo;
-use crate::sample_builder::{
+use crate::sample::builder::{
     DeleteSampleBuilder, PutSampleBuilder, QoSBuilderTrait, SampleBuilder, SampleBuilderTrait,
     TimestampBuilderTrait, ValueBuilderTrait,
 };
+use crate::sample::SourceInfo;
 use crate::Id;
 use crate::SessionRef;
 use crate::Undeclarable;

diff --git a/zenoh/src/sample.rs b/zenoh/src/sample.rs
@@ -16,7 +16,7 @@
 use crate::encoding::Encoding;
 use crate::payload::Payload;
 use crate::prelude::{KeyExpr, Value};
-use crate::sample_builder::{QoSBuilderTrait, ValueBuilderTrait};
+use crate::sample::builder::{QoSBuilderTrait, ValueBuilderTrait};
 use crate::time::Timestamp;
 use crate::Priority;
 #[zenoh_macros::unstable]
@@ -26,6 +26,8 @@ use zenoh_protocol::core::EntityGlobalId;
 use zenoh_protocol::network::declare::ext::QoSType;
 use zenoh_protocol::{core::CongestionControl, zenoh};
 
+pub mod builder;
+
 pub type SourceSn = u64;
 
 /// The locality of samples to be received by subscribers or targeted by publishers.

diff --git a/zenoh/src/session.rs b/zenoh/src/session.rs
@@ -683,8 +683,7 @@ impl Session {
     /// ```
     /// # async_std::task::block_on(async {
     /// use zenoh::prelude::r#async::*;
-    /// use zenoh::sample_builder::SampleBuilderTrait;
-    /// use zenoh::sample_builder::ValueBuilderTrait;
+    /// use zenoh::prelude::*;
     ///
     /// let session = zenoh::open(config::peer()).res().await.unwrap();
     /// session

diff --git a/zenoh/src/value.rs b/zenoh/src/value.rs
@@ -13,7 +13,7 @@
 //
 
 //! Value primitives.
-use crate::{encoding::Encoding, payload::Payload, sample_builder::ValueBuilderTrait};
+use crate::{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]

diff --git a/zenoh/tests/attachments.rs b/zenoh/tests/attachments.rs
@@ -14,7 +14,7 @@
 #[cfg(feature = "unstable")]
 #[test]
 fn pubsub() {
-    use zenoh::{prelude::sync::*, sample_builder::SampleBuilderTrait};
+    use zenoh::{prelude::sync::*, sample::builder::SampleBuilderTrait};
 
     let zenoh = zenoh::open(Config::default()).res().unwrap();
     let _sub = zenoh
@@ -61,7 +61,7 @@ fn pubsub() {
 #[cfg(feature = "unstable")]
 #[test]
 fn queries() {
-    use zenoh::{prelude::sync::*, sample::Attachment, sample_builder::SampleBuilderTrait};
+    use zenoh::{prelude::sync::*, sample::builder::SampleBuilderTrait, sample::Attachment};
 
     let zenoh = zenoh::open(Config::default()).res().unwrap();
     let _sub = zenoh

diff --git a/zenoh/tests/qos.rs b/zenoh/tests/qos.rs
@@ -15,7 +15,7 @@ use async_std::prelude::FutureExt;
 use async_std::task;
 use std::time::Duration;
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh::{publication::Priority, SessionDeclarations};
 use zenoh_core::zasync_executor_init;
 

diff --git a/zenoh/tests/routing.rs b/zenoh/tests/routing.rs
@@ -20,7 +20,7 @@ use std::sync::{atomic::AtomicUsize, Arc};
 use std::time::Duration;
 use zenoh::config::{Config, ModeDependentValue};
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh::{value::Value, Result};
 use zenoh_core::zasync_executor_init;
 use zenoh_protocol::core::{WhatAmI, WhatAmIMatcher};

diff --git a/zenoh/tests/session.rs b/zenoh/tests/session.rs
@@ -17,7 +17,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh_core::zasync_executor_init;
 
 const TIMEOUT: Duration = Duration::from_secs(60);

diff --git a/zenoh/tests/unicity.rs b/zenoh/tests/unicity.rs
@@ -17,7 +17,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 use zenoh::prelude::r#async::*;
-use zenoh::sample_builder::QoSBuilderTrait;
+use zenoh::sample::builder::QoSBuilderTrait;
 use zenoh_core::zasync_executor_init;
 
 const TIMEOUT: Duration = Duration::from_secs(60);