allow to generate standalone code

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

chi.go

@@ -23,52 +23,54 @@ func (g *Generator) chiGenerate(component string, plugin *protogen.Plugin) error
 
 		chiPackageFiles[file.GoPackageName] = struct{}{}
 		gname := "micro" + "_" + component + ".pb.go"
-		gfile := plugin.NewGeneratedFile(gname, ".")
+
+		path := file.GoImportPath
+		if g.standalone {
+			path = "."
+		}
+		gfile := plugin.NewGeneratedFile(gname, path)
 
 		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("package ", file.GoPackageName)
+		gfile.P()
 
-		gfile.P()
+		gfile.Import(contextPackage)
-		gfile.P("import (")
+		gfile.Import(fmtPackage)
-		gfile.P(`"context"`)
+		gfile.Import(httpPackage)
-		gfile.P(`"fmt"`)
+		gfile.Import(reflectPackage)
-		gfile.P(`"net/http"`)
+		gfile.Import(stringsPackage)
-		gfile.P(`"reflect"`)
+		gfile.Import(chiPackage)
-		gfile.P(`"strings"`)
+		gfile.Import(chiMiddlewarePackage)
-		gfile.P(`chi "github.com/go-chi/chi/v4"`)
+		gfile.Import(microApiPackage)
-		gfile.P(`middleware "github.com/go-chi/chi/v4/middleware"`)
-		gfile.P(`micro_api "github.com/unistack-org/micro/v3/api"`)
-		gfile.P(")")
-		gfile.P()
 
 		gfile.P("type routeKey struct{}")
 
-		gfile.P("func RouteName(ctx context.Context) (string, bool) {")
+		gfile.P("func RouteName(ctx ", contextPackage.Ident("Context"), ") (string, bool) {")
 		gfile.P("value, ok := ctx.Value(routeKey{}).(string)")
 		gfile.P("return value, ok")
 		gfile.P("}")
 		gfile.P()
-		gfile.P("func RegisterHandlers(r *chi.Mux, h interface{}, eps []*micro_api.Endpoint) error {")
+		gfile.P("func RegisterHandlers(r *", chiPackage.Ident("Mux"), ", h interface{}, eps []*", microApiPackage.Ident("Endpoint"), ") error {")
-		gfile.P("v := reflect.ValueOf(h)")
+		gfile.P("v := ", reflectPackage.Ident("ValueOf"), "(h)")
 		gfile.P("if v.NumMethod() < 1 {")
-		gfile.P(`return fmt.Errorf("handler has no methods: %T", h)`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("handler has no methods: %T", h)`)
 		gfile.P("}")
 		gfile.P("for _, ep := range eps {")
-		gfile.P(`idx := strings.Index(ep.Name, ".")`)
+		gfile.P(`idx := `, stringsPackage.Ident("Index"), `(ep.Name, ".")`)
 		gfile.P("if idx < 1 || len(ep.Name) <= idx {")
-		gfile.P(`return fmt.Errorf("invalid api.Endpoint name: %s", ep.Name)`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid `, microApiPackage.Ident("Endpoint"), ` name: %s", ep.Name)`)
 		gfile.P("}")
 		gfile.P("name := ep.Name[idx+1:]")
 		gfile.P("m := v.MethodByName(name)")
 		gfile.P("if !m.IsValid() || m.IsZero() {")
