modify yaml

common/yaml/yaml.go

@@ -11,7 +11,7 @@ import (
 )
 
 // loadYMLConfig Load yml config byte from file
-func loadYMLConfig(confProFile string) ([]byte, error) {
+func LoadYMLConfig(confProFile string) ([]byte, error) {
 	if len(confProFile) == 0 {
 		return nil, perrors.Errorf("application configure(provider) file name is nil")
 	}
@@ -25,7 +25,7 @@ func loadYMLConfig(confProFile string) ([]byte, error) {
 
 // unmarshalYMLConfig Load yml config byte from file , then unmarshal to object
 func UnmarshalYMLConfig(confProFile string, out interface{}) error {
-	confFileStream, err := loadYMLConfig(confProFile)
+	confFileStream, err := LoadYMLConfig(confProFile)
 	if err != nil {
 		return perrors.Errorf("ioutil.ReadFile(file:%s) = error:%v", confProFile, perrors.WithStack(err))
 	}

config/base_config_test.go

@@ -28,6 +28,7 @@ import (
 import (
 	"github.com/apache/dubbo-go/common/config"
 	"github.com/apache/dubbo-go/common/extension"
+	"github.com/apache/dubbo-go/common/yaml"
 	"github.com/apache/dubbo-go/config_center"
 	_ "github.com/apache/dubbo-go/config_center/apollo"
 )
@@ -523,7 +524,7 @@ func TestUnmarshalYMLConfig(t *testing.T) {
 	conPath, err := filepath.Abs("./testdata/consumer_config_with_configcenter.yml")
 	assert.NoError(t, err)
 	c := &ConsumerConfig{}
-	assert.NoError(t, unmarshalYMLConfig(conPath, c))
+	assert.NoError(t, yaml.UnmarshalYMLConfig(conPath, c))
 	assert.Equal(t, "default", c.ProxyFactory)
 	assert.Equal(t, "dubbo.properties", c.ConfigCenterConfig.ConfigFile)
 	assert.Equal(t, "100ms", c.Connect_Timeout)

config/condition_router_config.go

@@ -25,12 +25,13 @@ import (
 	"github.com/apache/dubbo-go/cluster/directory"
 	"github.com/apache/dubbo-go/common/extension"
 	"github.com/apache/dubbo-go/common/logger"
+	"github.com/apache/dubbo-go/common/yaml"
 )
 
 //RouterInit Load config file to init router config
 func RouterInit(confRouterFile string) error {
 	fileRouterFactories := extension.GetFileRouterFactories()
-	bytes, err := loadYMLConfig(confRouterFile)
+	bytes, err := yaml.LoadYMLConfig(confRouterFile)
 	if err != nil {
 		return perrors.Errorf("ioutil.ReadFile(file:%s) = error:%v", confRouterFile, perrors.WithStack(err))
 	}