From ec440bee04a27825796f885ef273c5eba15fe470 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Tue, 2 Nov 2021 14:02:58 +0000 Subject: [PATCH] fix mq --- mq/handler/mq.go | 6 +-- mq/main.go | 2 +- mq/proto/mq.pb.go | 10 ++--- mq/proto/mq.pb.micro.go | 84 ++++++++++++++++++++--------------------- mq/proto/mq.proto | 2 +- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/mq/handler/mq.go b/mq/handler/mq.go index a44d559..f9dcf9b 100644 --- a/mq/handler/mq.go +++ b/mq/handler/mq.go @@ -14,9 +14,9 @@ import ( "google.golang.org/protobuf/types/known/structpb" ) -type MQ struct{} +type Mq struct{} -func (mq *MQ) Publish(ctx context.Context, req *pb.PublishRequest, rsp *pb.PublishResponse) error { +func (mq *Mq) Publish(ctx context.Context, req *pb.PublishRequest, rsp *pb.PublishResponse) error { if len(req.Topic) == 0 { return errors.BadRequest("mq.publish", "topic is blank") } @@ -41,7 +41,7 @@ func (mq *MQ) Publish(ctx context.Context, req *pb.PublishRequest, rsp *pb.Publi return nil } -func (mq *MQ) Subscribe(ctx context.Context, req *pb.SubscribeRequest, stream pb.MQ_SubscribeStream) error { +func (mq *Mq) Subscribe(ctx context.Context, req *pb.SubscribeRequest, stream pb.Mq_SubscribeStream) error { if len(req.Topic) == 0 { return errors.BadRequest("mq.publish", "topic is blank") } diff --git a/mq/main.go b/mq/main.go index 8c787f4..b660763 100644 --- a/mq/main.go +++ b/mq/main.go @@ -15,7 +15,7 @@ func main() { ) // Register handler - pb.RegisterMQHandler(srv.Server(), new(handler.MQ)) + pb.RegisterMqHandler(srv.Server(), new(handler.Mq)) // Run service if err := srv.Run(); err != nil { diff --git a/mq/proto/mq.pb.go b/mq/proto/mq.pb.go index 63ddae7..a0e5cb9 100644 --- a/mq/proto/mq.pb.go +++ b/mq/proto/mq.pb.go @@ -245,7 +245,7 @@ var file_proto_mq_proto_rawDesc = []byte{ 0x74, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x31, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, - 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x78, 0x0a, 0x02, 0x4d, 0x51, 0x12, 0x34, + 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x78, 0x0a, 0x02, 0x4d, 0x71, 0x12, 0x34, 0x0a, 0x07, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x12, 0x12, 0x2e, 0x6d, 0x71, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x6d, 0x71, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, @@ -280,10 +280,10 @@ var file_proto_mq_proto_goTypes = []interface{}{ var file_proto_mq_proto_depIdxs = []int32{ 4, // 0: mq.PublishRequest.message:type_name -> google.protobuf.Struct 4, // 1: mq.SubscribeResponse.message:type_name -> google.protobuf.Struct - 0, // 2: mq.MQ.Publish:input_type -> mq.PublishRequest - 2, // 3: mq.MQ.Subscribe:input_type -> mq.SubscribeRequest - 1, // 4: mq.MQ.Publish:output_type -> mq.PublishResponse - 3, // 5: mq.MQ.Subscribe:output_type -> mq.SubscribeResponse + 0, // 2: mq.Mq.Publish:input_type -> mq.PublishRequest + 2, // 3: mq.Mq.Subscribe:input_type -> mq.SubscribeRequest + 1, // 4: mq.Mq.Publish:output_type -> mq.PublishResponse + 3, // 5: mq.Mq.Subscribe:output_type -> mq.SubscribeResponse 4, // [4:6] is the sub-list for method output_type 2, // [2:4] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/mq/proto/mq.pb.micro.go b/mq/proto/mq.pb.micro.go index fc3e30d..f4683c9 100644 --- a/mq/proto/mq.pb.micro.go +++ b/mq/proto/mq.pb.micro.go @@ -34,33 +34,33 @@ var _ context.Context var _ client.Option var _ server.Option -// Api Endpoints for MQ service +// Api Endpoints for Mq service -func NewMQEndpoints() []*api.Endpoint { +func NewMqEndpoints() []*api.Endpoint { return []*api.Endpoint{} } -// Client API for MQ service +// Client API for Mq service -type MQService interface { +type MqService interface { Publish(ctx context.Context, in *PublishRequest, opts ...client.CallOption) (*PublishResponse, error) - Subscribe(ctx context.Context, in *SubscribeRequest, opts ...client.CallOption) (MQ_SubscribeService, error) + Subscribe(ctx context.Context, in *SubscribeRequest, opts ...client.CallOption) (Mq_SubscribeService, error) } -type mQService struct { +type mqService struct { c client.Client name string } -func NewMQService(name string, c client.Client) MQService { - return &mQService{ +func NewMqService(name string, c client.Client) MqService { + return &mqService{ c: c, name: name, } } -func (c *mQService) Publish(ctx context.Context, in *PublishRequest, opts ...client.CallOption) (*PublishResponse, error) { - req := c.c.NewRequest(c.name, "MQ.Publish", in) +func (c *mqService) Publish(ctx context.Context, in *PublishRequest, opts ...client.CallOption) (*PublishResponse, error) { + req := c.c.NewRequest(c.name, "Mq.Publish", in) out := new(PublishResponse) err := c.c.Call(ctx, req, out, opts...) if err != nil { @@ -69,8 +69,8 @@ func (c *mQService) Publish(ctx context.Context, in *PublishRequest, opts ...cli return out, nil } -func (c *mQService) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...client.CallOption) (MQ_SubscribeService, error) { - req := c.c.NewRequest(c.name, "MQ.Subscribe", &SubscribeRequest{}) +func (c *mqService) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...client.CallOption) (Mq_SubscribeService, error) { + req := c.c.NewRequest(c.name, "Mq.Subscribe", &SubscribeRequest{}) stream, err := c.c.Stream(ctx, req, opts...) if err != nil { return nil, err @@ -78,10 +78,10 @@ func (c *mQService) Subscribe(ctx context.Context, in *SubscribeRequest, opts .. if err := stream.Send(in); err != nil { return nil, err } - return &mQServiceSubscribe{stream}, nil + return &mqServiceSubscribe{stream}, nil } -type MQ_SubscribeService interface { +type Mq_SubscribeService interface { Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error @@ -89,27 +89,27 @@ type MQ_SubscribeService interface { Recv() (*SubscribeResponse, error) } -type mQServiceSubscribe struct { +type mqServiceSubscribe struct { stream client.Stream } -func (x *mQServiceSubscribe) Close() error { +func (x *mqServiceSubscribe) Close() error { return x.stream.Close() } -func (x *mQServiceSubscribe) Context() context.Context { +func (x *mqServiceSubscribe) Context() context.Context { return x.stream.Context() } -func (x *mQServiceSubscribe) SendMsg(m interface{}) error { +func (x *mqServiceSubscribe) SendMsg(m interface{}) error { return x.stream.Send(m) } -func (x *mQServiceSubscribe) RecvMsg(m interface{}) error { +func (x *mqServiceSubscribe) RecvMsg(m interface{}) error { return x.stream.Recv(m) } -func (x *mQServiceSubscribe) Recv() (*SubscribeResponse, error) { +func (x *mqServiceSubscribe) Recv() (*SubscribeResponse, error) { m := new(SubscribeResponse) err := x.stream.Recv(m) if err != nil { @@ -118,42 +118,42 @@ func (x *mQServiceSubscribe) Recv() (*SubscribeResponse, error) { return m, nil } -// Server API for MQ service +// Server API for Mq service -type MQHandler interface { +type MqHandler interface { Publish(context.Context, *PublishRequest, *PublishResponse) error - Subscribe(context.Context, *SubscribeRequest, MQ_SubscribeStream) error + Subscribe(context.Context, *SubscribeRequest, Mq_SubscribeStream) error } -func RegisterMQHandler(s server.Server, hdlr MQHandler, opts ...server.HandlerOption) error { - type mQ interface { +func RegisterMqHandler(s server.Server, hdlr MqHandler, opts ...server.HandlerOption) error { + type mq interface { Publish(ctx context.Context, in *PublishRequest, out *PublishResponse) error Subscribe(ctx context.Context, stream server.Stream) error } - type MQ struct { - mQ + type Mq struct { + mq } - h := &mQHandler{hdlr} - return s.Handle(s.NewHandler(&MQ{h}, opts...)) + h := &mqHandler{hdlr} + return s.Handle(s.NewHandler(&Mq{h}, opts...)) } -type mQHandler struct { - MQHandler +type mqHandler struct { + MqHandler } -func (h *mQHandler) Publish(ctx context.Context, in *PublishRequest, out *PublishResponse) error { - return h.MQHandler.Publish(ctx, in, out) +func (h *mqHandler) Publish(ctx context.Context, in *PublishRequest, out *PublishResponse) error { + return h.MqHandler.Publish(ctx, in, out) } -func (h *mQHandler) Subscribe(ctx context.Context, stream server.Stream) error { +func (h *mqHandler) Subscribe(ctx context.Context, stream server.Stream) error { m := new(SubscribeRequest) if err := stream.Recv(m); err != nil { return err } - return h.MQHandler.Subscribe(ctx, m, &mQSubscribeStream{stream}) + return h.MqHandler.Subscribe(ctx, m, &mqSubscribeStream{stream}) } -type MQ_SubscribeStream interface { +type Mq_SubscribeStream interface { Context() context.Context SendMsg(interface{}) error RecvMsg(interface{}) error @@ -161,26 +161,26 @@ type MQ_SubscribeStream interface { Send(*SubscribeResponse) error } -type mQSubscribeStream struct { +type mqSubscribeStream struct { stream server.Stream } -func (x *mQSubscribeStream) Close() error { +func (x *mqSubscribeStream) Close() error { return x.stream.Close() } -func (x *mQSubscribeStream) Context() context.Context { +func (x *mqSubscribeStream) Context() context.Context { return x.stream.Context() } -func (x *mQSubscribeStream) SendMsg(m interface{}) error { +func (x *mqSubscribeStream) SendMsg(m interface{}) error { return x.stream.Send(m) } -func (x *mQSubscribeStream) RecvMsg(m interface{}) error { +func (x *mqSubscribeStream) RecvMsg(m interface{}) error { return x.stream.Recv(m) } -func (x *mQSubscribeStream) Send(m *SubscribeResponse) error { +func (x *mqSubscribeStream) Send(m *SubscribeResponse) error { return x.stream.Send(m) } diff --git a/mq/proto/mq.proto b/mq/proto/mq.proto index ab93ac0..b68b936 100644 --- a/mq/proto/mq.proto +++ b/mq/proto/mq.proto @@ -5,7 +5,7 @@ package mq; option go_package = "./proto;mq"; import "google/protobuf/struct.proto"; -service MQ { +service Mq { rpc Publish(PublishRequest) returns (PublishResponse) {} rpc Subscribe(SubscribeRequest) returns (stream SubscribeResponse) {} }