modify func name

Author: demoManito

api/metadata/metadata.pb.go

@@ -219,7 +219,7 @@ func buildMethodDesc(g *protogen.GeneratedFile, m *protogen.Method, method, path
 		Path:                  path,
 		Method:                method,
 		HasVars:               len(vars) > 0,
-		UseProtoTextNameAsKey: *isUseProtoTextNameAsKey,
+		UseProtoTextEncodeURL: *isUseProtoTextEncodeURL,
 	}
 }
 

api/metadata/metadata_grpc.pb.go

@@ -70,7 +70,7 @@ func New{{.ServiceType}}HTTPClient (client *http.Client) {{.ServiceType}}HTTPCli
 func (c *{{$svrType}}HTTPClientImpl) {{.Name}}(ctx context.Context, in *{{.Request}}, opts ...http.CallOption) (*{{.Reply}}, error) {
 	var out {{.Reply}}
 	pattern := "{{.Path}}"
-	path := binding.EncodeURL(pattern, in, {{not .HasBody}}, option.Encode().UseTextNameAsKey({{.UseProtoTextNameAsKey}}))
+	path := binding.EncodeURL(pattern, in, {{not .HasBody}}, option.Encode().UseProtoTextAsKey({{.UseProtoTextEncodeURL}}))
 	opts = append(opts, http.Operation(Operation{{$svrType}}{{.OriginalName}}))
 	opts = append(opts, http.PathTemplate(pattern))
 	{{if .HasBody -}}

api/metadata/metadata_http.pb.go

@@ -12,7 +12,7 @@ var (
 	showVersion             = flag.Bool("version", false, "print the version and exit")
 	omitempty               = flag.Bool("omitempty", true, "omit if google.api is empty")
 	omitemptyPrefix         = flag.String("omitempty_prefix", "", "omit if google.api is empty")
-	isUseProtoTextNameAsKey = flag.Bool("prototext_as_formkey", false, "use proto text name as params form key")
+	isUseProtoTextEncodeURL = flag.Bool("prototext_encodeurl", false, "use proto text name as params form key")
 )
 
 func main() {

cmd/protoc-gen-go-http/http.go

@@ -33,7 +33,7 @@ type methodDesc struct {
 	HasBody               bool
 	Body                  string
 	ResponseBody          string
-	UseProtoTextNameAsKey bool
+	UseProtoTextEncodeURL bool
 }
 
 func (s *serviceDesc) execute() string {

cmd/protoc-gen-go-http/httpTemplate.tpl

@@ -207,7 +207,7 @@ func TestEncodeFieldMask(t *testing.T) {
 	if v != "updateMask=foo,bar" {
 		t.Errorf("got %s", v)
 	}
-	v = EncodeFieldMask(req.ProtoReflect(), option.Encode().UseTextNameAsKey(true))
+	v = EncodeFieldMask(req.ProtoReflect(), option.Encode().UseProtoTextAsKey(true))
 	if v != "update_mask=foo,bar" {
 		t.Errorf("got %s", v)
 	}
@@ -225,7 +225,7 @@ func TestOptional(t *testing.T) {
 		t.Fatalf("got %s", query.Encode())
 	}
 
-	query, _ = EncodeValues(req, option.Encode().UseTextNameAsKey(true))
+	query, _ = EncodeValues(req, option.Encode().UseProtoTextAsKey(true))
 	if query.Encode() != "name=foo&opt_int32=100&sub.naming=bar" {
 		t.Fatalf("got %s", query.Encode())
 	}

cmd/protoc-gen-go-http/main.go

@@ -2,17 +2,17 @@ package option
 
 // EncodeOption is the encoding options.
 type EncodeOption struct {
-	ForceTextNameAsKey bool // forces to use proto field text name.
+	ForceProtoTextAsKey bool // forces to use proto field text name.
 }
 
 // Encode creates a new EncodeOption instance.
 func Encode() *EncodeOption {
 	return &EncodeOption{}
 }
 
-// UseTextNameAsKey forces to use proto field text name as key.
-func (opt *EncodeOption) UseTextNameAsKey(isUse bool) *EncodeOption {
-	opt.ForceTextNameAsKey = isUse
+// UseProtoTextAsKey forces to use proto field text name as key.
+func (opt *EncodeOption) UseProtoTextAsKey(isUse bool) *EncodeOption {
+	opt.ForceProtoTextAsKey = isUse
 	return opt
 }
 
@@ -24,8 +24,8 @@ func MergeEncodeOptions(opts ...*EncodeOption) *EncodeOption {
 			continue
 		}
 
-		if o.ForceTextNameAsKey {
-			opt.ForceTextNameAsKey = true
+		if o.ForceProtoTextAsKey {
+			opt.ForceProtoTextAsKey = true
 		}
 	}
 	return opt

cmd/protoc-gen-go-http/template.go

@@ -2,13 +2,13 @@ package option
 
 import "testing"
 
-func TestEncodeOption_UseTextNameAsKey(t *testing.T) {
-	e := Encode().UseTextNameAsKey(true)
-	if e.ForceTextNameAsKey != true {
+func TestEncodeOption_UseProtoTextAsKey(t *testing.T) {
+	e := Encode().UseProtoTextAsKey(true)
+	if e.ForceProtoTextAsKey != true {
 		t.Error("expect true")
 	}
-	e = Encode().UseTextNameAsKey(false)
-	if e.ForceTextNameAsKey != false {
+	e = Encode().UseProtoTextAsKey(false)
+	if e.ForceProtoTextAsKey != false {
 		t.Error("expect false")
 	}
 }
@@ -18,23 +18,23 @@ func TestMergeEncodeOptions(t *testing.T) {
 	if opt == nil {
 		t.Fatal("expect not nil")
 	}
-	if opt.ForceTextNameAsKey {
+	if opt.ForceProtoTextAsKey {
 		t.Error("expect false")
 	}
 
-	opt = MergeEncodeOptions(Encode().UseTextNameAsKey(true))
+	opt = MergeEncodeOptions(Encode().UseProtoTextAsKey(true))
 	if opt == nil {
 		t.Fatal("expect not nil")
 	}
-	if !opt.ForceTextNameAsKey {
+	if !opt.ForceProtoTextAsKey {
 		t.Error("expect true")
 	}
 
-	opt = MergeEncodeOptions(&EncodeOption{}, Encode().UseTextNameAsKey(true))
+	opt = MergeEncodeOptions(&EncodeOption{}, Encode().UseProtoTextAsKey(true))
 	if opt == nil {
 		t.Fatal("expect not nil")
 	}
-	if !opt.ForceTextNameAsKey {
+	if !opt.ForceProtoTextAsKey {
 		t.Error("expect true")
 	}
 }