aboutsummaryrefslogtreecommitdiff
path: root/java/core
Commit message (Collapse)AuthorAgeFilesLines
* Hacking ByteBufferWriter to work with GAEnmittler2016-10-201-5/+45
| | | | Fixes #2269
* Update version number.Feng Xiao2016-10-101-1/+1
| | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
* Fix java compatibilty tests.Feng Xiao2016-10-101-350/+1
| | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
|
* Integrate internal changesBo Yang2016-10-1060-1544/+4512
|
* Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
| | | Since Java 7, Strings produced with String.substring do not share byte arrays.
* Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
|
* Bump version number for GAJisi Liu2016-07-251-1/+1
|
* Versioning Java GeneratedMessage.Feng Xiao2016-07-194-347/+2718
| | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* Include javadoc/source in Java release packages.Feng Xiao2016-07-185-16/+16
| | | | | | 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
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
|
* Integrate from internal code base.Feng Xiao2016-07-134-1/+98
|
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-033-21/+21
|
* Integrated internal changes from GoogleAdam Cozzette2016-06-2948-2035/+5516
| | | | This includes all internal changes from around May 20 to now.
* Update version numbers for other languagesJisi Liu2016-05-101-1/+1
|
* 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-2858-2081/+5886
|/
* Integrate google internal changes.Jisi Liu2016-03-3061-1778/+5280
|
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-032-2/+2
|
* Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
|
* Uncomment the test, which was commented out during integrationJisi Liu2016-01-291-185/+184
|
* Integrate from google internal.Jisi Liu2016-01-29139-0/+55893
| | | | | 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.Jisi Liu2016-01-28140-55972/+0
| | | | | | | | | 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)Joshua Humphries2016-01-151-0/+211
|
* throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-153-4/+80
|
* Restructuring protobuf to multiple modulesnmittler2016-01-13142-0/+55866
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.