aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Collapse)AuthorAge
...
| * | Suppress the last unchecked warning.Gravatar Jisi Liu2017-03-10
| | | | | | | | | | | | | | | | | | Likely to be java language issue. Varargs are considered arrays, thus using generic with varargs will cause unchecked warning about generic array creation.
* | | Merge pull request #2832 from pherl/javaepGravatar Jisi Liu2017-03-10
|\| | | | | | | | Fix java code according to error prone.
* | | Merge pull request #2818 from xfxyjwf/i1470Gravatar Feng Xiao2017-03-10
|\ \ \ | | | | | | | | Don't expose gson exceptions in JsonFormat.
* \ \ \ Merge pull request #2827 from xfxyjwf/i1251Gravatar Feng Xiao2017-03-10
|\ \ \ \ | | | | | | | | | | Update comments for setSizeLimit.
| | | * | Fix java code according to error prone.Gravatar Jisi Liu2017-03-10
| |_|/ / |/| | |
| * | | Update comments for setSizeLimit.Gravatar Feng Xiao2017-03-09
| | | |
* | | | Merge pull request #2825 from pherl/javawarningGravatar Jisi Liu2017-03-09
|\ \ \ \ | | | | | | | | | | Cherry-pick changes from javalite branch to also fix Java warnings in the master branch
| * | | | Fix GeneratedMessageV3 warnings.Gravatar Jisi Liu2017-03-09
| | | | |
| * | | | Fix lint warnings in the javalite branch.Gravatar Jisi Liu2017-03-09
| |/ / /
| | * / Don't expose gson exceptions in JsonFormat.Gravatar Feng Xiao2017-03-09
| |/ /
| | * Mark sun.misc dependency as optionalGravatar Vasiliy Kudryavtsev2017-03-09
| |/
* / Make JsonFormat locale independent.Gravatar Feng Xiao2017-03-08
|/
* Merge pull request #2602 from GreatFruitOmsk/issue-2428Gravatar Feng Xiao2017-03-08
|\ | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
* | Prefer the term "3-Clause BSD License" over "New BSD License"Gravatar Sebastian Schuberth2017-02-28
| | | | | | | | The first is the newer name, which is also more telling.
* | Fix links to the New BSD License in meta-dataGravatar Sebastian Schuberth2017-02-28
| | | | | | | | | | The "New BSD License" is the "3-Clause BSD License", but the links were pointing to the "2-Clause BSD License".
* | Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
| * 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.
* 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
|