Remove constructor used only in tests

Author: benchaplin

server/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java

@@ -39,19 +39,6 @@ public final class SearchShardIterator implements Comparable<SearchShardIterator
     private final TimeValue searchContextKeepAlive;
     private final PlainIterator<String> targetNodesIterator;
 
-    /**
-     * Creates a {@link SearchShardIterator} instance that iterates over a subset of the given shards
-     * for a given <code>shardId</code>.
-     *
-     * @param clusterAlias    the alias of the cluster where the shard is located
-     * @param shardId         shard id of the group
-     * @param shards          shards to iterate
-     * @param originalIndices the indices that the search request originally related to (before any rewriting happened)
-     */
-    public SearchShardIterator(@Nullable String clusterAlias, ShardId shardId, List<ShardRouting> shards, OriginalIndices originalIndices) {
-        this(clusterAlias, shardId, shards.stream().map(ShardRouting::currentNodeId).toList(), originalIndices, null, null, false, false);
-    }
-
     /**
      * Creates a {@link SearchShardIterator} instance that iterates over a subset of the given shards
      * for a given <code>shardId</code>.

server/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java

@@ -82,7 +82,7 @@ private AbstractSearchAsyncAction<SearchPhaseResult> createAction(
             null,
             request,
             listener,
-            Collections.singletonList(new SearchShardIterator(null, new ShardId("index", "_na", 0), Collections.emptyList(), null)),
+            Collections.singletonList(new SearchShardIterator(null, new ShardId("index", "_na", 0), Collections.emptyList(), null, false)),
             timeProvider,
             ClusterState.EMPTY_STATE,
             null,
@@ -153,7 +153,8 @@ public void testBuildShardSearchTransportRequest() {
                 clusterAlias,
                 new ShardId(new Index("name", "foo"), 1),
                 Collections.emptyList(),
-                new OriginalIndices(new String[] { "name", "name1" }, IndicesOptions.strictExpand())
+                new OriginalIndices(new String[] { "name", "name1" }, IndicesOptions.strictExpand()),
+                false
             );
             ShardSearchRequest shardSearchTransportRequest = action.buildShardSearchRequest(iterator, 10);
             assertEquals(IndicesOptions.strictExpand(), shardSearchTransportRequest.indicesOptions());

server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java

@@ -640,7 +640,8 @@ public void testSkipUnavailableSearchShards() throws InterruptedException {
                 null,
                 new ShardId(index, 0),
                 Collections.emptyList(),
-                originalIndices
+                originalIndices,
+                false
             );
             // Skip all the shards
             searchShardIterator.skip(true);
@@ -760,7 +761,7 @@ static List<SearchShardIterator> getShardsIter(
             }
             Collections.shuffle(started, random());
             started.addAll(initializing);
-            list.add(new SearchShardIterator(null, new ShardId(index, i), started, originalIndices));
+            list.add(new SearchShardIterator(null, new ShardId(index, i), started, originalIndices, false));
         }
         return list;
     }

server/src/test/java/org/elasticsearch/action/search/SearchShardIteratorTests.java

@@ -45,7 +45,13 @@ private static List<ShardRouting> randomShardRoutings(ShardId shardId, int numRe
 
     public void testShardId() {
         ShardId shardId = new ShardId(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLength(10), randomInt());
-        SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), OriginalIndices.NONE);
+        SearchShardIterator searchShardIterator = new SearchShardIterator(
+            null,
+            shardId,
+            Collections.emptyList(),
+            OriginalIndices.NONE,
+            false
+        );
         assertSame(shardId, searchShardIterator.shardId());
     }
 
@@ -55,7 +61,7 @@ public void testGetOriginalIndices() {
             new String[] { randomAlphaOfLengthBetween(3, 10) },
             IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean())
         );
-        SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), originalIndices);
+        SearchShardIterator searchShardIterator = new SearchShardIterator(null, shardId, Collections.emptyList(), originalIndices, false);
         assertSame(originalIndices, searchShardIterator.getOriginalIndices());
     }
 
@@ -66,7 +72,8 @@ public void testGetClusterAlias() {
             clusterAlias,
             shardId,
             Collections.emptyList(),
-            OriginalIndices.NONE
+            OriginalIndices.NONE,
+            false
         );
         assertEquals(clusterAlias, searchShardIterator.getClusterAlias());
     }
@@ -164,15 +171,22 @@ public void testCompareTo() {
                 for (String uuid : uuids) {
                     ShardId shardId = new ShardId(index, uuid, i);
                     shardIterators.add(
-                        new SearchShardIterator(null, shardId, randomShardRoutings(shardId), OriginalIndicesTests.randomOriginalIndices())
+                        new SearchShardIterator(
+                            null,
+                            shardId,
+                            randomShardRoutings(shardId),
+                            OriginalIndicesTests.randomOriginalIndices(),
+                            false
+                        )
                     );
                     for (String cluster : clusters) {
                         shardIterators.add(
                             new SearchShardIterator(
                                 cluster,
                                 shardId,
                                 randomShardRoutings(shardId),
-                                OriginalIndicesTests.randomOriginalIndices()
+                                OriginalIndicesTests.randomOriginalIndices(),
+                                false
                             )
                         );
                     }
@@ -217,6 +231,12 @@ public void testCompareToEqualItems() {
     private static SearchShardIterator randomSearchShardIterator() {
         String clusterAlias = randomBoolean() ? null : randomAlphaOfLengthBetween(5, 10);
         ShardId shardId = new ShardId(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLength(10), randomIntBetween(0, Integer.MAX_VALUE));
-        return new SearchShardIterator(clusterAlias, shardId, randomShardRoutings(shardId), OriginalIndicesTests.randomOriginalIndices());
+        return new SearchShardIterator(
+            clusterAlias,
+            shardId,
+            randomShardRoutings(shardId),
+            OriginalIndicesTests.randomOriginalIndices(),
+            false
+        );
     }
 }

server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java

@@ -158,7 +158,7 @@ private static SearchShardIterator createSearchShardIterator(
     ) {
         ShardId shardId = new ShardId(index, id);
         List<ShardRouting> shardRoutings = SearchShardIteratorTests.randomShardRoutings(shardId);
-        return new SearchShardIterator(clusterAlias, shardId, shardRoutings, originalIndices);
+        return new SearchShardIterator(clusterAlias, shardId, shardRoutings, originalIndices, false);
     }
 
     private static ResolvedIndices createMockResolvedIndices(