-		gfile.P(`return fmt.Errorf("invalid handler, method %s not found", name)`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler, method %s not found", name)`)
 		gfile.P("}")
-		gfile.P("rh, ok := m.Interface().(func(http.ResponseWriter, *http.Request))")
+		gfile.P("rh, ok := m.Interface().(func(", httpPackage.Ident("ResponseWriter"), ", *", httpPackage.Ident("Request"), "))")
 		gfile.P("if !ok {")
-		gfile.P(`return fmt.Errorf("invalid handler: %#+v", m.Interface())`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler: %#+v", m.Interface())`)
 		gfile.P("}")
 		gfile.P("for _, method := range ep.Method {")
-		gfile.P("r.With(middleware.WithValue(routeKey{}, ep.Name)).MethodFunc(method, ep.Path[0], rh)")
+		gfile.P("r.With(", chiMiddlewarePackage.Ident("WithValue"), "(routeKey{}, ep.Name)).MethodFunc(method, ep.Path[0], rh)")
 		gfile.P("}")
 		gfile.P("}")
 		gfile.P("return nil")

go.mod

@@ -4,6 +4,6 @@ go 1.16
 
 require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.2.0
-	google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea
+	google.golang.org/genproto v0.0.0-20210224155714-063164c882e6
 	google.golang.org/protobuf v1.25.0
 )

go.sum

@@ -331,8 +331,9 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea h1:N98SvVh7Hdle2lgUVFuIkf0B3u29CUakMUQa7Hwz8Wc=
 google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210224155714-063164c882e6 h1:bXUwz2WkXXrXgiLxww3vWmoSHLOGv4ipdPdTvKymcKw=
+google.golang.org/genproto v0.0.0-20210224155714-063164c882e6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

gorilla.go

@@ -23,41 +23,42 @@ func (g *Generator) gorillaGenerate(component string, plugin *protogen.Plugin) e
 
 		gorillaPackageFiles[file.GoPackageName] = struct{}{}
 		gname := "micro" + "_" + component + ".pb.go"
-		gfile := plugin.NewGeneratedFile(gname, ".")
+
+		path := file.GoImportPath
+		if g.standalone {
+			path = "."
+		}
+		gfile := plugin.NewGeneratedFile(gname, path)
 
 		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("package ", file.GoPackageName)
 		gfile.P()
 
-		gfile.P("import (")
+		gfile.Import(fmtPackage)
-		gfile.P(`"fmt"`)
+		gfile.Import(httpPackage)
-		gfile.P(`"net/http"`)
+		gfile.Import(reflectPackage)
-		gfile.P(`"reflect"`)
+		gfile.Import(stringsPackage)
-		gfile.P(`"strings"`)
+		gfile.Import(microApiPackage)
-		gfile.P()
+		gfile.Import(gorillaMuxPackage)
-		gfile.P(`micro_api "github.com/unistack-org/micro/v3/api"`)
-		gfile.P(`mux "github.com/gorilla/mux"`)
-		gfile.P(")")
-		gfile.P()
 
-		gfile.P("func RegisterHandlers(r *mux.Router, h interface{}, eps []*micro_api.Endpoint) error {")
+		gfile.P("func RegisterHandlers(r *", gorillaMuxPackage.Ident("Router"), ", h interface{}, eps []*", microApiPackage.Ident("Endpoint"), ") error {")
-		gfile.P("v := reflect.ValueOf(h)")
+		gfile.P("v := ", reflectPackage.Ident("ValueOf"), "(h)")
 		gfile.P("if v.NumMethod() < 1 {")
-		gfile.P(`return fmt.Errorf("handler has no methods: %T", h)`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("handler has no methods: %T", h)`)
 		gfile.P("}")
 		gfile.P("for _, ep := range eps {")
-		gfile.P(`idx := strings.Index(ep.Name, ".")`)
+		gfile.P(`idx := `, stringsPackage.Ident("Index"), `(ep.Name, ".")`)
 		gfile.P("if idx < 1 || len(ep.Name) <= idx {")
-		gfile.P(`return fmt.Errorf("invalid api.Endpoint name: %s", ep.Name)`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid `, microApiPackage.Ident("Endpoint"), ` name: %s", ep.Name)`)
 		gfile.P("}")
 		gfile.P("name := ep.Name[idx+1:]")
 		gfile.P("m := v.MethodByName(name)")
 		gfile.P("if !m.IsValid() || m.IsZero() {")
-		gfile.P(`return fmt.Errorf("invalid handler, method %s not found", name)`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler, method %s not found", name)`)
 		gfile.P("}")
-		gfile.P("rh, ok := m.Interface().(func(http.ResponseWriter, *http.Request))")
+		gfile.P("rh, ok := m.Interface().(func(", httpPackage.Ident("ResponseWriter"), ", *", httpPackage.Ident("Request"), "))")
 		gfile.P("if !ok {")
-		gfile.P(`return fmt.Errorf("invalid handler: %#+v", m.Interface())`)
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler: %#+v", m.Interface())`)
 		gfile.P("}")
 		gfile.P("r.HandleFunc(ep.Path[0], rh).Methods(ep.Method...).Name(ep.Name)")
 		gfile.P("}")

http.go

@@ -1,21 +1,10 @@
 package main
 
 import (
-	"strings"
-
-	openapi_options "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	"google.golang.org/protobuf/compiler/protogen"
-	"google.golang.org/protobuf/proto"
 )
 
-type Error struct {
-	packageName string
-	types       []string
-}
-
 func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin) error {
-	errors := make(map[string]struct{})
-
 	for _, file := range plugin.Files {
 		if !file.Generate {
 			continue
@@ -25,31 +14,22 @@ func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin) erro
 		}
 
 		gname := file.GeneratedFilenamePrefix + "_micro_" + component + ".pb.go"
-		gfile := plugin.NewGeneratedFile(gname, ".")
+		path := file.GoImportPath
+		if g.standalone {
+			path = "."
+		}
+		gfile := plugin.NewGeneratedFile(gname, path)
 
 		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("// source: ", *file.Proto.Name)
 		gfile.P("package ", file.GoPackageName)
-
-		gfile.P()
-		gfile.P("import (")
-		gfile.P(`"context"`)
-		gfile.P()
-		gfile.P(`micro_api "github.com/unistack-org/micro/v3/api"`)
-		gfile.P(`micro_client_http "github.com/unistack-org/micro-client-http/v3"`)
-		gfile.P(`micro_client "github.com/unistack-org/micro/v3/client"`)
-		gfile.P(`micro_server "github.com/unistack-org/micro/v3/server"`)
-		gfile.P(")")
 		gfile.P()
 
-		gfile.P("// Reference imports to suppress errors if they are not otherwise used.")
+		gfile.Import(contextPackage)
-		gfile.P("var (")
+		gfile.Import(microApiPackage)
-		gfile.P("_ ", "micro_api.Endpoint")
+		gfile.Import(microClientPackage)
-		gfile.P("_ ", "context.Context")
+		gfile.Import(microClientHttpPackage)
-		gfile.P(" _ ", "micro_client.Option")
+		gfile.Import(microServerPackage)
-		gfile.P(" _ ", "micro_server.Option")
-		gfile.P(")")
-		gfile.P()
 
 		for _, service := range file.Services {
 			generateServiceClient(gfile, service)
@@ -57,81 +37,8 @@ func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin) erro
 			generateServiceServer(gfile, service)
 			generateServiceServerMethods(gfile, service)
 			generateServiceRegister(gfile, service)
-			if component == "http" {
-				for k, v := range getErrors(service) {
-					errors[k] = v
 		}
 	}
-		}
-	}
-
-	files := make(map[string]*Error)
-	for _, file := range plugin.Files {
-		if !file.Generate {
-			continue
-		}
-
-		err, ok := files[file.GeneratedFilenamePrefix]
-		if !ok {
-			err = &Error{packageName: string(file.GoPackageName)}
-		}
-		fok := false
-		for _, message := range file.Messages {
-			if _, ok := errors["."+string(message.Desc.FullName())]; ok {
-				fok = true
-				err.types = append(err.types, string(message.Desc.FullName()))
-			}
-		}
-		if fok {
-			files[file.GeneratedFilenamePrefix] = err
-		}
-	}
-
-	for file, err := range files {
-		gfile := plugin.NewGeneratedFile(file+"_micro_errors.pb.go", ".")
-		generateServiceErrors(gfile, err)
-	}
 
 	return nil
 }
