[thrift] branch master updated: Cleanup extend client logic for sync and async clients (#2808)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new cfede8631 Cleanup extend client logic for sync and async clients 
(#2808)
cfede8631 is described below

commit cfede863143810bb8b59e3cb67c532c72bc25bd1
Author: Bogdan Drutu <bogdandr...@gmail.com>
AuthorDate: Mon May 22 14:38:41 2023 -0700

    Cleanup extend client logic for sync and async clients (#2808)
    
    Signed-off-by: Bogdan Drutu <bogdandr...@gmail.com>
---
 compiler/cpp/src/thrift/generate/t_java_generator.cc | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc 
b/compiler/cpp/src/thrift/generate/t_java_generator.cc
index 2cfce5b9f..7e55bf919 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 @@ void 
t_java_generator::generate_service_helpers(t_service* tservice) {
  * @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_future_client(t_service* tservice) {
 }
 
 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();