Support more types in JSONPb marshaler

Author: yugui

examples/integration_test.go

@@ -238,6 +238,22 @@ func testABECreateBody(t *testing.T) {
 				Amount: 20,
 			},
 		},
+		RepeatedStringValue: []string{"a", "b", "c"},
+		OneofValue: &gw.ABitOfEverything_OneofString{
+			OneofString: "x",
+		},
+		MapValue: map[string]gw.NumericEnum{
+			"a": gw.NumericEnum_ONE,
+			"b": gw.NumericEnum_ZERO,
+		},
+		MappedStringValue: map[string]string{
+			"a": "x",
+			"b": "y",
+		},
+		MappedNestedValue: map[string]*gw.ABitOfEverything_Nested{
+			"a": {Name: "x", Amount: 1},
+			"b": {Name: "y", Amount: 2},
+		},
 	}
 	url := "http://localhost:8080/v1/example/a_bit_of_everything"
 	var m jsonpb.Marshaler

runtime/marshal_jsonpb.go

@@ -144,6 +144,9 @@ func decodeNonProtoField(d *json.Decoder, v interface{}) error {
 		if rv.IsNil() {
 			rv.Set(reflect.New(rv.Type().Elem()))
 		}
+		if rv.Type().ConvertibleTo(typeProtoMessage) {
+			return jsonpb.UnmarshalNext(d, rv.Interface().(proto.Message))
+		}
 		rv = rv.Elem()
 	}
 	if rv.Kind() == reflect.Map {
@@ -196,3 +199,5 @@ type protoEnum interface {
 	fmt.Stringer
 	EnumDescriptor() ([]byte, []int)
 }
+
+var typeProtoMessage = reflect.TypeOf((*proto.Message)(nil)).Elem()