-
-func getErrors(service *protogen.Service) map[string]struct{} {
-	errors := make(map[string]struct{})
-
-	for _, method := range service.Methods {
-		if method.Desc.Options() == nil {
-			continue
-		}
-		if !proto.HasExtension(method.Desc.Options(), openapi_options.E_Openapiv2Operation) {
-			continue
-		}
-
-		opts := proto.GetExtension(method.Desc.Options(), openapi_options.E_Openapiv2Operation)
-		if opts == nil {
-			continue
-		}
-
-		r := opts.(*openapi_options.Operation)
-		for _, response := range r.Responses {
-			if response.Schema == nil || response.Schema.JsonSchema == nil {
-				continue
-			}
-			errors[response.Schema.JsonSchema.Ref] = struct{}{}
-		}
-	}
-
-	return errors
-}
-
-func generateServiceErrors(gfile *protogen.GeneratedFile, err *Error) {
-	gfile.P("package ", err.packageName)
-	gfile.P("import (")
-	gfile.P(`"fmt"`)
-	gfile.P(")")
-	for _, typ := range err.types {
-		gfile.P("func (err *", typ[strings.LastIndex(typ, ".")+1:], ") Error() string {")
-		gfile.P(`return fmt.Sprintf("%#v", err)`)
-		gfile.P("}")
-		gfile.P()
-	}
-}

main.go

@@ -9,23 +9,14 @@ import (
 )
 
 var (
-	flags          flag.FlagSet
+	flagDebug      = flag.Bool("debug", false, "")
-	flagDebug      *bool
+	flagStandalone = flag.Bool("standalone", false, "")
-	flagComponents *string
+	flagComponents = flag.String("components", "micro|rpc", "")
-	flagPaths      *string
-	flagModule     *string
 )
 
