Let Guice manage dependencies in router modules

Author: andythsu

gateway-ha/src/main/java/io/trino/gateway/ha/module/QueryCountBasedRouterProvider.java

@@ -13,25 +13,22 @@
  */
 package io.trino.gateway.ha.module;
 
-import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import io.trino.gateway.ha.config.HaGatewayConfiguration;
 import io.trino.gateway.ha.router.QueryCountBasedRouter;
 import io.trino.gateway.ha.router.RoutingManager;
 
 public class QueryCountBasedRouterProvider
           extends RouterBaseModule
 {
-    private final QueryCountBasedRouter routingManager;
-
     public QueryCountBasedRouterProvider(HaGatewayConfiguration configuration)
     {
         super(configuration);
-        routingManager = new QueryCountBasedRouter(gatewayBackendManager, queryHistoryManager);
     }
 
-    @Provides
-    public RoutingManager getRoutingManager()
+    @Override
+    public void configure()
     {
-        return this.routingManager;
+        bind(RoutingManager.class).to(QueryCountBasedRouter.class).in(Scopes.SINGLETON);
     }
 }

gateway-ha/src/main/java/io/trino/gateway/ha/module/StochasticRoutingManagerProvider.java

@@ -13,31 +13,22 @@
  */
 package io.trino.gateway.ha.module;
 
-import com.google.inject.Provides;
+import com.google.inject.Scopes;
 import io.trino.gateway.ha.config.HaGatewayConfiguration;
 import io.trino.gateway.ha.router.RoutingManager;
 import io.trino.gateway.ha.router.StochasticRoutingManager;
 
 public class StochasticRoutingManagerProvider
             extends RouterBaseModule
 {
-    private final StochasticRoutingManager routingManager;
-
     public StochasticRoutingManagerProvider(HaGatewayConfiguration configuration)
     {
         super(configuration);
-        routingManager = new StochasticRoutingManager(gatewayBackendManager, queryHistoryManager);
-    }
-
-    @Provides
-    public StochasticRoutingManager getHaRoutingManager()
-    {
-        return this.routingManager;
     }
 
-    @Provides
-    public RoutingManager getRoutingManager()
+    @Override
+    public void configure()
     {
-        return getHaRoutingManager();
+        bind(RoutingManager.class).to(StochasticRoutingManager.class).in(Scopes.SINGLETON);
     }
 }

gateway-ha/src/main/java/io/trino/gateway/ha/router/QueryCountBasedRouter.java

@@ -17,6 +17,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.concurrent.GuardedBy;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 import io.trino.gateway.ha.clustermonitor.ClusterStats;
 import io.trino.gateway.ha.clustermonitor.TrinoStatus;
@@ -134,6 +135,7 @@ public void userQueuedCount(Map<String, Integer> userQueuedCount)
         }
     }
 
+    @Inject
     public QueryCountBasedRouter(
             GatewayBackendManager gatewayBackendManager,
             QueryHistoryManager queryHistoryManager)

gateway-ha/src/main/java/io/trino/gateway/ha/router/StochasticRoutingManager.java

@@ -14,6 +14,7 @@
 package io.trino.gateway.ha.router;
 
 import com.google.common.base.Strings;
+import com.google.inject.Inject;
 import io.airlift.log.Logger;
 
 public class StochasticRoutingManager
@@ -22,6 +23,7 @@ public class StochasticRoutingManager
     private static final Logger log = Logger.get(StochasticRoutingManager.class);
     private final QueryHistoryManager queryHistoryManager;
 
+    @Inject
     public StochasticRoutingManager(
             GatewayBackendManager gatewayBackendManager, QueryHistoryManager queryHistoryManager)
     {