Refactor listener to simplify

smalyshev · Sep 13, 2024 · 8a05bc2 · 8a05bc2
1 parent cf5e2ec
commit 8a05bc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/...c/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/...c/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
@@ -139,11 +139,7 @@ public TransportClusterStatsAction(
 
     @Override
     protected void doExecute(Task task, ClusterStatsRequest request, ActionListener<ClusterStatsResponse> listener) {
-        if (doRemotes(request)) {
-            super.doExecute(task, request, new ActionListenerWithRemotes(task, request, listener));
-        } else {
-            super.doExecute(task, request, listener);
-        }
+        super.doExecute(task, request, new ActionListenerWithRemotes(task, request, listener));
     }
 
     @Override
@@ -160,6 +156,7 @@ protected void newResponseAsync(
         );
         assert ThreadPool.assertCurrentThreadPool(ThreadPool.Names.MANAGEMENT);
         assert task instanceof CancellableTask;
+        assert listener instanceof ActionListenerWithRemotes;
 
         if (request.isRemoteStats()) {
             newRemoteResponseAsync(responses, listener);
@@ -174,10 +171,7 @@ protected void newResponseAsync(
             clusterService.threadPool().absoluteTimeInMillis()
         );
 
-        SubscribableListener<Map<String, RemoteClusterStats>> remoteClusterStatsListener =
-            (listener instanceof ActionListenerWithRemotes listenerWithRemotes)
-                ? listenerWithRemotes.getRemoteClusterStats()
-                : SubscribableListener.newSucceeded(null);
+        var remoteClusterStatsListener = ((ActionListenerWithRemotes) listener).getRemoteClusterStats();
 
         final ListenableFuture<MappingStats> mappingStatsStep = new ListenableFuture<>();
         final ListenableFuture<AnalysisStats> analysisStatsStep = new ListenableFuture<>();

diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java
@@ -45,7 +45,7 @@ public String getName() {
 
     @Override
     public Set<String> supportedQueryParameters() {
-        return Set.of("include_remotes");
+        return Set.of("include_remotes", "nodeId");
     }
 
     @Override