Node Stats: Allow to explicitly get specific indices level node stats element

closes elastic#2871

Author: kimchy

src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java

@@ -19,6 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.node.stats;
 
+import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
 import org.elasticsearch.action.support.nodes.NodesOperationRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -30,7 +31,7 @@
  */
 public class NodesStatsRequest extends NodesOperationRequest<NodesStatsRequest> {
 
- private boolean indices = true;
+ private CommonStatsFlags indices = new CommonStatsFlags();
  private boolean os;
  private boolean process;
  private boolean jvm;
@@ -55,7 +56,7 @@ public NodesStatsRequest(String... nodesIds) {
  * Sets all the request flags.
  */
  public NodesStatsRequest all() {
- this.indices = true;
+ this.indices.all();
  this.os = true;
  this.process = true;
  this.jvm = true;
@@ -71,7 +72,7 @@ public NodesStatsRequest all() {
  * Clears all the request flags.
  */
  public NodesStatsRequest clear() {
- this.indices = false;
+ this.indices.clear();
  this.os = false;
  this.process = false;
  this.jvm = false;
@@ -83,18 +84,24 @@ public NodesStatsRequest clear() {
  return this;
  }
 
- /**
- * Should indices stats be returned.
- */
- public boolean indices() {
- return this.indices;
+ public CommonStatsFlags indices() {
+ return indices;
+ }
+
+ public NodesStatsRequest indices(CommonStatsFlags indices) {
+ this.indices = indices;
+ return this;
  }
 
  /**
  * Should indices stats be returned.
  */
  public NodesStatsRequest indices(boolean indices) {
- this.indices = indices;
+ if (indices) {
+ this.indices.all();
+ } else {
+ this.indices.clear();
+ }
  return this;
  }
 
@@ -221,7 +228,7 @@ public NodesStatsRequest http(boolean http) {
  @Override
  public void readFrom(StreamInput in) throws IOException {
  super.readFrom(in);
- indices = in.readBoolean();
+ indices = CommonStatsFlags.readCommonStatsFlags(in);
  os = in.readBoolean();
  process = in.readBoolean();
  jvm = in.readBoolean();
@@ -235,7 +242,7 @@ public void readFrom(StreamInput in) throws IOException {
  @Override
  public void writeTo(StreamOutput out) throws IOException {
  super.writeTo(out);
- out.writeBoolean(indices);
+ indices.writeTo(out);
  out.writeBoolean(os);
  out.writeBoolean(process);
  out.writeBoolean(jvm);

src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.action.admin.cluster.node.stats;
 
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
 import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder;
 import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.internal.InternalClusterAdminClient;
@@ -57,6 +58,14 @@ public NodesStatsRequestBuilder setIndices(boolean indices) {
  return this;
  }
 
+ /**
+ * Should the node indices stats be returned.
+ */
+ public NodesStatsRequestBuilder setIndices(CommonStatsFlags indices) {
+ request.indices(indices);
+ return this;
+ }
+
  /**
  * Should the node OS stats be returned.
  */

src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java

@@ -45,40 +45,40 @@
 public class CommonStats implements Streamable, ToXContent {
 
  @Nullable
- DocsStats docs;
+ public DocsStats docs;
 
  @Nullable
- StoreStats store;
+ public StoreStats store;
 
  @Nullable
- IndexingStats indexing;
+ public IndexingStats indexing;
 
  @Nullable
- GetStats get;
+ public GetStats get;
 
  @Nullable
- SearchStats search;
+ public SearchStats search;
 
  @Nullable
- MergeStats merge;
+ public MergeStats merge;
 
  @Nullable
- RefreshStats refresh;
+ public RefreshStats refresh;
 
  @Nullable
- FlushStats flush;
+ public FlushStats flush;
 
  @Nullable
- WarmerStats warmer;
+ public WarmerStats warmer;
 
  @Nullable
- FilterCacheStats filterCache;
+ public FilterCacheStats filterCache;
 
  @Nullable
- IdCacheStats idCache;
+ public IdCacheStats idCache;
 
  @Nullable
- FieldDataStats fieldData;
+ public FieldDataStats fieldData;
 
  public void add(CommonStats stats) {
  if (docs == null) {