-func init() {
-	flagDebug = flags.Bool("debug", false, "")
-	flagComponents = flags.String("components", "micro", "")
-	flagPaths = flag.String("paths", "", "")
-	flagModule = flag.String("module", "", "")
-}
-
 func main() {
 	opts := &protogen.Options{
-		ParamFunc: flags.Set,
+		ParamFunc: flag.CommandLine.Set,
 	}
 
 	g := &Generator{}
@@ -34,13 +25,20 @@ func main() {
 }
 
 type Generator struct {
+	components string
+	standalone bool
+	debug      bool
 }
 
 func (g *Generator) Generate(plugin *protogen.Plugin) error {
 	var err error
 
+	g.standalone = *flagStandalone
+	g.debug = *flagDebug
+	g.components = *flagComponents
+
 	// Protoc passes a slice of File structs for us to process
-	for _, component := range strings.Split(*flagComponents, "|") {
+	for _, component := range strings.Split(g.components, "|") {
 		switch component {
 		case "micro":
 			err = g.microGenerate(component, plugin)

micro.go

@@ -14,28 +14,21 @@ func (g *Generator) microGenerate(component string, plugin *protogen.Plugin) err
 		}
 
 		gname := file.GeneratedFilenamePrefix + "_" + component + ".pb.go"
-		gfile := plugin.NewGeneratedFile(gname, ".")
+
+		path := file.GoImportPath
+		if g.standalone {
+			path = "."
+		}
+		gfile := plugin.NewGeneratedFile(gname, path)
 
 		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("// source: ", *file.Proto.Name)
 		gfile.P("package ", file.GoPackageName)
-
-		gfile.P()
-		gfile.P("import (")
-		gfile.P(`"context"`)
-		gfile.P()
-		gfile.P(`micro_api "github.com/unistack-org/micro/v3/api"`)
-		gfile.P(`micro_client "github.com/unistack-org/micro/v3/client"`)
-		gfile.P(")")
 		gfile.P()
 
-		gfile.P("// Reference imports to suppress errors if they are not otherwise used.")
+		gfile.Import(contextPackage)
-		gfile.P("var (")
+		gfile.Import(microApiPackage)
-		gfile.P("_ ", "micro_api.Endpoint")
+		gfile.Import(microClientPackage)
-		gfile.P("_ ", "context.Context")
-		gfile.P(" _ ", "micro_client.Option")
-		gfile.P(")")
-		gfile.P()
 
 		// generate services
 		for _, service := range file.Services {

rpc.go

@@ -14,30 +14,21 @@ func (g *Generator) rpcGenerate(component string, plugin *protogen.Plugin) error
 		}
 
 		gname := file.GeneratedFilenamePrefix + "_micro_" + component + ".pb.go"
-		gfile := plugin.NewGeneratedFile(gname, ".")
+		path := file.GoImportPath
+		if g.standalone {
+			path = "."
+		}
+		gfile := plugin.NewGeneratedFile(gname, path)
 
 		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("// source: ", *file.Proto.Name)
 		gfile.P("package ", file.GoPackageName)
-
-		gfile.P()
-		gfile.P("import (")
-		gfile.P(`"context"`)
-		gfile.P()
-		gfile.P(`micro_api "github.com/unistack-org/micro/v3/api"`)
-		gfile.P(`micro_client "github.com/unistack-org/micro/v3/client"`)
-		gfile.P(`micro_server "github.com/unistack-org/micro/v3/server"`)
-		gfile.P(")")
 		gfile.P()
 
-		gfile.P("// Reference imports to suppress errors if they are not otherwise used.")
+		gfile.Import(contextPackage)
-		gfile.P("var (")
+		gfile.Import(microApiPackage)
-		gfile.P("_ ", "micro_api.Endpoint")
+		gfile.Import(microClientPackage)
-		gfile.P("_ ", "context.Context")
+		gfile.Import(microServerPackage)
-		gfile.P(" _ ", "micro_client.Option")
-		gfile.P(" _ ", "micro_server.Option")
-		gfile.P(")")
-		gfile.P()
 
 		for _, service := range file.Services {
 			generateServiceClient(gfile, service)

util.go

@@ -10,29 +10,44 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func lowerFirst(s string) string {
+var (
+	reflectPackage         = protogen.GoImportPath("reflect")
+	stringsPackage         = protogen.GoImportPath("strings")
+	fmtPackage             = protogen.GoImportPath("fmt")
+	contextPackage         = protogen.GoImportPath("context")
+	httpPackage            = protogen.GoImportPath("net/http")
+	gorillaMuxPackage      = protogen.GoImportPath("github.com/gorilla/mux")
+	chiPackage             = protogen.GoImportPath("github.com/go-chi/chi/v4")
+	chiMiddlewarePackage   = protogen.GoImportPath("github.com/go-chi/chi/v4/middleware")
+	microApiPackage        = protogen.GoImportPath("github.com/unistack-org/micro/v3/api")
+	microClientPackage     = protogen.GoImportPath("github.com/unistack-org/micro/v3/client")
+	microServerPackage     = protogen.GoImportPath("github.com/unistack-org/micro/v3/server")
+	microClientHttpPackage = protogen.GoImportPath("github.com/unistack-org/micro-client-http/v3")
+	deprecationComment     = "// Deprecated: Do not use."
+)
+
+func unexport(s string) string {
 	return strings.ToLower(s[:1]) + s[1:]
 }
 
 func generateServiceClient(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
-	gfile.P("type ", lowerFirst(serviceName), "Service struct {")
+	gfile.P("type ", unexport(serviceName), "Client struct {")
-	gfile.P("c micro_client.Client")
+	gfile.P("c ", microClientPackage.Ident("Client"))
 	gfile.P("name string")
 	gfile.P("}")
 
-	gfile.P("// New", serviceName, "Service create new service client")
+	gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", serviceName, "Client {")
-	gfile.P("func New", serviceName, "Service(name string, c micro_client.Client) ", serviceName, "Service {")
+	gfile.P("return &", unexport(serviceName), "Client{c: c, name: name}")
-	gfile.P("return &", lowerFirst(serviceName), "Service{c: c, name: name}")
 	gfile.P("}")
 	gfile.P()
 }
 
 func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, http bool) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName)
-		gfile.P("func (c *", lowerFirst(serviceName), "Service) ", generateClientSignature(serviceName, method), "{")
+		generateClientFuncSignature(gfile, serviceName, method)
 
 		if http && method.Desc.Options() != nil {
 			if proto.HasExtension(method.Desc.Options(), openapi_options.E_Openapiv2Operation) {
@@ -41,9 +56,7 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 					r := opts.(*openapi_options.Operation)
 					gfile.P("errmap := make(map[string]interface{}, ", len(r.Responses), ")")
 					for code, response := range r.Responses {
-						if response.Schema == nil || response.Schema.JsonSchema == nil {
+						if response.Schema != nil && response.Schema.JsonSchema != nil {
-							continue
-						}
 							ref := response.Schema.JsonSchema.Ref
 							if strings.HasPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".") {
 								ref = strings.TrimPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".")
@@ -51,16 +64,17 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 							gfile.P(`errmap["`, code, `"] = &`, ref, "{}")
 						}
 					}
+				}
 
 				gfile.P("opts = append(opts,")
-				gfile.P("micro_client_http.ErrorMap(errmap),")
+				gfile.P(microClientHttpPackage.Ident("ErrorMap"), "(errmap),")
 
 				if proto.HasExtension(method.Desc.Options(), api_options.E_Http) {
 					endpoints, _ := generateEndpoints(method)
 					path, method, body := getEndpoint(endpoints[0])
-					gfile.P(`micro_client_http.Method("`, method, `"),`)
+					gfile.P(microClientHttpPackage.Ident("Method"), `("`, method, `"),`)
-					gfile.P(`micro_client_http.Path("`, path, `"),`)
+					gfile.P(microClientHttpPackage.Ident("Path"), `("`, path, `"),`)
-					gfile.P(`micro_client_http.Body("`, body, `"),`)
+					gfile.P(microClientHttpPackage.Ident("Body"), `("`, body, `"),`)
 				}
 
 				gfile.P(")")
@@ -68,7 +82,7 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 		}
 
 		if !method.Desc.IsStreamingServer() && !method.Desc.IsStreamingClient() {
-			gfile.P("rsp := &", method.Output.Desc.Name(), "{}")
+			gfile.P("rsp := &", gfile.QualifiedGoIdent(method.Output.GoIdent), "{}")
 			gfile.P(`err := c.c.Call(ctx, c.c.NewRequest(c.name, "`, methodName, `", req), rsp, opts...)`)
 			gfile.P("if err != nil {")
 			gfile.P("return nil, err")
@@ -76,10 +90,10 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 			gfile.P("return rsp, nil")
 			gfile.P("}")
 			gfile.P()
-			return
+			continue
 		}
 
-		gfile.P(`stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "`, methodName, `", &`, method.Input.Desc.Name(), `{}), opts...)`)
+		gfile.P(`stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "`, methodName, `", &`, gfile.QualifiedGoIdent(method.Input.GoIdent), `{}), opts...)`)
 		gfile.P("if err != nil {")
 		gfile.P("return nil, err")
 		gfile.P("}")
@@ -89,62 +103,62 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 			gfile.P("return nil, err")
 			gfile.P("}")
 		}
-		gfile.P("return &", lowerFirst(serviceName), "Service", method.GoName, "{stream}, nil")
+		gfile.P("return &", unexport(serviceName), "Client", method.GoName, "{stream}, nil")
 		gfile.P("}")
 		gfile.P()
 
 		if method.Desc.IsStreamingServer() || method.Desc.IsStreamingClient() {
-			gfile.P("type ", lowerFirst(serviceName), "Service", method.GoName, " struct {")
+			gfile.P("type ", unexport(serviceName), "Client", method.GoName, " struct {")
-			gfile.P("stream micro_client.Stream")
+			gfile.P("stream ", microClientPackage.Ident("Stream"))
 			gfile.P("}")
 		}
 
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") RecvAndClose() (*", method.Output.Desc.Name(), ", error) {")
+			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") RecvAndClose() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error) {")
-			gfile.P("m := &", method.Output.Desc.Name(), "{}")
+			gfile.P("msg := &", gfile.QualifiedGoIdent(method.Output.GoIdent), "{}")
-			gfile.P("err := s.RecvMsg(m)")
+			gfile.P("err := s.RecvMsg(msg)")
 			gfile.P("if err == nil {")
 			gfile.P("err = s.Close()")
 			gfile.P("}")
 			gfile.P("if err != nil {")
 			gfile.P("return nil, err")
 			gfile.P("}")
-			gfile.P("return m, nil")
+			gfile.P("return msg, nil")
 			gfile.P("}")
 		}
 
 		gfile.P()
