Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support direct generation of grpc method #2474

Merged
merged 7 commits into from
Apr 10, 2022
+17 −5
Merged

Support direct generation of grpc method #2474

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d435a6
Support direct generation of grpc method when package and service nam…
Apr 7, 2022
90a1b34
fix req.Interface() return nil.
Apr 9, 2022
3ff6944
Get rid of dependence on 'Micro-Topic'
Apr 9, 2022
141bb0a
Revert "Get rid of dependence on 'Micro-Topic'"
Apr 10, 2022
e64737b
Revert "fix req.Interface() return nil."
Apr 10, 2022
47b3229
Revert "Revert "fix req.Interface() return nil.""
Apr 10, 2022
0f7c8c3
Revert "Revert "Get rid of dependence on 'Micro-Topic'""
Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Support direct generation of grpc method when package and service nam… 
…es of proto files are different.
maxinglun committed Apr 7, 2022
commit 0d435a690ea21a3f64b0534d1fa244f512601493
11 changes: 8 additions & 3 deletions cmd/protoc-gen-micro/plugin/micro/micro.go
View file
Original file line number Diff line number Diff line change
@@ -131,7 +131,8 @@ func (g *micro) generateService(file *generator.FileDescriptor, service *pb.Serv

origServName := service.GetName()
serviceName := strings.ToLower(service.GetName())
if pkg := file.GetPackage(); pkg != "" {
pkg := file.GetPackage()
if pkg != "" {
serviceName = pkg
}
servName := generator.CamelCase(origServName)
@@ -209,7 +210,7 @@ func (g *micro) generateService(file *generator.FileDescriptor, service *pb.Serv
descExpr = fmt.Sprintf("&%s.Streams[%d]", serviceDescVar, streamIndex)
streamIndex++
}
g.generateClientMethod(serviceName, servName, serviceDescVar, method, descExpr)
g.generateClientMethod(pkg, serviceName, servName, serviceDescVar, method, descExpr)
}

g.P("// Server API for ", servName, " service")
@@ -331,8 +332,12 @@ func (g *micro) generateClientSignature(servName string, method *pb.MethodDescri
return fmt.Sprintf("%s(ctx %s.Context%s, opts ...%s.CallOption) (%s, error)", methName, contextPkg, reqArg, clientPkg, respName)
}

func (g *micro) generateClientMethod(reqServ, servName, serviceDescVar string, method *pb.MethodDescriptorProto, descExpr string) {
func (g *micro) generateClientMethod(pkg, reqServ, servName, serviceDescVar string, method *pb.MethodDescriptorProto, descExpr string) {
reqMethod := fmt.Sprintf("%s.%s", servName, method.GetName())
useGrpc := g.gen.Param["use_grpc"]
if useGrpc != "" {
reqMethod = fmt.Sprintf("/%s.%s/%s", pkg, servName, method.GetName())
}
methName := generator.CamelCase(method.GetName())
inType := g.typeName(method.GetInputType())
outType := g.typeName(method.GetOutputType())