unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 2 Actions 2 Packages Projects Releases 262 Wiki Activity

more idiomatic names inside generated protoc files

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-09-17 15:44:05 +03:00
parent 7e3fac8937
commit 74c10f1139
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/protoc-gen-micro/plugin/micro/micro.go
View File

@ -236,7 +236,7 @@ func (g *micro) generateService(file *generator.FileDescriptor, service *pb.Serv
outType := g.typeName(method.GetOutputType()) outType := g.typeName(method.GetOutputType())
if !method.GetServerStreaming() && !method.GetClientStreaming() { if !method.GetServerStreaming() && !method.GetClientStreaming() {
g.P(methName, "(ctx ", contextPkg, ".Context, in *", inType, ", out *", outType, ") error") g.P(methName, "(ctx ", contextPkg, ".Context, req *", inType, ", rsp *", outType, ") error")
continue continue
} }
g.P(methName, "(ctx ", contextPkg, ".Context, stream server.Stream) error") g.P(methName, "(ctx ", contextPkg, ".Context, stream server.Stream) error")
@ -322,7 +322,7 @@ func (g *micro) generateClientSignature(servName string, method *pb.MethodDescri
if reservedClientName[methName] { if reservedClientName[methName] {
methName += "_" methName += "_"
} }
reqArg := ", in *" + g.typeName(method.GetInputType()) reqArg := ", req *" + g.typeName(method.GetInputType())
if method.GetClientStreaming() { if method.GetClientStreaming() {
reqArg = "" reqArg = ""
} }
@ -349,23 +349,21 @@ func (g *micro) generateClientMethod(reqServ, servName, serviceDescVar string, m
g.P("func (c *", unexport(servAlias), ") ", g.generateClientSignature(servName, method), "{") g.P("func (c *", unexport(servAlias), ") ", g.generateClientSignature(servName, method), "{")
if !method.GetServerStreaming() && !method.GetClientStreaming() { if !method.GetServerStreaming() && !method.GetClientStreaming() {
g.P(`req := c.c.NewRequest(c.name, "`, reqMethod, `", in)`) g.P("rsp := &", outType, "{}")
g.P("out := new(", outType, ")")
// TODO: Pass descExpr to Invoke. // TODO: Pass descExpr to Invoke.
g.P("err := ", `c.c.Call(ctx, req, out, opts...)`) g.P(`err := c.c.Call(ctx, c.c.NewRequest(c.name, "`, reqMethod, `", req), rsp, opts...)`)
g.P("if err != nil { return nil, err }") g.P("if err != nil { return nil, err }")
g.P("return out, nil") g.P("return rsp, nil")
g.P("}") g.P("}")
g.P() g.P()
return return
} }
streamType := unexport(servAlias) + methName streamType := unexport(servAlias) + methName
g.P(`req := c.c.NewRequest(c.name, "`, reqMethod, `", &`, inType, `{})`) g.P(`stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "`, reqMethod, `", &`, inType, `{}), opts...)`)
g.P("stream, err := c.c.Stream(ctx, req, opts...)")
g.P("if err != nil { return nil, err }") g.P("if err != nil { return nil, err }")
if !method.GetClientStreaming() { if !method.GetClientStreaming() {
g.P("if err := stream.Send(in); err != nil { return nil, err }") g.P("if err := stream.Send(req); err != nil { return nil, err }")
} }
g.P("return &", streamType, "{stream}, nil") g.P("return &", streamType, "{stream}, nil")
@ -426,7 +424,7 @@ func (g *micro) generateClientMethod(reqServ, servName, serviceDescVar string, m
if genRecv { if genRecv {
g.P("func (x *", streamType, ") Recv() (*", outType, ", error) {") g.P("func (x *", streamType, ") Recv() (*", outType, ", error) {")
g.P("m := new(", outType, ")") g.P("m := &", outType, "{}")
g.P("err := x.stream.Recv(m)") g.P("err := x.stream.Recv(m)")
g.P("if err != nil {") g.P("if err != nil {")
g.P("return nil, err") g.P("return nil, err")
@ -469,8 +467,8 @@ func (g *micro) generateServerMethod(servName string, method *pb.MethodDescripto
outType := g.typeName(method.GetOutputType()) outType := g.typeName(method.GetOutputType())
if !method.GetServerStreaming() && !method.GetClientStreaming() { if !method.GetServerStreaming() && !method.GetClientStreaming() {
g.P("func (h *", unexport(servName), "Handler) ", methName, "(ctx ", contextPkg, ".Context, in *", inType, ", out *", outType, ") error {") g.P("func (h *", unexport(servName), "Handler) ", methName, "(ctx ", contextPkg, ".Context, req *", inType, ", rsp *", outType, ") error {")
g.P("return h.", serveType, ".", methName, "(ctx, in, out)") g.P("return h.", serveType, ".", methName, "(ctx, req, rsp)")
g.P("}") g.P("}")
g.P() g.P()
return hname return hname
@ -478,7 +476,7 @@ func (g *micro) generateServerMethod(servName string, method *pb.MethodDescripto
streamType := unexport(servName) + methName + "Stream" streamType := unexport(servName) + methName + "Stream"
g.P("func (h *", unexport(servName), "Handler) ", methName, "(ctx ", contextPkg, ".Context, stream server.Stream) error {") g.P("func (h *", unexport(servName), "Handler) ", methName, "(ctx ", contextPkg, ".Context, stream server.Stream) error {")
if !method.GetClientStreaming() { if !method.GetClientStreaming() {
g.P("m := new(", inType, ")") g.P("m := &", inType, "{}")
g.P("if err := stream.Recv(m); err != nil { return err }") g.P("if err := stream.Recv(m); err != nil { return err }")
g.P("return h.", serveType, ".", methName, "(ctx, m, &", streamType, "{stream})") g.P("return h.", serveType, ".", methName, "(ctx, m, &", streamType, "{stream})")
} else { } else {
@ -542,7 +540,7 @@ func (g *micro) generateServerMethod(servName string, method *pb.MethodDescripto
if genRecv { if genRecv {
g.P("func (x *", streamType, ") Recv() (*", inType, ", error) {") g.P("func (x *", streamType, ") Recv() (*", inType, ", error) {")
g.P("m := new(", inType, ")") g.P("m := &", inType, "{}")
g.P("if err := x.stream.Recv(m); err != nil { return nil, err }") g.P("if err := x.stream.Recv(m); err != nil { return nil, err }")
g.P("return m, nil") g.P("return m, nil")
g.P("}") g.P("}")