aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/util/src
Commit message (Collapse)AuthorAge
* fix typo in FieldMaskTree.java commentGravatar kenji yoshida2018-01-22
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
|
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Remove dependency on guava 20Gravatar Jisi Liu2017-07-25
|
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* | Allow unknown values for Map put*Value methods just like every other enum ↵Gravatar Anuraag Agrawal2017-04-07
| | | | | | | | mutation method.
* | Merge pull request #2937 from anuraaga/dev_rag2Gravatar Adam Cozzette2017-04-06
|\ \ | | | | | | Fix duplicate fields test and Any test. The repeated version is passing because nu…
| * | Fix test for unexpected type url when parsing Any. Currently, the test fails ↵Gravatar Anuraag Agrawal2017-04-05
| | | | | | | | | | | | since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields.
| * | Fix duplicate fields test. The repeated version is passing because null ↵Gravatar Anuraag Agrawal2017-04-04
| | | | | | | | | | | | | | | | | | values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). Also fix spelling of a test.
* | | Fix error message for int64 parse error.Gravatar Anuraag Agrawal2017-04-03
|/ /
| * Fix Java build.Gravatar Feng Xiao2017-03-29
| |
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
|
* Merge pull request #2818 from xfxyjwf/i1470Gravatar Feng Xiao2017-03-10
|\ | | | | Don't expose gson exceptions in JsonFormat.
| * Don't expose gson exceptions in JsonFormat.Gravatar Feng Xiao2017-03-09
| |
* | Make JsonFormat locale independent.Gravatar Feng Xiao2017-03-08
|/
* Merge pull request #2394 from cwelton/formattingGravatar Feng Xiao2016-12-08
|\ | | | | oneOf fix for JsonFormat includingDefaultValueFields
| * oneOf fix for JsonFormat includingDefaultValueFieldsGravatar Caleb Welton2016-12-05
| |
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
|/
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| | | | The default behaviour of throwing an exception remains
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* added minified JSON formatting functionality with testGravatar chezRong2016-07-01
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
|
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
|\
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30
| |
| * Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/ | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* Restructuring protobuf to multiple modulesGravatar nmittler2016-01-13
| | | | | | | | | protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings.
* Update version number and fix javadoc errors.Gravatar Feng Xiao2016-01-06
|
* Remove internal options from proto files.Gravatar Feng Xiao2015-12-14
| | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|
* Merge Java util package to github.Gravatar Feng Xiao2015-08-25