aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/core
Commit message (Collapse)AuthorAge
...
| * Update AbstractMessage.javaGravatar goorov2017-01-13
| | | | | | Apply review's comments.
| * Update AbstractMessage.javaGravatar goorov2017-01-12
|/ | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
* Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toGravatar Michael Stack2016-12-01
| | | | | | | | | | | | | 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-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| |
| * #2356 : fix ExceptionInInitializerError on IBM J9Gravatar Time2016-11-11
| |
| * Use latest maven-compiler-plugin (2.6.0)Gravatar Christopher Tubbs2016-11-04
| | | | | | | | | | | | * 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 GAEGravatar nmittler2016-10-20
|/ | | | Fixes #2269
* Update version number.Gravatar Feng Xiao2016-10-10
| | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
* Fix java compatibilty tests.Gravatar Feng Xiao2016-10-10
| | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
* Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
| | | Since Java 7, Strings produced with String.substring do not share byte arrays.
* Bump version number to 3.0.2Gravatar Jisi Liu2016-09-02
|
* Bump version number for GAGravatar Jisi Liu2016-07-25
|
* Versioning Java GeneratedMessage.Gravatar Feng Xiao2016-07-19
| | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* Include javadoc/source in Java release packages.Gravatar Feng Xiao2016-07-18
| | | | | | Also fixed javadoc errors. [ci skip]
* Remove Java deterministic API.Gravatar Feng Xiao2016-07-18
| | | | Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c
* Fix compatiblity issues.Gravatar Feng Xiao2016-07-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Update version number to 3.0.0-beta-4Gravatar Feng Xiao2016-07-13
|
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Update version numbers for other languagesGravatar Jisi Liu2016-05-10
|
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
|\
* | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| |
| * Added serialVersionUID to ExtendableMessage.Gravatar Jakub Kukul2016-04-22
|/
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Remove redundant `the` in comments.Gravatar Dongjoon Hyun2016-02-03
|
* Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
|
* Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29
|
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Undo the Java module change for integration.Gravatar Jisi Liu2016-01-28
| | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.
* move test file (was in wrong place after rebasing on java module refactor)Gravatar Joshua Humphries2016-01-15
|
* throw IOException instead of InvalidProtocolBufferException when appropriateGravatar Joshua Humphries2016-01-15
|
* 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.