aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Collapse)AuthorAge
* 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
| |
* | 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 Bo Yang2016-10-10
|
* 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
* Fix bugs for internal integration.Gravatar Bo Yang2016-10-10
|
* Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Fix gson dependency.Gravatar Bo Yang2016-09-21
| | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
* Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
| | | Since Java 7, Strings produced with String.substring do not share byte arrays.
* Merge remote-tracking branch 'origin/3.0.x' into mergeGravatar Jisi Liu2016-09-14
|\
* | Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| | | | | | | | The default behaviour of throwing an exception remains
| * Bump version number to 3.0.2Gravatar Jisi Liu2016-09-02
| |
| * Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-08-31
| | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
* | Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-08-01
|/ | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
* Bump version number for GAGravatar Jisi Liu2016-07-25
|
* Update compatibility tests as well.Gravatar Feng Xiao2016-07-19
| | | | Change-Id: I991396ac6e51e32f3ab1daa501d625f34c3ecb04
* 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
* Merge pull request #1781 from xfxyjwf/update_versionGravatar Feng Xiao2016-07-14
|\ | | | | Update version number to 3.0.0-beta-4
* | Exclude Java lite module from parent pom.xmlGravatar Feng Xiao2016-07-13
| |
| * 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
|
* 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.
* Describe platform requirements for the compatibility tests.Gravatar Feng Xiao2016-05-20
|
* Add compatiblity tests against v2.5.0Gravatar Feng Xiao2016-05-17
|
* Merge pull request #1542 from google/beta-3Gravatar Jisi Liu2016-05-16
|\ | | | | Merge Beta 3 release branch into master
* | Add compatibility notice for Java.Gravatar Feng Xiao2016-05-11
| |
| * Update version numbers for other languagesGravatar Jisi Liu2016-05-10
| |
| * Update version numbers for beta3Gravatar Jisi Liu2016-05-10
|/
* Remove accidentally restored deleted files.Gravatar Jisi Liu2016-05-06
|
* 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
|/
* 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
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-04 17:43:25 +0000