You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2022/03/02 21:23:37 UTC
[thrift] branch master updated (c9b7bd7 -> 5a44db8)
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git.
from c9b7bd7 THRIFT-5519 Java async client loses exceptions in void methods Client: java
new 4bd1fd8 THRIFT-5526 to use "private_members" instead of "private-members" as a consistent param casing Client: java Patch: Jiayu Liu
new 5a44db8 THRIFT-5525 use "reuse_objects" instead of "reuse-objects" as a consistent param casing Client: java Patch: Jiayu Liu
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
compiler/cpp/src/thrift/generate/t_java_generator.cc | 12 ++++++++----
.../src/test/java/org/apache/thrift/maven/TestThrift.java | 2 +-
lib/java/gradle/generateTestThrift.gradle | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
[thrift] 02/02: THRIFT-5525 use "reuse_objects" instead of "reuse-objects" as a consistent param casing Client: java Patch: Jiayu Liu
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 5a44db88b200892ff899a74b53d8a482ababb265
Author: Jiayu Liu <ji...@airbnb.com>
AuthorDate: Tue Feb 22 23:17:06 2022 +0800
THRIFT-5525 use "reuse_objects" instead of "reuse-objects" as a consistent param casing
Client: java
Patch: Jiayu Liu
This closes #2530
---
compiler/cpp/src/thrift/generate/t_java_generator.cc | 6 ++++--
lib/java/gradle/generateTestThrift.gradle | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 2329396..f43cf5f 100644
--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
@@ -91,7 +91,8 @@ public:
sorted_containers_ = true;
} else if( iter->first.compare("java5") == 0) {
java5_ = true;
- } else if( iter->first.compare("reuse-objects") == 0) {
+ } else if( iter->first.compare("reuse_objects") == 0 || iter->first.compare("reuse-objects") == 0) {
+ // keep both reuse_objects and reuse-objects (legacy) for backwards compatibility
reuse_objects_ = true;
} else if( iter->first.compare("option_type") == 0) {
use_option_type_ = true;
@@ -5453,8 +5454,9 @@ THRIFT_REGISTER_GENERATOR(
" Enable rethrow of unhandled exceptions and let them propagate further."
" (Default behavior is to catch and log it.)\n"
" java5: Generate Java 1.5 compliant code (includes android_legacy flag).\n"
- " reuse-objects: Data objects will not be allocated, but existing instances will be used "
+ " reuse_objects: Data objects will not be allocated, but existing instances will be used "
"(read and write).\n"
+ " reuse-objects: Same as 'reuse_objects' (deprecated).\n"
" sorted_containers:\n"
" Use TreeSet/TreeMap instead of HashSet/HashMap as a implementation of "
"set/map.\n"
diff --git a/lib/java/gradle/generateTestThrift.gradle b/lib/java/gradle/generateTestThrift.gradle
index 996c5fa..924dd0d 100644
--- a/lib/java/gradle/generateTestThrift.gradle
+++ b/lib/java/gradle/generateTestThrift.gradle
@@ -109,7 +109,7 @@ task generateFullCamelJava(group: 'Build') {
ext.outputBuffer = new ByteArrayOutputStream()
- thriftCompile(it, 'ReuseObjects.thrift', 'java:reuse-objects', genReuseSrc)
+ thriftCompile(it, 'ReuseObjects.thrift', 'java:reuse_objects', genReuseSrc)
}
task generateUnsafeBinariesJava(group: 'Build') {
[thrift] 01/02: THRIFT-5526 to use "private_members" instead of "private-members" as a consistent param casing Client: java Patch: Jiayu Liu
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 4bd1fd80791380de443bb217d7456b7ade56cf8a
Author: Jiayu Liu <ji...@airbnb.com>
AuthorDate: Tue Feb 22 23:22:04 2022 +0800
THRIFT-5526 to use "private_members" instead of "private-members" as a consistent param casing
Client: java
Patch: Jiayu Liu
This closes #2531
---
compiler/cpp/src/thrift/generate/t_java_generator.cc | 6 ++++--
.../src/test/java/org/apache/thrift/maven/TestThrift.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 3fa5f57..2329396 100644
--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
@@ -78,7 +78,8 @@ public:
bean_style_ = true;
} else if( iter->first.compare("android") == 0) {
android_style_ = true;
- } else if( iter->first.compare("private-members") == 0) {
+ } else if( iter->first.compare("private_members") == 0 || iter->first.compare("private-members") == 0) {
+ // keep both private_members and private-members (legacy) for backwards compatibility
private_members_ = true;
} else if( iter->first.compare("nocamel") == 0) {
nocamel_style_ = true;
@@ -5439,8 +5440,9 @@ THRIFT_REGISTER_GENERATOR(
java,
"Java",
" beans: Members will be private, and setter methods will return void.\n"
- " private-members: Members will be private, but setter methods will return 'this' like "
+ " private_members: Members will be private, but setter methods will return 'this' like "
"usual.\n"
+ " private-members: Same as 'private_members' (deprecated).\n"
" nocamel: Do not use CamelCase field accessors with beans.\n"
" fullcamel: Convert underscored_accessor_or_service_names to camelCase.\n"
" android: Generated structures are Parcelable.\n"
diff --git a/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java b/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java
index 7c7891e..1bc10a6 100644
--- a/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java
+++ b/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java
@@ -73,7 +73,7 @@ public class TestThrift {
@Test
public void testThriftCompileWithGeneratorOption() throws Exception {
- builder.setGenerator("java:private-members");
+ builder.setGenerator("java:private_members");
executeThriftCompile();
}