aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/json_util.cc
Commit message (Collapse)AuthorAge
* Merge pull request #4608 from khuzemap/masterGravatar Feng Xiao2018-06-25
|\ | | | | Add "override" keyword for overridden virtual functions
* | Additional whitespace.Gravatar Harvey Tuch2018-06-21
| | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
* | json: include field name in InvalidName status messages.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | | | | | This is invaluable for chasing down the culprit in failed JSON -> proto conversions. We often see in Envoy that a failed JSON (or indirectly via YAML) configuration won't load but it's unclear why. Signed-off-by: Harvey Tuch <htuch@google.com>
| * Add "override" for overridden virtual functionsGravatar Khuzema Pithewan2018-06-19
|/ | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* Merge branch 'master' into fixbug_enum2json2Gravatar stone47742018-03-22
|\
* | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵Gravatar stone47742018-03-19
| | | | | | | | print the default value of enums as strings
| * Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
|/
* formatting issuesGravatar Ubuntu2017-12-20
|
* resolve issue 4032 and added a unit testGravatar Ubuntu2017-12-19
|
* Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
| | | | See https://github.com/google/protobuf/issues/3752 for context.
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Add option to preserve original proto field namesGravatar Brendan McCarthy2017-03-17
|
* Add use_snake_case_for_field_names option to JsonPrintOptionsGravatar Brendan McCarthy2017-03-17
|
* Merge pull request #2355 from xfxyjwf/fixjsonGravatar Feng Xiao2017-02-24
|\ | | | | Speed up JSON parsing.
* | Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
| | | | | | | | https://github.com/google/protobuf/issues/2735
| * Speed up JSON parsing.Gravatar Feng Xiao2016-11-10
|/ | | | | | | | | | | It turns out calling StringOutputStream::Next()/BackUp() repeatedly is very costly in opensource protobuf because it keeps resize() the string back and forth. The current JSON conversion API suffers this problem and leads to ridiculously long parsing time: https://github.com/google/protobuf/issues/2305#issuecomment-257785492 This change fixes the problem but caching the buffer of Next() and avoid calling BackUp() as much as possible.
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* Add JsonParseOptions to ignore unknown fieldsGravatar Lizan Zhou2016-06-28
| | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-06-15
[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d