-		gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") Close() error {")
+		gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Close() error {")
 		gfile.P("return s.stream.Close()")
 		gfile.P("}")
 		gfile.P()
-		gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") Context() context.Context {")
+		gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Context() ", contextPackage.Ident("Context"), " {")
 		gfile.P("return s.stream.Context()")
 		gfile.P("}")
 		gfile.P()
-		gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") SendMsg(m interface{}) error {")
+		gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") SendMsg(msg interface{}) error {")
-		gfile.P("return s.stream.Send(m)")
+		gfile.P("return s.stream.Send(msg)")
 		gfile.P("}")
 		gfile.P()
-		gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") RecvMsg(m interface{}) error {")
+		gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") RecvMsg(msg interface{}) error {")
-		gfile.P("return s.stream.Recv(m)")
+		gfile.P("return s.stream.Recv(msg)")
 		gfile.P("}")
 		gfile.P()
 
 		if method.Desc.IsStreamingClient() {
-			gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") Send(m *", method.Input.Desc.Name(), ") error {")
+			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Send(msg *", gfile.QualifiedGoIdent(method.Input.GoIdent), ") error {")
-			gfile.P("return s.stream.Send(m)")
+			gfile.P("return s.stream.Send(msg)")
 			gfile.P("}")
 			gfile.P()
 		}
 
 		if method.Desc.IsStreamingServer() {
-			gfile.P("func (s *", lowerFirst(serviceName), "Service", method.GoName, ") Recv() (*", method.Output.Desc.Name(), ", error) {")
+			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Recv() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error) {")
-			gfile.P("m := &", method.Output.Desc.Name(), "{}")
+			gfile.P("msg := &", gfile.QualifiedGoIdent(method.Output.GoIdent), "{}")
-			gfile.P("if err := s.stream.Recv(m); err != nil {")
+			gfile.P("if err := s.stream.Recv(msg); err != nil {")
 			gfile.P("return nil, err")
 			gfile.P("}")
-			gfile.P("return m, nil")
+			gfile.P("return msg, nil")
 			gfile.P("}")
 			gfile.P()
 		}
