From b2f5437d6efafcb48d35cd09ed9ef542b8c776ae Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 24 Feb 2021 00:27:18 +0300 Subject: [PATCH] fixup gorilla Signed-off-by: Vasiliy Tolstov --- gorilla.go | 16 ++++++++-------- main.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gorilla.go b/gorilla.go index 3032bdb..f5b2e30 100644 --- a/gorilla.go +++ b/gorilla.go @@ -36,24 +36,24 @@ func (g *Generator) gorillaGenerate(component string, plugin *protogen.Plugin) e gfile.Import(microApiPackage) gfile.Import(gorillaMuxPackage) - gfile.P("func RegisterHandlers(r *mux.Router, h interface{}, eps []*micro_api.Endpoint) error {") - gfile.P("v := reflect.ValueOf(h)") + gfile.P("func RegisterHandlers(r *", gorillaMuxPackage.Ident("Router"), ", h interface{}, eps []*", microApiPackage.Ident("Endpoint"), ") error {") + 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("}") diff --git a/main.go b/main.go index a44be67..8465d5d 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ var ( func init() { flagDebug = flags.Bool("debug", false, "") - flagComponents = flags.String("components", "micro", "") + flagComponents = flags.String("components", "micro|rpc", "") flagPaths = flag.String("paths", "", "") flagModule = flag.String("module", "", "") }