Merge pull request 'generate client and server types in micro file' (#83) from interfaces into master
Reviewed-on: #83
This commit is contained in:
commit
d702897cb4
2
http.go
2
http.go
@ -39,11 +39,9 @@ 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.generateServiceClientMethods(gfile, service, component)
|
g.generateServiceClientMethods(gfile, service, component)
|
||||||
}
|
}
|
||||||
if genServer {
|
if genServer {
|
||||||
generateServiceServer(gfile, service)
|
|
||||||
g.generateServiceServerMethods(gfile, service)
|
g.generateServiceServerMethods(gfile, service)
|
||||||
g.generateServiceRegister(gfile, service, component)
|
g.generateServiceRegister(gfile, service, component)
|
||||||
}
|
}
|
||||||
|
2
micro.go
2
micro.go
@ -42,10 +42,12 @@ func (g *Generator) microGenerate(component string, plugin *protogen.Plugin, gen
|
|||||||
g.generateServiceName(gfile, service)
|
g.generateServiceName(gfile, service)
|
||||||
g.generateServiceEndpoints(gfile, service, component)
|
g.generateServiceEndpoints(gfile, service, component)
|
||||||
if genClient {
|
if genClient {
|
||||||
|
g.generateServiceClient(gfile, service)
|
||||||
g.generateServiceClientInterface(gfile, service)
|
g.generateServiceClientInterface(gfile, service)
|
||||||
g.generateServiceClientStreamInterface(gfile, service)
|
g.generateServiceClientStreamInterface(gfile, service)
|
||||||
}
|
}
|
||||||
if genServer {
|
if genServer {
|
||||||
|
g.generateServiceServer(gfile, service)
|
||||||
g.generateServiceServerInterface(gfile, service)
|
g.generateServiceServerInterface(gfile, service)
|
||||||
g.generateServiceServerStreamInterface(gfile, service)
|
g.generateServiceServerStreamInterface(gfile, service)
|
||||||
}
|
}
|
||||||
|
2
rpc.go
2
rpc.go
@ -37,11 +37,9 @@ 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.generateServiceClientMethods(gfile, service, component)
|
g.generateServiceClientMethods(gfile, service, component)
|
||||||
}
|
}
|
||||||
if genServer {
|
if genServer {
|
||||||
generateServiceServer(gfile, service)
|
|
||||||
g.generateServiceServerMethods(gfile, service)
|
g.generateServiceServerMethods(gfile, service)
|
||||||
g.generateServiceRegister(gfile, service, component)
|
g.generateServiceRegister(gfile, service, component)
|
||||||
}
|
}
|
||||||
|
2
util.go
2
util.go
@ -319,7 +319,7 @@ func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateServiceServer(gfile *protogen.GeneratedFile, service *protogen.Service) {
|
func (g *Generator) generateServiceServer(gfile *protogen.GeneratedFile, service *protogen.Service) {
|
||||||
serviceName := service.GoName
|
serviceName := service.GoName
|
||||||
gfile.P("type ", unexport(serviceName), "Server struct {")
|
gfile.P("type ", unexport(serviceName), "Server struct {")
|
||||||
gfile.P(serviceName, "Server")
|
gfile.P(serviceName, "Server")
|
||||||
|
Loading…
Reference in New Issue
Block a user