@@ -152,48 +166,43 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 }
 
 func generateServiceServer(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
-	gfile.P("type ", lowerFirst(serviceName), "Handler struct {")
+	gfile.P("type ", unexport(serviceName), "Server struct {")
-	gfile.P(serviceName, "Handler")
+	gfile.P(serviceName, "Server")
 	gfile.P("}")
 	gfile.P()
 }
 
 func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
 	for _, method := range service.Methods {
-		//methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName)
+		generateServerFuncSignature(gfile, serviceName, method, true)
-		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
-			gfile.P("func (h *", lowerFirst(serviceName), "Handler) ", method.GoName, "(ctx context.Context, stream micro_server.Stream) error {")
-		} else {
-			gfile.P("func (h *", lowerFirst(serviceName), "Handler) ", generateServerSignature(serviceName, method), "{")
-		}
 
 		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
 			if !method.Desc.IsStreamingClient() {
-				gfile.P("m := &", method.Input.Desc.Name(), "{}")
+				gfile.P("msg := &", gfile.QualifiedGoIdent(method.Input.GoIdent), "{}")
-				gfile.P("if err := stream.Recv(m); err != nil {")
+				gfile.P("if err := stream.Recv(msg); err != nil {")
 				gfile.P("return err")
 				gfile.P("}")
-				gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, m, &", lowerFirst(serviceName), method.GoName, "Stream{stream})")
+				gfile.P("return h.", serviceName, "Server.", method.GoName, "(ctx, msg, &", unexport(serviceName), method.GoName, "Stream{stream})")
 			} else {
-				gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, &", lowerFirst(serviceName), method.GoName, "Stream{stream})")
+				gfile.P("return h.", serviceName, "Server.", method.GoName, "(ctx, &", unexport(serviceName), method.GoName, "Stream{stream})")
 			}
 		} else {
-			gfile.P("return h.", serviceName, "Handler.", method.GoName, "(ctx, req, rsp)")
+			gfile.P("return h.", serviceName, "Server.", method.GoName, "(ctx, req, rsp)")
 		}
 		gfile.P("}")
 		gfile.P()
 
 		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
-			gfile.P("type ", lowerFirst(serviceName), method.GoName, "Stream struct {")
+			gfile.P("type ", unexport(serviceName), method.GoName, "Stream struct {")
-			gfile.P("stream micro_server.Stream")
+			gfile.P("stream ", microServerPackage.Ident("Stream"))
 			gfile.P("}")
 		}
 
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) SendAndClose(m *", method.Output.Desc.Name(), ") error {")
+			gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) SendAndClose(msg *", gfile.QualifiedGoIdent(method.Output.GoIdent), ") error {")
-			gfile.P("err := s.SendMsg(m)")
+			gfile.P("err := s.SendMsg(msg)")
 			gfile.P("if err == nil {")
 			gfile.P("err = s.stream.Close()")
 			gfile.P("}")
@@ -202,40 +211,40 @@ func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protog
 		}
 
 		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
-			gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) Close() error {")
+			gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) Close() error {")
 			gfile.P("return s.stream.Close()")
 			gfile.P("}")
 			gfile.P()
 
-			gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) Context() context.Context {")
+			gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) Context() ", contextPackage.Ident("Context"), " {")
 			gfile.P("return s.stream.Context()")
 			gfile.P("}")
 			gfile.P()
 
-			gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) SendMsg(m interface{}) error {")
+			gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) SendMsg(msg interface{}) error {")
-			gfile.P("return s.stream.Send(m)")
+			gfile.P("return s.stream.Send(msg)")
 			gfile.P("}")
 			gfile.P()
 
-			gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) RecvMsg(m interface{}) error {")
+			gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) RecvMsg(msg interface{}) error {")
-			gfile.P("return s.stream.Recv(m)")
+			gfile.P("return s.stream.Recv(msg)")
 			gfile.P("}")
 			gfile.P()
 
 			if method.Desc.IsStreamingServer() {
-				gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) Send(m *", method.Output.Desc.Name(), ") error {")
+				gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) Send(msg *", gfile.QualifiedGoIdent(method.Output.GoIdent), ") error {")
-				gfile.P("return s.stream.Send(m)")
+				gfile.P("return s.stream.Send(msg)")
 				gfile.P("}")
 				gfile.P()
 			}
 
 			if method.Desc.IsStreamingClient() {
-				gfile.P("func (s *", lowerFirst(serviceName), method.GoName, "Stream) Recv() (*", method.Input.Desc.Name(), ", error) {")
+				gfile.P("func (s *", unexport(serviceName), method.GoName, "Stream) Recv() (*", gfile.QualifiedGoIdent(method.Input.GoIdent), ", error) {")
-				gfile.P("m := &", method.Input.Desc.Name(), "{}")
+				gfile.P("msg := &", gfile.QualifiedGoIdent(method.Input.GoIdent), "{}")
-				gfile.P("if err := s.stream.Recv(m); err != nil {")
+				gfile.P("if err := s.stream.Recv(msg); err != nil {")
 				gfile.P("return nil, err")
 				gfile.P("}")
-				gfile.P("return m, nil")
+				gfile.P("return msg, nil")
 				gfile.P("}")
 				gfile.P()
 			}
@@ -245,98 +254,147 @@ func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protog
 }
 
 func generateServiceRegister(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
-	gfile.P("func Register", serviceName, "Handler(s micro_server.Server, sh ", serviceName, "Handler, opts ...micro_server.HandlerOption) error {")
+	gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", serviceName, "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {")
-	gfile.P("type ", lowerFirst(serviceName), " interface {")
+	gfile.P("type ", unexport(serviceName), " interface {")
 	for _, method := range service.Methods {
-		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
+		generateServerSignature(gfile, serviceName, method, true)
-			gfile.P(method.GoName, "(ctx context.Context, stream micro_server.Stream) error")
-		} else {
-			gfile.P(generateServerSignature(serviceName, method))
-		}
 	}
 	gfile.P("}")
 	gfile.P("type ", serviceName, " struct {")
-	gfile.P(lowerFirst(serviceName))
+	gfile.P(unexport(serviceName))
 	gfile.P("}")
-	gfile.P("h := &", lowerFirst(serviceName), "Handler{sh}")
+	gfile.P("h := &", unexport(serviceName), "Server{sh}")
 	gfile.P("for _, endpoint := range New", serviceName, "Endpoints() {")
-	gfile.P("opts = append(opts, micro_api.WithEndpoint(endpoint))")
+	gfile.P("opts = append(opts, ", microApiPackage.Ident("WithEndpoint"), "(endpoint))")
 	gfile.P("}")
 	gfile.P("return s.Handle(s.NewHandler(&", serviceName, "{h}, opts...))")
 	gfile.P("}")
 }
 
