aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Update AbstractMessage.javagoorov2017-01-131-1/+1
| | | Apply review's comments.
* Update AbstractMessage.javagoorov2017-01-121-1/+4
| | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-082-6/+30
|\ | | | | oneOf fix for JsonFormat includingDefaultValueFields
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-052-6/+30
| |
* | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toMichael Stack2016-12-012-5/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | Integer.MAX_SIZE (0x7FFFFFF) #2228 M java/core/src/main/java/com/google/protobuf/CodedInputStream.java Set DEFAULT_SIZE_LIMIT to Integer.MAX_SIZE (Was 64MB). This is how it was in pre-2.7.0 pb. Changed size check to an overflow-conscious test (as it is later in tryRefillBuffer (making sizeLimit a long was to disruptive). M java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java Add two tests that echo tests recently added over in c++ to test parse of message sizes that are approach and are beyond the size limit.
* | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-177-20/+123
|\|
| * #2356 : fix ExceptionInInitializerError on IBM J9Time2016-11-111-1/+1
| |
| * Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-045-14/+77
| | | | | | | | | | | | * Uses build-helper-maven-plugin to add generated sources to the classpath * Fixes an issue building with newer versions of the maven-compiler-plugin (See https://issues.apache.org/jira/browse/MCOMPILER-240)
| * Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
| | | | | | | | Fixes #2269
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1726-250/+513
|/
* Update version number.Bo Yang2016-10-101-1/+1
|
* Update version number.Feng Xiao2016-10-103-3/+3
| | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
* Fix java compatibilty tests.Feng Xiao2016-10-101-350/+1
| | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
* Fix bugs for internal integration.Bo Yang2016-10-106-1583/+0
|
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-104-4/+4
|
* Integrate internal changesBo Yang2016-10-1072-1703/+6458
|
* Fix gson dependency.Bo Yang2016-09-211-1/+1
| | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
* Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
| | | Since Java 7, Strings produced with String.substring do not share byte arrays.
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-143-3/+3
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-023-3/+3
| |
| * Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-311-5/+5
| | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
* | Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
| | | | | | | | The default behaviour of throwing an exception remains
* | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-011-5/+5
|/ | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
* Bump version number for GAJisi Liu2016-07-254-4/+4
|
* Update compatibility tests as well.Feng Xiao2016-07-193-347/+8
| | | | Change-Id: I991396ac6e51e32f3ab1daa501d625f34c3ecb04
* Versioning Java GeneratedMessage.Feng Xiao2016-07-194-347/+2718
| | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* Include javadoc/source in Java release packages.Feng Xiao2016-07-186-16/+42
| | | | | | Also fixed javadoc errors. [ci skip]
* Remove Java deterministic API.Feng Xiao2016-07-181-1/+1
| | | | Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c
* Fix compatiblity issues.Feng Xiao2016-07-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some public API methods are defined in GenreatedMessage.java and they have a generric return type: class GeneratedMessage { class Builder<BuilderType extends Builder<BuilderType>> { public BuilderType setField(...); public BuilderType setExtension(...); } } With these definitions, the compiled byte code of a callsite will have a direct reference to GeneratedMessage. For example: fooBuilder.setField(...); becomes: ##: invokevirtual // Method Builder.setField:(...)LGeneratedMessage.Builder ##: checkcast // class Builder This will prevent us from updating generated classes to subclass a different versioned GeneratedMessageV3 class in the future (we can't do it in a binary compatible way). This change addresses the problem by overriding these methods directly in the generated class: class Foo { class Builder extends GeneratedMessage.Builder<Builder> { public Builder setField(...) { return super.setField(...); } } } After this, fooBuilder.setField(...) will be compiled to: ##: invokevirtual // Method Builder.setField:(...)LFoo.Builder The callsites will no longer reference GeneratedMessage directly and we can change Foo to subclass GeneratedMessageV3 without breaking binary compatiblity. The downside of this change is: 1. It increases generated code size (though it saves some instructions on the callsites). 2. We can never stop generating these overrides because doing that will break binary compatibility. Change-Id: I879afbbc1325a66324a51565e017143489b06e97
* Merge pull request #1781 from xfxyjwf/update_versionFeng Xiao2016-07-144-4/+4
|\ | | | | Update version number to 3.0.0-beta-4
| * Update version number to 3.0.0-beta-4Feng Xiao2016-07-134-4/+4
| |
* | Exclude Java lite module from parent pom.xmlFeng Xiao2016-07-131-1/+1
|/
* Integrate from internal code base.Feng Xiao2016-07-136-18/+143
|
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-036-29/+29
|
* added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
|
* Integrated internal changes from GoogleAdam Cozzette2016-06-2958-3184/+7118
| | | | This includes all internal changes from around May 20 to now.
* Describe platform requirements for the compatibility tests.Feng Xiao2016-05-201-0/+4
|
* Add compatiblity tests against v2.5.0Feng Xiao2016-05-1778-0/+19517
|
* Merge pull request #1542 from google/beta-3Jisi Liu2016-05-164-4/+4
|\ | | | | Merge Beta 3 release branch into master
| * Update version numbers for other languagesJisi Liu2016-05-103-3/+3
| |
| * Update version numbers for beta3Jisi Liu2016-05-101-1/+1
| |
* | Add compatibility notice for Java.Feng Xiao2016-05-111-30/+55
|/
* Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
|
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
| |
* | Down integrate from Google internal.Jisi Liu2016-04-2872-2094/+7518
|/
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-4/+3
|\
| * Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
| | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* | Integrate google internal changes.Jisi Liu2016-03-3067-1981/+5575
|/
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-032-2/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 18:21:28 +0000