Google Git
Sign in
edge/third_party/golang/protobuf/62e4364d64b32762febb61f2c88c0a29bc49a225^!/.
commit
62e4364d64b32762febb61f2c88c0a29bc49a225
[log] [tgz]
author
David Symonds <dsymonds@golang.org>
Thu Mar 17 12:31:00 2016 +1100
committer
David Symonds <dsymonds@golang.org>
Thu Mar 17 12:32:49 2016 +1100
tree
93a88b9a59fb4ff702c90842e5cfbcb7da624c41
parent
99511271042a09d1e01baea8781caa5210fec66e [diff]
jsonpb: Accept both camelCase and orig_name as field names for oneof fields.

Fixes #148.

diff --git a/jsonpb/jsonpb.go b/jsonpb/jsonpb.go
index a9e778c..c4094ac 100644
--- a/jsonpb/jsonpb.go
+++ b/jsonpb/jsonpb.go

@@ -517,30 +517,39 @@
 			return err
 		}
 
+		consumeField := func(prop *proto.Properties) (json.RawMessage, bool) {
+			// Be liberal in what names we accept; both orig_name and camelName are okay.
+			fieldNames := acceptedJSONFieldNames(prop)
+
+			vOrig, okOrig := jsonFields[fieldNames.orig]
+			vCamel, okCamel := jsonFields[fieldNames.camel]
+			if !okOrig && !okCamel {
+				return nil, false
+			}
+			// If, for some reason, both are present in the data, favour the camelName.
+			var raw json.RawMessage
+			if okOrig {
+				raw = vOrig
+				delete(jsonFields, fieldNames.orig)
+			}
+			if okCamel {
+				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
 			}
-			// Be liberal in what names we accept; both orig_name and camelName are okay.
-			fieldNames := acceptedJSONFieldNames(ft)
 
-			vOrig, okOrig := jsonFields[fieldNames.orig]
-			vCamel, okCamel := jsonFields[fieldNames.camel]
-			if !okOrig && !okCamel {
+			valueForField, ok := consumeField(sprops.Prop[i])
+			if !ok {
 				continue
 			}
-			// If, for some reason, both are present in the data, favour the camelName.
-			var valueForField json.RawMessage
-			if okOrig {
-				valueForField = vOrig
-				delete(jsonFields, fieldNames.orig)
-			}
-			if okCamel {
-				valueForField = vCamel
-				delete(jsonFields, fieldNames.camel)
-			}
 
 			// Handle enums, which have an underlying type of int32,
 			// and may appear as strings. We do this while handling
@@ -570,14 +579,17 @@
 			}
 		}
 		// 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 @@
 	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

diff --git a/jsonpb/jsonpb_test.go b/jsonpb/jsonpb_test.go
index c04da85..a8f9572 100644
--- a/jsonpb/jsonpb_test.go
+++ b/jsonpb/jsonpb_test.go

@@ -379,6 +379,8 @@
 	{"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)}},
 

diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go
index a1263fb..4672283 100644
--- a/jsonpb/jsonpb_test_proto/test_objects.pb.go
+++ b/jsonpb/jsonpb_test_proto/test_objects.pb.go

@@ -337,6 +337,7 @@
 	// Types that are valid to be assigned to Union:
 	//	*MsgWithOneof_Title
 	//	*MsgWithOneof_Salary
+	//	*MsgWithOneof_Country
 	Union            isMsgWithOneof_Union `protobuf_oneof:"union"`
 	XXX_unrecognized []byte               `json:"-"`
 }
@@ -356,9 +357,13 @@
 type MsgWithOneof_Salary struct {
 	Salary int64 `protobuf:"varint,2,opt,name=salary,oneof"`
 }
+type MsgWithOneof_Country struct {
+	Country string `protobuf:"bytes,3,opt,name=Country,json=country,oneof"`
+}
 