-func generateServerSignature(serviceName string, method *protogen.Method) string {
+func generateServerFuncSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method, private bool) {
-	methodName := string(method.GoName)
+	args := append([]interface{}{},
-	req := []string{"ctx context.Context"}
+		"func (h *", unexport(serviceName), "Server) ", method.GoName,
-	ret := "error"
+		"(ctx ", contextPackage.Ident("Context"),
-
+	)
+	if private && (method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer()) {
+		args = append(args, ", stream ", microServerPackage.Ident("Stream"))
+	} else {
 		if !method.Desc.IsStreamingClient() {
-		req = append(req, "req *"+string(method.Input.Desc.Name()))
+			args = append(args, ", req *", gfile.QualifiedGoIdent(method.Input.GoIdent))
 		}
 		if method.Desc.IsStreamingServer() || method.Desc.IsStreamingClient() {
-		req = append(req, "stream "+serviceName+"_"+methodName+"Stream")
+			args = append(args, ", stream ", serviceName, "_", method.GoName, "Stream")
 		}
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-		req = append(req, "rsp *"+string(method.Output.Desc.Name()))
+			args = append(args, ", rsp *", gfile.QualifiedGoIdent(method.Output.GoIdent))
 		}
-	return methodName + "(" + strings.Join(req, ", ") + ") " + ret
+	}
+	args = append(args, ") error {")
+	gfile.P(args...)
 }
 
-func generateClientSignature(serviceName string, method *protogen.Method) string {
+func generateServerSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method, private bool) {
-	methodName := string(method.GoName)
+	args := append([]interface{}{},
-	req := ", req *" + string(method.Input.Desc.Name())
+		method.GoName,
-	if method.Desc.IsStreamingClient() {
+		"(ctx ", contextPackage.Ident("Context"),
-		req = ""
+	)
+	if private && (method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer()) {
+		args = append(args, ", stream ", microServerPackage.Ident("Stream"))
+	} else {
+		if !method.Desc.IsStreamingClient() {
+			args = append(args, ", req *", gfile.QualifiedGoIdent(method.Input.GoIdent))
 		}
-	rsp := "*" + string(method.Output.Desc.Name())
+		if method.Desc.IsStreamingServer() || method.Desc.IsStreamingClient() {
-	if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
+			args = append(args, ", stream ", serviceName, "_", method.GoName, "Stream")
-		rsp = serviceName + "_" + methodName + "Service"
 		}
-	return fmt.Sprintf("%s(ctx context.Context%s, opts ...micro_client.CallOption) (%s, error)", methodName, req, rsp)
+		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
+			args = append(args, ", rsp *", gfile.QualifiedGoIdent(method.Output.GoIdent))
+		}
+	}
+	args = append(args, ") error")
+	gfile.P(args...)
+}
+
+func generateClientFuncSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method) {
+	args := append([]interface{}{},
+		"func (c *",
+		unexport(serviceName),
+		"Client) ",
+		method.GoName,
+		"(ctx ", contextPackage.Ident("Context"), ", ",
+	)
+	if !method.Desc.IsStreamingClient() {
+		args = append(args, "req *", gfile.QualifiedGoIdent(method.Input.GoIdent), ", ")
+	}
+	args = append(args, "opts ...", microClientPackage.Ident("CallOption"), ") (")
+	if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
+		args = append(args, "*", gfile.QualifiedGoIdent(method.Output.GoIdent))
+	} else {
+		args = append(args, serviceName, "_", method.GoName, "Client")
+	}
+	args = append(args, ", error) {")
+	gfile.P(args...)
+}
+
+func generateClientSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method) {
+	args := append([]interface{}{},
+		method.GoName,
+		"(ctx ", contextPackage.Ident("Context"), ", ",
+	)
+	if !method.Desc.IsStreamingClient() {
+		args = append(args, "req *", gfile.QualifiedGoIdent(method.Input.GoIdent), ", ")
+	}
+	args = append(args, "opts ...", microClientPackage.Ident("CallOption"), ") (")
+	if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
+		args = append(args, "*", gfile.QualifiedGoIdent(method.Output.GoIdent))
+	} else {
+		args = append(args, serviceName, "_", method.GoName, "Client")
+	}
+	args = append(args, ", error)")
+	gfile.P(args...)
 }
 
 func generateServiceClientInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
