From c4909608299b2502b7eb94fee261150755bc88b2 Mon Sep 17 00:00:00 2001
From: "vito.he" <hxmhlt@163.com>
Date: Thu, 9 Apr 2020 19:42:33 +0800
Subject: [PATCH] Mod:format
---
common/rpc_service.go | 2 +-
config/base_config_test.go | 36 -------------------
config/instance/metedata_report.go | 2 +-
config/service_config_test.go | 5 ++-
config_center/zookeeper/impl_test.go | 2 +-
.../dynamic/service_name_mapping.go | 2 +-
6 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/common/rpc_service.go b/common/rpc_service.go
index 3bb3dfe32..3a25d3223 100644
--- a/common/rpc_service.go
+++ b/common/rpc_service.go
@@ -133,7 +133,7 @@ func (s *Service) Method() map[string]*MethodType {
return s.methods
}
-// Method ...
+// Name will return service name
func (s *Service) Name() string {
return s.name
}
diff --git a/config/base_config_test.go b/config/base_config_test.go
index e06b68a9d..60eccfb18 100644
--- a/config/base_config_test.go
+++ b/config/base_config_test.go
@@ -53,15 +53,6 @@ func Test_refresh(t *testing.T) {
Owner: "dubbo",
Environment: "test"},
Registries: map[string]*RegistryConfig{
- //"shanghai_reg1": {
- // id: "shanghai_reg1",
- // Protocol: "mock",
- // TimeoutStr: "2s",
- // group: "shanghai_idc",
- // Address: "127.0.0.1:2181",
- // Username: "user1",
- // Password: "pwd1",
- //},
"shanghai_reg2": {
Protocol: "mock",
TimeoutStr: "2s",
@@ -156,15 +147,6 @@ func Test_appExternal_refresh(t *testing.T) {
Owner: "dubbo",
Environment: "test"},
Registries: map[string]*RegistryConfig{
- //"shanghai_reg1": {
- // id: "shanghai_reg1",
- // Protocol: "mock",
- // TimeoutStr: "2s",
- // group: "shanghai_idc",
- // Address: "127.0.0.1:2181",
- // Username: "user1",
- // Password: "pwd1",
- //},
"shanghai_reg2": {
Protocol: "mock",
TimeoutStr: "2s",
@@ -251,15 +233,6 @@ func Test_appExternalWithoutId_refresh(t *testing.T) {
Owner: "dubbo",
Environment: "test"},
Registries: map[string]*RegistryConfig{
- //"shanghai_reg1": {
- // id: "shanghai_reg1",
- // Protocol: "mock",
- // TimeoutStr: "2s",
- // group: "shanghai_idc",
- // Address: "127.0.0.1:2181",
- // Username: "user1",
- // Password: "pwd1",
- //},
"shanghai_reg2": {
Protocol: "mock",
TimeoutStr: "2s",
@@ -408,15 +381,6 @@ func Test_refreshProvider(t *testing.T) {
Owner: "dubbo",
Environment: "test"},
Registries: map[string]*RegistryConfig{
- //"shanghai_reg1": {
- // id: "shanghai_reg1",
- // Protocol: "mock",
- // TimeoutStr: "2s",
- // group: "shanghai_idc",
- // Address: "127.0.0.1:2181",
- // Username: "user1",
- // Password: "pwd1",
- //},
"shanghai_reg2": {
Protocol: "mock",
TimeoutStr: "2s",
diff --git a/config/instance/metedata_report.go b/config/instance/metedata_report.go
index 6adc7e8a6..9cf435bc9 100644
--- a/config/instance/metedata_report.go
+++ b/config/instance/metedata_report.go
@@ -18,13 +18,13 @@
package instance
import (
- "github.com/apache/dubbo-go/metadata/report"
"sync"
)
import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/metadata/report"
)
var (
diff --git a/config/service_config_test.go b/config/service_config_test.go
index 26c558db1..fb3b4a7dc 100644
--- a/config/service_config_test.go
+++ b/config/service_config_test.go
@@ -18,10 +18,13 @@
package config
import (
- "go.uber.org/atomic"
"testing"
)
+import (
+ "go.uber.org/atomic"
+)
+
import (
"github.com/apache/dubbo-go/common/extension"
)
diff --git a/config_center/zookeeper/impl_test.go b/config_center/zookeeper/impl_test.go
index b8c2cf49d..30389122a 100644
--- a/config_center/zookeeper/impl_test.go
+++ b/config_center/zookeeper/impl_test.go
@@ -159,7 +159,7 @@ func Test_RemoveListener(t *testing.T) {
func TestZookeeperDynamicConfiguration_PublishConfig(t *testing.T) {
value := "Test Data"
- customGroup := "Custom group"
+ customGroup := "Custom Group"
key := "myKey"
ts, zk := initZkData(config_center.DEFAULT_GROUP, t)
defer ts.Stop()
diff --git a/metadata/namemapping/dynamic/service_name_mapping.go b/metadata/namemapping/dynamic/service_name_mapping.go
index b50a73c82..85e94a89c 100644
--- a/metadata/namemapping/dynamic/service_name_mapping.go
+++ b/metadata/namemapping/dynamic/service_name_mapping.go
@@ -18,7 +18,6 @@
package dynamic
import (
- "github.com/apache/dubbo-go/metadata/namemapping"
"strconv"
"time"
)
@@ -32,6 +31,7 @@ import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/config"
"github.com/apache/dubbo-go/config_center"
+ "github.com/apache/dubbo-go/metadata/namemapping"
)
const (
--
GitLab