commit cfede863143810bb8b59e3cb67c532c72bc25bd1
author Bogdan Drutu <bogdandrutu@gmail.com> Mon May 22 14:38:41 2023 -0700
committer GitHub <noreply@github.com> Mon May 22 17:38:41 2023 -0400
tree c58fc2f9fb24f5049235d48a6469ccd5e5330f49
parent 5a19e433fbca97b53593f2cf0f4bdc878ea05e0a

Cleanup extend client logic for sync and async clients (#2808)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

compiler/cpp/src/thrift/generate/t_java_generator.cc

diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 2cfce5b..7e55bf9 100644
--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
@@ -3199,13 +3199,9 @@
  * @param tservice The service to generate a server for.
  */
 void t_java_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() == nullptr) {
-    extends_client = "org.apache.thrift.TServiceClient";
-  } else {
-    extends = type_name(tservice->get_extends());
-    extends_client = extends + ".Client";
+  string extends_client = "org.apache.thrift.TServiceClient";
+  if (tservice->get_extends() != nullptr) {
+    extends_client = type_name(tservice->get_extends()) + ".Client";
   }
 
   indent(f_service_) << "public static class Client extends " << extends_client
@@ -3416,13 +3412,12 @@
 }
 
 void t_java_generator::generate_service_async_client(t_service* tservice) {
-  string extends = "org.apache.thrift.async.TAsyncClient";
-  string extends_client = "";
+  string extends_client = "org.apache.thrift.async.TAsyncClient";
   if (tservice->get_extends() != nullptr) {
-    extends = type_name(tservice->get_extends()) + ".AsyncClient";
+    extends_client = type_name(tservice->get_extends()) + ".AsyncClient";
   }
 
-  indent(f_service_) << "public static class AsyncClient extends " << extends
+  indent(f_service_) << "public static class AsyncClient extends " << extends_client
                      << " implements AsyncIface {" << endl;
   indent_up();