unistack-org/protoc-gen-go-micro
4
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases 61 Wiki Activity

Merge pull request #44 from unistack-org/drpc

Browse Source 
fix drpc method name in generator
This commit is contained in:
Василий Толстов 2022-03-20 15:10:23 +03:00 committed by GitHub
commit 3591d02d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http.go
View File

@ -41,7 +41,7 @@ func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin, genC
for _, service := range file.Services { for _, service := range file.Services {
if genClient { if genClient {
g.generateServiceClient(gfile, service) g.generateServiceClient(gfile, service)
g.generateServiceClientMethods(gfile, service, true) g.generateServiceClientMethods(gfile, service, component)
} }
if genServer { if genServer {
generateServiceServer(gfile, service) generateServiceServer(gfile, service)

2
main.go
View File

@ -90,7 +90,7 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
case "http": case "http":
err = g.httpGenerate(component, plugin, genClient, genServer) err = g.httpGenerate(component, plugin, genClient, genServer)
case "grpc", "drpc", "rpc": case "grpc", "drpc", "rpc":
err = g.rpcGenerate("rpc", plugin, genClient, genServer) err = g.rpcGenerate(component, plugin, genClient, genServer)
case "gorilla": case "gorilla":
err = g.gorillaGenerate(component, plugin) err = g.gorillaGenerate(component, plugin)
case "chi": case "chi":

2
rpc.go
View File

@ -38,7 +38,7 @@ func (g *Generator) rpcGenerate(component string, plugin *protogen.Plugin, genCl
for _, service := range file.Services { for _, service := range file.Services {
if genClient { if genClient {
g.generateServiceClient(gfile, service) g.generateServiceClient(gfile, service)
g.generateServiceClientMethods(gfile, service, false) g.generateServiceClientMethods(gfile, service, component)
} }
if genServer { if genServer {
generateServiceServer(gfile, service) generateServiceServer(gfile, service)

7
util.go
View File

@ -45,13 +45,16 @@ func (g *Generator) generateServiceClient(gfile *protogen.GeneratedFile, service
gfile.P() gfile.P()
} }
func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, http bool) { func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, component string) {
serviceName := service.GoName serviceName := service.GoName
for _, method := range service.Methods { for _, method := range service.Methods {
methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName) methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName)
if component == "drpc" {
methodName = fmt.Sprintf("%s.%s", method.Parent.Desc.FullName(), method.Desc.Name())
}
g.generateClientFuncSignature(gfile, serviceName, method) g.generateClientFuncSignature(gfile, serviceName, method)
if http && method.Desc.Options() != nil { if component == "http" && method.Desc.Options() != nil {
if proto.HasExtension(method.Desc.Options(), v2.E_Openapiv2Operation) { if proto.HasExtension(method.Desc.Options(), v2.E_Openapiv2Operation) {
opts := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation) opts := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation)
if opts != nil { if opts != nil {