optimized code for consul service discovery

registry/consul/service_discovery.go

@@ -136,7 +136,7 @@ type consulServiceDiscovery struct {
 	*consul.Config
 }
 
-func (csd *consulServiceDiscovery) Initialize(registryURL common.URL) error {
+func (csd *consulServiceDiscovery) Init(registryURL common.URL) error {
 	csd.serviceUrl = registryURL
 	csd.checkPassInterval = registryURL.GetParamInt(CHECK_PASS_INTERVAL, DEFAULT_CHECK_PASS_INTERVAL)
 	csd.tag = registryURL.GetParam(QUERY_TAG, "")

registry/consul/service_discovery_test.go

@@ -81,7 +81,7 @@ func TestConsulServiceDiscovery_Destroy(t *testing.T) {
 	prepareData()
 	serviceDiscovery, err := extension.GetServiceDiscovery(constant.CONSUL_KEY, testName)
 	_, registryUrl := prepareService()
-	serviceDiscovery.Initialize(registryUrl)
+	serviceDiscovery.Init(registryUrl)
 	assert.Nil(t, err)
 	assert.NotNil(t, serviceDiscovery)
 	err = serviceDiscovery.Destroy()
@@ -109,7 +109,7 @@ func TestConsulServiceDiscovery_CRUD(t *testing.T) {
 	serviceDiscovery, err := extension.GetServiceDiscovery(constant.CONSUL_KEY, testName)
 	assert.Nil(t, err)
 
-	err = serviceDiscovery.Initialize(registryUrl)
+	err = serviceDiscovery.Init(registryUrl)
 	assert.Nil(t, err)
 
 	err = serviceDiscovery.Unregister(instance)

registry/etcdv3/service_discovery.go

@@ -67,7 +67,7 @@ type etcdV3ServiceDiscovery struct {
 	childListenerMap map[string]*etcdv3.EventListener
 }
 
-func (e *etcdV3ServiceDiscovery) Initialize(registryURL common.URL) error {
+func (e *etcdV3ServiceDiscovery) Init(registryURL common.URL) error {
 	return nil
 }
 

registry/event/event_publishing_service_deiscovery_test.go

@@ -117,7 +117,7 @@ func (tel *TestServiceInstancePreRegisteredEventListener) GetEventType() reflect
 type ServiceDiscoveryA struct {
 }
 
-func (msd *ServiceDiscoveryA) Initialize(registryURL common.URL) error {
+func (msd *ServiceDiscoveryA) Init(registryURL common.URL) error {
 	return nil
 }
 

registry/event/event_publishing_service_discovery.go

@@ -38,8 +38,8 @@ import (
 // EventPublishingServiceDiscovery will enhance Service Discovery
 // Publish some event about service discovery
 type EventPublishingServiceDiscovery struct {
-	serviceDiscovery registry.ServiceDiscovery
-	once             sync.Once
+	serviceDiscovery         registry.ServiceDiscovery
+	serviceDiscoveryInitOnce sync.Once
 }
 
 // NewEventPublishingServiceDiscovery is a constructor
@@ -54,10 +54,10 @@ func (epsd *EventPublishingServiceDiscovery) String() string {
 	return epsd.serviceDiscovery.String()
 }
 
-func (epsd *EventPublishingServiceDiscovery) Initialize(registryURL common.URL) error {
+func (epsd *EventPublishingServiceDiscovery) Init(registryURL common.URL) error {
 	var err error
-	epsd.once.Do(func() {
-		err = epsd.serviceDiscovery.Initialize(registryURL)
+	epsd.serviceDiscoveryInitOnce.Do(func() {
+		err = epsd.serviceDiscovery.Init(registryURL)
 	})
 	return err
 }

registry/nacos/service_discovery.go

@@ -63,7 +63,7 @@ type nacosServiceDiscovery struct {
 	namingClient naming_client.INamingClient
 }
 
-func (n *nacosServiceDiscovery) Initialize(registryURL common.URL) error {
+func (n *nacosServiceDiscovery) Init(registryURL common.URL) error {
 	return nil
 }
 

registry/service_discovery.go

@@ -42,7 +42,7 @@ type ServiceDiscovery interface {
 	 * Initializes the  ServiceDiscovery
 	 *
 	 */
-	Initialize(registryURL common.URL) error
+	Init(registryURL common.URL) error
 
 	// Destroy will destroy the service discovery.
 	// If the discovery cannot be destroy, it will return an error.

registry/servicediscovery/service_discovery_registry.go

@@ -126,7 +126,7 @@ func creatServiceDiscovery(url *common.URL) (registry.ServiceDiscovery, error) {
 		return nil, perrors.WithMessage(err, "Create service discovery fialed")
 	}
 	serviceDiscovery := event.NewEventPublishingServiceDiscovery(originServiceDiscovery)
-	serviceDiscovery.Initialize(*url)
+	serviceDiscovery.Init(*url)
 	return serviceDiscovery, nil
 }
 

registry/servicediscovery/service_discovery_registry_test.go

@@ -126,7 +126,7 @@ func (m *mockServiceNameMapping) Get(serviceInterface string, group string, vers
 type mockServiceDiscovery struct {
 }
 
-func (m *mockServiceDiscovery) Initialize(registryURL common.URL) error {
+func (m *mockServiceDiscovery) Init(registryURL common.URL) error {
 	return nil
 }
 

registry/zookeeper/service_discovery.go

@@ -163,7 +163,7 @@ func (zksd *zookeeperServiceDiscovery) String() string {
 	return fmt.Sprintf("zookeeper-service-discovery[%s]", zksd.url)
 }
 
-func (zksd *zookeeperServiceDiscovery) Initialize(registryURL common.URL) error {
+func (zksd *zookeeperServiceDiscovery) Init(registryURL common.URL) error {
 	return nil
 }