40 Commits (d52f2bb9e45f6f92743ef632add29f6b15832d3b)

Author SHA1 Message Date
Josh Haberman d61aede89c Down-integrate from google3. 6 years ago
Feng Xiao 6bbe197e9c Down-integrate from google3. 6 years ago
Aleksej Kazmin 5ddc6874e4
Fix typo in FieldMaskTree.java warning 6 years ago
vijay-bhatt 0f56f27ffc Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4825) 6 years ago
kenji yoshida 1c3b20b122
fix typo in FieldMaskTree.java comment 7 years ago
Adam Cozzette 92a7e778e7 Integrated internal changes from Google 7 years ago
Jisi Liu 1a7a7fca80 Merge from google internal 7 years ago
Adam Cozzette 13fd045dbb Integrated internal changes from Google 7 years ago
Jisi Liu 9b8f6589f2 Remove dependency on guava 20 7 years ago
Jisi Liu 09354db143 Merge from Google internal for 3.4 release 7 years ago
Anuraag Agrawal bf483dfb99 Allow unknown values for Map put*Value methods just like every other enum mutation method. 8 years ago
Anuraag Agrawal 09328db1ff Fix test for unexpected type url when parsing Any. Currently, the test fails since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields. 8 years ago
Anuraag Agrawal 662f97841e Fix duplicate fields test. The repeated version is passing because null 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). 8 years ago
Anuraag Agrawal 58373fa160 Fix error message for int64 parse error. 8 years ago
Feng Xiao 84f6954ca9 Fix Java build. 8 years ago
Feng Xiao d36c0c538a Down-integrate from google3. 8 years ago
prehistoric-penguin 33cc25f36c Remove duplicated copyright statement 8 years ago
Feng Xiao 075475f834 Don't expose gson exceptions in JsonFormat. 8 years ago
Feng Xiao 4ae8656b6d Make JsonFormat locale independent. 8 years ago
Caleb Welton 1a56251a35 oneOf fix for JsonFormat includingDefaultValueFields 8 years ago
Adam Cozzette 5a76e633ea Integrated internal changes from Google 8 years ago
Bo Yang cc8ca5b6a5 Integrate internal changes 8 years ago
Bo Yang 98835fb8f8 Integrate internal changes 8 years ago
Dave Protasowski 1fc416be21 Allow the JsonFormat.Parser to ignore unknown fields 8 years ago
Feng Xiao 9086d96439 Integrate from internal code base. 8 years ago
chezRong 454dbf16fc added minified JSON formatting functionality with test 9 years ago
Adam Cozzette d64a2d9941 Integrated internal changes from Google 9 years ago
Jisi Liu cf14183bcd Down integrate from Google internal. 9 years ago
Jisi Liu 3b3c8abb96 Integrate google internal changes. 9 years ago
Pradeep Gollakota 4d98369f6d Allow custom URLs for Any in JsonFormat 9 years ago
Jisi Liu 5221dcbe47 Integrate from google internal. 9 years ago
Jisi Liu cb3f428810 Undo the Java module change for integration. 9 years ago
nmittler 49efe9d7db Restructuring protobuf to multiple modules 9 years ago
Feng Xiao 7d075a44c1 Update version number and fix javadoc errors. 9 years ago
Feng Xiao 13e1279d86 Remove internal options from proto files. 9 years ago
Feng Xiao e841bac4fc Down-integrate from internal code base. 9 years ago
Feng Xiao fbb3ef28c9 Merge Java util package to github. 9 years ago