Prefer static over default

No intention to override witResponsseHandler method so static is more
appropriate.

Author: henningandersen

modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java

@@ -77,10 +77,10 @@ public RemoteScrollableHitSource(Logger logger, BackoffPolicy backoffPolicy, Thr
 
     @Override
     protected void doStart(RejectAwareActionListener<Response> searchListener) {
-        lookupRemoteVersion(searchListener.withResponseHandler(version -> {
+        lookupRemoteVersion(RejectAwareActionListener.withResponseHandler(searchListener, version -> {
             remoteVersion = version;
             execute(RemoteRequestBuilders.initialSearch(searchRequest, query, remoteVersion),
-                RESPONSE_PARSER, searchListener.withResponseHandler(r -> onStartResponse(searchListener, r)));
+                RESPONSE_PARSER, RejectAwareActionListener.withResponseHandler(searchListener, r -> onStartResponse(searchListener, r)));
         }));
     }
 

server/src/main/java/org/elasticsearch/index/reindex/RejectAwareActionListener.java

@@ -31,12 +31,11 @@ public interface RejectAwareActionListener<T> extends ActionListener<T> {
     /**
      * Return a new listener that delegates failure/reject to original but forwards response to responseHandler
      */
-    default <X> RejectAwareActionListener<X> withResponseHandler(Consumer<X> responseHandler) {
-        RejectAwareActionListener<?> outer = this;
+    static <X> RejectAwareActionListener<X> withResponseHandler(RejectAwareActionListener<?> original, Consumer<X> responseHandler) {
         return new RejectAwareActionListener<>() {
             @Override
             public void onRejection(Exception e) {
-                outer.onRejection(e);
+                original.onRejection(e);
             }
 
             @Override
@@ -46,7 +45,7 @@ public void onResponse(X t) {
 
             @Override
             public void onFailure(Exception e) {
-                outer.onFailure(e);
+                original.onFailure(e);
             }
         };
     }