aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/core/src/main/java
Commit message (Collapse)AuthorAge
* Remove unsafe no-copy String allocation since it's not useful in recent Java ↵Gravatar Anuraag Agrawal2018-05-11
| | | | versions.
* Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
|
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| |
| * Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Gravatar Anuraag Agrawal2017-11-29
|/
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|\
* | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongGravatar alanbur2017-08-08
| |
| * Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|/
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Merge pull request #2827 from xfxyjwf/i1251Gravatar Feng Xiao2017-03-10
|\ | | | | Update comments for setSizeLimit.
| * Update comments for setSizeLimit.Gravatar Feng Xiao2017-03-09
| |
* | Fix GeneratedMessageV3 warnings.Gravatar Jisi Liu2017-03-09
| |
* | Fix lint warnings in the javalite branch.Gravatar Jisi Liu2017-03-09
|/
* 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.
* | 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.
* 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
| |
| * Hacking ByteBufferWriter to work with GAEGravatar nmittler2016-10-20
|/ | | | Fixes #2269
* Fix java compatibilty tests.Gravatar Feng Xiao2016-10-10
| | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61
* 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.
* 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
* 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.
* 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
|
* 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.
* 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.