coderabbit suggestions

Signed-off-by: Anthony Leong <aj.leong623@gmail.com>

Author: ajleong623

server/src/internalClusterTest/java/org/opensearch/search/msearch/MultiSearchStatsIT.java

@@ -26,7 +26,7 @@
 public class MultiSearchStatsIT extends OpenSearchIntegTestCase {
     private final SearchResponseStatusStats expectedSearchResponseStatusStats = new SearchResponseStatusStats();
 
-    public void testNodeIndicesStatsDocStatusStatsIndexBulk() {
+    public void testNodeIndicesStatsSearchResponseStatusStatsMultiSearch() {
         createIndex("test");
         ensureGreen();
         client().prepareIndex("test").setId("1").setSource("field", "xxx").get();
@@ -70,10 +70,12 @@ private void assertSearchResponseStatusStats() {
             .getStatusCounterStats()
             .getSearchResponseStatusStats();
 
-        Arrays.equals(
-            searchResponseStatusStats.getSearchResponseStatusCounter(),
-            expectedSearchResponseStatusStats.getSearchResponseStatusCounter(),
-            Comparator.comparingLong(LongAdder::longValue)
+        assertTrue(
+            Arrays.equals(
+                searchResponseStatusStats.getSearchResponseStatusCounter(),
+                expectedSearchResponseStatusStats.getSearchResponseStatusCounter(),
+                Comparator.comparingLong(LongAdder::longValue)
+            )
         );
     }
 

server/src/main/java/org/opensearch/action/admin/indices/stats/AbstractStatusStats.java

@@ -88,7 +88,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field(userFailureType, errorTypeCounts.getOrDefault(userFailureType, (long) 0));
         builder.field(systemErrorType, errorTypeCounts.getOrDefault(systemErrorType, (long) 0));
 
-        return builder.endObject();
+        return builder;
     }
 
     @Override

server/src/main/java/org/opensearch/action/admin/indices/stats/DocStatusStats.java

@@ -77,7 +77,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.startObject(Fields.DOC_STATUS);
 
         super.toXContent(builder, params);
-        return builder;
+        return builder.endObject();
     }
 
     @Override

server/src/main/java/org/opensearch/action/admin/indices/stats/SearchResponseStatusStats.java

@@ -76,7 +76,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.startObject(Fields.SEARCH_RESPONSE_STATUS);
 
         super.toXContent(builder, params);
-        return builder;
+        return builder.endObject();
     }
 
     @Override

server/src/main/java/org/opensearch/action/admin/indices/stats/StatusCounterStats.java

@@ -76,7 +76,15 @@ public StatusCounterStats getSnapshot() {
     }
 
     public void add(StatusCounterStats stats) {
-        docStatusStats.add(stats.docStatusStats);
+        if (stats == null) {
+            return;
+        }
+        if (docStatusStats != null) {
+            docStatusStats.add(stats.docStatusStats);
+        }
+        if (searchResponseStatusStats != null) {
+            searchResponseStatusStats.add(stats.searchResponseStatusStats);
+        }
     }
 
     @Override