Deprecate MessageSink::get_config

All the implementations were either returning NoConfig
or delegating some inner implementation.

Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>

Author: didier-wenzek

crates/common/batcher/src/lib.rs

@@ -68,9 +68,6 @@ impl<B: Batchable> BatchingActorBuilder<B> {
 }
 
 impl<B: Batchable> MessageSink<BatchDriverInput<B>, NoConfig> for BatchingActorBuilder<B> {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
     fn get_sender(&self) -> DynSender<BatchDriverInput<B>> {
         self.message_box.get_sender()
     }

crates/core/tedge_actors/src/builders.rs

@@ -102,9 +102,6 @@ pub struct NoConfig;
 /// For that purpose each source implementation defines a `Config` type parameter,
 /// and the sink has to provide the configuration value specific to its needs.
 pub trait MessageSink<M: Message, Config> {
-    /// Return the config used by this actor to connect the message source
-    fn get_config(&self) -> Config;
-
     /// Return the sender that can be used by peers to send messages to this actor
     fn get_sender(&self) -> DynSender<M>;
 
@@ -299,9 +296,6 @@ pub trait RuntimeRequestSink {
 /// #    }
 /// # }
 /// # impl MessageSink<MyActorInput, NoConfig> for MyActorBuilder {
-/// #    fn get_config(&self) -> NoConfig {
-/// #        NoConfig
-/// #    }
 /// #    fn get_sender(&self) -> DynSender<MyActorInput> {
 /// #        self.messages.get_sender()
 /// #    }
@@ -413,10 +407,6 @@ impl<I: Message, O: Message, C> MessageSource<O, C> for SimpleMessageBoxBuilder<
 
 /// A `SimpleMessageBoxBuilder<Input,Output>` is a [MessageSink] of `Input` messages with no specific config.
 impl<I: Message, O: Message> MessageSink<I, NoConfig> for SimpleMessageBoxBuilder<I, O> {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<I> {
         self.input_sender.sender_clone()
     }

crates/core/tedge_actors/src/converter.rs

@@ -37,7 +37,7 @@
 //! # use std::time::Duration;
 //! # use tedge_actors::{Actor, Builder, MessageReceiver, MessageSource, NoConfig, Sender};
 //! # use tedge_actors::test_helpers::MessageReceiverExt;
-//! let mut actor = ConvertingActor::builder("Repeater", Repeater, NoConfig);
+//! let mut actor = ConvertingActor::builder("Repeater", Repeater);
 //! let mut test_box = SimpleMessageBoxBuilder::new("Test", 16).with_connection(NoConfig, &mut actor).build().with_timeout(Duration::from_millis(100));
 //! tokio::spawn(async move { actor.build().run().await });
 //!
@@ -114,12 +114,8 @@ pub struct ConvertingActor<C: Converter> {
 }
 
 impl<C: Converter> ConvertingActor<C> {
-    pub fn builder<Config>(
-        name: &str,
-        converter: C,
-        config: Config,
-    ) -> ConvertingActorBuilder<C, Config> {
-        ConvertingActorBuilder::new(name, converter, config)
+    pub fn builder(name: &str, converter: C) -> ConvertingActorBuilder<C> {
+        ConvertingActorBuilder::new(name, converter)
     }
 }
 
@@ -214,10 +210,10 @@ impl<C: Converter> ConvertingActor<C> {
 ///     let mut converter_builder = ConvertingActor::builder(
 ///         "MyConverter",
 ///         MyConverter,
-///         TopicFilter("some/mqtt/topics/#"));
+///     );
 ///
 ///     // Connect this actor as a sink of the mqtt actor, to receive input messages from it
-///     converter_builder.add_input(converter_builder.get_config(), &mut mqtt_builder);
+///     converter_builder.add_input(TopicFilter("some/mqtt/topics/#"), &mut mqtt_builder);
 ///
 ///     // Connect the same mqtt actor as a sink of this actor, to send output messages to it
 ///     converter_builder.add_sink(NoConfig, &mut mqtt_builder);
@@ -226,19 +222,17 @@ impl<C: Converter> ConvertingActor<C> {
 ///     converter_builder.build()
 /// }
 /// ```
-pub struct ConvertingActorBuilder<C: Converter, Config> {
+pub struct ConvertingActorBuilder<C: Converter> {
     name: String,
     converter: C,
-    config: Config,
     message_box: SimpleMessageBoxBuilder<C::Input, C::Output>,
 }
 
-impl<C: Converter, Config> ConvertingActorBuilder<C, Config> {
-    fn new(name: &str, converter: C, config: Config) -> Self {
+impl<C: Converter> ConvertingActorBuilder<C> {
+    fn new(name: &str, converter: C) -> Self {
         ConvertingActorBuilder {
             name: name.to_string(),
             converter,
-            config,
             message_box: SimpleMessageBoxBuilder::new(name, 16), // FIXME: capacity should not be hardcoded
         }
     }
@@ -248,7 +242,7 @@ impl<C: Converter, Config> ConvertingActorBuilder<C, Config> {
     }
 }
 
-impl<C: Converter, Config> Builder<ConvertingActor<C>> for ConvertingActorBuilder<C, Config> {
+impl<C: Converter> Builder<ConvertingActor<C>> for ConvertingActorBuilder<C> {
     type Error = Infallible;
 
     fn try_build(self) -> Result<ConvertingActor<C>, Self::Error> {
@@ -264,27 +258,19 @@ impl<C: Converter, Config> Builder<ConvertingActor<C>> for ConvertingActorBuilde
     }
 }
 
-impl<C: Converter, Config> MessageSource<C::Output, NoConfig>
-    for ConvertingActorBuilder<C, Config>
-{
+impl<C: Converter> MessageSource<C::Output, NoConfig> for ConvertingActorBuilder<C> {
     fn register_peer(&mut self, config: NoConfig, sender: DynSender<C::Output>) {
         self.message_box.register_peer(config, sender)
     }
 }
 
-impl<C: Converter, Config: Clone> MessageSink<C::Input, Config>
-    for ConvertingActorBuilder<C, Config>
-{
-    fn get_config(&self) -> Config {
-        self.config.clone()
-    }
-
+impl<C: Converter> MessageSink<C::Input, NoConfig> for ConvertingActorBuilder<C> {
     fn get_sender(&self) -> DynSender<C::Input> {
         self.message_box.get_sender()
     }
 }
 
-impl<C: Converter, Config> RuntimeRequestSink for ConvertingActorBuilder<C, Config> {
+impl<C: Converter> RuntimeRequestSink for ConvertingActorBuilder<C> {
     fn get_signal_sender(&self) -> DynSender<RuntimeRequest> {
         self.message_box.get_signal_sender()
     }

crates/core/tedge_actors/src/lib.rs

@@ -221,10 +221,6 @@
 //! /// An actor builder also declares that it consumes messages
 //! /// by implementing the `MessageSink` trait for the appropriate input and config types.
 //! impl MessageSink<SomeMessage, SomeConfig> for SomeOtherActorBuilder {
-//!     fn get_config(&self) -> SomeConfig {
-//!        todo!()
-//!     }
-//!
 //!     /// Return a sender where to send the input messages.
 //!     fn get_sender(&self) -> DynSender<SomeMessage> {
 //!         todo!()

crates/core/tedge_actors/src/runtime.rs

@@ -139,10 +139,6 @@ impl RuntimeHandle {
 }
 
 impl MessageSink<RuntimeAction, NoConfig> for RuntimeHandle {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<RuntimeAction> {
         self.actions_sender.clone().into()
     }

crates/core/tedge_actors/src/servers/builders.rs

@@ -77,10 +77,6 @@ impl<Req: Message, Res: Message> RuntimeRequestSink for ServerMessageBoxBuilder<
 impl<Req: Message, Res: Message> MessageSink<RequestEnvelope<Req, Res>, NoConfig>
     for ServerMessageBoxBuilder<Req, Res>
 {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<RequestEnvelope<Req, Res>> {
         self.request_sender().sender_clone()
     }
@@ -191,10 +187,6 @@ impl<S: Server + Clone> Builder<ConcurrentServerActor<S>> for ServerActorBuilder
 impl<S: Server, K> MessageSink<RequestEnvelope<S::Request, S::Response>, NoConfig>
     for ServerActorBuilder<S, K>
 {
-    fn get_config(&self) -> NoConfig {
-        self.box_builder.get_config()
-    }
-
     fn get_sender(&self) -> DynSender<RequestEnvelope<S::Request, S::Response>> {
         self.box_builder.get_sender()
     }

crates/core/tedge_actors/src/test_helpers.rs

@@ -652,10 +652,6 @@ impl<I: MessagePlus, O: MessagePlus> MessageSource<O, NoConfig> for Probe<I, O>
 }
 
 impl<I: MessagePlus, O: MessagePlus> MessageSink<I, NoConfig> for Probe<I, O> {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<I> {
         self.input_interceptor.clone().into()
     }
@@ -801,10 +797,6 @@ impl<Request: Message, Response: Message> Default for FakeServerBoxBuilder<Reque
 impl<Request: Message, Response: Message> MessageSink<RequestEnvelope<Request, Response>, NoConfig>
     for FakeServerBoxBuilder<Request, Response>
 {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<RequestEnvelope<Request, Response>> {
         self.messages.get_sender()
     }

crates/core/tedge_agent/src/agent.rs

@@ -419,7 +419,7 @@ fn load_operation_workflow(
 
 pub fn create_tedge_to_te_converter(
     mqtt_actor_builder: &mut MqttActorBuilder,
-) -> Result<ConvertingActorBuilder<TedgetoTeConverter, TopicFilter>, anyhow::Error> {
+) -> Result<ConvertingActorBuilder<TedgetoTeConverter>, anyhow::Error> {
     let tedge_to_te_converter = TedgetoTeConverter::new();
 
     let subscriptions: TopicFilter = vec![
@@ -433,12 +433,8 @@ pub fn create_tedge_to_te_converter(
     .try_into()?;
 
     // Tedge to Te converter
-    let mut tedge_converter_actor: ConvertingActorBuilder<TedgetoTeConverter, TopicFilter> =
-        ConvertingActor::builder(
-            "TedgetoTeConverter",
-            tedge_to_te_converter,
-            subscriptions.clone(),
-        );
+    let mut tedge_converter_actor =
+        ConvertingActor::builder("TedgetoTeConverter", tedge_to_te_converter);
 
     tedge_converter_actor.add_input(subscriptions, mqtt_actor_builder);
     tedge_converter_actor.add_sink(NoConfig, mqtt_actor_builder);

crates/core/tedge_agent/src/operation_file_cache/mod.rs

@@ -324,10 +324,6 @@ impl FileCacheActorBuilder {
 }
 
 impl MessageSink<FileCacheInput, NoConfig> for FileCacheActorBuilder {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<FileCacheInput> {
         self.message_box.get_sender()
     }

crates/core/tedge_agent/src/restart_manager/builder.rs

@@ -28,10 +28,6 @@ impl RestartManagerBuilder {
 }
 
 impl MessageSink<RestartCommand, NoConfig> for RestartManagerBuilder {
-    fn get_config(&self) -> NoConfig {
-        NoConfig
-    }
-
     fn get_sender(&self) -> DynSender<RestartCommand> {
         self.message_box.get_sender()
     }