diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-09-02 20:33:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-02 20:33:12 -0700 |
commit | 37b5617d42d02d225faa1d64565696f5bfb8e61a (patch) | |
tree | 4b96647ab654f80b749a6add9522966e5c9b1c07 | |
parent | d340bdf50821e6db173a9e41bc7bde740275ba33 (diff) | |
parent | 52870ad8fdd96ce27dc371a03552844af4f9a147 (diff) | |
download | protobuf-37b5617d42d02d225faa1d64565696f5bfb8e61a.tar.gz protobuf-37b5617d42d02d225faa1d64565696f5bfb8e61a.tar.bz2 protobuf-37b5617d42d02d225faa1d64565696f5bfb8e61a.zip |
Merge pull request #5099 from oqton/feature/issue-5806
Fixes JSON Loading of Any messages with Unknown Fields in C++
3 files changed, 41 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.cc b/src/google/protobuf/util/internal/protostream_objectwriter.cc index 3d06e12d..3751e07c 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc @@ -75,6 +75,18 @@ ProtoStreamObjectWriter::ProtoStreamObjectWriter( ProtoStreamObjectWriter::ProtoStreamObjectWriter( const TypeInfo* typeinfo, const google::protobuf::Type& type, + strings::ByteSink* output, ErrorListener* listener, + const ProtoStreamObjectWriter::Options& options) + : ProtoWriter(typeinfo, type, output, listener), + master_type_(type), + current_(nullptr), + options_(options) { + set_ignore_unknown_fields(options_.ignore_unknown_fields); + set_use_lower_camel_for_enums(options.use_lower_camel_for_enums); +} + +ProtoStreamObjectWriter::ProtoStreamObjectWriter( + const TypeInfo* typeinfo, const google::protobuf::Type& type, strings::ByteSink* output, ErrorListener* listener) : ProtoWriter(typeinfo, type, output, listener), master_type_(type), @@ -342,7 +354,7 @@ void ProtoStreamObjectWriter::AnyWriter::StartAny(const DataPiece& value) { // Create our object writer and initialize it with the first StartObject // call. ow_.reset(new ProtoStreamObjectWriter(parent_->typeinfo(), *type, &output_, - parent_->listener())); + parent_->listener(), parent_->options_)); // Don't call StartObject() for well-known types yet. Depending on the // type of actual data, we may not need to call StartObject(). For diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.h b/src/google/protobuf/util/internal/protostream_objectwriter.h index 714c5561..df56a8bd 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.h +++ b/src/google/protobuf/util/internal/protostream_objectwriter.h @@ -323,6 +323,11 @@ class LIBPROTOBUF_EXPORT ProtoStreamObjectWriter : public ProtoWriter { const google::protobuf::Type& type, strings::ByteSink* output, ErrorListener* listener); + ProtoStreamObjectWriter(const TypeInfo* typeinfo, + const google::protobuf::Type& type, + strings::ByteSink* output, ErrorListener* listener, + const ProtoStreamObjectWriter::Options& options); + // Returns true if the field is a map. inline bool IsMap(const google::protobuf::Field& field); diff --git a/src/google/protobuf/util/json_util_test.cc b/src/google/protobuf/util/json_util_test.cc index cbfc7ada..125d4d4a 100644 --- a/src/google/protobuf/util/json_util_test.cc +++ b/src/google/protobuf/util/json_util_test.cc @@ -56,6 +56,7 @@ using proto3::TestEnumValue; using proto3::TestMap; using proto3::TestMessage; using proto3::TestOneof; +using proto3::TestAny; static const char kTypeUrlPrefix[] = "type.googleapis.com"; @@ -357,6 +358,28 @@ TEST_F(JsonUtilTest, TestDynamicMessage) { EXPECT_EQ(ToJson(generated, options), ToJson(*message, options)); } +TEST_F(JsonUtilTest, TestParsingUnknownAnyFields) { + string input = + "{\n" + " \"value\": {\n" + " \"@type\": \"type.googleapis.com/proto3.TestMessage\",\n" + " \"unknown_field\": \"UNKOWN_VALUE\",\n" + " \"string_value\": \"expected_value\"\n" + " }\n" + "}"; + + TestAny m; + JsonParseOptions options; + EXPECT_FALSE(FromJson(input, &m, options)); + + options.ignore_unknown_fields = true; + EXPECT_TRUE(FromJson(input, &m, options)); + + TestMessage t; + EXPECT_TRUE(m.value().UnpackTo(&t)); + EXPECT_EQ("expected_value", t.string_value()); +} + TEST_F(JsonUtilTest, TestParsingUnknownEnumsProto2) { string input = "{\n" |