From 0ace3a72530e1aac791d409d45d0ad3aa6f39503 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Wed, 10 Apr 2024 08:58:32 +0200
Subject: [PATCH] Remove redundant return value from closingBinder registration

Align closingBinder API with helpers such as configBinder or
jaxrsBinder. This also clears an IDE warning about unused return value.
---
 .../java/io/trino/server/CoordinatorModule.java    |  9 ++++-----
 .../java/io/trino/server/ServerMainModule.java     |  7 +++----
 .../InMemoryTransactionManagerModule.java          |  5 ++---
 .../java/io/trino/plugin/base/ClosingBinder.java   | 14 ++++++--------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
index 4a617f66d563..4b6d54a7fb83 100644
--- a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
@@ -365,11 +365,10 @@ List<OutputStatsEstimatorFactory> getCompositeOutputDataSizeEstimatorDelegateFac
         install(new QueryExecutionFactoryModule());
 
         // cleanup
-        closingBinder(binder)
-                .registerExecutor(Key.get(ExecutorService.class, ForStatementResource.class))
-                .registerExecutor(Key.get(ScheduledExecutorService.class, ForStatementResource.class))
-                .registerExecutor(Key.get(ExecutorService.class, ForQueryExecution.class))
-                .registerExecutor(Key.get(ScheduledExecutorService.class, ForScheduler.class));
+        closingBinder(binder).registerExecutor(Key.get(ExecutorService.class, ForStatementResource.class));
+        closingBinder(binder).registerExecutor(Key.get(ScheduledExecutorService.class, ForStatementResource.class));
+        closingBinder(binder).registerExecutor(Key.get(ExecutorService.class, ForQueryExecution.class));
+        closingBinder(binder).registerExecutor(Key.get(ScheduledExecutorService.class, ForScheduler.class));
     }
 
     // working around circular dependency Metadata <-> PlannerContext
diff --git a/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java b/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java
index 53dcfbfc4367..957ba1303a80 100644
--- a/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/ServerMainModule.java
@@ -496,10 +496,9 @@ protected void setup(Binder binder)
         newOptionalBinder(binder, RuleStatsRecorder.class);
 
         // cleanup
-        closingBinder(binder)
-                .registerExecutor(Key.get(ScheduledExecutorService.class, ForExchange.class))
-                .registerExecutor(Key.get(ExecutorService.class, ForAsyncHttp.class))
-                .registerExecutor(Key.get(ScheduledExecutorService.class, ForAsyncHttp.class));
+        closingBinder(binder).registerExecutor(Key.get(ScheduledExecutorService.class, ForExchange.class));
+        closingBinder(binder).registerExecutor(Key.get(ExecutorService.class, ForAsyncHttp.class));
+        closingBinder(binder).registerExecutor(Key.get(ScheduledExecutorService.class, ForAsyncHttp.class));
     }
 
     private static class RegisterFunctionBundles
diff --git a/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java b/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java
index 8664fafa474e..b8eb2a81c364 100644
--- a/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java
+++ b/core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManagerModule.java
@@ -37,9 +37,8 @@ public class InMemoryTransactionManagerModule
     public void configure(Binder binder)
     {
         configBinder(binder).bindConfig(TransactionManagerConfig.class);
-        closingBinder(binder)
-                .registerExecutor(Key.get(ExecutorService.class, ForTransactionManager.class))
-                .registerExecutor(Key.get(ScheduledExecutorService.class, ForTransactionManager.class));
+        closingBinder(binder).registerExecutor(Key.get(ExecutorService.class, ForTransactionManager.class));
+        closingBinder(binder).registerExecutor(Key.get(ScheduledExecutorService.class, ForTransactionManager.class));
     }
 
     @Provides
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ClosingBinder.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ClosingBinder.java
index 4432c20dc0c0..cf70e26b3c61 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ClosingBinder.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ClosingBinder.java
@@ -53,26 +53,24 @@ private ClosingBinder(Binder binder)
         binder.bind(Cleanup.class).asEagerSingleton();
     }
 
-    public ClosingBinder registerExecutor(Class<? extends ExecutorService> type)
+    public void registerExecutor(Class<? extends ExecutorService> type)
     {
-        return registerExecutor(Key.get(type));
+        registerExecutor(Key.get(type));
     }
 
-    public ClosingBinder registerExecutor(Key<? extends ExecutorService> key)
+    public void registerExecutor(Key<? extends ExecutorService> key)
     {
         executors.addBinding().to(requireNonNull(key, "key is null"));
-        return this;
     }
 
-    public ClosingBinder registerCloseable(Class<? extends Closeable> type)
+    public void registerCloseable(Class<? extends Closeable> type)
     {
-        return registerCloseable(Key.get(type));
+        registerCloseable(Key.get(type));
     }
 
-    public ClosingBinder registerCloseable(Key<? extends Closeable> key)
+    public void registerCloseable(Key<? extends Closeable> key)
     {
         closeables.addBinding().to(key);
-        return this;
     }
 
     private record Cleanup(