Make a few simpler interfaces instead of carrying one huge implement all SearchCluster around.

1 files changed, 4 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 36c5c8a16fa..b7a2d9f70ba 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -58,9 +58,9 @@ public class Dispatcher extends AbstractComponent {
     private final ClusterMonitor<Node> clusterMonitor;
     private final LoadBalancer loadBalancer;
     private final InvokerFactory invokerFactory;
-    private final RpcResourcePool rpcResourcePool;
     private final RpcClient rpcClient;
     private final int maxHitsPerNode;
+    private final RpcResourcePool rpcResourcePool;
 
     private static final QueryProfileType argumentType;
 
@@ -101,7 +101,7 @@ public class Dispatcher extends AbstractComponent {
                        RpcClient rpcClient, RpcResourcePool rpcResourcePool) {
         this(new ClusterMonitor<>(searchCluster, true),
                 searchCluster, dispatchConfig,
-                new RpcInvokerFactory(rpcResourcePool, searchCluster),
+                new RpcInvokerFactory(rpcResourcePool, searchCluster, dispatchConfig),
                 rpcClient, rpcResourcePool);
     }
 
@@ -161,9 +161,8 @@ public class Dispatcher extends AbstractComponent {
         new Compressor().warmup(seconds);
     }
 
-    /** Returns the search cluster this dispatches to */
-    public SearchCluster searchCluster() {
-        return searchCluster;
+    public boolean allGroupsHaveSize1() {
+        return searchCluster.allGroupsHaveSize1();
     }
 
     @Override