jsonpb: Format and parse the WKTs in wrappers.proto.

Per the spec, they are meant to use the same representation
in JSON as the wrapped primitive type. Fortunately for us,
that is trivial to implement.

jsonpb/jsonpb.go

@@ -107,6 +107,12 @@ func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent string
 	}
 	if wkt, ok := v.(wkt); ok {
 		switch wkt.XXX_WellKnownType() {
+		case "DoubleValue", "FloatValue", "Int64Value", "UInt64Value",
+			"Int32Value", "UInt32Value", "BoolValue", "StringValue", "BytesValue":
+			// "Wrappers use the same representation in JSON
+			//  as the wrapped primitive type, ..."
+			sprop := proto.GetProperties(s.Type())
+			return m.marshalValue(out, sprop.Prop[0], s.Field(0), indent)
 		case "Duration":
 			// "Generated output always contains 3, 6, or 9 fractional digits,
 			//  depending on required precision."
@@ -427,6 +433,13 @@ func unmarshalValue(target reflect.Value, inputValue json.RawMessage) error {
 	}
 	if wkt, ok := target.Addr().Interface().(wkt); ok {
 		switch wkt.XXX_WellKnownType() {
+		case "DoubleValue", "FloatValue", "Int64Value", "UInt64Value",
+			"Int32Value", "UInt32Value", "BoolValue", "StringValue", "BytesValue":
+			// "Wrappers use the same representation in JSON
+			//  as the wrapped primitive type, except that null is allowed."
+			// encoding/json will turn JSON `null` into Go `nil`,
+			// so we don't have to do any extra work.
+			return unmarshalValue(target.Field(0), inputValue)
 		case "Duration":
 			unq, err := strconv.Unquote(string(inputValue))
 			if err != nil {

jsonpb/jsonpb_test.go

@@ -41,6 +41,7 @@ import (
 	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
 	durpb "github.com/golang/protobuf/ptypes/duration"
 	tspb "github.com/golang/protobuf/ptypes/timestamp"
+	wpb "github.com/golang/protobuf/ptypes/wrappers"
 )
 
 var (
@@ -321,6 +322,16 @@ var marshalingTests = []struct {
 
 	{"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}, `{"dur":"3.000s"}`},
 	{"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}, `{"ts":"2014-05-13T16:53:20.021Z"}`},
+
+	{"DoubleValue", marshaler, &pb.KnownTypes{Dbl: &wpb.DoubleValue{Value: 1.2}}, `{"dbl":1.2}`},
+	{"FloatValue", marshaler, &pb.KnownTypes{Flt: &wpb.FloatValue{Value: 1.2}}, `{"flt":1.2}`},
+	{"Int64Value", marshaler, &pb.KnownTypes{I64: &wpb.Int64Value{Value: -3}}, `{"i64":"-3"}`},
+	{"UInt64Value", marshaler, &pb.KnownTypes{U64: &wpb.UInt64Value{Value: 3}}, `{"u64":"3"}`},
+	{"Int32Value", marshaler, &pb.KnownTypes{I32: &wpb.Int32Value{Value: -4}}, `{"i32":-4}`},
+	{"UInt32Value", marshaler, &pb.KnownTypes{U32: &wpb.UInt32Value{Value: 4}}, `{"u32":4}`},
+	{"BoolValue", marshaler, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}, `{"bool":true}`},
+	{"StringValue", marshaler, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}, `{"str":"plush"}`},
+	{"BytesValue", marshaler, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}, `{"bytes":"d293"}`},
 }
 
 func TestMarshaling(t *testing.T) {
@@ -363,6 +374,18 @@ var unmarshalingTests = []struct {
 
 	{"Duration", `{"dur":"3.000s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}},
 	{"Timestamp", `{"ts":"2014-05-13T16:53:20.021Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}},
+
+	{"DoubleValue", `{"dbl":1.2}`, &pb.KnownTypes{Dbl: &wpb.DoubleValue{Value: 1.2}}},
+	{"FloatValue", `{"flt":1.2}`, &pb.KnownTypes{Flt: &wpb.FloatValue{Value: 1.2}}},
+	{"Int64Value", `{"i64":"-3"}`, &pb.KnownTypes{I64: &wpb.Int64Value{Value: -3}}},
+	{"UInt64Value", `{"u64":"3"}`, &pb.KnownTypes{U64: &wpb.UInt64Value{Value: 3}}},
+	{"Int32Value", `{"i32":-4}`, &pb.KnownTypes{I32: &wpb.Int32Value{Value: -4}}},
+	{"UInt32Value", `{"u32":4}`, &pb.KnownTypes{U32: &wpb.UInt32Value{Value: 4}}},
+	{"BoolValue", `{"bool":true}`, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}},
+	{"StringValue", `{"str":"plush"}`, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}},
+	{"BytesValue", `{"bytes":"d293"}`, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}},
+	// `null` is also a permissible value. Let's just test one.
+	{"null DoubleValue", `{"dbl":null}`, &pb.KnownTypes{Dbl: &wpb.DoubleValue{}}},
 }
 
 func TestUnmarshaling(t *testing.T) {

jsonpb/jsonpb_test_proto/Makefile

@@ -30,4 +30,4 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 regenerate:
-	protoc --go_out=Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp:. *.proto
+	protoc --go_out=Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers:. *.proto

jsonpb/jsonpb_test_proto/test_objects.pb.go

@@ -9,6 +9,7 @@ import fmt "fmt"
 import math "math"
 import google_protobuf "github.com/golang/protobuf/ptypes/duration"
 import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
+import google_protobuf2 "github.com/golang/protobuf/ptypes/wrappers"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -517,9 +518,18 @@ var E_Complex_RealExtension = &proto.ExtensionDesc{
 }
 
 type KnownTypes struct {
-	Dur              *google_protobuf.Duration   `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
-	Ts               *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
-	XXX_unrecognized []byte                      `json:"-"`
+	Dur              *google_protobuf.Duration     `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
+	Ts               *google_protobuf1.Timestamp   `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
+	Dbl              *google_protobuf2.DoubleValue `protobuf:"bytes,3,opt,name=dbl" json:"dbl,omitempty"`
+	Flt              *google_protobuf2.FloatValue  `protobuf:"bytes,4,opt,name=flt" json:"flt,omitempty"`
+	I64              *google_protobuf2.Int64Value  `protobuf:"bytes,5,opt,name=i64" json:"i64,omitempty"`
+	U64              *google_protobuf2.UInt64Value `protobuf:"bytes,6,opt,name=u64" json:"u64,omitempty"`
+	I32              *google_protobuf2.Int32Value  `protobuf:"bytes,7,opt,name=i32" json:"i32,omitempty"`
+	U32              *google_protobuf2.UInt32Value `protobuf:"bytes,8,opt,name=u32" json:"u32,omitempty"`
+	Bool             *google_protobuf2.BoolValue   `protobuf:"bytes,9,opt,name=bool" json:"bool,omitempty"`
+	Str              *google_protobuf2.StringValue `protobuf:"bytes,10,opt,name=str" json:"str,omitempty"`
+	Bytes            *google_protobuf2.BytesValue  `protobuf:"bytes,11,opt,name=bytes" json:"bytes,omitempty"`
+	XXX_unrecognized []byte                        `json:"-"`
 }
 
 func (m *KnownTypes) Reset()                    { *m = KnownTypes{} }
@@ -541,6 +551,69 @@ func (m *KnownTypes) GetTs() *google_protobuf1.Timestamp {
 	return nil
 }
 
+func (m *KnownTypes) GetDbl() *google_protobuf2.DoubleValue {
+	if m != nil {
+		return m.Dbl
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetFlt() *google_protobuf2.FloatValue {
+	if m != nil {
+		return m.Flt
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetI64() *google_protobuf2.Int64Value {
+	if m != nil {
+		return m.I64
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetU64() *google_protobuf2.UInt64Value {
+	if m != nil {
+		return m.U64
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetI32() *google_protobuf2.Int32Value {
+	if m != nil {
+		return m.I32
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetU32() *google_protobuf2.UInt32Value {
+	if m != nil {
+		return m.U32
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetBool() *google_protobuf2.BoolValue {
+	if m != nil {
+		return m.Bool
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetStr() *google_protobuf2.StringValue {
+	if m != nil {
+		return m.Str
+	}
+	return nil
+}
+
+func (m *KnownTypes) GetBytes() *google_protobuf2.BytesValue {
+	if m != nil {
+		return m.Bytes
+	}
+	return nil
+}
+
 var E_Name = &proto.ExtensionDesc{
 	ExtendedType:  (*Real)(nil),
 	ExtensionType: (*string)(nil),
@@ -564,56 +637,65 @@ func init() {
 }
 
 var fileDescriptor1 = []byte{
-	// 812 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x94, 0xdf, 0x8e, 0xdb, 0x44,
-	0x14, 0xc6, 0x1b, 0x4f, 0x9c, 0xd8, 0x27, 0xbb, 0x4b, 0x18, 0x6d, 0xc1, 0x0d, 0xff, 0x2a, 0x0b,
-	0x2a, 0x28, 0xe0, 0x4a, 0xa1, 0xaa, 0x50, 0xe1, 0x86, 0xed, 0x06, 0xa8, 0x60, 0x8b, 0x34, 0xdb,
-	0xaa, 0x97, 0x91, 0xd3, 0x9d, 0x0d, 0x2e, 0xb6, 0x27, 0x3a, 0x9e, 0xd0, 0x46, 0x70, 0xc1, 0x43,
-	0xf0, 0x0a, 0xf0, 0x08, 0x3c, 0x1f, 0x67, 0x66, 0x6c, 0xcf, 0xfe, 0x51, 0xf7, 0x66, 0x73, 0xfc,
-	0x9d, 0xef, 0xcb, 0xf8, 0x37, 0x27, 0x07, 0xb8, 0x96, 0x8d, 0x5e, 0xaa, 0xd5, 0x4b, 0xf9, 0x42,
-	0x37, 0xd9, 0x06, 0x95, 0x56, 0x7c, 0xf4, 0xb2, 0x51, 0xf5, 0x66, 0x35, 0xfb, 0x70, 0xad, 0xd4,
-	0xba, 0x94, 0xf7, 0xec, 0xd3, 0xd5, 0xf6, 0xfc, 0xde, 0xd9, 0x16, 0x73, 0x5d, 0xa8, 0xda, 0xf5,
-	0xcd, 0x3e, 0xba, 0xaa, 0xeb, 0xa2, 0xa2, 0xb4, 0xbc, 0xda, 0xb8, 0x86, 0xf4, 0x9f, 0x00, 0x46,
-	0xa7, 0x45, 0xb5, 0x29, 0x25, 0xbf, 0x09, 0x23, 0xb5, 0x5c, 0x29, 0x55, 0x26, 0x83, 0xdb, 0x83,
-	0x4f, 0x23, 0x11, 0xaa, 0x23, 0x2a, 0xf8, 0xbb, 0x30, 0x56, 0xcb, 0xa2, 0xd6, 0x5f, 0xcd, 0x93,
-	0x80, 0x9e, 0x87, 0x62, 0xa4, 0x1e, 0x9b, 0xaa, 0x17, 0x1e, 0xdc, 0x4f, 0x18, 0x09, 0xcc, 0x09,
-	0x0f, 0xee, 0xf3, 0x5b, 0x10, 0xa9, 0xe5, 0xd6, 0x59, 0x86, 0xa4, 0xec, 0x8b, 0xb1, 0x7a, 0x66,
-	0x4b, 0x2f, 0x91, 0x29, 0x24, 0x69, 0xd8, 0x4a, 0x9d, 0xab, 0x71, 0xae, 0x11, 0x49, 0x6f, 0x93,
-	0x74, 0x7a, 0xc1, 0xd5, 0x38, 0xd7, 0x98, 0x24, 0xde, 0x4a, 0xe4, 0xb2, 0x87, 0x38, 0x2f, 0x55,
-	0xae, 0x93, 0x88, 0x94, 0x80, 0x0e, 0xf1, 0xbd, 0xa9, 0x9c, 0xe7, 0x4c, 0x6d, 0x57, 0xa5, 0x4c,
-	0x62, 0x52, 0x06, 0xe4, 0x39, 0xb6, 0x65, 0x1b, 0xa7, 0xb1, 0xa8, 0xd7, 0x09, 0x90, 0x14, 0x9b,
-	0x38, 0x5b, 0xba, 0xb8, 0xd5, 0x8e, 0x88, 0x27, 0x13, 0x52, 0xf6, 0x28, 0xee, 0xc8, 0x54, 0xe9,
-	0xbf, 0x01, 0x8c, 0x85, 0xdc, 0xc8, 0x5c, 0x37, 0x06, 0x14, 0x76, 0xa0, 0x98, 0x01, 0x85, 0x1d,
-	0x28, 0xec, 0x41, 0x31, 0x03, 0x0a, 0x7b, 0x50, 0xd8, 0x83, 0x62, 0x06, 0x14, 0xf6, 0xa0, 0xd0,
-	0x83, 0x62, 0x06, 0x14, 0x7a, 0x50, 0xe8, 0x41, 0x31, 0x03, 0x0a, 0x3d, 0x28, 0xf4, 0xa0, 0x98,
-	0x01, 0x85, 0xa7, 0x17, 0x5c, 0x3d, 0x28, 0x66, 0x40, 0xa1, 0x07, 0x85, 0x3d, 0x28, 0x66, 0x40,
-	0x61, 0x0f, 0x0a, 0x3d, 0x28, 0x66, 0x40, 0xa1, 0x07, 0x85, 0x1e, 0x14, 0x33, 0xa0, 0xd0, 0x83,
-	0xc2, 0x1e, 0x14, 0x33, 0xa0, 0xd0, 0x81, 0xfa, 0x8f, 0x06, 0xea, 0x79, 0x71, 0xb6, 0x96, 0x9a,
-	0xdf, 0x85, 0xf0, 0x85, 0x2a, 0x15, 0xda, 0x79, 0x3a, 0x98, 0x1f, 0x66, 0x6e, 0x68, 0x33, 0x27,
-	0x67, 0x8f, 0x8c, 0x26, 0x5c, 0x0b, 0xff, 0xd2, 0xe4, 0xb9, 0x6e, 0x03, 0xef, 0x4d, 0xdd, 0x23,
-	0xb4, 0xff, 0xf9, 0x1d, 0x18, 0x35, 0x76, 0x6a, 0xed, 0x05, 0x4e, 0xe6, 0x07, 0x5d, 0xb7, 0x9b,
-	0x65, 0xd1, 0xaa, 0xfc, 0x33, 0x07, 0xc4, 0x76, 0x9a, 0x73, 0x5e, 0xef, 0x34, 0x80, 0xda, 0xd6,
-	0x31, 0xba, 0x0b, 0x4e, 0x0e, 0x6d, 0xe6, 0x5b, 0x5d, 0x67, 0x7b, 0xef, 0xa2, 0xd3, 0xf9, 0x17,
-	0x10, 0xe3, 0xb2, 0x6b, 0xbe, 0x69, 0x63, 0xaf, 0x35, 0x47, 0xd8, 0x7e, 0x4a, 0x3f, 0x81, 0xd0,
-	0x1d, 0x7a, 0x0c, 0x4c, 0x2c, 0x8e, 0xa7, 0x37, 0x78, 0x0c, 0xe1, 0x0f, 0x62, 0xb1, 0x78, 0x32,
-	0x1d, 0xf0, 0x08, 0x86, 0x47, 0x3f, 0x3f, 0x5b, 0x4c, 0x83, 0xf4, 0xef, 0x00, 0x86, 0x27, 0xf9,
-	0xa6, 0xe1, 0xdf, 0xc0, 0xa4, 0x72, 0xe3, 0x62, 0xd8, 0xdb, 0x19, 0x9b, 0xcc, 0xdf, 0xeb, 0xf2,
-	0x4d, 0x4b, 0x76, 0x62, 0xe7, 0x87, 0xae, 0x62, 0x51, 0x6b, 0xdc, 0x89, 0xb8, 0xea, 0x6a, 0xfe,
-	0x1d, 0xec, 0x57, 0x76, 0x36, 0xbb, 0xb7, 0x0e, 0xac, 0xfd, 0x83, 0xcb, 0x76, 0x33, 0xaf, 0xee,
-	0xb5, 0x5d, 0xc0, 0xa4, 0xf2, 0x4f, 0x66, 0xdf, 0xc2, 0xc1, 0xe5, 0x7c, 0x3e, 0x05, 0xf6, 0x9b,
-	0xdc, 0xd9, 0x6b, 0x64, 0xc2, 0x7c, 0xe4, 0x87, 0x10, 0xfe, 0x9e, 0x97, 0x5b, 0x69, 0x57, 0x42,
-	0x2c, 0x5c, 0xf1, 0x30, 0xf8, 0x7a, 0x30, 0x7b, 0x02, 0xd3, 0xab, 0xf1, 0x17, 0xfd, 0x91, 0xf3,
-	0x7f, 0x7c, 0xd1, 0x7f, 0xfd, 0x52, 0x7c, 0x5e, 0xfa, 0x18, 0xf6, 0x4e, 0x9a, 0xf5, 0xf3, 0x42,
-	0xff, 0xfa, 0x4b, 0x2d, 0xd5, 0x39, 0x7f, 0x07, 0x42, 0x5d, 0x68, 0x7a, 0x31, 0x93, 0x16, 0xff,
-	0x78, 0x43, 0xb8, 0x92, 0x27, 0x34, 0x11, 0x79, 0x99, 0xe3, 0xce, 0x46, 0x32, 0x12, 0xda, 0xfa,
-	0x68, 0x0c, 0xe1, 0xb6, 0xa6, 0x95, 0x98, 0xde, 0x81, 0xa1, 0x90, 0x79, 0xe9, 0x0f, 0x3f, 0xb0,
-	0x7b, 0xc1, 0x15, 0x77, 0xa3, 0xe8, 0x6c, 0xfa, 0x17, 0xfd, 0x05, 0xe9, 0x2b, 0x18, 0x3f, 0x52,
-	0xe6, 0x1c, 0xaf, 0xf9, 0xfb, 0x10, 0x17, 0x55, 0xbe, 0x2e, 0x6a, 0x13, 0xec, 0xda, 0xfd, 0x03,
-	0x6f, 0x99, 0x1f, 0xc3, 0x01, 0x52, 0xf4, 0x52, 0xbe, 0xd6, 0xb2, 0x6e, 0xe8, 0xcb, 0xf8, 0x9e,
-	0x1f, 0x88, 0xbc, 0x4c, 0xfe, 0xb8, 0x3c, 0x51, 0x6d, 0xbc, 0xd8, 0x37, 0xa6, 0x45, 0xe7, 0x49,
-	0x25, 0xc0, 0x4f, 0xb5, 0x7a, 0x55, 0x3f, 0xdd, 0x6d, 0x64, 0xc3, 0x3f, 0x07, 0x46, 0xdb, 0xdc,
-	0x7e, 0xeb, 0x64, 0x7e, 0x2b, 0x73, 0x9b, 0x3c, 0xeb, 0x36, 0x79, 0x76, 0xdc, 0x6e, 0x7a, 0x61,
-	0xba, 0xe8, 0xb7, 0x16, 0xd0, 0x2c, 0x3a, 0x9a, 0xb3, 0x6b, 0xbd, 0x4f, 0xbb, 0xad, 0x2f, 0xa8,
-	0xeb, 0xe1, 0x6d, 0x18, 0xd6, 0x79, 0x25, 0xaf, 0x1c, 0xf1, 0x4f, 0x7b, 0x93, 0x56, 0xf9, 0x3f,
-	0x00, 0x00, 0xff, 0xff, 0x73, 0x4f, 0x6f, 0xec, 0x73, 0x06, 0x00, 0x00,
+	// 947 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x95, 0xd1, 0x72, 0xdb, 0x44,
+	0x14, 0x86, 0x6b, 0xad, 0x65, 0x49, 0xeb, 0x26, 0x98, 0x9d, 0x14, 0x54, 0x53, 0xa0, 0xe3, 0x81,
+	0x0e, 0x14, 0x50, 0x07, 0xb7, 0xd3, 0x61, 0x0a, 0x37, 0xa4, 0x31, 0xd0, 0x81, 0x94, 0x99, 0x4d,
+	0x43, 0x2f, 0x3d, 0x72, 0xa3, 0x18, 0x15, 0x49, 0xab, 0x39, 0x92, 0x49, 0x3d, 0x70, 0xc1, 0x43,
+	0xc0, 0x23, 0xc0, 0x23, 0xf0, 0x7c, 0x9c, 0xb3, 0x2b, 0x69, 0x9d, 0xb8, 0x26, 0x37, 0xf1, 0xea,
+	0xff, 0xcf, 0xaf, 0xd5, 0xb7, 0x47, 0x47, 0x5c, 0xd4, 0x49, 0x55, 0xcf, 0xd5, 0xe2, 0x65, 0xf2,
+	0xa2, 0xae, 0xa2, 0x12, 0x54, 0xad, 0xc4, 0xe0, 0x65, 0xa5, 0x8a, 0x72, 0x31, 0x7e, 0x6f, 0xa9,
+	0xd4, 0x32, 0x4b, 0xee, 0xe9, 0xab, 0x8b, 0xd5, 0xf9, 0xbd, 0xb3, 0x15, 0xc4, 0x75, 0xaa, 0x0a,
+	0xe3, 0x1b, 0xbf, 0x7f, 0x55, 0xaf, 0xd3, 0x1c, 0xd3, 0xe2, 0xbc, 0x6c, 0x0c, 0x5b, 0x01, 0x17,
+	0x10, 0x97, 0x65, 0x02, 0xcd, 0x8d, 0x26, 0x7f, 0x3b, 0x7c, 0x70, 0x92, 0xe6, 0x65, 0x96, 0x88,
+	0x1b, 0x7c, 0xa0, 0xe6, 0x0b, 0xa5, 0xb2, 0xb0, 0x77, 0xbb, 0xf7, 0x91, 0x2f, 0x5d, 0x75, 0x88,
+	0x0b, 0xf1, 0x36, 0xf7, 0xd4, 0x3c, 0x2d, 0xea, 0xfb, 0xd3, 0xd0, 0xc1, 0xeb, 0xae, 0x1c, 0xa8,
+	0x27, 0xb4, 0xea, 0x84, 0x87, 0x0f, 0x42, 0x86, 0x02, 0x33, 0xc2, 0xc3, 0x07, 0xe2, 0x26, 0xf7,
+	0xd5, 0x7c, 0x65, 0x4a, 0xfa, 0xa8, 0xec, 0x49, 0x4f, 0x9d, 0xea, 0xa5, 0x95, 0xb0, 0xc8, 0x45,
+	0xa9, 0xdf, 0x48, 0x6d, 0x55, 0x65, 0xaa, 0x06, 0x28, 0xbd, 0x89, 0xd2, 0xc9, 0x46, 0x55, 0x65,
+	0xaa, 0x3c, 0x94, 0x44, 0x23, 0x61, 0x95, 0xde, 0xc4, 0x79, 0xa6, 0xe2, 0x3a, 0xf4, 0x51, 0x71,
+	0x70, 0x13, 0xdf, 0xd0, 0xca, 0xd4, 0x9c, 0xa9, 0xd5, 0x22, 0x4b, 0xc2, 0x00, 0x95, 0x1e, 0xd6,
+	0x1c, 0xe9, 0x65, 0x13, 0x57, 0x43, 0x5a, 0x2c, 0x43, 0x8e, 0x52, 0x40, 0x71, 0x7a, 0x69, 0xe2,
+	0x16, 0x6b, 0x3c, 0x91, 0x70, 0x88, 0xca, 0x75, 0x8c, 0x3b, 0xa4, 0xd5, 0xe4, 0x1f, 0x87, 0x7b,
+	0x32, 0x29, 0x93, 0xb8, 0xae, 0x08, 0x14, 0xb4, 0xa0, 0x18, 0x81, 0x82, 0x16, 0x14, 0x74, 0xa0,
+	0x18, 0x81, 0x82, 0x0e, 0x14, 0x74, 0xa0, 0x18, 0x81, 0x82, 0x0e, 0x14, 0x58, 0x50, 0x8c, 0x40,
+	0x81, 0x05, 0x05, 0x16, 0x14, 0x23, 0x50, 0x60, 0x41, 0x81, 0x05, 0xc5, 0x08, 0x14, 0x9c, 0x6c,
+	0x54, 0x75, 0xa0, 0x18, 0x81, 0x02, 0x0b, 0x0a, 0x3a, 0x50, 0x8c, 0x40, 0x41, 0x07, 0x0a, 0x2c,
+	0x28, 0x46, 0xa0, 0xc0, 0x82, 0x02, 0x0b, 0x8a, 0x11, 0x28, 0xb0, 0xa0, 0xa0, 0x03, 0xc5, 0x08,
+	0x14, 0x18, 0x50, 0xff, 0x62, 0x43, 0x3d, 0x4f, 0xcf, 0x96, 0x49, 0x2d, 0xee, 0x72, 0xf7, 0x85,
+	0xca, 0x14, 0xe8, 0x7e, 0xda, 0x9f, 0x1e, 0x44, 0xa6, 0xa9, 0x23, 0x23, 0x47, 0x8f, 0x49, 0x93,
+	0xc6, 0x22, 0x3e, 0xa3, 0x3c, 0xe3, 0x26, 0x78, 0xbb, 0xdc, 0x03, 0xd0, 0xff, 0xc5, 0x1d, 0x3e,
+	0xa8, 0x74, 0xd7, 0xea, 0x03, 0x1c, 0x4e, 0xf7, 0x5b, 0xb7, 0xe9, 0x65, 0xd9, 0xa8, 0xe2, 0x63,
+	0x03, 0x44, 0x3b, 0x69, 0x9f, 0xdb, 0x4e, 0x02, 0xd4, 0x58, 0x3d, 0x30, 0x07, 0x1c, 0x1e, 0xe8,
+	0xcc, 0x37, 0x5a, 0x67, 0x73, 0xee, 0xb2, 0xd5, 0xc5, 0xa7, 0x3c, 0x80, 0x79, 0x6b, 0xbe, 0xa1,
+	0x63, 0xb7, 0xcc, 0x3e, 0x34, 0xbf, 0x26, 0x1f, 0x72, 0xd7, 0x6c, 0xda, 0xe3, 0x4c, 0xce, 0x8e,
+	0x46, 0xd7, 0x44, 0xc0, 0xdd, 0x6f, 0xe5, 0x6c, 0xf6, 0x74, 0xd4, 0x13, 0x3e, 0xef, 0x1f, 0xfe,
+	0x70, 0x3a, 0x1b, 0x39, 0x93, 0x3f, 0x1d, 0xde, 0x3f, 0x8e, 0xcb, 0x4a, 0x7c, 0xc9, 0x87, 0xb9,
+	0x69, 0x17, 0x62, 0xaf, 0x7b, 0x6c, 0x38, 0x7d, 0xa7, 0xcd, 0x27, 0x4b, 0x74, 0xac, 0xfb, 0x07,
+	0x8f, 0x62, 0x56, 0xd4, 0xb0, 0x96, 0x41, 0xde, 0xae, 0xc5, 0xd7, 0x7c, 0x2f, 0xd7, 0xbd, 0xd9,
+	0x3e, 0xb5, 0xa3, 0xcb, 0xdf, 0xbd, 0x5c, 0x4e, 0xfd, 0x6a, 0x1e, 0xdb, 0x04, 0x0c, 0x73, 0x7b,
+	0x65, 0xfc, 0x15, 0xdf, 0xbf, 0x9c, 0x2f, 0x46, 0x9c, 0xfd, 0x92, 0xac, 0xf5, 0x31, 0x32, 0x49,
+	0x3f, 0xc5, 0x01, 0x77, 0x7f, 0x8d, 0xb3, 0x55, 0xa2, 0x47, 0x42, 0x20, 0xcd, 0xe2, 0x91, 0xf3,
+	0x45, 0x6f, 0xfc, 0x94, 0x8f, 0xae, 0xc6, 0x6f, 0xd6, 0xfb, 0xa6, 0xfe, 0x83, 0xcd, 0xfa, 0xed,
+	0x43, 0xb1, 0x79, 0x93, 0x27, 0xfc, 0xfa, 0x71, 0xb5, 0x7c, 0x9e, 0xd6, 0x3f, 0xff, 0x58, 0x24,
+	0xea, 0x5c, 0xbc, 0xc5, 0xdd, 0x3a, 0xad, 0xf1, 0xc1, 0x28, 0x2d, 0xf8, 0xee, 0x9a, 0x34, 0x4b,
+	0x11, 0x62, 0x47, 0xc4, 0x59, 0x0c, 0x6b, 0x1d, 0xc9, 0x50, 0x68, 0xd6, 0x87, 0x1e, 0x77, 0x57,
+	0x05, 0x8e, 0xcc, 0xc9, 0x1d, 0xde, 0x97, 0x49, 0x9c, 0xd9, 0xcd, 0xf7, 0xf4, 0x5c, 0x30, 0x8b,
+	0xbb, 0xbe, 0x7f, 0x36, 0xfa, 0x03, 0xff, 0x9c, 0xc9, 0x05, 0xf7, 0x1e, 0x2b, 0xda, 0xc7, 0x2b,
+	0x71, 0x8b, 0x07, 0x69, 0x1e, 0x2f, 0xd3, 0x82, 0x82, 0x8d, 0xdd, 0x5e, 0xb0, 0x25, 0xd3, 0x23,
+	0xbe, 0x0f, 0x18, 0x3d, 0x4f, 0x5e, 0xd5, 0x49, 0x51, 0xe1, 0xcd, 0xc4, 0x75, 0xdb, 0x10, 0x71,
+	0x16, 0xfe, 0x76, 0xb9, 0xa3, 0x9a, 0x78, 0xb9, 0x47, 0x45, 0xb3, 0xb6, 0x66, 0xf2, 0x57, 0x9f,
+	0xf3, 0xef, 0x0b, 0x75, 0x51, 0x3c, 0x5b, 0x97, 0x49, 0x25, 0x3e, 0xe1, 0x0c, 0xc7, 0xbd, 0xbe,
+	0xed, 0x70, 0x7a, 0x33, 0x32, 0x93, 0x3c, 0x6a, 0x27, 0x79, 0x74, 0xd4, 0x7c, 0x0a, 0x24, 0xb9,
+	0xf0, 0x65, 0x73, 0xb0, 0x19, 0x0d, 0xce, 0xf1, 0x96, 0xf7, 0x59, 0xfb, 0x59, 0x90, 0xe8, 0x12,
+	0x11, 0x06, 0x2f, 0x32, 0x3d, 0xb5, 0x87, 0xd3, 0x5b, 0xdb, 0xc1, 0xfa, 0xed, 0xff, 0x89, 0xa8,
+	0x48, 0x32, 0xe2, 0xcb, 0xc9, 0xce, 0xb3, 0x5a, 0xcf, 0x72, 0xea, 0xc4, 0xab, 0x7e, 0x3d, 0x47,
+	0x1a, 0x3b, 0xfa, 0xc8, 0x9e, 0x36, 0xf3, 0xfd, 0x75, 0x76, 0xdd, 0x5b, 0x8d, 0x1d, 0x7d, 0xb4,
+	0x9b, 0x15, 0xda, 0x07, 0x3b, 0x76, 0x73, 0xba, 0xe9, 0x47, 0xa3, 0x8e, 0xc7, 0xd1, 0xe7, 0xed,
+	0x8e, 0xbf, 0x3f, 0x6d, 0xe3, 0x71, 0x26, 0x52, 0x3c, 0xda, 0xfd, 0xff, 0x89, 0xef, 0xfc, 0x2b,
+	0xed, 0xef, 0xeb, 0xd9, 0x1e, 0xec, 0x40, 0x49, 0xcd, 0x6d, 0xec, 0xda, 0x47, 0xf9, 0xf4, 0x9a,
+	0xf2, 0x1d, 0xf9, 0x66, 0x5e, 0x36, 0xf9, 0x68, 0x14, 0x9f, 0x73, 0xd7, 0x7e, 0x60, 0x5e, 0xf7,
+	0x00, 0x7a, 0x8e, 0x9a, 0x02, 0xe3, 0x7c, 0x74, 0x9b, 0xf7, 0x8b, 0x38, 0x4f, 0xae, 0xf4, 0xd4,
+	0xef, 0xfa, 0xd5, 0xd3, 0xca, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xac, 0xb6, 0x4e, 0x44,
+	0x08, 0x00, 0x00,
 }

jsonpb/jsonpb_test_proto/test_objects.proto

@@ -33,6 +33,7 @@ syntax = "proto2";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
+import "google/protobuf/wrappers.proto";
 
 package jsonpb;
 
@@ -115,4 +116,14 @@ message Complex {
 message KnownTypes {
   optional google.protobuf.Duration dur = 1;
   optional google.protobuf.Timestamp ts = 2;
+
+  optional google.protobuf.DoubleValue dbl = 3;
+  optional google.protobuf.FloatValue flt = 4;
+  optional google.protobuf.Int64Value i64 = 5;
+  optional google.protobuf.UInt64Value u64 = 6;
+  optional google.protobuf.Int32Value i32 = 7;
+  optional google.protobuf.UInt32Value u32 = 8;
+  optional google.protobuf.BoolValue bool = 9;
+  optional google.protobuf.StringValue str = 10;
+  optional google.protobuf.BytesValue bytes = 11;
 }