Move back to using register_listener() taking ownership of the Arc<dy…

…n UListener>
eclipse-uprotocol · Apr 4, 2024 · ec6ff04 · ec6ff04
1 parent 3ef0986
commit ec6ff04
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/example-utils/example-up-client-foo/src/up_client_foo.rs b/example-utils/example-up-client-foo/src/up_client_foo.rs
@@ -285,9 +285,8 @@ impl UTransport for UPClientFoo {
     async fn register_listener(
         &self,
         topic: UUri,
-        listener: &Arc<dyn UListener>,
+        listener: Arc<dyn UListener>,
     ) -> Result<(), UStatus> {
-        let listener = listener.clone();
         println!("{}: registering listener for: {topic:?}", &self.name);
 
         return if topic.resource.is_none() && topic.entity.is_none() {

diff --git a/examples/simple-example/src/main.rs b/examples/simple-example/src/main.rs
@@ -292,7 +292,7 @@ pub async fn run_client(
             let client = UPClientFoo::new(&name, rx, tx).await;
 
             let register_res = client
-                .register_listener(my_client_uuri.clone(), &listener)
+                .register_listener(my_client_uuri.clone(), listener)
                 .await;
             let Ok(_registration_string) = register_res else {
                 panic!("Unable to register!");

diff --git a/up-streamer/src/route.rs b/up-streamer/src/route.rs
@@ -49,7 +49,7 @@ const ROUTEFN_NEW_TAG: &str = "new():";
 /// #         async fn register_listener(
 /// #             &self,
 /// #             topic: UUri,
-/// #             _listener: &Arc<dyn UListener>,
+/// #             _listener: Arc<dyn UListener>,
 /// #         ) -> Result<(), UStatus> {
 /// #             println!("UPClientFoo: registering topic: {:?}", topic);
 /// #             let uuid = UUIDBuilder::build();

diff --git a/up-streamer/src/ustreamer.rs b/up-streamer/src/ustreamer.rs
@@ -78,10 +78,7 @@ impl UStreamer {
             r#in.transport
                 .lock()
                 .await
-                .register_listener(
-                    Self::uauthority_to_uuri(out.authority),
-                    &forwarding_listener,
-                )
+                .register_listener(Self::uauthority_to_uuri(out.authority), forwarding_listener)
                 .await
         }
     }
@@ -158,7 +155,7 @@ mod tests {
         async fn register_listener(
             &self,
             topic: UUri,
-            _listener: &Arc<dyn UListener>,
+            _listener: Arc<dyn UListener>,
         ) -> Result<(), UStatus> {
             println!("UPClientFoo: registering topic: {:?}", topic);
             Ok(())
@@ -189,7 +186,7 @@ mod tests {
         async fn register_listener(
             &self,
             topic: UUri,
-            _listener: &Arc<dyn UListener>,
+            _listener: Arc<dyn UListener>,
         ) -> Result<(), UStatus> {
             println!("UPClientBar: registering topic: {:?}", topic);
             Ok(())