Moving listener to last in the args list

Author: masseyke

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportDataStreamsStatsAction.java

@@ -115,8 +115,8 @@ protected void shardOperation(
         DataStreamsStatsAction.Request request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<DataStreamsStatsAction.DataStreamShardStats> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<DataStreamsStatsAction.DataStreamShardStats> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             assert shardRouting.isSearchable() : "shard routing is not searchable: " + shardRouting;

server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportReloadAnalyzersAction.java

@@ -123,8 +123,8 @@ protected void shardOperation(
         ReloadAnalyzersRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<ReloadResult> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<ReloadResult> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             logger.info("reloading analyzers for index shard " + shardRouting);

server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java

@@ -95,8 +95,8 @@ protected void shardOperation(
         ClearIndicesCacheRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<EmptyResult> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<EmptyResult> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             indicesService.clearIndexShardCache(

server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java

@@ -95,8 +95,8 @@ protected void shardOperation(
         ForceMergeRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<TransportBroadcastByNodeAction.EmptyResult> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<EmptyResult> listener
     ) {
         assert (task instanceof CancellableTask) == false; // TODO: add cancellation handling here once the task supports it
         SubscribableListener.<IndexShard>newForked(l -> {

server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java

@@ -107,8 +107,8 @@ protected void shardOperation(
         RecoveryRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<RecoveryState> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<RecoveryState> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             assert task instanceof CancellableTask;

server/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java

@@ -110,8 +110,8 @@ protected void shardOperation(
         IndicesSegmentsRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<ShardSegments> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<ShardSegments> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             assert task instanceof CancellableTask;

server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportFieldUsageAction.java

@@ -95,8 +95,8 @@ protected void shardOperation(
         FieldUsageStatsRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<FieldUsageShardResponse> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<FieldUsageShardResponse> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             final ShardId shardId = shardRouting.shardId();

server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java

@@ -117,8 +117,8 @@ protected void shardOperation(
         IndicesStatsRequest request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<ShardStats> listener,
-        Void nodeContext
+        Void nodeContext,
+        ActionListener<ShardStats> listener
     ) {
         ActionListener.completeWith(listener, () -> {
             assert task instanceof CancellableTask;

server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java

@@ -185,8 +185,8 @@ protected abstract void shardOperation(
         Request request,
         ShardRouting shardRouting,
         Task task,
-        ActionListener<ShardOperationResult> listener,
-        NodeContext nodeContext
+        NodeContext nodeContext,
+        ActionListener<ShardOperationResult> listener
     );
 
     protected NodeContext createNodeContext() {
@@ -430,7 +430,7 @@ private void executeAsDataNode(
             @Override
             protected void sendItemRequest(ShardRouting shardRouting, ActionListener<ShardOperationResult> listener) {
                 logger.trace(() -> format("[%s] executing operation for shard [%s]", actionName, shardRouting.shortSummary()));
-                ActionRunnable.wrap(listener, l -> shardOperation(request, shardRouting, task, l, nodeContext)).run();
+                ActionRunnable.wrap(listener, l -> shardOperation(request, shardRouting, task, nodeContext, l)).run();
             }
 
             @Override
@@ -616,7 +616,8 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     /**
-     * Can be used for implementations of {@link #shardOperation(BroadcastRequest, ShardRouting, Task, ActionListener, NodeContext) shardOperation} for
+     * Can be used for implementations of
+     * {@linkTransportBroadcastByNodeAction#shardOperation(BroadcastRequest, ShardRouting, Task, Object, ActionListener) shardOperation} for
      * which there is no shard-level return value.
      */
     public static final class EmptyResult implements Writeable {

server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java

@@ -216,8 +216,8 @@ protected void shardOperation(
             Request request,
             ShardRouting shardRouting,
             Task task,
-            ActionListener<ShardResult> listener,
-            Integer nodeContext
+            Integer nodeContext,
+            ActionListener<ShardResult> listener
         ) {
             assertThat(expectedNodeContext, not(nullValue()));
             assertThat(nodeContext, equalTo(expectedNodeContext));
@@ -666,8 +666,8 @@ protected void shardOperation(
                 Request request,
                 ShardRouting shardRouting,
                 Task task,
-                ActionListener<ShardResult> listener,
-                Integer nodeContext
+                Integer nodeContext,
+                ActionListener<ShardResult> listener
             ) {
                 // this test runs a node-level operation on three shards, cancelling the task some time during the execution on the second
                 if (task instanceof CancellableTask cancellableTask) {
@@ -726,8 +726,8 @@ protected void shardOperation(
                 Request request,
                 ShardRouting shardRouting,
                 Task task,
-                ActionListener<ShardResult> listener,
-                Integer nodeContext
+                Integer nodeContext,
+                ActionListener<ShardResult> listener
             ) {
                 listeners.add(listener);
             }