-	gfile.P("type ", serviceName, "Service interface {")
+	gfile.P("type ", serviceName, "Client interface {")
 	for _, method := range service.Methods {
-		gfile.P(generateClientSignature(serviceName, method))
+		generateClientSignature(gfile, serviceName, method)
 	}
 	gfile.P("}")
 	gfile.P()
 }
 
 func generateServiceServerInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
-	gfile.P("type ", serviceName, "Handler interface {")
+	gfile.P("type ", serviceName, "Server interface {")
 	for _, method := range service.Methods {
-		gfile.P(generateServerSignature(serviceName, method))
+		generateServerSignature(gfile, serviceName, method, false)
 	}
 	gfile.P("}")
 	gfile.P()
 }
 
 func generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 			continue
 		}
 		methodName := method.GoName
-		gfile.P("type ", serviceName, "_", methodName, "Service interface {")
+		gfile.P("type ", serviceName, "_", methodName, "Client interface {")
-		gfile.P("Context() context.Context")
+		gfile.P("Context() ", contextPackage.Ident("Context"))
 		gfile.P("SendMsg(msg interface{}) error")
 		gfile.P("RecvMsg(msg interface{}) error")
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			gfile.P("RecvAndClose() (*", method.Output.Desc.Name(), ", error)")
+			gfile.P("RecvAndClose() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error)")
 		}
 		gfile.P("Close() error")
 		if method.Desc.IsStreamingClient() {
-			gfile.P("Send(msg *", method.Input.Desc.Name(), ") error")
+			gfile.P("Send(msg *", gfile.QualifiedGoIdent(method.Input.GoIdent), ") error")
 		}
 		if method.Desc.IsStreamingServer() {
-			gfile.P("Recv() (*", method.Output.Desc.Name(), ", error)")
+			gfile.P("Recv() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error)")
 		}
 		gfile.P("}")
 		gfile.P()
@@ -344,25 +402,25 @@ func generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service
 }
 
 func generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 			continue
 		}
 		methodName := method.GoName
 		gfile.P("type ", serviceName, "_", methodName, "Stream interface {")
-		gfile.P("Context() context.Context")
+		gfile.P("Context() ", contextPackage.Ident("Context"))
 		gfile.P("SendMsg(msg interface{}) error")
 		gfile.P("RecvMsg(msg interface{}) error")
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			gfile.P("SendAndClose(msg *", method.Output.Desc.Name(), ") error")
+			gfile.P("SendAndClose(msg *", gfile.QualifiedGoIdent(method.Output.GoIdent), ") error")
 		}
 		gfile.P("Close() error")
 		if method.Desc.IsStreamingClient() {
-			gfile.P("Recv() (*", method.Input.Desc.Name(), ", error)")
+			gfile.P("Recv() (*", gfile.QualifiedGoIdent(method.Input.GoIdent), ", error)")
 		}
 		if method.Desc.IsStreamingServer() {
-			gfile.P("Send(msg *", method.Output.Desc.Name(), ") error")
+			gfile.P("Send(msg *", gfile.QualifiedGoIdent(method.Output.GoIdent), ") error")
 		}
 		gfile.P("}")
 		gfile.P()
@@ -370,10 +428,9 @@ func generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service
 }
 
 func generateServiceEndpoints(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := strings.TrimSuffix(service.GoName, "Service")
+	serviceName := service.GoName
-	gfile.P("// New", serviceName, "Endpoints provides api endpoints metdata for ", serviceName, " service")
+	gfile.P("func New", serviceName, "Endpoints() []*", microApiPackage.Ident("Endpoint"), " {")
-	gfile.P("func New", serviceName, "Endpoints() []*micro_api.Endpoint {")
+	gfile.P("return []*", microApiPackage.Ident("Endpoint"), "{")
-	gfile.P("return []*", "micro_api.Endpoint{")
 	for _, method := range service.Methods {
 		if method.Desc.Options() == nil {
 			continue
@@ -381,7 +438,7 @@ func generateServiceEndpoints(gfile *protogen.GeneratedFile, service *protogen.S
 		if proto.HasExtension(method.Desc.Options(), api_options.E_Http) {
 			endpoints, streaming := generateEndpoints(method)
 			for _, endpoint := range endpoints {
-				gfile.P("&", "micro_api.Endpoint{")
+				gfile.P("&", microApiPackage.Ident("Endpoint"), "{")
 				generateEndpoint(gfile, serviceName, method.GoName, endpoint, streaming)
 				gfile.P("},")
 			}