From 31bc67857277dfac4f398adcf6c2bb9b60c8a4a9 Mon Sep 17 00:00:00 2001
From: pantianying <601666418@qq.com>
Date: Sat, 21 Mar 2020 00:18:21 +0800
Subject: [PATCH] Improved code style
---
cluster/router/tag/factory.go | 6 ++++--
cluster/router/tag/factory_test.go | 2 +-
cluster/router/tag/tag_router.go | 10 +++++++---
cluster/router/tag/tag_router_test.go | 1 +
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/cluster/router/tag/factory.go b/cluster/router/tag/factory.go
index 84b8d6aa3..a36ac753f 100644
--- a/cluster/router/tag/factory.go
+++ b/cluster/router/tag/factory.go
@@ -25,17 +25,19 @@ import (
)
func init() {
- extension.SetRouterFactory(constant.TagRouterName, newtagRouterFactory)
+ extension.SetRouterFactory(constant.TagRouterName, NewTagRouterFactory)
}
type tagRouterFactory struct{}
-func newtagRouterFactory() router.RouterFactory {
+func NewTagRouterFactory() router.RouterFactory {
return &tagRouterFactory{}
}
+
func (c *tagRouterFactory) NewRouter(url *common.URL) (router.Router, error) {
return NewTagRouter(url)
}
+
func (c *tagRouterFactory) NewFileRouter(content []byte) (router.Router, error) {
return NewFileTagRouter(content)
}
diff --git a/cluster/router/tag/factory_test.go b/cluster/router/tag/factory_test.go
index ecc88066f..58bff5b18 100644
--- a/cluster/router/tag/factory_test.go
+++ b/cluster/router/tag/factory_test.go
@@ -32,7 +32,7 @@ import (
func TestTagRouterFactory_NewRouter(t *testing.T) {
u1, err := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=&version=2.6.0&enabled=true")
assert.Nil(t, err)
- factory := newtagRouterFactory()
+ factory := NewTagRouterFactory()
tagRouter, e := factory.NewRouter(&u1)
assert.Nil(t, e)
assert.NotNil(t, tagRouter)
diff --git a/cluster/router/tag/tag_router.go b/cluster/router/tag/tag_router.go
index 85afd9410..87da41894 100644
--- a/cluster/router/tag/tag_router.go
+++ b/cluster/router/tag/tag_router.go
@@ -18,10 +18,13 @@
package tag
import (
- perrors "github.com/pkg/errors"
"strconv"
)
+import (
+ perrors "github.com/pkg/errors"
+)
+
import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
@@ -62,6 +65,7 @@ func (c *tagRouter) Route(invokers []protocol.Invoker, url *common.URL, invocati
func (c *tagRouter) URL() common.URL {
return *c.url
}
+
func (c *tagRouter) Priority() int64 {
return c.priority
}
@@ -78,10 +82,10 @@ func filterUsingStaticTag(invokers []protocol.Invoker, url *common.URL, invocati
return invokers
}
return result
- } else {
- return invokers
}
+ return invokers
}
+
func isForceUseTag(url *common.URL, invocation protocol.Invocation) bool {
if b, e := strconv.ParseBool(invocation.AttachmentsByKey(constant.ForceUseTag, url.GetParam(constant.ForceUseTag, "false"))); e == nil {
return b
diff --git a/cluster/router/tag/tag_router_test.go b/cluster/router/tag/tag_router_test.go
index d042aae74..17ebcdeae 100644
--- a/cluster/router/tag/tag_router_test.go
+++ b/cluster/router/tag/tag_router_test.go
@@ -80,6 +80,7 @@ func TestTagRouter_Priority(t *testing.T) {
p := tagRouter.Priority()
assert.Equal(t, int64(0), p)
}
+
func TestTagRouter_Route_force(t *testing.T) {
u1, e1 := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserConsumer?interface=com.ikurento.user.UserConsumer&group=&version=2.6.0&enabled=true&dubbo.force.tag=true")
assert.Nil(t, e1)
--
GitLab