调整装饰器模式

infraboard · Mar 11, 2020 · 212197c · 212197c
1 parent 3f86b20
commit 212197c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/http/router/entry.go b/http/router/entry.go
@@ -11,10 +11,12 @@ type Entry struct {
 }
 
 // AddLabel 添加Label
-func (e *Entry) AddLabel(labels ...*Label) {
+func (e *Entry) AddLabel(labels ...*Label) EntryDecorator {
 	for i := range labels {
 		e.Labels[labels[i].Key()] = labels[i].Value()
 	}
+
+	return e
 }
 
 // NewEntrySet 实例

diff --git a/http/router/httprouter/subrouter.go b/http/router/httprouter/subrouter.go
@@ -56,8 +56,7 @@ func (r *subRouter) AddProtected(method, path string, h http.HandlerFunc) router
 
 	r.add(e)
 
-	new := *r
-	return &new
+	return e.Entry
 }
 
 func (r *subRouter) AddPublict(method, path string, h http.HandlerFunc) router.EntryDecorator {
@@ -74,13 +73,11 @@ func (r *subRouter) AddPublict(method, path string, h http.HandlerFunc) router.E
 	}
 	r.add(e)
 
-	new := *r
-	return &new
+	return e.Entry
 }
 
-func (r *subRouter) SetLabel(labels ...*router.Label) router.EntryDecorator {
+func (r *subRouter) SetLabel(labels ...*router.Label) {
 	r.labels = append(r.labels, labels...)
-	return r
 }
 
 func (r *subRouter) ResourceRouter(resourceName string, labels ...*router.Label) router.ResourceRouter {

diff --git a/http/router/httprouter/subrouter_test.go b/http/router/httprouter/subrouter_test.go
@@ -99,7 +99,7 @@ func (a *subRouterTestSuit) testWithParams() func(t *testing.T) {
 func (a *subRouterTestSuit) testSetLabelWithEntry() func(t *testing.T) {
 	return func(t *testing.T) {
 		label := router.NewLable("k1", "v1")
-		a.sub.AddPublict("GET", "/index/entry/label", IndexHandler).SetLabel(label)
+		a.sub.AddPublict("GET", "/index/entry/label", IndexHandler).AddLabel(label)
 
 		es := a.root.GetEndpoints()
 

diff --git a/http/router/router.go b/http/router/router.go
@@ -44,9 +44,10 @@ type ResourceRouter interface {
 
 // SubRouter 子路由或者分组路由
 type SubRouter interface {
-	EntryDecorator
 	// 添加中间件
 	Use(m Middleware)
+	// SetLabel 设置路由标签, 作用于Entry上
+	SetLabel(...*Label)
 	// With独立作用于某一个Handler
 	With(m ...Middleware) SubRouter
 	// 添加受认证保护的路由
@@ -60,5 +61,5 @@ type SubRouter interface {
 // EntryDecorator 装饰
 type EntryDecorator interface {
 	// SetLabel 设置子路由标签, 作用于Entry上
-	SetLabel(...*Label) EntryDecorator
+	AddLabel(...*Label) EntryDecorator
 }