diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2017-03-17 15:05:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 15:05:58 -0700 |
| commit | 15b60bccf8992f7ff0897705e43aa8ab8889cd02 (patch) | |
| tree | 811272aec7bfe0b81f6f2daaedfdc87eeb5b98c2 /src/google/protobuf/util/json_util.cc | |
| parent | c12cc3490bb5dc4bb686a597e10e8025b1617dac (diff) | |
| parent | 89eb4e51b24f7417224b47faf32503d11b6b1bc0 (diff) | |
| download | protobuf-15b60bccf8992f7ff0897705e43aa8ab8889cd02.tar.gz protobuf-15b60bccf8992f7ff0897705e43aa8ab8889cd02.tar.bz2 protobuf-15b60bccf8992f7ff0897705e43aa8ab8889cd02.zip | |
Merge pull request #2867 from mojoBrendan/master
Add preserve_proto_field_names option to JsonPrintOptions
Diffstat (limited to 'src/google/protobuf/util/json_util.cc')
| -rw-r--r-- | src/google/protobuf/util/json_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc index 129b6eaf..8595a881 100644 --- a/src/google/protobuf/util/json_util.cc +++ b/src/google/protobuf/util/json_util.cc @@ -83,12 +83,16 @@ util::Status BinaryToJsonStream(TypeResolver* resolver, RETURN_IF_ERROR(resolver->ResolveMessageType(type_url, &type)); converter::ProtoStreamObjectSource proto_source(&in_stream, resolver, type); proto_source.set_use_ints_for_enums(options.always_print_enums_as_ints); + proto_source.set_preserve_proto_field_names( + options.preserve_proto_field_names); io::CodedOutputStream out_stream(json_output); converter::JsonObjectWriter json_writer(options.add_whitespace ? " " : "", &out_stream); if (options.always_print_primitive_fields) { converter::DefaultValueObjectWriter default_value_writer( resolver, type, &json_writer); + default_value_writer.set_preserve_proto_field_names( + options.preserve_proto_field_names); return proto_source.WriteTo(&default_value_writer); } else { return proto_source.WriteTo(&json_writer); |