-func (*MsgWithOneof_Title) isMsgWithOneof_Union()  {}
-func (*MsgWithOneof_Salary) isMsgWithOneof_Union() {}
+func (*MsgWithOneof_Title) isMsgWithOneof_Union()   {}
+func (*MsgWithOneof_Salary) isMsgWithOneof_Union()  {}
+func (*MsgWithOneof_Country) isMsgWithOneof_Union() {}
 
 func (m *MsgWithOneof) GetUnion() isMsgWithOneof_Union {
 	if m != nil {
@@ -381,11 +386,19 @@
 	return 0
 }
 
+func (m *MsgWithOneof) GetCountry() string {
+	if x, ok := m.GetUnion().(*MsgWithOneof_Country); ok {
+		return x.Country
+	}
+	return ""
+}
+
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*MsgWithOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _MsgWithOneof_OneofMarshaler, _MsgWithOneof_OneofUnmarshaler, _MsgWithOneof_OneofSizer, []interface{}{
 		(*MsgWithOneof_Title)(nil),
 		(*MsgWithOneof_Salary)(nil),
+		(*MsgWithOneof_Country)(nil),
 	}
 }
 
@@ -399,6 +412,9 @@
 	case *MsgWithOneof_Salary:
 		b.EncodeVarint(2<<3 | proto.WireVarint)
 		b.EncodeVarint(uint64(x.Salary))
+	case *MsgWithOneof_Country:
+		b.EncodeVarint(3<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.Country)
 	case nil:
 	default:
 		return fmt.Errorf("MsgWithOneof.Union has unexpected type %T", x)
@@ -423,6 +439,13 @@
 		x, err := b.DecodeVarint()
 		m.Union = &MsgWithOneof_Salary{int64(x)}
 		return true, err
+	case 3: // union.Country
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.Union = &MsgWithOneof_Country{x}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -439,6 +462,10 @@
 	case *MsgWithOneof_Salary:
 		n += proto.SizeVarint(2<<3 | proto.WireVarint)
 		n += proto.SizeVarint(uint64(x.Salary))
