Replace InternalSearchResponse#EMPTY with InternalSearchResponse#empty()

rest-api-spec/test/scroll/11_clear.yaml

@@ -1,9 +1,4 @@
 ---
-setup:
-  - skip:
-      version: 0 - 999
-      reason:  This test some impacts other tests
----
 "Clear scroll":
   - do:
       indices.create:

src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java

@@ -140,7 +140,7 @@ protected BaseAsyncAction(SearchRequest request, ActionListener<SearchResponse>
         public void start() {
             if (expectedSuccessfulOps == 0) {
                 // no search shards to search on, bail with empty response (it happens with search across _all with no indices around and consistent with broadcast operations)
-                listener.onResponse(new SearchResponse(InternalSearchResponse.EMPTY, null, 0, 0, System.currentTimeMillis() - startTime, ShardSearchFailure.EMPTY_ARRAY));
+                listener.onResponse(new SearchResponse(InternalSearchResponse.empty(), null, 0, 0, System.currentTimeMillis() - startTime, ShardSearchFailure.EMPTY_ARRAY));
                 return;
             }
             request.beforeStart();

src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java

@@ -414,7 +414,7 @@ public InternalSearchResponse merge(ScoreDoc[] sortedDocs, AtomicArray<? extends
         List<? extends AtomicArray.Entry<? extends FetchSearchResultProvider>> fetchResults = fetchResultsArr.asList();
 
         if (queryResults.isEmpty()) {
-            return InternalSearchResponse.EMPTY;
+            return InternalSearchResponse.empty();
         }
 
         QuerySearchResult firstResult = queryResults.get(0).value.queryResult();

src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java

@@ -40,6 +40,10 @@
  */
 public class InternalSearchResponse implements Streamable, ToXContent {
 
+    public static InternalSearchResponse empty() {
+        return new InternalSearchResponse(new InternalSearchHits(new InternalSearchHit[0], 0, 0), null, null, null, false);
+    }
+
     private InternalSearchHits hits;
 
     private InternalFacets facets;
@@ -50,8 +54,6 @@ public class InternalSearchResponse implements Streamable, ToXContent {
 
     private boolean timedOut;
 
-    public static final InternalSearchResponse EMPTY = new InternalSearchResponse(new InternalSearchHits(new InternalSearchHit[0], 0, 0), null, null, null, false);
-
     private InternalSearchResponse() {
     }