rename Router to Routers

justxuewei · Oct 25, 2021 · dd0867d · dd0867d
1 parent 52090c3
commit dd0867d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/config/config_loader_options.go b/config/config_loader_options.go
@@ -47,7 +47,7 @@ type loaderConf struct {
 }
 
 func NewLoaderConf(opts ...LoaderConfOption) *loaderConf {
-	configFilePath := "../conf/dubbogo.yaml"
+	configFilePath := "../conf/dubbogo.yml"
 	if configFilePathFromEnv := os.Getenv(constant.CONFIG_FILE_ENV_KEY); configFilePathFromEnv != "" {
 		configFilePath = configFilePathFromEnv
 	}

diff --git a/config/root_config.go b/config/root_config.go
@@ -72,7 +72,7 @@ type RootConfig struct {
 	// Shutdown config
 	Shutdown *ShutdownConfig `yaml:"shutdown" json:"shutdown,omitempty" property:"shutdown"`
 
-	Router []*RouterConfig `yaml:"router" json:"router,omitempty" property:"router"`
+	Routers []*RouterConfig `yaml:"routers" json:"router,omitempty" property:"router"`
 
 	EventDispatcherType string `default:"direct" yaml:"event-dispatcher-type" json:"event-dispatcher-type,omitempty"`
 
@@ -279,7 +279,7 @@ func (rb *RootConfigBuilder) SetShutdown(shutdown *ShutdownConfig) *RootConfigBu
 }
 
 func (rb *RootConfigBuilder) SetRouter(router []*RouterConfig) *RootConfigBuilder {
-	rb.rootConfig.Router = router
+	rb.rootConfig.Routers = router
 	return rb
 }
 

diff --git a/config/router_config.go b/config/router_config.go
@@ -59,14 +59,14 @@ func (c *RouterConfig) Init() error {
 }
 
 func initRouterConfig(rc *RootConfig) error {
-	routers := rc.Router
+	routers := rc.Routers
 	if len(routers) > 0 {
 		for _, r := range routers {
 			if err := r.Init(); err != nil {
 				return err
 			}
 		}
-		rc.Router = routers
+		rc.Routers = routers
 	}
 
 	//chain.SetVSAndDRConfigByte(vsBytes, drBytes)

diff --git a/metadata/report/delegate/delegate_report_test.go b/metadata/report/delegate/delegate_report_test.go
@@ -38,7 +38,7 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/metadata/identifier"
 )
 
-func TestMetadataReport_MetadataReportRetry(t *testing.T) {
+func TestMetadataReportRetry(t *testing.T) {
 	counter := atomic.NewInt64(1)
 
 	retry, err := newMetadataReportRetry(1, 10, func() bool {
@@ -49,11 +49,11 @@ func TestMetadataReport_MetadataReportRetry(t *testing.T) {
 	retry.startRetryTask()
 	<-time.After(2500 * time.Millisecond)
 	retry.scheduler.Clear()
-	assert.Equal(t, counter.Load(), int64(3))
+	assert.Equal(t, int64(3), counter.Load())
 	logger.Info("over")
 }
 
-func TestMetadataReport_MetadataReportRetryWithLimit(t *testing.T) {
+func TestMetadataReportRetryWithLimit(t *testing.T) {
 	counter := atomic.NewInt64(1)
 
 	retry, err := newMetadataReportRetry(1, 1, func() bool {
@@ -64,7 +64,7 @@ func TestMetadataReport_MetadataReportRetryWithLimit(t *testing.T) {
 	retry.startRetryTask()
 	<-time.After(2500 * time.Millisecond)
 	retry.scheduler.Clear()
-	assert.Equal(t, counter.Load(), int64(2))
+	assert.Equal(t, int64(2), counter.Load())
 	logger.Info("over")
 }