diff --git a/common/extension/service_instance_selector_factory.go b/common/extension/service_instance_selector_factory.go index 1dd1ac6c996d6bf392558a3f6543acf7a8225ab6..d767e0a7dce9300777af1c5ef647c22ba8d7b374 100644 --- a/common/extension/service_instance_selector_factory.go +++ b/common/extension/service_instance_selector_factory.go @@ -18,7 +18,7 @@ package extension import ( - "github.com/apache/dubbo-go/registry/service/instance" + "github.com/apache/dubbo-go/registry/servicediscovery/instance" perrors "github.com/pkg/errors" ) diff --git a/registry/service/instance/random/random_service_instance_selector.go b/registry/servicediscovery/instance/random/random_service_instance_selector.go similarity index 96% rename from registry/service/instance/random/random_service_instance_selector.go rename to registry/servicediscovery/instance/random/random_service_instance_selector.go index 47f84c76c8d62b26fe74e9302424e5d1e452d0ee..1efbbc3fcbba81615a296e05c85441fd999a7e1f 100644 --- a/registry/service/instance/random/random_service_instance_selector.go +++ b/registry/servicediscovery/instance/random/random_service_instance_selector.go @@ -21,7 +21,7 @@ import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/registry" - "github.com/apache/dubbo-go/registry/service/instance" + "github.com/apache/dubbo-go/registry/servicediscovery/instance" "math/rand" "time" ) diff --git a/registry/service/instance/random/random_service_instance_selector_test.go b/registry/servicediscovery/instance/random/random_service_instance_selector_test.go similarity index 100% rename from registry/service/instance/random/random_service_instance_selector_test.go rename to registry/servicediscovery/instance/random/random_service_instance_selector_test.go diff --git a/registry/service/instance/service_instance_selector.go b/registry/servicediscovery/instance/service_instance_selector.go similarity index 100% rename from registry/service/instance/service_instance_selector.go rename to registry/servicediscovery/instance/service_instance_selector.go diff --git a/registry/service/proxy/metadata_service_proxy_factory.go b/registry/servicediscovery/proxy/metadata_service_proxy_factory.go similarity index 100% rename from registry/service/proxy/metadata_service_proxy_factory.go rename to registry/servicediscovery/proxy/metadata_service_proxy_factory.go diff --git a/registry/service/proxy/service_proxy.go b/registry/servicediscovery/proxy/service_proxy.go similarity index 100% rename from registry/service/proxy/service_proxy.go rename to registry/servicediscovery/proxy/service_proxy.go diff --git a/registry/service/service_discovery_registry.go b/registry/servicediscovery/service_discovery_registry.go similarity index 99% rename from registry/service/service_discovery_registry.go rename to registry/servicediscovery/service_discovery_registry.go index b3c9e6a632054e89e787aa45720b84d076a02971..7256416c1ee03fc51151a6955659729af74c059a 100644 --- a/registry/service/service_discovery_registry.go +++ b/registry/servicediscovery/service_discovery_registry.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package service +package servicediscovery import ( "bytes" @@ -29,8 +29,8 @@ import ( "github.com/apache/dubbo-go/metadata/service" "github.com/apache/dubbo-go/metadata/service/inmemory" "github.com/apache/dubbo-go/registry" - "github.com/apache/dubbo-go/registry/service/proxy" - "github.com/apache/dubbo-go/registry/service/synthesizer" + "github.com/apache/dubbo-go/registry/servicediscovery/proxy" + "github.com/apache/dubbo-go/registry/servicediscovery/synthesizer" "github.com/apache/dubbo-go/remoting" gxset "github.com/dubbogo/gost/container/set" "strconv" diff --git a/registry/service/service_discovery_registry_test.go b/registry/servicediscovery/service_discovery_registry_test.go similarity index 98% rename from registry/service/service_discovery_registry_test.go rename to registry/servicediscovery/service_discovery_registry_test.go index 41b681d991258d0616d1898da3eb1b40c0cc12af..90a8c0e25709e4bf9b624fc7ccff2f3a9e4169f4 100644 --- a/registry/service/service_discovery_registry_test.go +++ b/registry/servicediscovery/service_discovery_registry_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package service +package servicediscovery import ( "testing" diff --git a/registry/service/synthesizer/rest/rest_subscribed_urls_synthesizer.go b/registry/servicediscovery/synthesizer/rest/rest_subscribed_urls_synthesizer.go similarity index 96% rename from registry/service/synthesizer/rest/rest_subscribed_urls_synthesizer.go rename to registry/servicediscovery/synthesizer/rest/rest_subscribed_urls_synthesizer.go index a7e7a5bc3065008197963f1f566f6a1593c15e58..e09dfd6be7a02f6a32c56383b7fbd9a42c16e188 100644 --- a/registry/service/synthesizer/rest/rest_subscribed_urls_synthesizer.go +++ b/registry/servicediscovery/synthesizer/rest/rest_subscribed_urls_synthesizer.go @@ -21,7 +21,7 @@ import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/registry" - "github.com/apache/dubbo-go/registry/service/synthesizer" + "github.com/apache/dubbo-go/registry/servicediscovery/synthesizer" "net/url" "strings" ) diff --git a/registry/service/synthesizer/rest/rest_subscribed_urls_synthesizer_test.go b/registry/servicediscovery/synthesizer/rest/rest_subscribed_urls_synthesizer_test.go similarity index 100% rename from registry/service/synthesizer/rest/rest_subscribed_urls_synthesizer_test.go rename to registry/servicediscovery/synthesizer/rest/rest_subscribed_urls_synthesizer_test.go diff --git a/registry/service/synthesizer/subscribed_urls_synthesizer.go b/registry/servicediscovery/synthesizer/subscribed_urls_synthesizer.go similarity index 100% rename from registry/service/synthesizer/subscribed_urls_synthesizer.go rename to registry/servicediscovery/synthesizer/subscribed_urls_synthesizer.go diff --git a/registry/service/synthesizer/subscribed_urls_synthesizer_factory.go b/registry/servicediscovery/synthesizer/subscribed_urls_synthesizer_factory.go similarity index 100% rename from registry/service/synthesizer/subscribed_urls_synthesizer_factory.go rename to registry/servicediscovery/synthesizer/subscribed_urls_synthesizer_factory.go