Merge pull request #96 from gengo/feature/avoid-custom-pascal-snake

Better compatibility to field names generated by protoc-gen-go

Makefile

@@ -8,8 +8,8 @@ GO_PLUGIN=bin/protoc-gen-go
 GO_PLUGIN_PKG=github.com/golang/protobuf/protoc-gen-go
 SWAGGER_PLUGIN=bin/protoc-gen-swagger
 SWAGGER_PLUGIN_SRC= utilities/doc.go \
-		    utilities/name.go \
 		    utilities/pattern.go \
+		    utilities/trie.go \
 		    protoc-gen-swagger/genswagger/generator.go \
 		    protoc-gen-swagger/genswagger/template.go \
 		    protoc-gen-swagger/main.go

protoc-gen-grpc-gateway/descriptor/types.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/httprule"
-	"github.com/gengo/grpc-gateway/utilities"
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
+	gogen "github.com/golang/protobuf/protoc-gen-go/generator"
 )
 
 // GoPackage represents a golang package
@@ -235,15 +235,15 @@ type FieldPathComponent struct {
 
 // RHS returns a right-hand-side expression in go for this field.
 func (c FieldPathComponent) RHS() string {
-	return utilities.PascalFromSnake(c.Name)
+	return gogen.CamelCase(c.Name)
 }
 
 // LHS returns a left-hand-side expression in go for this field.
 func (c FieldPathComponent) LHS() string {
 	if c.Target.Message.File.proto2() {
-		return fmt.Sprintf("Get%s()", utilities.PascalFromSnake(c.Name))
+		return fmt.Sprintf("Get%s()", gogen.CamelCase(c.Name))
 	}
-	return utilities.PascalFromSnake(c.Name)
+	return gogen.CamelCase(c.Name)
 }
 
 var (

protoc-gen-grpc-gateway/gengateway/template.go

@@ -114,7 +114,7 @@ var _ codes.Code
 var _ io.Reader
 var _ = runtime.String
 var _ = json.Marshal
-var _ = utilities.PascalFromSnake
+var _ = utilities.NewDoubleArray
 `))
 
 	handlerTemplate = template.Must(template.New("handler").Parse(`

runtime/query.go

@@ -12,7 +12,7 @@ import (
 )
 
 // PopulateQueryParameters populates "values" into "msg".
-// A value is ignored if its key starts with one of the elements in "filters".
+// A value is ignored if its key starts with one of the elements in "filter".
 func PopulateQueryParameters(msg proto.Message, values url.Values, filter *utilities.DoubleArray) error {
 	for key, values := range values {
 		fieldPath := strings.Split(key, ".")
@@ -44,7 +44,7 @@ func populateFieldValueFromPath(msg proto.Message, fieldPath []string, values []
 		if !isLast && m.Kind() != reflect.Struct {
 			return fmt.Errorf("non-aggregate type in the mid of path: %s", strings.Join(fieldPath, "."))
 		}
-		f := m.FieldByName(utilities.PascalFromSnake(fieldName))
+		f := fieldByProtoName(m, fieldName)
 		if !f.IsValid() {
 			glog.Warningf("field not found in %T: %s", msg, strings.Join(fieldPath, "."))
 			return nil
@@ -83,6 +83,18 @@ func populateFieldValueFromPath(msg proto.Message, fieldPath []string, values []
 	return populateField(m, values[0])
 }
 
+// fieldByProtoName looks up a field whose corresponding protobuf field name is "name".
+// "m" must be a struct value. It returns zero reflect.Value if no such field found.
+func fieldByProtoName(m reflect.Value, name string) reflect.Value {
+	props := proto.GetProperties(m.Type())
+	for _, p := range props.Prop {
+		if p.OrigName == name {
+			return m.FieldByName(p.Name)
+		}
+	}
+	return reflect.Value{}
+}
+
 func populateRepeatedField(f reflect.Value, values []string) error {
 	elemType := f.Type().Elem()
 	conv, ok := convFromType[elemType.Kind()]