GC unused code

4 files changed, 6 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index 75b47fbdf60..da7dfdc7b84 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.model.search.SearchCluster;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -37,7 +38,7 @@ public class LocalProvider extends Provider implements
 
     @Override
     public void getConfig(ClusterConfig.Builder builder) {
-        assert (searchCluster != null) : "Null search cluster!";
+        Objects.requireNonNull(searchCluster,  "Null search cluster!");
         builder.clusterId(searchCluster.getClusterIndex());
         builder.clusterName(searchCluster.getClusterName());
 
diff --git a/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java b/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java
index 97846404852..c2c86c5abb6 100644
--- a/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java
+++ b/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java
@@ -11,15 +11,9 @@ import com.yahoo.container.QrSearchersConfig;
  */
 public abstract class IndexFactsFactory {
 
-    public static IndexFacts newInstance(String configId) {
-        return new IndexFacts(new IndexModel(resolveConfig(IndexInfoConfig.class, configId),
-                                             resolveConfig(QrSearchersConfig.class, configId)));
-
-    }
-
-    public static IndexFacts newInstance(String indexInfoConfigId, String qrSearchersConfigId) {
+    public static IndexFacts newInstance(String indexInfoConfigId) {
         return new IndexFacts(new IndexModel(resolveConfig(IndexInfoConfig.class, indexInfoConfigId),
-                                             resolveConfig(QrSearchersConfig.class, qrSearchersConfigId)));
+                                             resolveConfig(QrSearchersConfig.class, null)));
 
     }
 
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
index 22ba8754572..6c45dd2a1b1 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CJKSearcherTestCase.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 public class CJKSearcherTestCase {
 
     private final IndexFacts indexFacts = IndexFactsFactory.newInstance("file:src/test/java/com/yahoo/prelude/" +
-                                                                        "querytransform/test/cjk-index-info.cfg", null);
+                                                                        "querytransform/test/cjk-index-info.cfg");
 
     @Test
     void testTermWeight() {
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
index a925668dffd..3db51ad4b8a 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java
@@ -29,7 +29,7 @@ public class StemmingSearcherTestCase {
 
     private static final Linguistics linguistics = new SimpleLinguistics();
     private final IndexFacts indexFacts = IndexFactsFactory.newInstance("dir:src/test/java/com/yahoo/prelude/" +
-                                                                        "querytransform/test/", null);
+                                                                        "querytransform/test/");
 
     @Test
     void testStemOnlySomeTerms() {