+	case *MsgWithOneof_Country:
+		n += proto.SizeVarint(3<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.Country)))
+		n += len(x.Country)
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -646,66 +673,67 @@
 }
 
 var fileDescriptor1 = []byte{
-	// 973 bytes of a gzipped FileDescriptorProto
+	// 988 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x55, 0xdd, 0x72, 0xdb, 0x44,
-	0x14, 0xae, 0xb5, 0x96, 0x25, 0xad, 0x93, 0x60, 0x76, 0x52, 0xaa, 0x86, 0x00, 0x1d, 0x0f, 0x14,
-	0x28, 0xa0, 0x0e, 0x6e, 0xa7, 0xc3, 0x14, 0x6e, 0x48, 0x63, 0xa0, 0x03, 0x29, 0x33, 0x9b, 0x86,
-	0x5e, 0x7a, 0xe4, 0x44, 0x31, 0x2a, 0x92, 0x56, 0xb3, 0x5a, 0x91, 0x7a, 0xe0, 0x82, 0x87, 0xe0,
-	0x15, 0xe0, 0x11, 0xb8, 0xe4, 0xd9, 0x38, 0x67, 0x57, 0xd2, 0x3a, 0x76, 0x4d, 0x6e, 0xe2, 0xa3,
-	0xef, 0x47, 0xab, 0x6f, 0xcf, 0x9e, 0xa5, 0x4c, 0x25, 0x95, 0x9a, 0x89, 0xf9, 0xcb, 0xe4, 0x5c,
-	0x55, 0x51, 0x29, 0x85, 0x12, 0x6c, 0xf0, 0xb2, 0x12, 0x45, 0x39, 0x3f, 0x78, 0x77, 0x21, 0xc4,
-	0x22, 0x4b, 0xee, 0xeb, 0xa7, 0xf3, 0xfa, 0xf2, 0xfe, 0x45, 0x2d, 0x63, 0x95, 0x8a, 0xc2, 0xf0,
-	0x0e, 0x0e, 0xd7, 0xf1, 0x4a, 0xc9, 0xfa, 0x5c, 0x35, 0xe8, 0x7b, 0xeb, 0xa8, 0x4a, 0x73, 0x78,
-	0x57, 0x9c, 0x97, 0x0d, 0x61, 0xc3, 0xfe, 0x4a, 0xc6, 0x65, 0x99, 0xc8, 0x66, 0x19, 0xe3, 0xbf,
-	0x1c, 0x3a, 0x38, 0x4d, 0xf3, 0x32, 0x4b, 0xd8, 0x4d, 0x3a, 0x10, 0xb3, 0xb9, 0x10, 0x59, 0xd8,
-	0xbb, 0xd3, 0xfb, 0xc8, 0xe7, 0xae, 0x38, 0x82, 0x82, 0xdd, 0xa2, 0x9e, 0x98, 0xa5, 0x85, 0x7a,
-	0x30, 0x09, 0x1d, 0x78, 0xee, 0xf2, 0x81, 0x78, 0x8a, 0x55, 0x07, 0x3c, 0x7a, 0x18, 0x12, 0x00,
-	0x88, 0x01, 0x1e, 0x3d, 0x64, 0xb7, 0xa9, 0x2f, 0x66, 0xb5, 0x91, 0xf4, 0x01, 0xd9, 0xe5, 0x9e,
-	0x38, 0xd3, 0xa5, 0x85, 0x40, 0xe4, 0x02, 0xd4, 0x6f, 0xa0, 0x56, 0x55, 0x19, 0xd5, 0x00, 0xa0,
-	0x37, 0x01, 0x3a, 0x5d, 0x51, 0x55, 0x46, 0xe5, 0x01, 0xc4, 0x1a, 0x08, 0x54, 0x7a, 0x11, 0x97,
-	0x99, 0x88, 0x55, 0xe8, 0x03, 0xe2, 0xc0, 0x22, 0xbe, 0xc1, 0xca, 0x68, 0x2e, 0x44, 0x3d, 0xcf,
-	0x92, 0x30, 0x00, 0xa4, 0x07, 0x9a, 0x63, 0x5d, 0x36, 0x76, 0x4a, 0xa6, 0xc5, 0x22, 0xa4, 0x00,
-	0x05, 0x68, 0xa7, 0x4b, 0x63, 0x37, 0x5f, 0xc2, 0x7e, 0x85, 0x43, 0x40, 0x76, 0xc0, 0xee, 0x08,
-	0xab, 0xf1, 0xdf, 0x0e, 0xf5, 0x78, 0x52, 0x26, 0xb1, 0xaa, 0x30, 0x28, 0xd9, 0x06, 0x45, 0x30,
-	0x28, 0xd9, 0x06, 0x25, 0xbb, 0xa0, 0x08, 0x06, 0x25, 0xbb, 0xa0, 0x64, 0x17, 0x14, 0xc1, 0xa0,
-	0x64, 0x17, 0x94, 0xb4, 0x41, 0x11, 0x0c, 0x4a, 0xda, 0xa0, 0xa4, 0x0d, 0x8a, 0x60, 0x50, 0xd2,
-	0x06, 0x25, 0x6d, 0x50, 0x04, 0x83, 0x92, 0xa7, 0x2b, 0xaa, 0x2e, 0x28, 0x82, 0x41, 0x49, 0x1b,
-	0x94, 0xec, 0x82, 0x22, 0x18, 0x94, 0xec, 0x82, 0x92, 0x36, 0x28, 0x82, 0x41, 0x49, 0x1b, 0x94,
-	0xb4, 0x41, 0x11, 0x0c, 0x4a, 0xda, 0xa0, 0x64, 0x17, 0x14, 0xc1, 0xa0, 0xa4, 0x09, 0xea, 0x1f,
-	0x68, 0xa8, 0x17, 0xe9, 0xc5, 0x22, 0x51, 0xec, 0x1e, 0x75, 0xcf, 0x45, 0x26, 0xa4, 0xee, 0xa7,
-	0xbd, 0xc9, 0x7e, 0x64, 0x5a, 0x3e, 0x32, 0x70, 0xf4, 0x04, 0x31, 0x6e, 0x28, 0xec, 0x33, 0xf4,
-	0x33, 0x6c, 0x0c, 0x6f, 0x1b, 0x7b, 0x20, 0xf5, 0x7f, 0x76, 0x97, 0x0e, 0x2a, 0xdd, 0xb5, 0x7a,
-	0x03, 0x87, 0x93, 0xbd, 0x96, 0x6d, 0x7a, 0x99, 0x37, 0x28, 0xfb, 0xd8, 0x04, 0xa2, 0x99, 0xb8,
-	0xce, 0x4d, 0x26, 0x06, 0xd4, 0x50, 0x3d, 0x69, 0x36, 0x38, 0xdc, 0xd7, 0x9e, 0x6f, 0xb4, 0xcc,
-	0x66, 0xdf, 0x79, 0x8b, 0xb3, 0x4f, 0x69, 0x20, 0x67, 0x2d, 0xf9, 0xa6, 0xb6, 0xdd, 0x20, 0xfb,
-	0xb2, 0xf9, 0x35, 0xfe, 0x80, 0xba, 0x66, 0xd1, 0x1e, 0x25, 0x7c, 0x7a, 0x3c, 0xba, 0xc1, 0x02,
-	0xea, 0x7e, 0xcb, 0xa7, 0xd3, 0x67, 0xa3, 0x1e, 0xf3, 0x69, 0xff, 0xe8, 0x87, 0xb3, 0xe9, 0xc8,
-	0x19, 0xff, 0xe9, 0xd0, 0xfe, 0x49, 0x5c, 0x56, 0xec, 0x4b, 0x3a, 0xcc, 0x4d, 0xbb, 0x60, 0xf6,
-	0xba, 0xc7, 0x86, 0x93, 0xb7, 0x5b, 0x7f, 0xa4, 0x44, 0x27, 0xba, 0x7f, 0x60, 0x2b, 0xa6, 0x85,
-	0x92, 0x4b, 0x1e, 0xe4, 0x6d, 0xcd, 0xbe, 0xa6, 0xbb, 0xb9, 0xee, 0xcd, 0xf6, 0xab, 0x1d, 0x2d,
-	0x7f, 0xe7, 0xba, 0x1c, 0xfb, 0xd5, 0x7c, 0xb6, 0x31, 0x18, 0xe6, 0xf6, 0xc9, 0xc1, 0x57, 0x74,
-	0xef, 0xba, 0x3f, 0x1b, 0x51, 0xf2, 0x4b, 0xb2, 0xd4, 0xdb, 0x48, 0x38, 0xfe, 0x64, 0xfb, 0xd4,
-	0xfd, 0x35, 0xce, 0xea, 0x44, 0x8f, 0x84, 0x80, 0x9b, 0xe2, 0xb1, 0xf3, 0x45, 0xef, 0xe0, 0x19,
-	0x1d, 0xad, 0xdb, 0xaf, 0xea, 0x7d, 0xa3, 0x7f, 0x7f, 0x55, 0xbf, 0xb9, 0x29, 0xd6, 0x6f, 0xfc,
-	0x94, 0xee, 0x9c, 0x54, 0x8b, 0x17, 0xa9, 0xfa, 0xf9, 0xc7, 0x22, 0x11, 0x97, 0xec, 0x2d, 0xea,
-	0xaa, 0x54, 0xc1, 0x87, 0xa1, 0x5b, 0xf0, 0xdd, 0x0d, 0x6e, 0x4a, 0x16, 0x42, 0x47, 0xc4, 0x59,
-	0x2c, 0x97, 0xda, 0x92, 0x00, 0xd0, 0xd4, 0x47, 0x1e, 0x75, 0xeb, 0x02, 0x06, 0xea, 0xf8, 0x2e,
-	0xed, 0xf3, 0x24, 0xce, 0xec, 0xe2, 0x7b, 0x7a, 0x2e, 0x98, 0xe2, 0x9e, 0xef, 0x5f, 0x8c, 0xfe,
-	0x80, 0x3f, 0x67, 0x7c, 0x45, 0xbd, 0x27, 0x02, 0xd7, 0xf1, 0x8a, 0x1d, 0xd2, 0x20, 0xcd, 0xe3,
-	0x45, 0x5a, 0xa0, 0xb1, 0xa1, 0xdb, 0x07, 0x56, 0x32, 0x39, 0xa6, 0x7b, 0x12, 0xac, 0x67, 0xc9,
-	0x2b, 0x95, 0x14, 0x15, 0xbc, 0x8c, 0xed, 0xd8, 0x86, 0x88, 0xb3, 0xf0, 0xb7, 0xeb, 0x1d, 0xd5,
-	0xd8, 0xf3, 0x5d, 0x14, 0x4d, 0x5b, 0xcd, 0xf8, 0xdf, 0x3e, 0xa5, 0xdf, 0x17, 0xe2, 0xaa, 0x78,
-	0xbe, 0x2c, 0x93, 0x8a, 0x7d, 0x42, 0x09, 0x5c, 0x06, 0xfa, 0xb5, 0xc3, 0xc9, 0xed, 0xc8, 0x4c,
-	0xf2, 0xa8, 0x9d, 0xe4, 0xd1, 0x71, 0x73, 0x51, 0x70, 0x64, 0xb1, 0x0f, 0xa9, 0x53, 0xa9, 0x70,
-	0x47, 0x73, 0x6f, 0x6d, 0x70, 0x4f, 0xf5, 0xa5, 0xc1, 0x81, 0x02, 0xa7, 0xd2, 0x81, 0xae, 0x35,
-	0xb9, 0x1f, 0x6c, 0x10, 0x9f, 0xb7, 0xf7, 0x07, 0x07, 0x16, 0x8b, 0x60, 0x05, 0xf3, 0x4c, 0x8f,
-	0xf7, 0xe1, 0xe4, 0x70, 0x73, 0x05, 0x7a, 0x4c, 0xfc, 0x84, 0xf1, 0x71, 0x24, 0xc2, 0x29, 0x26,
-	0x97, 0x99, 0xd2, 0x43, 0x1f, 0x5b, 0x76, 0x9d, 0xaf, 0x07, 0x4e, 0x43, 0x07, 0x1e, 0xd2, 0xd3,
-	0xe6, 0x22, 0x78, 0x1d, 0x5d, 0x37, 0x61, 0x43, 0x07, 0x1e, 0xae, 0xa6, 0x06, 0xfa, 0x60, 0xcb,
-	0x6a, 0xce, 0x56, 0xf9, 0x40, 0xd4, 0xf6, 0x30, 0x23, 0xbd, 0xed, 0xf6, 0x0f, 0x26, 0xad, 0x3d,
-	0x0c, 0x4f, 0xb4, 0x07, 0xba, 0xff, 0x3f, 0xf6, 0x1d, 0xbf, 0xd6, 0xfc, 0xbe, 0xbe, 0x04, 0x82,
-	0x2d, 0x51, 0xe2, 0x29, 0x30, 0x74, 0xcd, 0x43, 0x7f, 0x3c, 0xcf, 0x74, 0x8b, 0xbf, 0x19, 0xac,
-	0x8d, 0x3f, 0x10, 0xd9, 0xe7, 0xd4, 0xb5, 0x37, 0xd1, 0xeb, 0x3e, 0x40, 0x0f, 0x5c, 0x23, 0x30,
-	0xcc, 0xc7, 0x77, 0x68, 0xbf, 0x88, 0xf3, 0x64, 0xad, 0xf9, 0x7e, 0xd7, 0x67, 0x54, 0x23, 0xff,
-	0x05, 0x00, 0x00, 0xff, 0xff, 0x87, 0xe6, 0xa7, 0x10, 0x8b, 0x08, 0x00, 0x00,
+	0x14, 0xae, 0xb5, 0x96, 0x65, 0xaf, 0x93, 0x60, 0x76, 0x52, 0xaa, 0x9a, 0x00, 0x1d, 0x0f, 0x14,
+	0x28, 0xe0, 0x0e, 0x6e, 0xa7, 0xc3, 0x14, 0x6e, 0x48, 0x63, 0x7e, 0x06, 0x52, 0x66, 0x36, 0x0d,
+	0xbd, 0xf4, 0xc8, 0x89, 0x62, 0x54, 0x64, 0xad, 0x66, 0xb5, 0x22, 0xcd, 0xc0, 0x05, 0x0f, 0xc1,
+	0x2b, 0xc0, 0x23, 0x70, 0xc9, 0xb3, 0x71, 0xce, 0x59, 0x49, 0xeb, 0xd8, 0x75, 0x73, 0x13, 0x9f,
+	0xfd, 0xbe, 0xf3, 0xe9, 0xec, 0xb7, 0x67, 0xcf, 0x72, 0x61, 0xe2, 0xc2, 0xcc, 0xd4, 0xfc, 0x45,
+	0x7c, 0x66, 0x8a, 0x71, 0xae, 0x95, 0x51, 0xa2, 0xf3, 0xa2, 0x50, 0x59, 0x3e, 0x1f, 0xbe, 0xbb,
+	0x50, 0x6a, 0x91, 0xc6, 0xf7, 0x69, 0x75, 0x5e, 0x5e, 0xdc, 0x3f, 0x2f, 0x75, 0x64, 0x12, 0x95,
+	0x59, 0xde, 0xf0, 0x60, 0x1d, 0x2f, 0x8c, 0x2e, 0xcf, 0x4c, 0x85, 0xbe, 0xb7, 0x8e, 0x9a, 0x64,
+	0x09, 0xdf, 0x8a, 0x96, 0x79, 0x45, 0xd8, 0x90, 0xbf, 0xd4, 0x51, 0x9e, 0xc7, 0xba, 0x2a, 0x63,
+	0xf4, 0xb7, 0xc7, 0x3b, 0x27, 0xc9, 0x32, 0x4f, 0x63, 0x71, 0x93, 0x77, 0xd4, 0x6c, 0xae, 0x54,
+	0x1a, 0xb6, 0xee, 0xb4, 0x3e, 0xea, 0x4a, 0x5f, 0x1d, 0x42, 0x20, 0x6e, 0xf1, 0x40, 0xcd, 0x92,
+	0xcc, 0x3c, 0x98, 0x84, 0x1e, 0xac, 0xfb, 0xb2, 0xa3, 0xbe, 0xc7, 0xa8, 0x01, 0x1e, 0x3d, 0x0c,
+	0x19, 0x00, 0xcc, 0x02, 0x8f, 0x1e, 0x8a, 0xdb, 0xbc, 0xab, 0x66, 0xa5, 0x4d, 0x69, 0x03, 0xb2,
+	0x2b, 0x03, 0x75, 0x4a, 0xa1, 0x83, 0x20, 0xc9, 0x07, 0xa8, 0x5d, 0x41, 0x75, 0x56, 0x61, 0xb3,
+	0x3a, 0x00, 0xbd, 0x09, 0xd0, 0xc9, 0x4a, 0x56, 0x61, 0xb3, 0x02, 0x80, 0x44, 0x05, 0x41, 0x16,
+	0x15, 0x71, 0x91, 0xaa, 0xc8, 0x84, 0x5d, 0x40, 0x3c, 0x28, 0xe2, 0x1b, 0x8c, 0x6c, 0xce, 0xb9,
+	0x2a, 0xe7, 0x69, 0x1c, 0xf6, 0x00, 0x69, 0x41, 0xce, 0x11, 0x85, 0x95, 0x9c, 0xd1, 0x49, 0xb6,
+	0x08, 0x39, 0x40, 0x3d, 0x94, 0xa3, 0xd0, 0xca, 0xcd, 0xaf, 0xe0, 0xbc, 0xc2, 0x3e, 0x20, 0x3b,
+	0x20, 0x77, 0x88, 0xd1, 0xe8, 0x1f, 0x8f, 0x07, 0x32, 0xce, 0xe3, 0xc8, 0x14, 0x68, 0x94, 0xae,
+	0x8d, 0x62, 0x68, 0x94, 0xae, 0x8d, 0xd2, 0x8d, 0x51, 0x0c, 0x8d, 0xd2, 0x8d, 0x51, 0xba, 0x31,
+	0x8a, 0xa1, 0x51, 0xba, 0x31, 0x4a, 0x3b, 0xa3, 0x18, 0x1a, 0xa5, 0x9d, 0x51, 0xda, 0x19, 0xc5,
+	0xd0, 0x28, 0xed, 0x8c, 0xd2, 0xce, 0x28, 0x86, 0x46, 0xe9, 0x93, 0x95, 0xac, 0xc6, 0x28, 0x86,
+	0x46, 0x69, 0x67, 0x94, 0x6e, 0x8c, 0x62, 0x68, 0x94, 0x6e, 0x8c, 0xd2, 0xce, 0x28, 0x86, 0x46,
+	0x69, 0x67, 0x94, 0x76, 0x46, 0x31, 0x34, 0x4a, 0x3b, 0xa3, 0x74, 0x63, 0x14, 0x43, 0xa3, 0xb4,
+	0x35, 0xea, 0x5f, 0x68, 0xa8, 0xe7, 0xc9, 0xf9, 0x22, 0x36, 0xe2, 0x1e, 0xf7, 0xcf, 0x54, 0xaa,
+	0x34, 0xf5, 0xd3, 0xde, 0x64, 0x7f, 0x6c, 0x5b, 0x7e, 0x6c, 0xe1, 0xf1, 0x13, 0xc4, 0xa4, 0xa5,
+	0x88, 0xcf, 0x50, 0xcf, 0xb2, 0xd1, 0xbc, 0x6d, 0xec, 0x8e, 0xa6, 0xff, 0xe2, 0x2e, 0xef, 0x14,
+	0xd4, 0xb5, 0x74, 0x80, 0xfd, 0xc9, 0x5e, 0xcd, 0xb6, 0xbd, 0x2c, 0x2b, 0x54, 0x7c, 0x6c, 0x0d,
+	0x21, 0x26, 0xd6, 0xb9, 0xc9, 0x44, 0x83, 0x2a, 0x6a, 0xa0, 0xed, 0x01, 0x87, 0xfb, 0xa4, 0xf9,
+	0x46, 0xcd, 0xac, 0xce, 0x5d, 0xd6, 0xb8, 0xf8, 0x94, 0xf7, 0xf4, 0xac, 0x26, 0xdf, 0x24, 0xd9,
+	0x0d, 0x72, 0x57, 0x57, 0xbf, 0x46, 0x1f, 0x70, 0xdf, 0x16, 0x1d, 0x70, 0x26, 0xa7, 0x47, 0x83,
+	0x1b, 0xa2, 0xc7, 0xfd, 0x6f, 0xe5, 0x74, 0xfa, 0x74, 0xd0, 0x12, 0x5d, 0xde, 0x3e, 0xfc, 0xf1,
+	0x74, 0x3a, 0xf0, 0x46, 0x7f, 0x79, 0xbc, 0x7d, 0x1c, 0xe5, 0x85, 0xf8, 0x92, 0xf7, 0x97, 0xb6,
+	0x5d, 0xd0, 0x7b, 0xea, 0xb1, 0xfe, 0xe4, 0xed, 0x5a, 0x1f, 0x29, 0xe3, 0x63, 0xea, 0x1f, 0x38,
+	0x8a, 0x69, 0x66, 0xf4, 0x95, 0xec, 0x2d, 0xeb, 0x58, 0x7c, 0xcd, 0x77, 0x97, 0xd4, 0x9b, 0xf5,
+	0xae, 0x3d, 0x4a, 0x7f, 0xe7, 0x7a, 0x3a, 0xf6, 0xab, 0xdd, 0xb6, 0x15, 0xe8, 0x2f, 0xdd, 0xca,
+	0xf0, 0x2b, 0xbe, 0x77, 0x5d, 0x5f, 0x0c, 0x38, 0xfb, 0x35, 0xbe, 0xa2, 0x63, 0x64, 0x12, 0x7f,
+	0x8a, 0x7d, 0xee, 0xff, 0x16, 0xa5, 0x65, 0x4c, 0x23, 0xa1, 0x27, 0x6d, 0xf0, 0xd8, 0xfb, 0xa2,
+	0x35, 0x7c, 0xca, 0x07, 0xeb, 0xf2, 0xab, 0xf9, 0x5d, 0x9b, 0xff, 0xfe, 0x6a, 0xfe, 0xe6, 0xa1,
+	0x38, 0xbd, 0x51, 0xcc, 0x77, 0x8e, 0x8b, 0xc5, 0xf3, 0xc4, 0xfc, 0xf2, 0x53, 0x16, 0xab, 0x0b,
+	0xf1, 0x16, 0xf7, 0x4d, 0x62, 0x60, 0x63, 0xa8, 0xd6, 0xfb, 0xee, 0x86, 0xb4, 0xa1, 0x08, 0xa1,
+	0x23, 0xa2, 0x34, 0xd2, 0x57, 0x24, 0xc9, 0x00, 0xa8, 0x62, 0x31, 0xe4, 0xc1, 0x13, 0x55, 0x62,
+	0x21, 0x34, 0xa7, 0x30, 0x27, 0x38, 0xb3, 0x0b, 0x87, 0x01, 0xf7, 0xcb, 0x0c, 0x86, 0xed, 0xe8,
+	0x2e, 0x6f, 0xcb, 0x38, 0x4a, 0xdd, 0xc6, 0x5a, 0x34, 0x33, 0x6c, 0x70, 0xaf, 0xdb, 0x3d, 0x1f,
+	0xfc, 0x09, 0x7f, 0xde, 0xe8, 0x12, 0xc5, 0xb0, 0xc6, 0x97, 0xe2, 0x80, 0xf7, 0x92, 0x65, 0xb4,
+	0x48, 0x32, 0xfc, 0xa8, 0xa5, 0xbb, 0x05, 0x97, 0x32, 0x39, 0xe2, 0x7b, 0x1a, 0xa4, 0x67, 0xf1,
+	0x4b, 0x13, 0x67, 0x05, 0x7c, 0x4c, 0xec, 0xb8, 0x66, 0x89, 0xd2, 0xf0, 0xf7, 0xeb, 0xdd, 0x56,
+	0xc9, 0xcb, 0x5d, 0x4c, 0x9a, 0xd6, 0x39, 0xa3, 0xff, 0xda, 0x9c, 0xff, 0x90, 0xa9, 0xcb, 0xec,
+	0xd9, 0x55, 0x1e, 0x17, 0xe2, 0x13, 0xce, 0xe0, 0xa1, 0xa0, 0xcf, 0xf6, 0x27, 0xb7, 0xc7, 0x76,
+	0xca, 0x8f, 0xeb, 0x29, 0x3f, 0x3e, 0xaa, 0x1e, 0x11, 0x89, 0x2c, 0xf1, 0x21, 0xf7, 0x0a, 0x13,
+	0xee, 0x10, 0xf7, 0xd6, 0x06, 0xf7, 0x84, 0x1e, 0x14, 0x09, 0x14, 0xb8, 0xb1, 0x1e, 0x74, 0xb4,
+	0x3d, 0x93, 0xe1, 0x06, 0xf1, 0x59, 0xfd, 0xb6, 0x48, 0x60, 0x89, 0x31, 0x54, 0x30, 0x4f, 0xc9,
+	0xd2, 0xfe, 0xe4, 0x60, 0xb3, 0x02, 0x1a, 0x21, 0x3f, 0xa3, 0x7d, 0x12, 0x89, 0x70, 0xc3, 0xd9,
+	0x45, 0x6a, 0xe8, 0x41, 0xc0, 0x76, 0x5e, 0xe7, 0xd3, 0x30, 0xaa, 0xe8, 0xc0, 0x43, 0x7a, 0x52,
+	0x3d, 0x12, 0xaf, 0xa2, 0x53, 0x83, 0x56, 0x74, 0xe0, 0x61, 0x35, 0x25, 0xd0, 0x3b, 0x5b, 0xaa,
+	0x39, 0x5d, 0xe5, 0x03, 0x91, 0xe4, 0x61, 0x7e, 0x06, 0xdb, 0xe5, 0x1f, 0x4c, 0x6a, 0x79, 0x18,
+	0xac, 0x28, 0x0f, 0xf4, 0xee, 0x6b, 0xe4, 0x1b, 0x7e, 0x49, 0xfc, 0x36, 0x3d, 0x10, 0xbd, 0x2d,
+	0x56, 0xe2, 0x0d, 0xb1, 0x74, 0xe2, 0xa1, 0x3e, 0xde, 0x75, 0xbe, 0x45, 0xdf, 0x0e, 0xdd, 0x4a,
+	0x1f, 0x88, 0xe2, 0x73, 0xee, 0xbb, 0x57, 0xea, 0x55, 0x1b, 0xa0, 0x61, 0x6c, 0x13, 0x2c, 0xf3,
+	0xf1, 0x1d, 0xde, 0xce, 0xa2, 0x65, 0xbc, 0xd6, 0x7c, 0x7f, 0xd0, 0xfd, 0x25, 0xe4, 0xff, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x39, 0x6b, 0x15, 0x0e, 0xa7, 0x08, 0x00, 0x00,
 }

diff --git a/jsonpb/jsonpb_test_proto/test_objects.proto b/jsonpb/jsonpb_test_proto/test_objects.proto
index 4346935..ea4a048 100644
--- a/jsonpb/jsonpb_test_proto/test_objects.proto
+++ b/jsonpb/jsonpb_test_proto/test_objects.proto

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