generate client and server types in micro file

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

http.go

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

micro.go

@@ -42,10 +42,12 @@ func (g *Generator) microGenerate(component string, plugin *protogen.Plugin, gen
 			g.generateServiceName(gfile, service)
 			g.generateServiceEndpoints(gfile, service, component)
 			if genClient {
+				g.generateServiceClient(gfile, service)
 				g.generateServiceClientInterface(gfile, service)
 				g.generateServiceClientStreamInterface(gfile, service)
 			}
 			if genServer {
+				g.generateServiceServer(gfile, service)
 				g.generateServiceServerInterface(gfile, service)
 				g.generateServiceServerStreamInterface(gfile, service)
 			}

rpc.go

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

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
 	gfile.P("type ", unexport(serviceName), "Server struct {")
 	gfile.P(serviceName, "Server")