From a5da721ad47a9bbd213c2179be414ddea27e9887 Mon Sep 17 00:00:00 2001
From: flycash <flycash@apache.org>
Date: Fri, 1 May 2020 22:42:33 +0800
Subject: [PATCH] rename service => service discovery

---
 common/extension/service_instance_selector_factory.go       | 2 +-
 .../instance/random/random_service_instance_selector.go     | 2 +-
 .../random/random_service_instance_selector_test.go         | 0
 .../instance/service_instance_selector.go                   | 0
 .../proxy/metadata_service_proxy_factory.go                 | 0
 .../{service => servicediscovery}/proxy/service_proxy.go    | 0
 .../service_discovery_registry.go                           | 6 +++---
 .../service_discovery_registry_test.go                      | 2 +-
 .../synthesizer/rest/rest_subscribed_urls_synthesizer.go    | 2 +-
 .../rest/rest_subscribed_urls_synthesizer_test.go           | 0
 .../synthesizer/subscribed_urls_synthesizer.go              | 0
 .../synthesizer/subscribed_urls_synthesizer_factory.go      | 0
 12 files changed, 7 insertions(+), 7 deletions(-)
 rename registry/{service => servicediscovery}/instance/random/random_service_instance_selector.go (96%)
 rename registry/{service => servicediscovery}/instance/random/random_service_instance_selector_test.go (100%)
 rename registry/{service => servicediscovery}/instance/service_instance_selector.go (100%)
 rename registry/{service => servicediscovery}/proxy/metadata_service_proxy_factory.go (100%)
 rename registry/{service => servicediscovery}/proxy/service_proxy.go (100%)
 rename registry/{service => servicediscovery}/service_discovery_registry.go (99%)
 rename registry/{service => servicediscovery}/service_discovery_registry_test.go (98%)
 rename registry/{service => servicediscovery}/synthesizer/rest/rest_subscribed_urls_synthesizer.go (96%)
 rename registry/{service => servicediscovery}/synthesizer/rest/rest_subscribed_urls_synthesizer_test.go (100%)
 rename registry/{service => servicediscovery}/synthesizer/subscribed_urls_synthesizer.go (100%)
 rename registry/{service => servicediscovery}/synthesizer/subscribed_urls_synthesizer_factory.go (100%)

diff --git a/common/extension/service_instance_selector_factory.go b/common/extension/service_instance_selector_factory.go
index 1dd1ac6c9..d767e0a7d 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 47f84c76c..1efbbc3fc 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 b3c9e6a63..7256416c1 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 41b681d99..90a8c0e25 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 a7e7a5bc3..e09dfd6be 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
-- 
GitLab