drier

Author: original-brownbear

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

@@ -430,10 +430,6 @@ protected void finish() {  // as a tribute to @kimchy aka. finishHim()
         executeNextPhase(name, this::getNextPhase);
     }
 
-    public final void execute(Runnable command) {
-        executor.execute(command);
-    }
-
     /**
      * Builds an request for the initial search phase.
      *

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

@@ -65,21 +65,21 @@ public abstract class AsyncSearchContext<Result extends SearchPhaseResult> {
     // protected for tests
     protected final List<Releasable> releasables = new ArrayList<>();
 
-    protected final AtomicBoolean requestCancelled = new AtomicBoolean();
+    private final AtomicBoolean requestCancelled = new AtomicBoolean();
 
     protected final SearchTask task;
 
     protected final AtomicInteger successfulOps = new AtomicInteger();
 
     protected final SearchTransportService searchTransportService;
-    protected final Executor executor;
+    private final Executor executor;
 
     protected final List<SearchShardIterator> toSkipShardsIts;
     protected final List<SearchShardIterator> shardsIts;
     protected final SearchShardIterator[] shardIterators;
 
     protected final SetOnce<AtomicArray<ShardSearchFailure>> shardFailures = new SetOnce<>();
-    protected final Object shardFailuresMutex = new Object();
+    private final Object shardFailuresMutex = new Object();
 
     protected final TransportVersion minTransportVersion;
     protected final Map<String, AliasFilter> aliasFilter;
@@ -288,7 +288,9 @@ public final void addReleasable(Releasable releasable) {
         releasables.add(releasable);
     }
 
-    abstract void execute(Runnable command);
+    public final void execute(Runnable command) {
+        executor.execute(command);
+    }
 
     abstract void onShardFailure(int shardIndex, SearchShardTarget shard, Exception e);
 

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

@@ -747,11 +747,6 @@ public void onPhaseFailure(String phase, String msg, Throwable cause) {
         raisePhaseFailure(new SearchPhaseExecutionException(phase, msg, cause, buildShardFailures(shardFailures)));
     }
 
-    @Override
-    public void execute(Runnable command) {
-        executor.execute(command);
-    }
-
     @Override
     public void sendReleaseSearchContext(ShardSearchContextId contextId, Transport.Connection connection) {
         assert isPartOfPointInTime(contextId) == false : "Must not release point in time context [" + contextId + "]";