Minor tidyup to TNA and TBbNA (#92971)

Inlines/removes some unused things and gives these classes and their
derivatives a dedicated `logger` each.

server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java

@@ -8,6 +8,8 @@
 
 package org.elasticsearch.action.admin.cluster.node.reload;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
@@ -37,6 +39,8 @@ public class TransportNodesReloadSecureSettingsAction extends TransportNodesActi
     NodesReloadSecureSettingsRequest.NodeRequest,
     NodesReloadSecureSettingsResponse.NodeResponse> {
 
+    private static final Logger logger = LogManager.getLogger(TransportNodesReloadSecureSettingsAction.class);
+
     private final Environment environment;
     private final PluginsService pluginsService;
 

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

@@ -60,7 +60,7 @@ public class TransportClearIndicesCacheAction extends TransportBroadcastByNodeAc
 
     @Override
     protected EmptyResult readShardResult(StreamInput in) throws IOException {
-        return EmptyResult.readEmptyResultFrom(in);
+        return EmptyResult.INSTANCE;
     }
 
     @Override

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

@@ -64,7 +64,7 @@ public class TransportForceMergeAction extends TransportBroadcastByNodeAction<
 
     @Override
     protected EmptyResult readShardResult(StreamInput in) throws IOException {
-        return EmptyResult.readEmptyResultFrom(in);
+        return EmptyResult.INSTANCE;
     }
 
     @Override

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

@@ -8,6 +8,8 @@
 
 package org.elasticsearch.action.support.broadcast.node;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.IndicesRequest;
@@ -71,6 +73,8 @@ public abstract class TransportBroadcastByNodeAction<
     Response extends BaseBroadcastResponse,
     ShardOperationResult extends Writeable> extends HandledTransportAction<Request, Response> {
 
+    private static final Logger logger = LogManager.getLogger(TransportBroadcastByNodeAction.class);
+
     private final ClusterService clusterService;
     private final TransportService transportService;
     private final IndexNameExpressionResolver indexNameExpressionResolver;
@@ -349,7 +353,7 @@ public abstract class TransportBroadcastByNodeAction<
 
         private void sendNodeRequest(final DiscoveryNode node, List<ShardRouting> shards, final int nodeIndex) {
             try {
-                final NodeRequest nodeRequest = new NodeRequest(node.getId(), request, shards);
+                final NodeRequest nodeRequest = new NodeRequest(request, shards, node.getId());
                 if (task != null) {
                     nodeRequest.setParentTask(clusterService.localNode().getId(), task.getId());
                 }
@@ -552,7 +556,7 @@ public abstract class TransportBroadcastByNodeAction<
                 listener.onFailure(failure);
             };
             try {
-                shardOperation(request.indicesLevelRequest, shardRouting, task, new ActionListener<>() {
+                shardOperation(request.getIndicesLevelRequest(), shardRouting, task, new ActionListener<>() {
                     @Override
                     public void onResponse(ShardOperationResult shardOperationResult) {
                         if (logger.isTraceEnabled()) {
@@ -574,11 +578,10 @@ public abstract class TransportBroadcastByNodeAction<
     }
 
     public class NodeRequest extends TransportRequest implements IndicesRequest {
-        private String nodeId;
-
-        private List<ShardRouting> shards;
 
-        protected Request indicesLevelRequest;
+        private final Request indicesLevelRequest;
+        private final List<ShardRouting> shards;
+        private final String nodeId;
 
         public NodeRequest(StreamInput in) throws IOException {
             super(in);
@@ -587,8 +590,8 @@ public abstract class TransportBroadcastByNodeAction<
             nodeId = in.readString();
         }
 
-        public NodeRequest(String nodeId, Request request, List<ShardRouting> shards) {
-            this.indicesLevelRequest = request;
+        public NodeRequest(Request indicesLevelRequest, List<ShardRouting> shards, String nodeId) {
+            this.indicesLevelRequest = indicesLevelRequest;
             this.shards = shards;
             this.nodeId = nodeId;
         }
@@ -601,6 +604,10 @@ public abstract class TransportBroadcastByNodeAction<
             return nodeId;
         }
 
+        public Request getIndicesLevelRequest() {
+            return indicesLevelRequest;
+        }
+
         @Override
         public String[] indices() {
             return indicesLevelRequest.indices();
@@ -692,13 +699,7 @@ public abstract class TransportBroadcastByNodeAction<
 
         private EmptyResult() {}
 
-        private EmptyResult(StreamInput in) {}
-
         @Override
         public void writeTo(StreamOutput out) {}
-
-        public static EmptyResult readEmptyResultFrom(StreamInput in) {
-            return INSTANCE;
-        }
     }
 }

server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java

@@ -8,6 +8,8 @@
 
 package org.elasticsearch.action.support.nodes;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.support.ActionFilters;
@@ -42,6 +44,8 @@ public abstract class TransportNodesAction<
     NodeRequest extends TransportRequest,
     NodeResponse extends BaseNodeResponse> extends HandledTransportAction<NodesRequest, NodesResponse> {
 
+    private static final Logger logger = LogManager.getLogger(TransportNodesAction.class);
+
     protected final ThreadPool threadPool;
     protected final ClusterService clusterService;
     protected final TransportService transportService;

server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java

@@ -8,6 +8,8 @@
 
 package org.elasticsearch.gateway;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionType;
@@ -56,6 +58,8 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesAction
     TransportNodesListGatewayStartedShards.NodeRequest,
     TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> {
 
+    private static final Logger logger = LogManager.getLogger(TransportNodesListGatewayStartedShards.class);
+
     public static final String ACTION_NAME = "internal:gateway/local/started_shards";
     public static final ActionType<NodesGatewayStartedShards> TYPE = new ActionType<>(ACTION_NAME, NodesGatewayStartedShards::new);
 

server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetadata.java

@@ -8,6 +8,8 @@
 
 package org.elasticsearch.indices.store;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionType;
@@ -58,6 +60,8 @@ public class TransportNodesListShardStoreMetadata extends TransportNodesAction<
     TransportNodesListShardStoreMetadata.NodeRequest,
     TransportNodesListShardStoreMetadata.NodeStoreFilesMetadata> {
 
+    private static final Logger logger = LogManager.getLogger(TransportNodesListShardStoreMetadata.class);
+
     public static final String ACTION_NAME = "internal:cluster/nodes/indices/shard/store";
     public static final ActionType<NodesStoreFilesMetadata> TYPE = new ActionType<>(ACTION_NAME, NodesStoreFilesMetadata::new);
 

server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java

@@ -7,6 +7,8 @@
  */
 package org.elasticsearch.action.admin.cluster.node.tasks;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestBuilder;
@@ -69,6 +71,8 @@ import static org.elasticsearch.test.ESTestCase.waitUntil;
  */
 public class TestTaskPlugin extends Plugin implements ActionPlugin, NetworkPlugin {
 
+    private static final Logger logger = LogManager.getLogger(TestTaskPlugin.class);
+
     @Override
     public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         return Arrays.asList(

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

@@ -131,7 +131,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
 
         @Override
         protected EmptyResult readShardResult(StreamInput in) {
-            return EmptyResult.readEmptyResultFrom(in);
+            return EmptyResult.INSTANCE;
         }
 
         @Override
@@ -214,7 +214,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
         );
         transportService.start();
         transportService.acceptIncomingRequests();
-        setClusterState(clusterService, TEST_INDEX);
+        setClusterState(clusterService);
         action = new TestTransportBroadcastByNodeAction(
             transportService,
             new ActionFilters(new HashSet<>()),
@@ -230,10 +230,10 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
         clusterService.close();
     }
 
-    void setClusterState(ClusterService clusterService, String index) {
+    void setClusterState(ClusterService clusterService) {
         int numberOfNodes = randomIntBetween(3, 5);
         DiscoveryNodes.Builder discoBuilder = DiscoveryNodes.builder();
-        IndexRoutingTable.Builder indexRoutingTable = IndexRoutingTable.builder(new Index(index, "_na_"));
+        IndexRoutingTable.Builder indexRoutingTable = IndexRoutingTable.builder(new Index(TEST_INDEX, "_na_"));
 
         int shardIndex = -1;
         int totalIndexShards = 0;
@@ -243,9 +243,9 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
             int numberOfShards = randomIntBetween(1, 10);
             totalIndexShards += numberOfShards;
             for (int j = 0; j < numberOfShards; j++) {
-                final ShardId shardId = new ShardId(index, "_na_", ++shardIndex);
+                final ShardId shardId = new ShardId(TEST_INDEX, "_na_", ++shardIndex);
                 ShardRouting shard = TestShardRouting.newShardRouting(
-                    index,
+                    TEST_INDEX,
                     shardId.getId(),
                     node.getId(),
                     true,
@@ -260,7 +260,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
         discoBuilder.masterNodeId(newNode(numberOfNodes - 1).getId());
         ClusterState.Builder stateBuilder = ClusterState.builder(new ClusterName(TEST_CLUSTER));
         stateBuilder.nodes(discoBuilder);
-        final IndexMetadata.Builder indexMetadata = IndexMetadata.builder(index)
+        final IndexMetadata.Builder indexMetadata = IndexMetadata.builder(TEST_INDEX)
             .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT))
             .numberOfReplicas(0)
             .numberOfShards(totalIndexShards);
@@ -283,7 +283,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
     }
 
     public void testGlobalBlock() {
-        Request request = new Request(new String[] { TEST_INDEX });
+        Request request = new Request(TEST_INDEX);
         PlainActionFuture<Response> listener = new PlainActionFuture<>();
 
         ClusterBlocks.Builder block = ClusterBlocks.builder()
@@ -298,7 +298,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
     }
 
     public void testRequestBlock() {
-        Request request = new Request(new String[] { TEST_INDEX });
+        Request request = new Request(TEST_INDEX);
         PlainActionFuture<Response> listener = new PlainActionFuture<>();
 
         ClusterBlocks.Builder block = ClusterBlocks.builder()
@@ -316,7 +316,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
     }
 
     public void testOneRequestIsSentToEachNodeHoldingAShard() {
-        Request request = new Request(new String[] { TEST_INDEX });
+        Request request = new Request(TEST_INDEX);
         PlainActionFuture<Response> listener = new PlainActionFuture<>();
 
         action.doExecute(null, request, listener);
@@ -357,7 +357,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
         final PlainActionFuture<TransportResponse> future = PlainActionFuture.newFuture();
         TestTransportChannel channel = new TestTransportChannel(future);
 
-        handler.messageReceived(action.new NodeRequest(nodeId, new Request(), new ArrayList<>(shards)), channel, cancelledTask());
+        handler.messageReceived(action.new NodeRequest(new Request(), new ArrayList<>(shards), nodeId), channel, cancelledTask());
         expectThrows(TaskCancelledException.class, future::actionGet);
 
         assertThat(action.getResults(), anEmptyMap());
@@ -368,7 +368,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
     // that node will not be in the local cluster state on any node that has detected the master as failing
     // in this case, such a shard should be treated as unassigned
     public void testRequestsAreNotSentToFailedMaster() {
-        Request request = new Request(new String[] { TEST_INDEX });
+        Request request = new Request(TEST_INDEX);
         PlainActionFuture<Response> listener = new PlainActionFuture<>();
 
         DiscoveryNode masterNode = clusterService.state().nodes().getMasterNode();
@@ -419,7 +419,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
         final PlainActionFuture<TransportResponse> future = PlainActionFuture.newFuture();
         TestTransportChannel channel = new TestTransportChannel(future);
 
-        handler.messageReceived(action.new NodeRequest(nodeId, new Request(), new ArrayList<>(shards)), channel, null);
+        handler.messageReceived(action.new NodeRequest(new Request(), new ArrayList<>(shards), nodeId), channel, null);
 
         // check the operation was executed only on the expected shards
         assertEquals(shards, action.getResults().keySet());
@@ -455,7 +455,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
     }
 
     public void testResultAggregation() throws ExecutionException, InterruptedException {
-        Request request = new Request(new String[] { TEST_INDEX });
+        Request request = new Request(TEST_INDEX);
         PlainActionFuture<Response> listener = new PlainActionFuture<>();
 
         // simulate removing the master
@@ -524,7 +524,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase {
     }
 
     public void testNoResultAggregationIfTaskCancelled() {
-        Request request = new Request(new String[] { TEST_INDEX });
+        Request request = new Request(TEST_INDEX);
         PlainActionFuture<Response> listener = new PlainActionFuture<>();
         final CancellableTask task = new CancellableTask(randomLong(), "transport", "action", "", null, emptyMap());
         TransportBroadcastByNodeAction<Request, Response, TransportBroadcastByNodeAction.EmptyResult>.AsyncAction asyncAction =

server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java

@@ -79,7 +79,7 @@ public class TransportNodesActionTests extends ESTestCase {
         int numSelectors = randomIntBetween(1, 5);
         Set<String> nodeSelectors = new HashSet<>();
         for (int i = 0; i < numSelectors; i++) {
-            nodeSelectors.add(randomFrom(NodeSelector.values()).selector);
+            nodeSelectors.add(randomFrom("_local", "_master", "master:true", "data:true", "attr:value"));
         }
         int numNodeIds = randomIntBetween(0, 3);
         String[] nodeIds = clusterService.state().nodes().getNodes().keySet().toArray(new String[0]);
@@ -189,20 +189,6 @@ public class TransportNodesActionTests extends ESTestCase {
         return failures;
     }
 
-    private enum NodeSelector {
-        LOCAL("_local"),
-        ELECTED_MASTER("_master"),
-        MASTER_ELIGIBLE("master:true"),
-        DATA("data:true"),
-        CUSTOM_ATTRIBUTE("attr:value");
-
-        private final String selector;
-
-        NodeSelector(String selector) {
-            this.selector = selector;
-        }
-    }
-
     @BeforeClass
     public static void startThreadPool() {
         THREAD_POOL = new TestThreadPool(TransportBroadcastByNodeActionTests.class.getSimpleName());

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportForgetFollowerAction.java

@@ -71,7 +71,7 @@ public class TransportForgetFollowerAction extends TransportBroadcastByNodeActio
 
     @Override
     protected EmptyResult readShardResult(final StreamInput in) {
-        return EmptyResult.readEmptyResultFrom(in);
+        return EmptyResult.INSTANCE;
     }
 
     @Override

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/TransportClearSearchableSnapshotsCacheAction.java

@@ -52,7 +52,7 @@ public class TransportClearSearchableSnapshotsCacheAction extends AbstractTransp
 
     @Override
     protected EmptyResult readShardResult(StreamInput in) {
-        return EmptyResult.readEmptyResultFrom(in);
+        return EmptyResult.INSTANCE;
     }
 
     @Override