1 files changed, 6 insertions, 19 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java b/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java
index 53d1a2457d0..d86fcdfc25d 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/MockInvoker.java
@@ -4,6 +4,7 @@ package com.yahoo.search.dispatch;
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
+import com.yahoo.search.dispatch.searchcluster.Group;
 import com.yahoo.search.dispatch.searchcluster.Node;
 import com.yahoo.search.result.Coverage;
 import com.yahoo.search.result.Hit;
@@ -17,27 +18,17 @@ import java.util.OptionalInt;
 class MockInvoker extends SearchInvoker {
 
     private final Coverage coverage;
-    private final OptionalInt groupId;
     private Query query;
     private List<Hit> hits;
     int hitsRequested;
 
-    protected MockInvoker(int key, Coverage coverage, OptionalInt groupId) {
+    protected MockInvoker(int key, Coverage coverage) {
         super(Optional.of(new Node(key, "?", 0)));
         this.coverage = coverage;
-        this.groupId = groupId;
-    }
-
-    protected MockInvoker(int key, OptionalInt groupId) {
-        this(key, null, groupId);
-    }
-
-    protected MockInvoker(int key, Coverage coverage) {
-        this(key, coverage, OptionalInt.empty());
     }
 
     protected MockInvoker(int key) {
-        this(key, null, OptionalInt.empty());
+        this(key, null);
     }
 
     MockInvoker setHits(List<Hit> hits) {
@@ -45,18 +36,15 @@ class MockInvoker extends SearchInvoker {
         return this;
     }
 
-    /** Returns the group to be invoked, if known */
-    public OptionalInt groupId() { return groupId; }
-
     @Override
-    protected Object sendSearchRequest(Query query, Object context) throws IOException {
+    protected Object sendSearchRequest(Query query, Object context) {
         this.query = query;
         hitsRequested = query.getHits();
         return context;
     }
 
     @Override
-    protected InvokerResult getSearchResult(Execution execution) throws IOException {
+    protected InvokerResult getSearchResult(Execution execution) {
         InvokerResult ret = new InvokerResult(query, 10);
         if (coverage != null) {
             ret.getResult().setCoverage(coverage);
@@ -80,8 +68,7 @@ class MockInvoker extends SearchInvoker {
 
     @Override
     public String toString() {
-        return "invoker with key " + distributionKey() +
-               (groupId().isPresent() ? " of group " + groupId().getAsInt() : "");
+        return "invoker with key " + distributionKey();
     }
 
 }
\ No newline at end of file