- GC unused code.

- GC unused id parameter.

4 files changed, 8 insertions, 35 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java
index 514a087bed1..f911e215867 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java
@@ -37,8 +37,7 @@ public class DuplicateSourceTestCase {
         SearchChainResolver resolver = new SearchChainResolver.Builder()
                 .addSearchChain(new ComponentId(chain1), List.of(schema1, schema2))
                 .build();
-        FederationSearcher searcher = new FederationSearcher(new ComponentId("test"), resolver,
-                                                             Map.of(schema1, List.of(chain1), schema2, List.of(chain1)));
+        var searcher = new FederationSearcher(resolver, Map.of(schema1, List.of(chain1), schema2, List.of(chain1)));
 
         Result result = searcher.search(new Query("?query=test&sources=doc1%2cdoc2"),
                 new Execution(Execution.Context.createContextStub(searchChains)));
diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java
index af0e0ef69a8..5d2e19d02a3 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java
@@ -284,7 +284,7 @@ public class FederationSearcherTestCase {
         builder.addSourceForProvider(news, provider1, provider1, true, options, List.of());
         builder.addSourceForProvider(news, provider2, provider2, false, options, List.of());
 
-        return new FederationSearcher(new ComponentId("federation"), builder.build(), Map.of());
+        return new FederationSearcher(builder.build(), Map.of());
     }
 
     private static class MockProvider extends Searcher {
@@ -304,30 +304,4 @@ public class FederationSearcherTestCase {
 
     }
 
-    private static class QueryCheckSearcher extends Searcher {
-
-        private static final String STATUS = "status";
-        public static final String FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY = "FederationSearcher has cloned the query.";
-        public static final String OK = "Got the correct query.";
-        private final Query query;
-
-        QueryCheckSearcher(Query query) {
-            this.query = query;
-        }
-
-        @Override
-        public Result search(Query query, Execution execution) {
-            Result result = new Result(query);
-            if (query != this.query) {
-                result.hits().addError(ErrorMessage
-                        .createErrorInPluginSearcher(FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY));
-            } else {
-                final Hit h = new Hit("QueryCheckSearcher status hit");
-                h.setField(STATUS, OK);
-                result.hits().add(h);
-            }
-            return result;
-        }
-    }
-
 }
diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java
index ec540e43dfd..6016e85bc17 100644
--- a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java
+++ b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java
@@ -47,7 +47,7 @@ class FederationTester {
     }
 
     FederationSearcher buildFederationSearcher() {
-        return new FederationSearcher(ComponentId.fromString("federation"), builder.build(), Map.of());
+        return new FederationSearcher(builder.build(), Map.of());
     }
 
     public Result search() {
diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
index 36c80e852d1..bfcde54d65b 100644
--- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java
@@ -39,11 +39,11 @@ public class FutureDataTestCase {
         Searcher syncProviderSearcher = new SyncProviderSearcher();
         Chain<Searcher> asyncSource = new Chain<>(new ComponentId("async"), asyncProviderSearcher);
         Chain<Searcher> syncSource = new Chain<>(new ComponentId("sync"), syncProviderSearcher);
-        SearchChainResolver searchChainResolver =
-                new SearchChainResolver.Builder().addSearchChain(new ComponentId("sync"), new FederationOptions().setUseByDefault(true)).
-                        addSearchChain(new ComponentId("async"), new FederationOptions().setUseByDefault(true)).
-                        build();
-        Chain<Searcher> main = new Chain<>(new FederationSearcher(new ComponentId("federator"), searchChainResolver, Map.of()));
+        var searchChainResolver = new SearchChainResolver.Builder()
+                .addSearchChain(new ComponentId("sync"), new FederationOptions().setUseByDefault(true))
+                .addSearchChain(new ComponentId("async"), new FederationOptions().setUseByDefault(true))
+                .build();
+        Chain<Searcher> main = new Chain<>(new FederationSearcher(searchChainResolver, Map.of()));
         SearchChainRegistry searchChainRegistry = new SearchChainRegistry();
         searchChainRegistry.register(main);
         searchChainRegistry.register(syncSource);