Skip to content

Commit 9addb64

Browse files
huangjunwenhuangjunwen
committed
Rename some functions to NewXXX
1 parent 5c4aed0 commit 9addb64

File tree

9 files changed

+38
-38
lines changed

9 files changed

+38
-38
lines changed

‎binlogmsg/binlogmsg_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func countMsgs(db *sql.DB, schema, table string) int {
6262
}
6363

6464
func newPublisher(db *sql.DB, schema, table string) MsgPublisherFunc {
65-
return PbJsonPublisher(db, schema, table)
65+
return NewPbJsonPublisher(db, schema, table)
6666
}
6767

6868
func newRawPublisher(db *sql.DB, schema, table string) MsgPublisherFunc {

‎binlogmsg/pj.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
. "github.com/huangjunwen/nproto/v2/msg"
1111
)
1212

13-
// PbJsonPublisher creates a msg publisher using protobuf or json for encoding:
13+
// NewPbJsonPublisher creates a msg publisher using protobuf or json for encoding:
1414
// - If msg is proto.Message, then use protobuf.
1515
// - Otherwise use json.
16-
func PbJsonPublisher(q sqlh.Queryer, schema, table string) MsgPublisherFunc {
16+
func NewPbJsonPublisher(q sqlh.Queryer, schema, table string) MsgPublisherFunc {
1717

1818
pbPublisher := NewMsgPublisher(pjenc.DefaultPbEncoder, q, schema, table)
1919
jsonPublisher := NewMsgPublisher(pjenc.DefaultJsonEncoder, q, schema, table)

‎natsrpc/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func NewClientConn(nc *nats.Conn, opts ...ClientConnOption) (*ClientConn, error)
4949
return cc, nil
5050
}
5151

52-
// Client creates an rpc client using specified encoder and decoder.
53-
func (cc *ClientConn) Client(encoder npenc.Encoder, decoder npenc.Decoder) RPCClientFunc {
52+
// NewClient creates an rpc client using specified encoder and decoder.
53+
func (cc *ClientConn) NewClient(encoder npenc.Encoder, decoder npenc.Decoder) RPCClientFunc {
5454
return func(spec RPCSpec) RPCHandler {
5555
return cc.makeHandler(spec, encoder, decoder)
5656
}

‎natsrpc/natsrpc_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func TestCall(t *testing.T) {
144144
log.Printf("natsrpc.ServerConn created.\n")
145145
}
146146

147-
server := sc.Server(pjenc.DefaultPjDecoder, pjenc.DefaultPjEncoder)
147+
server := sc.NewServer(pjenc.DefaultPjDecoder, pjenc.DefaultPjEncoder)
148148

149149
// Creates client conns.
150150
var (
@@ -172,11 +172,11 @@ func TestCall(t *testing.T) {
172172
log.Printf("natsrpc.ClientConn 2 created.\n")
173173
}
174174

175-
pbClient := cc1.Client(pjenc.DefaultPbEncoder, pjenc.DefaultPjDecoder)
175+
pbClient := cc1.NewClient(pjenc.DefaultPbEncoder, pjenc.DefaultPjDecoder)
176176

177-
jsonClient := cc2.Client(pjenc.DefaultJsonEncoder, pjenc.DefaultPjDecoder)
177+
jsonClient := cc2.NewClient(pjenc.DefaultJsonEncoder, pjenc.DefaultPjDecoder)
178178

179-
rawClient := cc2.Client(rawenc.DefaultRawEncoder, rawenc.DefaultRawDecoder)
179+
rawClient := cc2.NewClient(rawenc.DefaultRawEncoder, rawenc.DefaultRawDecoder)
180180

181181
var (
182182
svcName = "test"
@@ -765,8 +765,8 @@ func TestLoadBalance(t *testing.T) {
765765
log.Printf("natsrpc.ServerConn 2 created.\n")
766766
}
767767

768-
server1 := PbJsonServer(sc1)
769-
server2 := PbJsonServer(sc2)
768+
server1 := NewPbJsonServer(sc1)
769+
server2 := NewPbJsonServer(sc2)
770770

771771
var (
772772
cc *ClientConn
@@ -780,7 +780,7 @@ func TestLoadBalance(t *testing.T) {
780780

781781
}
782782

783-
client := PbJsonClient(cc)
783+
client := NewPbJsonClient(cc)
784784

785785
var (
786786
spec = MustRPCSpec(

‎natsrpc/pj.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
. "github.com/huangjunwen/nproto/v2/rpc"
88
)
99

10-
// PbJsonClient creates an rpc client using protobuf or json for encoding/decoding:
10+
// NewPbJsonClient creates an rpc client using protobuf or json for encoding/decoding:
1111
// - If both input and output are proto.Message, then use protobuf.
1212
// - Otherwise use json.
13-
func PbJsonClient(cc *ClientConn) RPCClientFunc {
13+
func NewPbJsonClient(cc *ClientConn) RPCClientFunc {
1414

15-
pbClient := cc.Client(pjenc.DefaultPbEncoder, pjenc.DefaultPjDecoder)
16-
jsonClient := cc.Client(pjenc.DefaultJsonEncoder, pjenc.DefaultPjDecoder)
15+
pbClient := cc.NewClient(pjenc.DefaultPbEncoder, pjenc.DefaultPjDecoder)
16+
jsonClient := cc.NewClient(pjenc.DefaultJsonEncoder, pjenc.DefaultPjDecoder)
1717

1818
return func(spec RPCSpec) RPCHandler {
1919
_, ok1 := spec.InputValue().(proto.Message)
@@ -27,7 +27,7 @@ func PbJsonClient(cc *ClientConn) RPCClientFunc {
2727

2828
}
2929

30-
// PbJsonClient creates an rpc server using protobuf or json for decoding/encoding.
31-
func PbJsonServer(sc *ServerConn) RPCServerFunc {
32-
return sc.Server(pjenc.DefaultPjDecoder, pjenc.DefaultPjEncoder)
30+
// NewPbJsonClient creates an rpc server using protobuf or json for decoding/encoding.
31+
func NewPbJsonServer(sc *ServerConn) RPCServerFunc {
32+
return sc.NewServer(pjenc.DefaultPjDecoder, pjenc.DefaultPjEncoder)
3333
}

‎natsrpc/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ func NewServerConn(nc *nats.Conn, opts ...ServerConnOption) (sc *ServerConn, err
8888
return serverConn, nil
8989
}
9090

91-
// Server creates an rpc server using specified decoder and encoder.
92-
func (sc *ServerConn) Server(decoder npenc.Decoder, encoder npenc.Encoder) RPCServerFunc {
91+
// NewServer creates an rpc server using specified decoder and encoder.
92+
func (sc *ServerConn) NewServer(decoder npenc.Decoder, encoder npenc.Encoder) RPCServerFunc {
9393
return func(spec RPCSpec, handler RPCHandler) error {
9494
return sc.registHandler(spec, handler, decoder, encoder)
9595
}

‎stanmsg/durconn.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ func NewDurConn(nc *nats.Conn, clusterID string, opts ...DurConnOption) (durConn
106106
return dc, nil
107107
}
108108

109-
// Publisher creates a publisher using specified encoder.
110-
func (dc *DurConn) Publisher(encoder npenc.Encoder) MsgAsyncPublisherFunc {
109+
// NewPublisher creates a publisher using specified encoder.
110+
func (dc *DurConn) NewPublisher(encoder npenc.Encoder) MsgAsyncPublisherFunc {
111111
return func(ctx context.Context, spec MsgSpec, msg interface{}, cb func(error)) error {
112112
return dc.publishAsync(ctx, spec, msg, encoder, cb)
113113
}
114114
}
115115

116-
// Subscriber creates a subscriber using specified decoder.
117-
func (dc *DurConn) Subscriber(decoder npenc.Decoder) MsgSubscriberFunc {
116+
// NewSubscriber creates a subscriber using specified decoder.
117+
func (dc *DurConn) NewSubscriber(decoder npenc.Decoder) MsgSubscriberFunc {
118118
return func(spec MsgSpec, queue string, handler MsgHandler, opts ...interface{}) error {
119119
sub := &subscription{
120120
spec: spec,

‎stanmsg/pj.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
. "github.com/huangjunwen/nproto/v2/msg"
1010
)
1111

12-
// PbJsonPublisher creates a msg publisher using protobuf or json for encoding:
12+
// NewPbJsonPublisher creates a msg publisher using protobuf or json for encoding:
1313
// - If msg is proto.Message, then use protobuf.
1414
// - Otherwise use json.
15-
func PbJsonPublisher(dc *DurConn) MsgAsyncPublisherFunc {
15+
func NewPbJsonPublisher(dc *DurConn) MsgAsyncPublisherFunc {
1616

17-
pbPublisher := dc.Publisher(pjenc.DefaultPbEncoder)
18-
jsonPublisher := dc.Publisher(pjenc.DefaultJsonEncoder)
17+
pbPublisher := dc.NewPublisher(pjenc.DefaultPbEncoder)
18+
jsonPublisher := dc.NewPublisher(pjenc.DefaultJsonEncoder)
1919

2020
return func(ctx context.Context, spec MsgSpec, msg interface{}, cb func(error)) error {
2121
// If msg is proto.Message, then use pbPublisher, otherwise jsonPublisher.
@@ -27,7 +27,7 @@ func PbJsonPublisher(dc *DurConn) MsgAsyncPublisherFunc {
2727

2828
}
2929

30-
// PbJsonSubscriber creates a msg subscriber using protobuf or json for decoding.
31-
func PbJsonSubscriber(dc *DurConn) MsgSubscriberFunc {
32-
return dc.Subscriber(pjenc.DefaultPjDecoder)
30+
// NewPbJsonSubscriber creates a msg subscriber using protobuf or json for decoding.
31+
func NewPbJsonSubscriber(dc *DurConn) MsgSubscriberFunc {
32+
return dc.NewSubscriber(pjenc.DefaultPjDecoder)
3333
}

‎stanmsg/stanmsg_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ func TestPubSub(t *testing.T) {
172172
// Wait connect.
173173
log.Printf("DurConn connected %p.\n", <-connectC)
174174

175-
publisher := PbJsonPublisher(dc)
176-
subscriber := PbJsonSubscriber(dc)
175+
publisher := NewPbJsonPublisher(dc)
176+
subscriber := NewPbJsonSubscriber(dc)
177177

178178
// Subscribe.
179179
goodC := make(chan string, 10)
@@ -459,7 +459,7 @@ func TestResubscribe(t *testing.T) {
459459
defer dc.Close()
460460
log.Printf("DurConn created.\n")
461461
}
462-
subscriber := PbJsonSubscriber(dc)
462+
subscriber := NewPbJsonSubscriber(dc)
463463

464464
onConnect(func(sc stan.Conn) {
465465
err = subscriber.Subscribe(validSpec, queue, handler)
@@ -533,8 +533,8 @@ func TestGroupRedelivery(t *testing.T) {
533533
defer dc1.Close()
534534
log.Printf("DurConn 1 created.\n")
535535
}
536-
publisher1 := PbJsonPublisher(dc1)
537-
subscriber1 := PbJsonSubscriber(dc1)
536+
publisher1 := NewPbJsonPublisher(dc1)
537+
subscriber1 := NewPbJsonSubscriber(dc1)
538538

539539
// The first subscribe always returns error cause redelivery.
540540
sub1Handled := make(chan struct{})
@@ -608,7 +608,7 @@ func TestGroupRedelivery(t *testing.T) {
608608
defer dc2.Close()
609609
log.Printf("DurConn 2 created.\n")
610610
}
611-
subscriber2 := PbJsonSubscriber(dc2)
611+
subscriber2 := NewPbJsonSubscriber(dc2)
612612

613613
// The second subscribe returns nil.
614614
sub2Handled := make(chan struct{})

0 commit comments

Comments
 (0)