scrollId still needed in a few places

Author: thecoop

modules/reindex/src/test/java/org/elasticsearch/reindex/ClientScrollableHitSourceTests.java

@@ -167,11 +167,7 @@ private SearchResponse createSearchResponse() {
             new TotalHits(0, TotalHits.Relation.EQUAL_TO),
             0
         );
-        return SearchResponseUtils.response(hits)
-            .scrollId(randomSimpleString(random(), 1, 10))
-            .shards(5, 4, 0)
-            .tookInMillis(randomLong())
-            .build();
+        return SearchResponseUtils.response(hits).scrollId(randomSimpleString(random(), 1, 10)).shards(5, 4, 0).build();
     }
 
     private void assertSameHits(List<? extends ScrollableHitSource.Hit> actual, SearchHit[] expected) {

test/framework/src/main/java/org/elasticsearch/search/SearchResponseUtils.java

@@ -193,6 +193,11 @@ public SearchResponseBuilder shardFailures(ShardSearchFailure... failures) {
             return this;
         }
 
+        public SearchResponseBuilder shardFailures(List<ShardSearchFailure> failures) {
+            shardFailures = List.copyOf(failures);
+            return this;
+        }
+
         public SearchResponseBuilder clusters(Clusters clusters) {
             this.clusters = clusters;
             return this;

x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichCacheTests.java

@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.xpack.enrich;
 
-import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.TimeValue;
@@ -27,6 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.elasticsearch.action.support.ActionTestUtils.assertNoFailureListener;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
@@ -123,18 +123,10 @@ public void testComputeIfAbsent() throws InterruptedException {
                 searchResponseActionListener.onResponse(searchResponse);
                 searchResponse.decRef();
                 queriedDatabaseLatch.countDown();
-            }, new ActionListener<>() {
-                @Override
-                public void onResponse(List<Map<?, ?>> response) {
-                    assertThat(response, equalTo(searchResponseMap));
-                    notifiedOfResultLatch.countDown();
-                }
-
-                @Override
-                public void onFailure(Exception e) {
-                    fail(e);
-                }
-            });
+            }, assertNoFailureListener(response -> {
+                assertThat(response, equalTo(searchResponseMap));
+                notifiedOfResultLatch.countDown();
+            }));
             assertThat(queriedDatabaseLatch.await(5, TimeUnit.SECONDS), equalTo(true));
             assertThat(notifiedOfResultLatch.await(5, TimeUnit.SECONDS), equalTo(true));
             EnrichStatsAction.Response.CacheStats cacheStats = enrichCache.getStats(randomAlphaOfLength(10));
@@ -150,17 +142,7 @@ public void onFailure(Exception e) {
             CountDownLatch notifiedOfResultLatch = new CountDownLatch(1);
             enrichCache.computeIfAbsent("policy1-1", "1", 1, (searchResponseActionListener) -> {
                 fail("Expected no call to the database because item should have been in the cache");
-            }, new ActionListener<>() {
-                @Override
-                public void onResponse(List<Map<?, ?>> maps) {
-                    notifiedOfResultLatch.countDown();
-                }
-
-                @Override
-                public void onFailure(Exception e) {
-                    fail(e);
-                }
-            });
+            }, assertNoFailureListener(r -> notifiedOfResultLatch.countDown()));
             assertThat(notifiedOfResultLatch.await(5, TimeUnit.SECONDS), equalTo(true));
             EnrichStatsAction.Response.CacheStats cacheStats = enrichCache.getStats(randomAlphaOfLength(10));
             assertThat(cacheStats.count(), equalTo(1L));
@@ -181,7 +163,7 @@ private SearchResponse convertToSearchResponse(List<Map<String, ?>> searchRespon
             }
         }).toArray(SearchHit[]::new);
         SearchHits hits = SearchHits.unpooled(hitArray, null, 0);
-        return SearchResponseUtils.response(hits).shards(5, 4, 0).tookInMillis(randomLong()).build();
+        return SearchResponseUtils.response(hits).shards(5, 4, 0).build();
     }
 
     private BytesReference convertMapToJson(Map<String, ?> simpleMap) throws IOException {

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/saml/TransportSamlInvalidateSessionActionTests.java

@@ -201,15 +201,18 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
                     final SearchHit[] hits = searchFunction.apply(searchRequest);
                     final var searchHits = new SearchHits(hits, new TotalHits(hits.length, TotalHits.Relation.EQUAL_TO), 0f);
                     try {
-                        ActionListener.respondAndRelease(listener, (Response) SearchResponseUtils.successfulResponse(searchHits));
+                        ActionListener.respondAndRelease(
+                            listener,
+                            (Response) SearchResponseUtils.response(searchHits).scrollId("_scrollId1").build()
+                        );
                     } finally {
                         searchHits.decRef();
                     }
                 } else if (TransportSearchScrollAction.TYPE.name().equals(action.name())) {
                     assertThat(request, instanceOf(SearchScrollRequest.class));
                     ActionListener.respondAndRelease(
                         listener,
-                        (Response) SearchResponseUtils.successfulResponse(SearchHits.EMPTY_WITH_TOTAL_HITS)
+                        (Response) SearchResponseUtils.response(SearchHits.EMPTY_WITH_TOTAL_HITS).scrollId("_scrollId1").build()
                     );
                 } else if (TransportClearScrollAction.NAME.equals(action.name())) {
                     assertThat(request, instanceOf(ClearScrollRequest.class));

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/PivotTests.java

@@ -385,7 +385,7 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
                     listener,
                     (Response) SearchResponseUtils.response(SearchHits.EMPTY_WITH_TOTAL_HITS)
                         .shards(10, searchFailures.isEmpty() ? 5 : 0, 0)
-                        .shardFailures(searchFailures.toArray(ShardSearchFailure[]::new))
+                        .shardFailures(searchFailures)
                         .build()
                 );
                 return;

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java

@@ -216,7 +216,7 @@ void stopExecutor() {}
         SearchHits searchHits = SearchHits.unpooled(hits, new TotalHits(count, TotalHits.Relation.EQUAL_TO), 1.0f);
         doAnswer(invocation -> {
             ActionListener<SearchResponse> listener = (ActionListener<SearchResponse>) invocation.getArguments()[2];
-            ActionListener.respondAndRelease(listener, SearchResponseUtils.successfulResponse(searchHits));
+            ActionListener.respondAndRelease(listener, SearchResponseUtils.response(searchHits).scrollId("scrollId").build());
             return null;
         }).when(client).execute(eq(TransportSearchAction.TYPE), any(SearchRequest.class), anyActionListener());