Provide some sensible defaults

Author: thecoop

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java

@@ -342,7 +342,7 @@ private String mockSearches(String databaseName, int firstChunk, int lastChunk)
             }
 
             SearchHits hits = SearchHits.unpooled(new SearchHit[] { hit }, new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1f);
-            SearchResponse searchResponse = SearchResponseUtils.success(hits);
+            SearchResponse searchResponse = SearchResponseUtils.successfulResponse(hits);
             toRelease.add(searchResponse::decRef);
             @SuppressWarnings("unchecked")
             ActionFuture<SearchResponse> actionFuture = mock(ActionFuture.class);

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

@@ -575,8 +575,7 @@ protected RequestWrapper<?> buildRequest(Hit doc) {
             new TotalHits(0, TotalHits.Relation.EQUAL_TO),
             0
         );
-        SearchResponse searchResponse = SearchResponseUtils.builder(hits)
-            .numReducePhases(1)
+        SearchResponse searchResponse = SearchResponseUtils.response(hits)
             .scrollId(scrollId())
             .shards(5, 4, 0)
             .tookInMillis(randomLong())

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

@@ -167,8 +167,7 @@ private SearchResponse createSearchResponse() {
             new TotalHits(0, TotalHits.Relation.EQUAL_TO),
             0
         );
-        return SearchResponseUtils.builder(hits)
-            .numReducePhases(1)
+        return SearchResponseUtils.response(hits)
             .scrollId(randomSimpleString(random(), 1, 10))
             .shards(5, 4, 0)
             .tookInMillis(randomLong())

qa/ccs-unavailable-clusters/src/javaRestTest/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java

@@ -99,7 +99,9 @@ private static MockTransportService startTransport(
                 EsExecutors.DIRECT_EXECUTOR_SERVICE,
                 SearchRequest::new,
                 (request, channel, task) -> {
-                    var searchResponse = SearchResponseUtils.success(SearchHits.empty(Lucene.TOTAL_HITS_EQUAL_TO_ZERO, Float.NaN));
+                    var searchResponse = SearchResponseUtils.successfulResponse(
+                        SearchHits.empty(Lucene.TOTAL_HITS_EQUAL_TO_ZERO, Float.NaN)
+                    );
                     try {
                         channel.sendResponse(searchResponse);
                     } finally {

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

@@ -174,7 +174,7 @@ public void testFailOneItemFailsEntirePhase() throws IOException {
             @Override
             void sendExecuteMultiSearch(MultiSearchRequest request, SearchTask task, ActionListener<MultiSearchResponse> listener) {
                 assertTrue(executedMultiSearch.compareAndSet(false, true));
-                SearchResponse searchResponse = SearchResponseUtils.success(collapsedHits);
+                SearchResponse searchResponse = SearchResponseUtils.successfulResponse(collapsedHits);
                 ActionListener.respondAndRelease(
                     listener,
                     new MultiSearchResponse(

server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java

@@ -155,7 +155,7 @@ public static MockTransportService startTransport(
                     } else {
                         searchHits = SearchHits.empty(new TotalHits(0, TotalHits.Relation.EQUAL_TO), Float.NaN);
                     }
-                    try (var searchResponseRef = ReleasableRef.of(SearchResponseUtils.success(searchHits))) {
+                    try (var searchResponseRef = ReleasableRef.of(SearchResponseUtils.successfulResponse(searchHits))) {
                         channel.sendResponse(searchResponseRef.get());
                     }
                 }

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

@@ -78,12 +78,16 @@
 public enum SearchResponseUtils {
     ;
 
-    public static SearchResponseBuilder builder(SearchHits hits) {
-        return new SearchResponseBuilder().searchHits(hits);
+    public static SearchResponseBuilder response() {
+        return new SearchResponseBuilder();
     }
 
-    public static SearchResponse success(SearchHits hits) {
-        return builder(hits).numReducePhases(1).shards(1, 1, 0).tookInMillis(100).build();
+    public static SearchResponseBuilder response(SearchHits hits) {
+        return new SearchResponseBuilder().searchHits(hits).numReducePhases(1).shards(1, 1, 0).tookInMillis(100);
+    }
+
+    public static SearchResponse successfulResponse(SearchHits hits) {
+        return response(hits).build();
     }
 
     public static SearchResponse emptyWithTotalHits(

x-pack/plugin/async-search/src/test/java/org/elasticsearch/xpack/search/AsyncSearchTaskTests.java

@@ -473,10 +473,8 @@ private static SearchResponse newSearchResponse(
         int skippedShards,
         ShardSearchFailure... failures
     ) {
-        return SearchResponseUtils.builder(SearchHits.EMPTY_WITH_TOTAL_HITS)
-            .numReducePhases(1)
+        return SearchResponseUtils.response(SearchHits.EMPTY_WITH_TOTAL_HITS)
             .shards(totalShards, successfulShards, skippedShards)
-            .tookInMillis(100)
             .shardFailures(failures)
             .build();
     }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexing/AsyncTwoPhaseIndexerTests.java

@@ -113,7 +113,7 @@ protected void doNextSearch(long waitTimeInNanos, ActionListener<SearchResponse>
                 return;
             }
 
-            ActionListener.respondAndRelease(nextPhase, SearchResponseUtils.success(SearchHits.EMPTY_WITH_TOTAL_HITS));
+            ActionListener.respondAndRelease(nextPhase, SearchResponseUtils.successfulResponse(SearchHits.EMPTY_WITH_TOTAL_HITS));
         }
 
         @Override
@@ -246,7 +246,7 @@ protected void doNextSearch(long waitTimeInNanos, ActionListener<SearchResponse>
                 awaitForLatch();
             }
 
-            ActionListener.respondAndRelease(nextPhase, SearchResponseUtils.success(SearchHits.EMPTY_WITH_TOTAL_HITS));
+            ActionListener.respondAndRelease(nextPhase, SearchResponseUtils.successfulResponse(SearchHits.EMPTY_WITH_TOTAL_HITS));
         }
 
         @Override

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

@@ -181,7 +181,7 @@ private SearchResponse convertToSearchResponse(List<Map<String, ?>> searchRespon
             }
         }).toArray(SearchHit[]::new);
         SearchHits hits = SearchHits.unpooled(hitArray, null, 0);
-        return SearchResponseUtils.builder(hits).numReducePhases(1).shards(5, 4, 0).tookInMillis(randomLong()).build();
+        return SearchResponseUtils.response(hits).shards(5, 4, 0).tookInMillis(randomLong()).build();
     }
 
     private BytesReference convertMapToJson(Map<String, ?> simpleMap) throws IOException {