feat(rumqttd): removed deprecated Link (#684)

Author: swanandx

rumqttd/CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 
 ### Removed
+- Link and its implementation which were deprecated.
 
 ### Fixed
 - Retained Messages

rumqttd/src/link/local.rs

@@ -1,6 +1,4 @@
-use crate::protocol::{
-    ConnAck, Filter, LastWill, Packet, Publish, QoS, RetainForwardRule, Subscribe,
-};
+use crate::protocol::{Filter, LastWill, Packet, Publish, QoS, RetainForwardRule, Subscribe};
 use crate::router::Ack;
 use crate::router::{
     iobufs::{Incoming, Outgoing},
@@ -127,121 +125,6 @@ impl<'a> LinkBuilder<'a> {
     }
 }
 
-pub struct Link;
-
-#[deprecated = "Link will be removed soon, please consider using LinkBuilder"]
-impl Link {
-    #[allow(clippy::type_complexity)]
-    fn prepare(
-        tenant_id: Option<String>,
-        client_id: &str,
-        clean: bool,
-        last_will: Option<LastWill>,
-        dynamic_filters: bool,
-        topic_alias_max: u16,
-    ) -> (
-        Event,
-        Arc<Mutex<VecDeque<Packet>>>,
-        Arc<Mutex<VecDeque<Notification>>>,
-        Receiver<()>,
-    ) {
-        let connection = Connection::new(
-            tenant_id,
-            client_id.to_owned(),
-            clean,
-            last_will,
-            dynamic_filters,
-            topic_alias_max,
-        );
-        let incoming = Incoming::new(connection.client_id.to_owned());
-        let (outgoing, link_rx) = Outgoing::new(connection.client_id.to_owned());
-        let outgoing_data_buffer = outgoing.buffer();
-        let incoming_data_buffer = incoming.buffer();
-
-        let event = Event::Connect {
-            connection,
-            incoming,
-            outgoing,
-        };
-
-        (event, incoming_data_buffer, outgoing_data_buffer, link_rx)
-    }
-
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(
-        tenant_id: Option<String>,
-        client_id: &str,
-        router_tx: Sender<(ConnectionId, Event)>,
-        clean: bool,
-        last_will: Option<LastWill>,
-        dynamic_filters: bool,
-        topic_alias_max: Option<u16>,
-    ) -> Result<(LinkTx, LinkRx, Notification), LinkError> {
-        // Connect to router
-        // Local connections to the router shall have access to all subscriptions
-
-        let (message, i, o, link_rx) = Link::prepare(
-            tenant_id,
-            client_id,
-            clean,
-            last_will,
-            dynamic_filters,
-            topic_alias_max.unwrap_or(0),
-        );
-        router_tx.send((0, message))?;
-
-        link_rx.recv()?;
-        let notification = o.lock().pop_front().unwrap();
-
-        // Right now link identifies failure with dropped rx in router,
-        // which is probably ok. We need this here to get id assigned by router
-        let id = match notification {
-            Notification::DeviceAck(Ack::ConnAck(id, ..)) => id,
-            _message => return Err(LinkError::NotConnectionAck),
-        };
-
-        let tx = LinkTx::new(id, router_tx.clone(), i);
-        let rx = LinkRx::new(id, router_tx, link_rx, o);
-        Ok((tx, rx, notification))
-    }
-
-    pub async fn init(
-        tenant_id: Option<String>,
-        client_id: &str,
-        router_tx: Sender<(ConnectionId, Event)>,
-        clean: bool,
-        last_will: Option<LastWill>,
-        dynamic_filters: bool,
-        topic_alias_max: Option<u16>,
-    ) -> Result<(LinkTx, LinkRx, ConnAck), LinkError> {
-        // Connect to router
-        // Local connections to the router shall have access to all subscriptions
-
-        let (message, i, o, link_rx) = Link::prepare(
-            tenant_id,
-            client_id,
-            clean,
-            last_will,
-            dynamic_filters,
-            topic_alias_max.unwrap_or(0),
-        );
-        router_tx.send_async((0, message)).await?;
-
-        link_rx.recv_async().await?;
-        let notification = o.lock().pop_front().unwrap();
-        // Right now link identifies failure with dropped rx in router,
-        // which is probably ok. We need this here to get id assigned by router
-        let (id, ack) = match notification {
-            Notification::DeviceAck(Ack::ConnAck(id, ack, _)) => (id, ack),
-            _message => return Err(LinkError::NotConnectionAck),
-        };
-
-        let tx = LinkTx::new(id, router_tx.clone(), i);
-        let rx = LinkRx::new(id, router_tx, link_rx, o);
-        Ok((tx, rx, ack))
-    }
-}
-
 pub struct LinkTx {
     pub(crate) connection_id: ConnectionId,
     router_tx: Sender<(ConnectionId, Event)>,