Moving empty IndicesStats creation to Response class

Signed-off-by: Harsh Garg <[email protected]>
opensearch-project · Oct 23, 2024 · 40cc55a · 40cc55a
1 parent 016fcaf
commit 40cc55a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/...er/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java b/...er/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
@@ -12,7 +12,6 @@
 import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.opensearch.action.admin.indices.stats.ShardStats;
 import org.opensearch.action.pagination.PageParams;
 import org.opensearch.action.pagination.ShardPaginationStrategy;
 import org.opensearch.action.support.ActionFilters;
@@ -28,7 +27,6 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
-import java.util.Collections;
 import java.util.Objects;
 
 import static org.opensearch.common.breaker.ResponseLimitSettings.LimitEntity.SHARDS;
@@ -42,13 +40,6 @@ public class TransportCatShardsAction extends HandledTransportAction<CatShardsRe
 
     private final NodeClient client;
     private final ResponseLimitSettings responseLimitSettings;
-    private static final IndicesStatsResponse EMPTY_INDICES_STATS_RESPONSE = new IndicesStatsResponse(
-        new ShardStats[0],
-        0,
-        0,
-        0,
-        Collections.emptyList()
-    );
 
     @Inject
     public TransportCatShardsAction(
@@ -119,7 +110,7 @@ public void onResponse(ClusterStateResponse clusterStateResponse) {
                         catShardsResponse.setPageToken(Objects.isNull(paginationStrategy) ? null : paginationStrategy.getResponseToken());
                         // For paginated queries, if strategy outputs no shards to be returned, avoid fetching IndicesStats.
                         if (shouldSkipIndicesStatsRequest(paginationStrategy)) {
-                            catShardsResponse.setIndicesStatsResponse(EMPTY_INDICES_STATS_RESPONSE);
+                            catShardsResponse.setIndicesStatsResponse(IndicesStatsResponse.getEmptyResponse());
                             cancellableListener.onResponse(catShardsResponse);
                             return;
                         }

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/stats/IndicesStatsResponse.java
@@ -45,6 +45,7 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -230,4 +231,8 @@ static final class Fields {
     public String toString() {
         return Strings.toString(MediaTypeRegistry.JSON, this, true, false);
     }
+
+    public static IndicesStatsResponse getEmptyResponse() {
+        return new IndicesStatsResponse(new ShardStats[0], 0, 0, 0, Collections.emptyList());
+    }
 }
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
@@ -43,7 +43,6 @@
 import org.opensearch.action.admin.indices.stats.IndexStats;
 import org.opensearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.opensearch.action.admin.indices.stats.ShardStats;
 import org.opensearch.action.pagination.IndexPaginationStrategy;
 import org.opensearch.action.pagination.PageToken;
 import org.opensearch.action.support.GroupedActionListener;
@@ -105,13 +104,6 @@ public class RestIndicesAction extends AbstractListAction {
         "Parameter [master_timeout] is deprecated and will be removed in 3.0. To support inclusive language, please use [cluster_manager_timeout] instead.";
     private static final String DUPLICATE_PARAMETER_ERROR_MESSAGE =
         "Please only use one of the request parameters [master_timeout, cluster_manager_timeout].";
-    private static final IndicesStatsResponse EMPTY_INDICES_STATS_RESPONSE = new IndicesStatsResponse(
-        new ShardStats[0],
-        0,
-        0,
-        0,
-        Collections.emptyList()
-    );
 
     private final ResponseLimitSettings responseLimitSettings;
 
@@ -223,7 +215,7 @@ public void onResponse(ClusterStateResponse clusterStateResponse) {
                                     // For paginated queries, if strategy outputs no indices to be returned,
                                     // avoid fetching indices stats.
                                     if (shouldSkipIndicesStatsRequest(paginationStrategy)) {
-                                        groupedListener.onResponse(EMPTY_INDICES_STATS_RESPONSE);
+                                        groupedListener.onResponse(IndicesStatsResponse.getEmptyResponse());
                                     } else {
                                         sendIndicesStatsRequest(
                                             indicesToBeQueried,