remove Extension constraint

apache · May 10, 2024 · 1064a1d · 1064a1d
1 parent 7d0ee36
commit 1064a1d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/dubbo/src/extension/invoker_extension.rs b/dubbo/src/extension/invoker_extension.rs
@@ -8,7 +8,6 @@ use futures_core::Stream;
 use crate::{StdError, Url};
 use crate::extension::{Extension, ExtensionFactories, ExtensionMetaInfo, LoadExtensionPromise};
 use crate::extension::invoker_extension::proxy::InvokerProxy;
-use crate::extension::registry_extension::proxy::RegistryProxy;
 use crate::params::extension_param::{ExtensionName, ExtensionType};
 use crate::url::UrlParam;
 
@@ -192,6 +191,10 @@ where
     T: Invoker + Send + 'static,
     T: Extension<Target= Box<dyn Invoker + Send + 'static>>
 {
+    fn name() -> String {
+        T::name()
+    }
+
     fn extension_type() -> ExtensionType {
         ExtensionType::Invoker
     }

diff --git a/dubbo/src/extension/mod.rs b/dubbo/src/extension/mod.rs
@@ -285,7 +285,6 @@ impl ExtensionDirectoryCommander {
     #[allow(private_bounds)]
     pub async fn register<T>(&self) -> Result<(), StdError>
     where
-        T: Extension,
         T: ExtensionMetaInfo,
     {
         let extension_name = T::name();
@@ -329,7 +328,6 @@ impl ExtensionDirectoryCommander {
     #[allow(private_bounds)]
     pub async fn remove<T>(&self) -> Result<(), StdError>
     where
-        T: Extension,
         T: ExtensionMetaInfo,
     {
         let extension_name = T::name();
@@ -433,6 +431,7 @@ pub trait Extension {
 
 #[allow(private_bounds)]
 pub(crate) trait ExtensionMetaInfo {
+    fn name() -> String;
     fn extension_type() -> ExtensionType;
     fn extension_factory() -> ExtensionFactories;
 }

diff --git a/dubbo/src/extension/registry_extension.rs b/dubbo/src/extension/registry_extension.rs
@@ -71,6 +71,10 @@ where
     T: Registry + Send + Sync + 'static,
     T: Extension<Target = Box<dyn Registry + Send + Sync + 'static>>,
 {
+    fn name() -> String {
+        T::name()
+    }
+
     fn extension_type() -> ExtensionType {
         ExtensionType::Registry
     }

diff --git a/examples/greeter/src/greeter/client.rs b/examples/greeter/src/greeter/client.rs
@@ -24,14 +24,15 @@ use dubbo::codegen::*;
 
 use dubbo::extension;
 use futures_util::StreamExt;
+use dubbo::extension::registry_extension::RegistryExtension;
 use protos::{greeter_client::GreeterClient, GreeterRequest};
 use registry_nacos::NacosRegistry;
 
 #[tokio::main]
 async fn main() {
     dubbo::logger::init();
 
-    let _ = extension::EXTENSIONS.register::<NacosRegistry>().await;
+    let _ = extension::EXTENSIONS.register::<RegistryExtension<NacosRegistry>>().await;
 
     let builder = ClientBuilder::new().with_registry("nacos://127.0.0.1:8848".parse().unwrap());
 

diff --git a/examples/greeter/src/greeter/server.rs b/examples/greeter/src/greeter/server.rs
@@ -33,6 +33,7 @@ use dubbo::{
     },
     Dubbo,
 };
+use dubbo::extension::registry_extension::RegistryExtension;
 use protos::{
     greeter_server::{register_server, Greeter},
     GreeterReply, GreeterRequest,
@@ -60,7 +61,7 @@ async fn main() {
         Err(_err) => panic!("err: {:?}", _err), // response was droped
     };
 
-    let _ = extension::EXTENSIONS.register::<NacosRegistry>().await;
+    let _ = extension::EXTENSIONS.register::<RegistryExtension<NacosRegistry>>().await;
     let mut f = Dubbo::new()
         .with_config(r)
         .add_registry("nacos://127.0.0.1:8848/");