1 files changed, 3 insertions, 10 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java
index 065489ef9a0..ca2a0c9bfb0 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcResourcePool.java
@@ -2,9 +2,6 @@
 package com.yahoo.search.dispatch.rpc;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.inject.Inject;
-import com.yahoo.component.AbstractComponent;
-import com.yahoo.component.ComponentId;
 import com.yahoo.compress.CompressionType;
 import com.yahoo.compress.Compressor;
 import com.yahoo.compress.Compressor.Compression;
@@ -26,7 +23,7 @@ import java.util.Random;
  *
  * @author ollivir
  */
-public class RpcResourcePool extends AbstractComponent {
+public class RpcResourcePool {
     /** The compression method which will be used with rpc dispatch. "lz4" (default) and "none" is supported. */
     public final static CompoundName dispatchCompression = new CompoundName("dispatch.compression");
 
@@ -36,15 +33,13 @@ public class RpcResourcePool extends AbstractComponent {
     /** Connections to the search nodes this talks to, indexed by node id ("partid") */
     private final ImmutableMap<Integer, NodeConnectionPool> nodeConnectionPools;
 
-    RpcResourcePool(Map<Integer, NodeConnection> nodeConnections) {
+    public RpcResourcePool(Map<Integer, NodeConnection> nodeConnections) {
         var builder = new ImmutableMap.Builder<Integer, NodeConnectionPool>();
         nodeConnections.forEach((key, connection) -> builder.put(key, new NodeConnectionPool(Collections.singletonList(connection))));
         this.nodeConnectionPools = builder.build();
     }
 
-    @Inject
     public RpcResourcePool(DispatchConfig dispatchConfig) {
-        super();
         var client = new RpcClient(dispatchConfig.numJrtTransportThreads());
 
         // Create rpc node connection pools indexed by the node distribution key
@@ -78,9 +73,7 @@ public class RpcResourcePool extends AbstractComponent {
         }
     }
 
-    @Override
-    public void deconstruct() {
-        super.deconstruct();
+    public void release() {
         nodeConnectionPools.values().forEach(NodeConnectionPool::release);
     }