Revert "rename Router to Routers"

This reverts commit dd0867d

config/config_loader_options.go

@@ -47,7 +47,7 @@ type loaderConf struct {
 }
 
 func NewLoaderConf(opts ...LoaderConfOption) *loaderConf {
-	configFilePath := "../conf/dubbogo.yml"
+	configFilePath := "../conf/dubbogo.yaml"
 	if configFilePathFromEnv := os.Getenv(constant.CONFIG_FILE_ENV_KEY); configFilePathFromEnv != "" {
 		configFilePath = configFilePathFromEnv
 	}

config/root_config.go

@@ -72,7 +72,7 @@ type RootConfig struct {
 	// Shutdown config
 	Shutdown *ShutdownConfig `yaml:"shutdown" json:"shutdown,omitempty" property:"shutdown"`
 
-	Routers []*RouterConfig `yaml:"routers" json:"router,omitempty" property:"router"`
+	Router []*RouterConfig `yaml:"router" 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.Routers = router
+	rb.rootConfig.Router = router
 	return rb
 }
 

config/router_config.go

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

metadata/report/delegate/delegate_report_test.go

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