aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/java
Commit message (Collapse)AuthorAge
* Merge pull request #2121 from mazurkin/issue-2108Gravatar Feng Xiao2018-06-18
|\ | | | | issue-2108 [protoc/Java] Excessive copying on buildPartial()
* \ Merge pull request #4504 from xfxyjwf/liteGravatar Feng Xiao2018-04-18
|\ \ | | | | | | Cleanup + documentation for Java Lite runtime.
* | | Fixed a Visual Studio 2017 build error. (#4488)Gravatar Ronny Krüger2018-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current 15.6.x versions of Visual Studio 2017 contain a bug that prevent them from compiling the following construct under certain conditions: std::unique_ptr<std::unique_ptr<Foo> []> foos; This will fail to compile if Foo is an abstract class. To work-around the problem the whole construct was change into: std::vector<std::unique_ptr<Foo>> foos; This not only fixes the compiler error but is also more readable than previous version.
| * | Cleanup + documentation for Java Lite runtime.Gravatar Feng Xiao2018-04-12
|/ /
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| |
* | Java: Generate warning free codeGravatar David Ostrovsky2018-01-27
| | | | | | | | Partially fixes #4230.
* | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Gravatar Adam Cozzette2017-12-14
|\ \ | | | | | | Java: generate an annotation to suppress deprecation warnings
| * | Generate an annotation to suppress deprecation warningsGravatar Adam Cozzette2017-12-13
| | | | | | | | | | | | | | | | | | The valueOf method on enums is deprecated, but for compatibility reasons the generated code has to keep using it. We can use an annotation to suppress the deprecation warnings.
* | | Add deprecation annotation for oneof case.Gravatar Jisi Liu2017-12-13
|/ /
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| |
* | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-25
|\ \
* | | Fix Java 1.6 compileGravatar Jisi Liu2017-10-18
| | |
* | | Merge from google internalGravatar Jisi Liu2017-10-18
| | |
* | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
| | |
| * | Add @Deprecated annotation support for proto file.Gravatar Jisi Liu2017-08-31
|/ /
* | Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\ \
* | | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| | |
| * | Merge pull request #3134 from lundefugl/javabug1Gravatar Feng Xiao2017-07-17
| |\ \ | | | | | | | | Issue 3112: Object class with fully qualified name
| * | | Qualify string in java_options.hGravatar Calder Coalson2017-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building the protobuf compiler with Bazel fails to resolve the unqualifed "string"s in java_options.h: ``` ERROR: .../external/com_google_protobuf/BUILD:248:1: C++ compilation of rule '@com_google_protobuf//:protoc_lib' failed: Process exited with status 1 [sandboxed]. In file included from external/com_google_protobuf/src/google/protobuf/compiler/java/java_context.h:41:0, from external/com_google_protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.cc:38: external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:59:3: error: 'string' does not name a type string annotation_list_file; ^ external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:62:3: error: 'string' does not name a type string output_list_file; ^ Use --strategy=CppCompile=standalone to disable sandboxing for the failing actions. INFO: Elapsed time: 41.487s, Critical Path: 6.20s //interpreter:eval_test NO STATUS Executed 0 out of 1 test: 1 was skipped. ```
| * | | Ensure that for Java, imports of .proto files with empty packages worksGravatar Adam Cozzette2017-06-02
|/ / / | | | | | | | | | | | | | | | This fixes a compiler bug that caused a Java syntax error when one .proto file would import another one with an empty package and java_package. This fixes issue #3114.
| * / Issue 3112: Object class with fully qualified nameGravatar lundefugl2017-05-24
|/ /
* | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\ \
* | | Allow unknown values for Map put*Value methods just like every other enum ↵Gravatar Anuraag Agrawal2017-04-07
| | | | | | | | | | | | mutation method.
| * | Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/ /
* | Fix java code according to error prone.Gravatar Jisi Liu2017-03-10
| |
* | Fix lint warnings in the javalite branch.Gravatar Jisi Liu2017-03-09
| |
* | Merge pull request #2810 from xfxyjwf/i1994Gravatar Feng Xiao2017-03-09
|\ \ | | | | | | Avoid redundant type casts for oneof bytes fields.
* \ \ Merge pull request #2814 from pherl/javadeprecateGravatar Jisi Liu2017-03-09
|\ \ \ | | | | | | | | Add annotations for deprecated messages in Java
| * | | Add annotations for deprecated messages in JavaGravatar Jisi Liu2017-03-09
| | | |
| | * | Avoid redundant type casts for oneof bytes fields.Gravatar Feng Xiao2017-03-08
| |/ / |/| |
* | | const FieldDescriptorCompareGravatar Ross Wang2017-02-17
|/ / | | | | | | | | | | | | Clang now validates that <set> comparators must have a const operator(): https://reviews.llvm.org/rL291969 Discussion: https://groups.google.com/d/msg/protobuf/9W6zFIHaJ-4/9RrfwelpEQAJ
* | 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
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| |
* | Integrate internal changesGravatar Bo Yang2016-10-10
| |
| * [issue-2108] [protoc/java] Excessive copying on buildPartial()Gravatar Nickolay Mazurkin2016-09-18
|/
* Versioning Java GeneratedMessage.Gravatar Feng Xiao2016-07-19
| | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
* 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.
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
|
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* 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.
* fully qualify invocations of static methods on GeneratedMessageGravatar Joshua Humphries2016-01-15
|
* throw IOException instead of InvalidProtocolBufferException when appropriateGravatar Joshua Humphries2016-01-15
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|
* Correct spellingGravatar Benjamin Barenblat2015-10-30
|
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Make the PARSER @Deprecated public.Gravatar Feng Xiao2015-08-25
| | | | (cherry-picking an intenral change).
* Cherry-pick Java utf8 change.Gravatar Feng Xiao2015-08-24
|