From b3ab3231a653697438c1548facec3f983a9bb38a Mon Sep 17 00:00:00 2001
From: Patrick <dreamlike.sky@foxmail.com>
Date: Wed, 5 Aug 2020 23:16:19 +0800
Subject: [PATCH] modify name

---
 config/config_loader.go               |  4 ++--
 registry/protocol/protocol.go         | 26 +++++++++++++-------------
 registry/service_discovery_factory.go |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/config_loader.go b/config/config_loader.go
index befa01b0a..f57fd9f2d 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -229,8 +229,8 @@ func registerServiceInstance(){
 	}
 	rs := rp.GetRegistries()
 	for _, r := range rs {
-		var sdr registry.ServiceDiscoveryFactory
-		if sdr, ok = r.(registry.ServiceDiscoveryFactory); !ok {
+		var sdr registry.ServiceDiscoveryHolder
+		if sdr, ok = r.(registry.ServiceDiscoveryHolder); !ok {
 			continue
 		}
 		err := sdr.GetServiceDiscovery().Register(instance)
diff --git a/registry/protocol/protocol.go b/registry/protocol/protocol.go
index 963a3cba9..f7189a995 100644
--- a/registry/protocol/protocol.go
+++ b/registry/protocol/protocol.go
@@ -43,7 +43,7 @@ import (
 )
 
 var (
-	regProtocol   *RegistryProtocol
+	regProtocol   *registryProtocol
 	once          sync.Once
 	reserveParams = []string{
 		"application", "codec", "exchanger", "serialization", "cluster", "connections", "deprecated", "group",
@@ -52,7 +52,7 @@ var (
 	}
 )
 
-type RegistryProtocol struct {
+type registryProtocol struct {
 	invokers []protocol.Invoker
 	// Registry  Map<RegistryAddress, Registry>
 	registries *sync.Map
@@ -74,8 +74,8 @@ func getCacheKey(url *common.URL) string {
 	return url.CloneExceptParams(delKeys).String()
 }
 
-func newRegistryProtocol() *RegistryProtocol {
-	return &RegistryProtocol{
+func newRegistryProtocol() *registryProtocol {
+	return &registryProtocol{
 		registries: &sync.Map{},
 		bounds:     &sync.Map{},
 	}
@@ -111,13 +111,13 @@ func filterHideKey(url *common.URL) *common.URL {
 	return url.CloneExceptParams(removeSet)
 }
 
-func (proto *RegistryProtocol) initConfigurationListeners() {
+func (proto *registryProtocol) initConfigurationListeners() {
 	proto.overrideListeners = &sync.Map{}
 	proto.serviceConfigurationListeners = &sync.Map{}
 	proto.providerConfigurationListener = newProviderConfigurationListener(proto.overrideListeners)
 }
 
-func (proto *RegistryProtocol) GetRegistries() []registry.Registry{
+func (proto *registryProtocol) GetRegistries() []registry.Registry{
 	var rs []registry.Registry
 	proto.registries.Range(func(_, v interface{}) bool {
 		if r, ok := v.(registry.Registry); ok {
@@ -129,7 +129,7 @@ func (proto *RegistryProtocol) GetRegistries() []registry.Registry{
 }
 
 // Refer provider service from registry center
-func (proto *RegistryProtocol) Refer(url common.URL) protocol.Invoker {
+func (proto *registryProtocol) Refer(url common.URL) protocol.Invoker {
 	var registryUrl = url
 	var serviceUrl = registryUrl.SubURL
 	if registryUrl.Protocol == constant.REGISTRY_PROTOCOL {
@@ -169,7 +169,7 @@ func (proto *RegistryProtocol) Refer(url common.URL) protocol.Invoker {
 }
 
 // Export provider service to registry center
-func (proto *RegistryProtocol) Export(invoker protocol.Invoker) protocol.Exporter {
+func (proto *registryProtocol) Export(invoker protocol.Invoker) protocol.Exporter {
 	proto.once.Do(func() {
 		proto.initConfigurationListeners()
 	})
@@ -218,7 +218,7 @@ func (proto *RegistryProtocol) Export(invoker protocol.Invoker) protocol.Exporte
 
 }
 
-func (proto *RegistryProtocol) reExport(invoker protocol.Invoker, newUrl *common.URL) {
+func (proto *registryProtocol) reExport(invoker protocol.Invoker, newUrl *common.URL) {
 	url := getProviderUrl(invoker)
 	key := getCacheKey(url)
 	if oldExporter, loaded := proto.bounds.Load(key); loaded {
@@ -234,11 +234,11 @@ func (proto *RegistryProtocol) reExport(invoker protocol.Invoker, newUrl *common
 type overrideSubscribeListener struct {
 	url           *common.URL
 	originInvoker protocol.Invoker
-	protocol      *RegistryProtocol
+	protocol      *registryProtocol
 	configurator  config_center.Configurator
 }
 
-func newOverrideSubscribeListener(overriderUrl *common.URL, invoker protocol.Invoker, proto *RegistryProtocol) *overrideSubscribeListener {
+func newOverrideSubscribeListener(overriderUrl *common.URL, invoker protocol.Invoker, proto *registryProtocol) *overrideSubscribeListener {
 	return &overrideSubscribeListener{url: overriderUrl, originInvoker: invoker, protocol: proto}
 }
 
@@ -340,7 +340,7 @@ func getSubscribedOverrideUrl(providerUrl *common.URL) *common.URL {
 }
 
 // Destroy registry protocol
-func (proto *RegistryProtocol) Destroy() {
+func (proto *registryProtocol) Destroy() {
 	for _, ivk := range proto.invokers {
 		ivk.Destroy()
 	}
@@ -384,7 +384,7 @@ func setProviderUrl(regURL *common.URL, providerURL *common.URL) {
 	regURL.SubURL = providerURL
 }
 
-// GetProtocol return the singleton RegistryProtocol
+// GetProtocol return the singleton registryProtocol
 func GetProtocol() protocol.Protocol {
 	once.Do(func() {
 		regProtocol = newRegistryProtocol()
diff --git a/registry/service_discovery_factory.go b/registry/service_discovery_factory.go
index 6382403a4..86c38d0cf 100644
--- a/registry/service_discovery_factory.go
+++ b/registry/service_discovery_factory.go
@@ -17,8 +17,8 @@
 
 package registry
 
-// ServiceDiscoveryFactory
-type ServiceDiscoveryFactory interface {
+// ServiceDiscoveryHolder
+type ServiceDiscoveryHolder interface {
 	// GetServiceDiscovery get service discovery
 	GetServiceDiscovery() ServiceDiscovery
 }
-- 
GitLab