Cleanup TransportRequestOptions Usage (#65248) (#65257)

A class with 2 fields does not need a builder, especially
when in many cases the builder result is just equivalent to the
`EMPTY` singleton to begin with.
Removed the builder and simplified related code accordingly.

Author: original-brownbear

server/src/main/java/org/elasticsearch/action/ActionType.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.action;
 
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.transport.TransportRequestOptions;
 
 /**
@@ -57,7 +56,7 @@ public Writeable.Reader<Response> getResponseReader() {
     /**
      * Optional request options for the action.
      */
-    public TransportRequestOptions transportOptions(Settings settings) {
+    public TransportRequestOptions transportOptions() {
         return TransportRequestOptions.EMPTY;
     }
 

server/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.action;
 
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.transport.TransportRequestOptions;
 import org.elasticsearch.transport.TransportService;
 
@@ -33,10 +32,10 @@ public class TransportActionNodeProxy<Request extends ActionRequest, Response ex
     private final ActionType<Response> action;
     private final TransportRequestOptions transportOptions;
 
-    public TransportActionNodeProxy(Settings settings, ActionType<Response> action, TransportService transportService) {
+    public TransportActionNodeProxy(ActionType<Response> action, TransportService transportService) {
         this.action = action;
         this.transportService = transportService;
-        this.transportOptions = action.transportOptions(settings);
+        this.transportOptions = action.transportOptions();
     }
 
     public void execute(final DiscoveryNode node, final Request request, final ActionListener<Response> listener) {

server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java

@@ -96,10 +96,6 @@ protected void doExecute(Task thisTask, GetTaskRequest request, ActionListener<G
      * {@link #getFinishedTaskFromIndex(Task, GetTaskRequest, ActionListener)} on this node.
      */
     private void runOnNodeWithTaskIfPossible(Task thisTask, GetTaskRequest request, ActionListener<GetTaskResponse> listener) {
-        TransportRequestOptions.Builder builder = TransportRequestOptions.builder();
-        if (request.getTimeout() != null) {
-            builder.withTimeout(request.getTimeout());
-        }
         DiscoveryNode node = clusterService.state().nodes().get(request.getTaskId().getNodeId());
         if (node == null) {
             // Node is no longer part of the cluster! Try and look the task up from the results index.
@@ -115,7 +111,7 @@ private void runOnNodeWithTaskIfPossible(Task thisTask, GetTaskRequest request,
             return;
         }
         GetTaskRequest nodeRequest = request.nodeRequest(clusterService.localNode().getId(), thisTask.getId());
-        transportService.sendRequest(node, GetTaskAction.NAME, nodeRequest, builder.build(),
+        transportService.sendRequest(node, GetTaskAction.NAME, nodeRequest, TransportRequestOptions.timeout(request.getTimeout()),
             new ActionListenerResponseHandler<>(listener, GetTaskResponse::new, ThreadPool.Names.SAME));
     }
 

server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java

@@ -20,20 +20,22 @@
 package org.elasticsearch.action.bulk;
 
 import org.elasticsearch.action.ActionType;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.transport.TransportRequestOptions;
 
 public class BulkAction extends ActionType<BulkResponse> {
 
     public static final BulkAction INSTANCE = new BulkAction();
     public static final String NAME = "indices:data/write/bulk";
 
+    private static final TransportRequestOptions TRANSPORT_REQUEST_OPTIONS =
+            TransportRequestOptions.of(null, TransportRequestOptions.Type.BULK);
+
     private BulkAction() {
         super(NAME, BulkResponse::new);
     }
 
     @Override
-    public TransportRequestOptions transportOptions(Settings settings) {
-        return TransportRequestOptions.builder().withType(TransportRequestOptions.Type.BULK).build();
+    public TransportRequestOptions transportOptions() {
+        return TRANSPORT_REQUEST_OPTIONS;
     }
 }

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -110,8 +110,8 @@ public TransportShardBulkAction(Settings settings, TransportService transportSer
     }
 
     @Override
-    protected TransportRequestOptions transportOptions(Settings settings) {
-        return BulkAction.INSTANCE.transportOptions(settings);
+    protected TransportRequestOptions transportOptions() {
+        return BulkAction.INSTANCE.transportOptions();
     }
 
     @Override

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

@@ -200,10 +200,7 @@ void start() {
                 threadPool.generic().execute(() -> listener.onResponse(newResponse(request, responses)));
                 return;
             }
-            TransportRequestOptions.Builder builder = TransportRequestOptions.builder();
-            if (request.timeout() != null) {
-                builder.withTimeout(request.timeout());
-            }
+            final TransportRequestOptions transportRequestOptions = TransportRequestOptions.timeout(request.timeout());
             for (int i = 0; i < nodes.length; i++) {
                 final int idx = i;
                 final DiscoveryNode node = nodes[i];
@@ -214,7 +211,7 @@ void start() {
                         nodeRequest.setParentTask(clusterService.localNode().getId(), task.getId());
                     }
 
-                    transportService.sendRequest(node, getTransportNodeAction(node), nodeRequest, builder.build(),
+                    transportService.sendRequest(node, getTransportNodeAction(node), nodeRequest, transportRequestOptions,
                             new TransportResponseHandler<NodeResponse>() {
                                 @Override
                                 public NodeResponse read(StreamInput in) throws IOException {

server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java

@@ -170,7 +170,7 @@ protected TransportReplicationAction(Settings settings, String actionName, Trans
         transportService.registerRequestHandler(transportReplicaAction, executor, true, true,
             in -> new ConcreteReplicaRequest<>(replicaRequestReader, in), this::handleReplicaRequest);
 
-        this.transportOptions = transportOptions(settings);
+        this.transportOptions = transportOptions();
 
         this.syncGlobalCheckpointAfterOperation = syncGlobalCheckpointAfterOperation;
 
@@ -249,7 +249,7 @@ public ClusterBlockLevel indexBlockLevel() {
         return null;
     }
 
-    protected TransportRequestOptions transportOptions(Settings settings) {
+    protected TransportRequestOptions transportOptions() {
         return TransportRequestOptions.EMPTY;
     }
 

server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java

@@ -246,10 +246,7 @@ private void start() {
                     listener.onFailure(e);
                 }
             } else {
-                TransportRequestOptions.Builder builder = TransportRequestOptions.builder();
-                if (request.getTimeout() != null) {
-                    builder.withTimeout(request.getTimeout());
-                }
+                final TransportRequestOptions transportRequestOptions = TransportRequestOptions.timeout(request.getTimeout());
                 for (int i = 0; i < nodesIds.length; i++) {
                     final String nodeId = nodesIds[i];
                     final int idx = i;
@@ -260,7 +257,7 @@ private void start() {
                         } else {
                             NodeTaskRequest nodeRequest = new NodeTaskRequest(request);
                             nodeRequest.setParentTask(clusterService.localNode().getId(), task.getId());
-                            transportService.sendRequest(node, transportNodeAction, nodeRequest, builder.build(),
+                            transportService.sendRequest(node, transportNodeAction, nodeRequest, transportRequestOptions,
                                 new TransportResponseHandler<NodeTasksResponse>() {
                                     @Override
                                     public NodeTasksResponse read(StreamInput in) throws IOException {

server/src/main/java/org/elasticsearch/client/transport/TransportClient.java

@@ -223,7 +223,7 @@ private static ClientTemplate buildTemplate(Settings providedSettings, Settings
             final List<? extends ActionType<?>> baseActions =
                     actionModule.getActions().values().stream().map(ActionPlugin.ActionHandler::getAction).collect(Collectors.toList());
             clientActions.addAll(baseActions);
-            final TransportProxyClient proxy = new TransportProxyClient(settings, transportService, nodesService, clientActions);
+            final TransportProxyClient proxy = new TransportProxyClient(transportService, nodesService, clientActions);
 
             List<LifecycleComponent> pluginLifecycleComponents = new ArrayList<>(pluginsService.getGuiceServiceClasses().stream()
                 .map(injector::getInstance).collect(Collectors.toList()));

server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java

@@ -76,7 +76,7 @@ final class TransportClientNodesService implements Closeable {
 
     private final TimeValue nodesSamplerInterval;
 
-    private final long pingTimeout;
+    private final TimeValue pingTimeout;
 
     private final ClusterName clusterName;
 
@@ -132,7 +132,7 @@ final class TransportClientNodesService implements Closeable {
         this.minCompatibilityVersion = Version.CURRENT.minimumCompatibilityVersion();
 
         this.nodesSamplerInterval = TransportClient.CLIENT_TRANSPORT_NODES_SAMPLER_INTERVAL.get(settings);
-        this.pingTimeout = TransportClient.CLIENT_TRANSPORT_PING_TIMEOUT.get(settings).millis();
+        this.pingTimeout = TransportClient.CLIENT_TRANSPORT_PING_TIMEOUT.get(settings);
         this.ignoreClusterName = TransportClient.CLIENT_TRANSPORT_IGNORE_CLUSTER_NAME.get(settings);
 
         if (logger.isDebugEnabled()) {
@@ -417,7 +417,7 @@ public LivenessResponse read(StreamInput in) throws IOException {
                             }
                         });
                     transportService.sendRequest(connection, TransportLivenessAction.NAME, new LivenessRequest(),
-                        TransportRequestOptions.builder().withType(TransportRequestOptions.Type.STATE).withTimeout(pingTimeout).build(),
+                        TransportRequestOptions.of(pingTimeout, TransportRequestOptions.Type.STATE),
                         handler);
                     final LivenessResponse livenessResponse = handler.txGet();
                     if (!ignoreClusterName && !clusterName.equals(livenessResponse.getClusterName())) {
@@ -507,8 +507,7 @@ protected void doRun() throws Exception {
                             }
                             transportService.sendRequest(pingConnection, ClusterStateAction.NAME,
                                 Requests.clusterStateRequest().clear().nodes(true).local(true),
-                                TransportRequestOptions.builder().withType(TransportRequestOptions.Type.STATE)
-                                    .withTimeout(pingTimeout).build(),
+                                TransportRequestOptions.of(pingTimeout, TransportRequestOptions.Type.STATE),
                                 new TransportResponseHandler<ClusterStateResponse>() {
 
                                     @Override