aboutsummaryrefslogtreecommitdiff
path: root/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-27/+21
* Merge master branch.Feng Xiao2018-08-081-1/+50
|\
| * Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4...vijay-bhatt2018-07-301-2/+50
* | Down-integrate from google3.Feng Xiao2018-08-081-5/+8
|/
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-0/+15
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-2/+2
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-271-11/+126
|\
| * Fix Java build.Feng Xiao2017-03-291-1/+1
| * Down-integrate from google3.Feng Xiao2017-03-291-11/+126
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-071-3/+1
* | Fix test for unexpected type url when parsing Any. Currently, the test fails ...Anuraag Agrawal2017-04-051-1/+1
* | Fix duplicate fields test. The repeated version is passing because null value...Anuraag Agrawal2017-04-041-4/+14
|/
* Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-101-0/+34
|\
| * Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-091-0/+34
* | Make JsonFormat locale independent.Feng Xiao2017-03-081-0/+6
|/
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-081-0/+17
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-051-0/+17
* | Integrated internal changes from GoogleAdam Cozzette2016-11-171-1/+37
|/
* Integrate internal changesBo Yang2016-10-101-5/+105
* Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-081-0/+16
* Integrate from internal code base.Feng Xiao2016-07-131-2/+20
* added minified JSON formatting functionality with testchezRong2016-07-011-0/+58
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-369/+364
* Integrate google internal changes.Jisi Liu2016-03-301-111/+129
* Down-integrate from internal code base.Feng Xiao2015-12-111-105/+285
* Merge Java util package to github.Feng Xiao2015-08-251-0/+976