jsonpb: Accept both camelCase and orig_name as field names for oneof fields.

Fixes #148.

Author: dsymonds

jsonpb/jsonpb.go

@@ -517,30 +517,39 @@ func unmarshalValue(target reflect.Value, inputValue json.RawMessage) error {
 			return err
 		}
 
-		sprops := proto.GetProperties(targetType)
-		for i := 0; i < target.NumField(); i++ {
-			ft := target.Type().Field(i)
-			if strings.HasPrefix(ft.Name, "XXX_") {
-				continue
-			}
+		consumeField := func(prop *proto.Properties) (json.RawMessage, bool) {
 			// Be liberal in what names we accept; both orig_name and camelName are okay.
-			fieldNames := acceptedJSONFieldNames(ft)
+			fieldNames := acceptedJSONFieldNames(prop)
 
 			vOrig, okOrig := jsonFields[fieldNames.orig]
 			vCamel, okCamel := jsonFields[fieldNames.camel]
 			if !okOrig && !okCamel {
-				continue
+				return nil, false
 			}
 			// If, for some reason, both are present in the data, favour the camelName.
-			var valueForField json.RawMessage
+			var raw json.RawMessage
 			if okOrig {
-				valueForField = vOrig
+				raw = vOrig
 				delete(jsonFields, fieldNames.orig)
 			}
 			if okCamel {
-				valueForField = vCamel
+				raw = vCamel
 				delete(jsonFields, fieldNames.camel)
 			}
+			return raw, true
+		}
+
+		sprops := proto.GetProperties(targetType)
+		for i := 0; i < target.NumField(); i++ {
+			ft := target.Type().Field(i)
+			if strings.HasPrefix(ft.Name, "XXX_") {
+				continue
+			}
+
+			valueForField, ok := consumeField(sprops.Prop[i])
+			if !ok {
+				continue
+			}
 
 			// Handle enums, which have an underlying type of int32,
 			// and may appear as strings. We do this while handling
@@ -570,14 +579,17 @@ func unmarshalValue(target reflect.Value, inputValue json.RawMessage) error {
 			}
 		}
 		// Check for any oneof fields.
-		for fname, raw := range jsonFields {
-			if oop, ok := sprops.OneofTypes[fname]; ok {
+		if len(jsonFields) > 0 {
+			for _, oop := range sprops.OneofTypes {
+				raw, ok := consumeField(oop.Prop)
+				if !ok {
+					continue
+				}
 				nv := reflect.New(oop.Type.Elem())
 				target.Field(oop.Field).Set(nv)
 				if err := unmarshalValue(nv.Elem().Field(0), raw); err != nil {
 					return err
 				}
-				delete(jsonFields, fname)
 			}
 		}
 		if len(jsonFields) > 0 {
@@ -663,9 +675,7 @@ type fieldNames struct {
 	orig, camel string
 }
 
-func acceptedJSONFieldNames(f reflect.StructField) fieldNames {
-	var prop proto.Properties
-	prop.Init(f.Type, f.Name, f.Tag.Get("protobuf"), &f)
+func acceptedJSONFieldNames(prop *proto.Properties) fieldNames {
 	opts := fieldNames{orig: prop.OrigName, camel: prop.OrigName}
 	if prop.JSONName != "" {
 		opts.camel = prop.JSONName

jsonpb/jsonpb_test.go

@@ -379,6 +379,8 @@ var unmarshalingTests = []struct {
 	{"map<string, string>", `{"strry":{"\"one\"":"two","three":"four"}}`, &pb.Mappy{Strry: map[string]string{`"one"`: "two", "three": "four"}}},
 	{"map<int32, Object>", `{"objjy":{"1":{"dub":1}}}`, &pb.Mappy{Objjy: map[int32]*pb.Simple3{1: &pb.Simple3{Dub: 1}}}},
 	{"oneof", `{"salary":31000}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Salary{31000}}},
+	{"oneof spec name", `{"country":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Country{"Australia"}}},
+	{"oneof orig_name", `{"Country":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Country{"Australia"}}},
 	{"orig_name input", `{"o_bool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
 	{"camelName input", `{"oBool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
 

jsonpb/jsonpb_test_proto/test_objects.pb.go

@@ -94,6 +94,7 @@ message MsgWithOneof {
   oneof union {
     string title = 1;
     int64 salary = 2;
+    string Country = 3;
   }
 }