From 50a1609ca558c1d92f20da3c7e60303d708e94c2 Mon Sep 17 00:00:00 2001
From: pantianying <601666418@qq.com>
Date: Sun, 22 Mar 2020 17:05:49 +0800
Subject: [PATCH] code optimization
---
cluster/router/condition/app_router_test.go | 2 +-
cluster/router/condition/file.go | 2 +-
cluster/router/condition/listenable_router.go | 2 +-
cluster/router/condition/router.go | 2 +-
cluster/router/condition/router_rule.go | 9 +++------
cluster/router/condition/router_rule_test.go | 4 ++--
cluster/router/tag/file.go | 2 +-
cluster/router/tag/router_rule.go | 9 +++------
cluster/router/tag/router_rule_test.go | 4 ++--
.../router/{match/match_utils.go => util/match.go} | 2 +-
.../match_utils_test.go => util/match_test.go} | 2 +-
common/yaml/yaml.go | 4 ++++
common/yaml/yaml_test.go | 12 ++++++++++++
13 files changed, 33 insertions(+), 23 deletions(-)
rename cluster/router/{match/match_utils.go => util/match.go} (99%)
rename cluster/router/{match/match_utils_test.go => util/match_test.go} (99%)
diff --git a/cluster/router/condition/app_router_test.go b/cluster/router/condition/app_router_test.go
index bd817af36..e99307625 100644
--- a/cluster/router/condition/app_router_test.go
+++ b/cluster/router/condition/app_router_test.go
@@ -113,7 +113,7 @@ conditions:
assert.Nil(t, err)
assert.NotNil(t, appRouter)
- rule, err := Parse(testYML)
+ rule, err := getRule(testYML)
assert.Nil(t, err)
appRouter.generateConditions(rule)
diff --git a/cluster/router/condition/file.go b/cluster/router/condition/file.go
index efeec53ef..b2c876690 100644
--- a/cluster/router/condition/file.go
+++ b/cluster/router/condition/file.go
@@ -44,7 +44,7 @@ type FileConditionRouter struct {
// NewFileConditionRouter Create file condition router instance with content ( from config file)
func NewFileConditionRouter(content []byte) (*FileConditionRouter, error) {
fileRouter := &FileConditionRouter{}
- rule, err := Parse(string(content))
+ rule, err := getRule(string(content))
if err != nil {
return nil, perrors.Errorf("yaml.Unmarshal() failed , error:%v", perrors.WithStack(err))
}
diff --git a/cluster/router/condition/listenable_router.go b/cluster/router/condition/listenable_router.go
index ba2fbb0eb..4ccc19e95 100644
--- a/cluster/router/condition/listenable_router.go
+++ b/cluster/router/condition/listenable_router.go
@@ -102,7 +102,7 @@ func (l *listenableRouter) Process(event *config_center.ConfigChangeEvent) {
return
}
- routerRule, err := Parse(content)
+ routerRule, err := getRule(content)
if err != nil {
logger.Errorf("Parse condition router rule fail,error:[%s] ", err)
return
diff --git a/cluster/router/condition/router.go b/cluster/router/condition/router.go
index c5d46444b..1a6735255 100644
--- a/cluster/router/condition/router.go
+++ b/cluster/router/condition/router.go
@@ -27,7 +27,7 @@ import (
)
import (
- matcher "github.com/apache/dubbo-go/cluster/router/match"
+ matcher "github.com/apache/dubbo-go/cluster/router/util"
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/logger"
diff --git a/cluster/router/condition/router_rule.go b/cluster/router/condition/router_rule.go
index 1374cf9de..fc42d7801 100644
--- a/cluster/router/condition/router_rule.go
+++ b/cluster/router/condition/router_rule.go
@@ -17,12 +17,9 @@
package condition
-import (
- "gopkg.in/yaml.v2"
-)
-
import (
"github.com/apache/dubbo-go/cluster/router"
+ "github.com/apache/dubbo-go/common/yaml"
)
// RouterRule RouterRule config read from config file or config center
@@ -44,9 +41,9 @@ type RouterRule struct {
* =>
* 1.1.1.1
*/
-func Parse(rawRule string) (*RouterRule, error) {
+func getRule(rawRule string) (*RouterRule, error) {
r := &RouterRule{}
- err := yaml.Unmarshal([]byte(rawRule), r)
+ err := yaml.UnmarshalYML([]byte(rawRule), r)
if err != nil {
return r, err
}
diff --git a/cluster/router/condition/router_rule_test.go b/cluster/router/condition/router_rule_test.go
index 5acc72839..6b9fd8e71 100644
--- a/cluster/router/condition/router_rule_test.go
+++ b/cluster/router/condition/router_rule_test.go
@@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/assert"
)
-func TestParse(t *testing.T) {
+func TestGetRule(t *testing.T) {
testyml := `
scope: application
runtime: true
@@ -36,7 +36,7 @@ conditions:
ip=127.0.0.1
=>
1.1.1.1`
- rule, e := Parse(testyml)
+ rule, e := getRule(testyml)
assert.Nil(t, e)
assert.NotNil(t, rule)
diff --git a/cluster/router/tag/file.go b/cluster/router/tag/file.go
index c9fb88db7..8144c8320 100644
--- a/cluster/router/tag/file.go
+++ b/cluster/router/tag/file.go
@@ -45,7 +45,7 @@ type FileTagRouter struct {
// NewFileTagRouter Create file tag router instance with content ( from config file)
func NewFileTagRouter(content []byte) (*FileTagRouter, error) {
fileRouter := &FileTagRouter{}
- rule, err := Parse(string(content))
+ rule, err := getRule(string(content))
if err != nil {
return nil, perrors.Errorf("yaml.Unmarshal() failed , error:%v", perrors.WithStack(err))
}
diff --git a/cluster/router/tag/router_rule.go b/cluster/router/tag/router_rule.go
index 3e910a9a0..926446dcb 100644
--- a/cluster/router/tag/router_rule.go
+++ b/cluster/router/tag/router_rule.go
@@ -17,12 +17,9 @@
package tag
-import (
- "gopkg.in/yaml.v2"
-)
-
import (
"github.com/apache/dubbo-go/cluster/router"
+ "github.com/apache/dubbo-go/common/yaml"
)
// RouterRule RouterRule config read from config file or config center
@@ -30,9 +27,9 @@ type RouterRule struct {
router.BaseRouterRule `yaml:",inline""`
}
-func Parse(rawRule string) (*RouterRule, error) {
+func getRule(rawRule string) (*RouterRule, error) {
r := &RouterRule{}
- err := yaml.Unmarshal([]byte(rawRule), r)
+ err := yaml.UnmarshalYML([]byte(rawRule), r)
if err != nil {
return r, err
}
diff --git a/cluster/router/tag/router_rule_test.go b/cluster/router/tag/router_rule_test.go
index b61c1cb9c..2df65193f 100644
--- a/cluster/router/tag/router_rule_test.go
+++ b/cluster/router/tag/router_rule_test.go
@@ -25,13 +25,13 @@ import (
"github.com/stretchr/testify/assert"
)
-func TestParse(t *testing.T) {
+func TestGetRule(t *testing.T) {
yml := `
scope: application
runtime: true
force: true
`
- rule, e := Parse(yml)
+ rule, e := getRule(yml)
assert.Nil(t, e)
assert.NotNil(t, rule)
assert.Equal(t, true, rule.Force)
diff --git a/cluster/router/match/match_utils.go b/cluster/router/util/match.go
similarity index 99%
rename from cluster/router/match/match_utils.go
rename to cluster/router/util/match.go
index 28fe7151c..8b82087a3 100644
--- a/cluster/router/match/match_utils.go
+++ b/cluster/router/util/match.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package match
+package util
import (
"strings"
diff --git a/cluster/router/match/match_utils_test.go b/cluster/router/util/match_test.go
similarity index 99%
rename from cluster/router/match/match_utils_test.go
rename to cluster/router/util/match_test.go
index f16480f1d..ae8dad65b 100644
--- a/cluster/router/match/match_utils_test.go
+++ b/cluster/router/util/match_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package match
+package util
import (
"testing"
diff --git a/common/yaml/yaml.go b/common/yaml/yaml.go
index 7c31d71c3..93ebb1661 100644
--- a/common/yaml/yaml.go
+++ b/common/yaml/yaml.go
@@ -48,3 +48,7 @@ func UnmarshalYMLConfig(confProFile string, out interface{}) ([]byte, error) {
}
return confFileStream, yaml.Unmarshal(confFileStream, out)
}
+
+func UnmarshalYML(data []byte, out interface{}) error {
+ return yaml.Unmarshal(data, out)
+}
diff --git a/common/yaml/yaml_test.go b/common/yaml/yaml_test.go
index 45eee5904..c8b8258a6 100644
--- a/common/yaml/yaml_test.go
+++ b/common/yaml/yaml_test.go
@@ -46,6 +46,18 @@ func TestUnmarshalYMLConfig_Error(t *testing.T) {
assert.Error(t, err)
}
+func TestUnmarshalYML(t *testing.T) {
+ c := &Config{}
+ b, err := LoadYMLConfig("./testdata/config.yml")
+ assert.NoError(t, err)
+ err = UnmarshalYML(b, c)
+ assert.NoError(t, err)
+ assert.Equal(t, "strTest", c.StrTest)
+ assert.Equal(t, 11, c.IntTest)
+ assert.Equal(t, false, c.BooleanTest)
+ assert.Equal(t, "childStrTest", c.ChildConfig.StrTest)
+}
+
type Config struct {
StrTest string `yaml:"strTest" default:"default" json:"strTest,omitempty" property:"strTest"`
IntTest int `default:"109" yaml:"intTest" json:"intTest,omitempty" property:"intTest"`
--
GitLab