use go fmt to update the format

apache · Jun 27, 2020 · 2c940e6 · 2c940e6
1 parent 67a933b
commit 2c940e6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/config/base_config_test.go b/config/base_config_test.go
@@ -33,13 +33,13 @@ import (
 	_ "github.com/apache/dubbo-go/config_center/apollo"
 )
 
-func getMockMap() map[string]string{
+func getMockMap() map[string]string {
 	baseMockMap := map[string]string{
-		"dubbo.registries.shanghai_reg1.protocol": "mock100",
+		"dubbo.registries.shanghai_reg1.protocol":             "mock100",
 		"dubbo.reference.com.MockService.MockService.retries": "10",
-		"dubbo.com.MockService.MockService.GetUser.retries": "10",
-		"dubbo.consumer.check": "false",
-		"dubbo.application.name": "dubbo",
+		"dubbo.com.MockService.MockService.GetUser.retries":   "10",
+		"dubbo.consumer.check":                                "false",
+		"dubbo.application.name":                              "dubbo",
 	}
 	return baseMockMap
 }
@@ -116,10 +116,10 @@ func TestRefresh(t *testing.T) {
 	config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
 
 	father := &ConsumerConfig{
-		Check: &[]bool{true}[0],
+		Check:             &[]bool{true}[0],
 		ApplicationConfig: baseAppConfig,
-		Registries: baseRegistries,
-		References: baseMockRef,
+		Registries:        baseRegistries,
+		References:        baseMockRef,
 		ShutdownConfig: &ShutdownConfig{
 			Timeout:              "12s",
 			StepTimeout:          "2s",
@@ -148,10 +148,10 @@ func TestAppExternalRefresh(t *testing.T) {
 	mockMap["dubbo.consumer.check"] = "true"
 	config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
 	father := &ConsumerConfig{
-		Check: &[]bool{true}[0],
+		Check:             &[]bool{true}[0],
 		ApplicationConfig: baseAppConfig,
-		Registries: baseRegistries,
-		References: baseMockRef,
+		Registries:        baseRegistries,
+		References:        baseMockRef,
 	}
 
 	c.SetFatherConfig(father)
@@ -174,10 +174,10 @@ func TestAppExternalWithoutIDRefresh(t *testing.T) {
 	mockMap["dubbo.consumer.check"] = "true"
 	config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
 	father := &ConsumerConfig{
-		Check: &[]bool{true}[0],
+		Check:             &[]bool{true}[0],
 		ApplicationConfig: baseAppConfig,
-		Registries: baseRegistries,
-		References: baseMockRef,
+		Registries:        baseRegistries,
+		References:        baseMockRef,
 	}
 
 	c.SetFatherConfig(father)
@@ -202,11 +202,11 @@ func TestRefreshSingleRegistry(t *testing.T) {
 	config.GetEnvInstance().UpdateExternalConfigMap(mockMap)
 
 	father := &ConsumerConfig{
-		Check: &[]bool{true}[0],
+		Check:             &[]bool{true}[0],
 		ApplicationConfig: baseAppConfig,
-		Registries: map[string]*RegistryConfig{},
-		Registry:   &RegistryConfig{},
-		References: baseMockRef,
+		Registries:        map[string]*RegistryConfig{},
+		Registry:          &RegistryConfig{},
+		References:        baseMockRef,
 	}
 
 	c.SetFatherConfig(father)
@@ -232,7 +232,7 @@ func TestRefreshProvider(t *testing.T) {
 
 	father := &ProviderConfig{
 		ApplicationConfig: baseAppConfig,
-		Registries: baseRegistries,
+		Registries:        baseRegistries,
 		Services: map[string]*ServiceConfig{
 			"MockService": {
 				InterfaceName: "com.MockService",
@@ -251,7 +251,7 @@ func TestRefreshProvider(t *testing.T) {
 						Loadbalance:   "random",
 					},
 					{
-						InterfaceId: "MockService",
+						InterfaceId:   "MockService",
 						InterfaceName: "com.MockService",
 						Name:          "GetUser1",
 						Retries:       "2",

diff --git a/config/config_utils.go b/config/config_utils.go
@@ -39,7 +39,7 @@ func mergeValue(str1, str2, def string) string {
 		str = "," + constant.DEFAULT_KEY + str
 	}
 	str = strings.TrimPrefix(strings.Replace(str, ","+constant.DEFAULT_KEY, ","+def, -1), ",")
-	return removeMinus(strings.Split(str, ","))	
+	return removeMinus(strings.Split(str, ","))
 }
 
 func removeMinus(strArr []string) string {
@@ -50,14 +50,14 @@ func removeMinus(strArr []string) string {
 	var minusStrArr []string
 	for _, v := range strArr {
 		if strings.HasPrefix(v, "-") {
-			minusStrArr = append(minusStrArr,v[1:])
+			minusStrArr = append(minusStrArr, v[1:])
 		} else {
 			normalStr += fmt.Sprintf(",%s", v)
 		}
 	}
 	normalStr = strings.Trim(normalStr, ",")
 	for _, v := range minusStrArr {
-		normalStr = strings.Replace(normalStr, v, "",1)
+		normalStr = strings.Replace(normalStr, v, "", 1)
 	}
 	reg := regexp.MustCompile("[,]+")
 	normalStr = reg.ReplaceAllString(strings.Trim(normalStr, ","), ",")

diff --git a/config/config_utils_test.go b/config/config_utils_test.go
@@ -58,6 +58,6 @@ func TestRemoveMinus(t *testing.T) {
 	strList = removeMinus([]string{"b", "a", "-c", "c"})
 	assert.Equal(t, strList, "b,a")
 
-	strList = removeMinus([]string{"c", "b", "a", "d","c", "-c", "-a", "e", "f"})
+	strList = removeMinus([]string{"c", "b", "a", "d", "c", "-c", "-a", "e", "f"})
 	assert.Equal(t, strList, "b,d,c,e,f")
-}
+}