Merge pull request #208 from sriniven/jsonunmarshal

Allowing unknown fields to be dropped instead of returning error from…
grpc-ecosystem · Aug 8, 2016 · ccd4e6b · ccd4e6b
2 parents c8ec92d + 22f58cf
commit ccd4e6b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/runtime/marshal_jsonpb.go b/runtime/marshal_jsonpb.go
@@ -111,7 +111,8 @@ func decodeJSONPb(d *json.Decoder, v interface{}) error {
 	if !ok {
 		return decodeNonProtoField(d, v)
 	}
-	return jsonpb.UnmarshalNext(d, p)
+	unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: true}
+	return unmarshaler.UnmarshalNext(d, p)
 }
 
 func decodeNonProtoField(d *json.Decoder, v interface{}) error {
@@ -124,7 +125,8 @@ func decodeNonProtoField(d *json.Decoder, v interface{}) error {
 			rv.Set(reflect.New(rv.Type().Elem()))
 		}
 		if rv.Type().ConvertibleTo(typeProtoMessage) {
-			return jsonpb.UnmarshalNext(d, rv.Interface().(proto.Message))
+			unmarshaler := &jsonpb.Unmarshaler{AllowUnknownFields: true}
+			return unmarshaler.UnmarshalNext(d, rv.Interface().(proto.Message))
 		}
 		rv = rv.Elem()
 	}