style: optimize code

Change-Id: I3712660dcab1ceaf27fd1a90e4950f3a60e9ca6e
mebratuA · Dec 11, 2018 · 30c6f51 · 30c6f51
1 parent e235e3e
commit 30c6f51
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 32 deletions.
diff --git a/proto/jsonproto/README.md b/proto/jsonproto/README.md
@@ -49,13 +49,13 @@ func TestJsonProto(t *testing.T) {
 	// Server
 	srv := tp.NewPeer(tp.PeerConfig{ListenPort: 9090})
 	srv.RouteCall(new(Home))
-	go srv.ListenAndServe(jsonproto.NewJsonProtoFunc)
+	go srv.ListenAndServe(jsonproto.NewJSONProtoFunc())
 	time.Sleep(1e9)
 
 	// Client
 	cli := tp.NewPeer(tp.PeerConfig{})
 	cli.RoutePush(new(Push))
-	sess, err := cli.Dial(":9090", jsonproto.NewJsonProtoFunc)
+	sess, err := cli.Dial(":9090", jsonproto.NewJSONProtoFunc())
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/proto/jsonproto/jsonproto.go b/proto/jsonproto/jsonproto.go
@@ -30,14 +30,16 @@ import (
 	"github.com/henrylee2cn/teleport/utils"
 )
 
-// NewJsonProtoFunc is creation function of JSON socket protocol.
+// NewJSONProtoFunc is creation function of JSON socket protocol.
 //  Message data format: {length bytes}{xfer_pipe length byte}{xfer_pipe bytes}{JSON bytes}
 //  Message data demo: `830{"seq":%q,"mtype":%d,"serviceMethod":%q,"meta":%q,"bodyCodec":%d,"body":"%s"}`
-var NewJsonProtoFunc = func(rw tp.IOWithReadBuffer) tp.Proto {
-	return &jsonproto{
-		id:   'j',
-		name: "json",
-		rw:   rw,
+func NewJSONProtoFunc() tp.ProtoFunc {
+	return func(rw tp.IOWithReadBuffer) tp.Proto {
+		return &jsonproto{
+			id:   'j',
+			name: "json",
+			rw:   rw,
+		}
 	}
 }
 

diff --git a/proto/jsonproto/jsonproto_test.go b/proto/jsonproto/jsonproto_test.go
@@ -28,13 +28,13 @@ func TestJsonProto(t *testing.T) {
 	// Server
 	srv := tp.NewPeer(tp.PeerConfig{ListenPort: 9090})
 	srv.RouteCall(new(Home))
-	go srv.ListenAndServe(jsonproto.NewJsonProtoFunc)
+	go srv.ListenAndServe(jsonproto.NewJSONProtoFunc())
 	time.Sleep(1e9)
 
 	// Client
 	cli := tp.NewPeer(tp.PeerConfig{})
 	cli.RoutePush(new(Push))
-	sess, err := cli.Dial(":9090", jsonproto.NewJsonProtoFunc)
+	sess, err := cli.Dial(":9090", jsonproto.NewJSONProtoFunc())
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/proto/pbproto/README.md b/proto/pbproto/README.md
@@ -48,13 +48,13 @@ func TestPbProto(t *testing.T) {
 	// server
 	srv := tp.NewPeer(tp.PeerConfig{ListenPort: 9090})
 	srv.RouteCall(new(Home))
-	go srv.ListenAndServe(pbproto.NewPbProtoFunc)
+	go srv.ListenAndServe(pbproto.NewPbProtoFunc())
 	time.Sleep(1e9)
 
 	// client
 	cli := tp.NewPeer(tp.PeerConfig{})
 	cli.RoutePush(new(Push))
-	sess, err := cli.Dial(":9090", pbproto.NewPbProtoFunc)
+	sess, err := cli.Dial(":9090", pbproto.NewPbProtoFunc())
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/proto/pbproto/pbproto.go b/proto/pbproto/pbproto.go
@@ -28,11 +28,13 @@ import (
 )
 
 // NewPbProtoFunc is creation function of PROTOBUF socket protocol.
-var NewPbProtoFunc = func(rw tp.IOWithReadBuffer) tp.Proto {
-	return &pbproto{
-		id:   'p',
-		name: "protobuf",
-		rw:   rw,
+func NewPbProtoFunc() tp.ProtoFunc {
+	return func(rw tp.IOWithReadBuffer) tp.Proto {
+		return &pbproto{
+			id:   'p',
+			name: "protobuf",
+			rw:   rw,
+		}
 	}
 }
 

diff --git a/proto/pbproto/pbproto_test.go b/proto/pbproto/pbproto_test.go
@@ -28,13 +28,13 @@ func TestPbProto(t *testing.T) {
 	// server
 	srv := tp.NewPeer(tp.PeerConfig{ListenPort: 9090})
 	srv.RouteCall(new(Home))
-	go srv.ListenAndServe(pbproto.NewPbProtoFunc)
+	go srv.ListenAndServe(pbproto.NewPbProtoFunc())
 	time.Sleep(1e9)
 
 	// client
 	cli := tp.NewPeer(tp.PeerConfig{})
 	cli.RoutePush(new(Push))
-	sess, err := cli.Dial(":9090", pbproto.NewPbProtoFunc)
+	sess, err := cli.Dial(":9090", pbproto.NewPbProtoFunc())
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/proto/rawproto/README.md b/proto/rawproto/README.md
@@ -53,7 +53,7 @@ func (h *Home) Test(arg *map[string]string) (map[string]interface{}, *tp.Rerror)
 	}, nil
 }
 
-func TestPbProto(t *testing.T) {
+func TestRawProto(t *testing.T) {
 	gzip.Reg('g', "gizp-5", 5)
 
 	// server
@@ -98,5 +98,5 @@ func (p *Push) Test(arg *map[string]string) *tp.Rerror {
 test command:
 
 ```sh
-go test -v -run=TestPbProto
+go test -v -run=TestRawProto
 ```
diff --git a/proto/rawproto/rawproto.go b/proto/rawproto/rawproto.go
@@ -1,6 +1,7 @@
 package rawproto
 
 import (
+	tp "github.com/henrylee2cn/teleport"
 	"github.com/henrylee2cn/teleport/socket"
 )
 
@@ -27,4 +28,6 @@ import (
 // NOTE:
 //  it is the default protocol.
 //  id:'r', name:"raw"
-var NewRawProtoFunc = socket.NewRawProtoFunc
+func NewRawProtoFunc() tp.ProtoFunc {
+	return socket.RawProtoFunc
+}
diff --git a/proto/rawproto/rawproto_test.go b/proto/rawproto/rawproto_test.go
@@ -21,7 +21,7 @@ func (h *Home) Test(arg *map[string]string) (map[string]interface{}, *tp.Rerror)
 	}, nil
 }
 
-func TestPbProto(t *testing.T) {
+func TestRawProto(t *testing.T) {
 	gzip.Reg('g', "gizp-5", 5)
 
 	// server

diff --git a/proto/thriftproto/README.md b/proto/thriftproto/README.md
@@ -50,13 +50,13 @@ func TestTProto(t *testing.T) {
 	// server
 	srv := tp.NewPeer(tp.PeerConfig{ListenPort: 9090})
 	srv.RouteCall(new(Home))
-	go srv.ListenAndServe(thriftproto.NewTProtoFactory())
+	go srv.ListenAndServe(thriftproto.NewTProtoFunc())
 	time.Sleep(1e9)
 
 	// client
 	cli := tp.NewPeer(tp.PeerConfig{})
 	cli.RoutePush(new(Push))
-	sess, err := cli.Dial(":9090", thriftproto.NewTProtoFactory())
+	sess, err := cli.Dial(":9090", thriftproto.NewTProtoFunc())
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/proto/thriftproto/thriftproto.go b/proto/thriftproto/thriftproto.go
@@ -14,10 +14,10 @@ func init() {
 	tp.SetServiceMethodMapper(tp.RPCServiceMethodMapper)
 }
 
-// NewTProtoFactory creates tp.ProtoFunc of Thrift protocol.
+// NewTProtoFunc creates tp.ProtoFunc of Thrift protocol.
 // NOTE:
 //  If @factory is not provided, use the default binary protocol.
-func NewTProtoFactory(factory ...thrift.TProtocolFactory) tp.ProtoFunc {
+func NewTProtoFunc(factory ...thrift.TProtocolFactory) tp.ProtoFunc {
 	var fa thrift.TProtocolFactory
 	if len(factory) > 0 {
 		fa = factory[0]

diff --git a/proto/thriftproto/thriftproto_test.go b/proto/thriftproto/thriftproto_test.go
@@ -28,13 +28,13 @@ func TestTProto(t *testing.T) {
 	// server
 	srv := tp.NewPeer(tp.PeerConfig{ListenPort: 9090})
 	srv.RouteCall(new(Home))
-	go srv.ListenAndServe(thriftproto.NewTProtoFactory())
+	go srv.ListenAndServe(thriftproto.NewTProtoFunc())
 	time.Sleep(1e9)
 
 	// client
 	cli := tp.NewPeer(tp.PeerConfig{})
 	cli.RoutePush(new(Push))
-	sess, err := cli.Dial(":9090", thriftproto.NewTProtoFactory())
+	sess, err := cli.Dial(":9090", thriftproto.NewTProtoFunc())
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/socket/protocol.go b/socket/protocol.go
@@ -48,7 +48,7 @@ type (
 )
 
 // default builder of socket communication protocol.
-var defaultProtoFunc = NewRawProtoFunc
+var defaultProtoFunc = RawProtoFunc
 
 // DefaultProtoFunc gets the default builder of socket communication protocol
 func DefaultProtoFunc() ProtoFunc {
@@ -90,9 +90,9 @@ type rawProto struct {
 	rMu  sync.Mutex
 }
 
-// NewRawProtoFunc is creation function of fast socket protocol.
+// RawProtoFunc is creation function of fast socket protocol.
 // NOTE: it is the default protocol.
-var NewRawProtoFunc = func(rw IOWithReadBuffer) Proto {
+var RawProtoFunc = func(rw IOWithReadBuffer) Proto {
 	return &rawProto{
 		id:   'r',
 		name: "raw",