GC unused parameters.

2 files changed, 15 insertions, 31 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java
index 6c39bc299fb..54c46b34163 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java
@@ -14,7 +14,6 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.PhaseNames;
 
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -32,7 +31,7 @@ public class FieldCollapsingSearcher extends Searcher {
     private static final CompoundName collapseSummaryName = new CompoundName("collapse.summary");
 
     /** Maximum number of queries to send next searcher */
-    private final int maxQueries = 4;
+    private static final int maxQueries = 4;
 
     /**
      * The max number of hits that will be preserved per unique
@@ -49,16 +48,7 @@ public class FieldCollapsingSearcher extends Searcher {
 
     /** Create this searcher using default values for all settings */
     public FieldCollapsingSearcher() {
-        this((String) null);
-    }
-
-    /**
-     * Creates a collapser
-     *
-     * @param collapseField the default field to collapse on, or null to not collapse as default
-     */
-    public FieldCollapsingSearcher(String collapseField) {
-        this(1, 2.0, collapseField);
+        this(1, 2.0);
     }
 
     @Inject
@@ -78,9 +68,8 @@ public class FieldCollapsingSearcher extends Searcher {
      * @param extraFactor the percentage by which to scale up the
      *        requested number of hits, to allow some hits to be removed
      *        without refetching
-     * @param collapseField the field to collapse on. This is currently <b>ignored</b>.
      */
-    public FieldCollapsingSearcher(int collapseSize, double extraFactor, String collapseField) {
+    public FieldCollapsingSearcher(int collapseSize, double extraFactor) {
         init(collapseSize, extraFactor);
     }
 
@@ -158,14 +147,11 @@ public class FieldCollapsingSearcher extends Searcher {
      */
     private void collapse(Result result, Map<String, Integer> knownCollapses,
                           Result resultSource, String collapseField, int collapseSize) {
-        for (Iterator<Hit> it = resultSource.hits().iterator(); it.hasNext();) {
-            Hit unknownHit = it.next();
-
-            if (!(unknownHit instanceof FastHit)) {
+        for (Hit unknownHit : resultSource.hits()) {
+            if (!(unknownHit instanceof FastHit hit)) {
                 result.hits().add(unknownHit);
                 continue;
             }
-            FastHit hit = (FastHit) unknownHit;
             Object peek = hit.getField(collapseField);
             String collapseId = peek != null ? peek.toString() : null;
             if (collapseId == null) {
diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java
index 4a2a34a64c2..d697b067a00 100644
--- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java
@@ -2,7 +2,6 @@
 package com.yahoo.prelude.searcher.test;
 
 import com.yahoo.component.chain.Chain;
-import com.yahoo.language.simple.SimpleLinguistics;
 import com.yahoo.prelude.fastsearch.FastHit;
 import com.yahoo.prelude.query.AndItem;
 import com.yahoo.prelude.query.WordItem;
@@ -14,7 +13,6 @@ import com.yahoo.search.grouping.result.Group;
 import com.yahoo.search.grouping.result.GroupList;
 import com.yahoo.search.grouping.result.LongId;
 import com.yahoo.search.grouping.result.RootId;
-import com.yahoo.search.rendering.RendererRegistry;
 import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
@@ -42,7 +40,7 @@ public class FieldCollapsingSearcherTestCase {
         // Set up
         Map<Searcher, Searcher> chained = new HashMap<>();
 
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         ZeroHitsControl checker = new ZeroHitsControl();
         chained.put(collapse, checker);
 
@@ -58,7 +56,7 @@ public class FieldCollapsingSearcherTestCase {
     void testFieldCollapsingWithoutHitsHugeOffset() {
         Map<Searcher, Searcher> chained = new HashMap<>();
 
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         ZeroHitsControl checker = new ZeroHitsControl();
         chained.put(collapse, checker);
 
@@ -75,7 +73,7 @@ public class FieldCollapsingSearcherTestCase {
         Map<Searcher, Searcher> chained = new HashMap<>();
 
         // Set up
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         chained.put(collapse, docsource);
 
@@ -112,7 +110,7 @@ public class FieldCollapsingSearcherTestCase {
     void testFieldCollapsingTwoPhase() {
         // Set up
         Map<Searcher, Searcher> chained = new HashMap<>();
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         chained.put(collapse, docsource);
         // Caveat: Collapse is set to false, because that's what the
@@ -181,7 +179,7 @@ public class FieldCollapsingSearcherTestCase {
     void testCollapsingLargeCollection() {
         // Set up
         Map<Searcher, Searcher> chained = new HashMap<>();
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher(4, 2.0, "amid");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher(4, 2.0);
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         chained.put(collapse, docsource);
 
@@ -226,7 +224,7 @@ public class FieldCollapsingSearcherTestCase {
     void testCollapsingDispersedCollection() {
         // Set up
         Map<Searcher, Searcher> chained = new HashMap<>();
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher(1, 2.0, "amid");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher(1, 2.0);
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         chained.put(collapse, docsource);
 
@@ -260,7 +258,7 @@ public class FieldCollapsingSearcherTestCase {
     void testQueryTransformAndCollapsing() {
         // Set up
         Map<Searcher, Searcher> chained = new HashMap<>();
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         Searcher messUp = new QueryMessupSearcher();
 
@@ -298,7 +296,7 @@ public class FieldCollapsingSearcherTestCase {
     void testFieldCollapsingTwoPhaseSelectSummary() {
         // Set up
         Map<Searcher, Searcher> chained = new HashMap<>();
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         chained.put(collapse, docsource);
         // Caveat: Collapse is set to false, because that's what the
@@ -348,7 +346,7 @@ public class FieldCollapsingSearcherTestCase {
     @Test
     void testFieldCollapsingWithGrouping() {
         // Set up
-        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher("other");
+        FieldCollapsingSearcher collapse = new FieldCollapsingSearcher();
         DocumentSourceSearcher docsource = new DocumentSourceSearcher();
         Chain<Searcher> chain = new Chain<>(collapse, new AddAggregationStyleGroupingResultSearcher(), docsource);
 
@@ -434,7 +432,7 @@ public class FieldCollapsingSearcherTestCase {
             Group root = new Group(new RootId(0), new Relevance(1));
             GroupList groupList = new GroupList(label);
             root.add(groupList);
-            Group value = new Group(new LongId(37l), new Relevance(2.11));
+            Group value = new Group(new LongId(37L), new Relevance(2.11));
             groupList.add(value);
             return root;
         }