refactoring getter/setters

Fixes elastic#2657

Author: dadoonet

src/main/java/org/elasticsearch/action/ActionRequest.java

@@ -49,15 +49,15 @@ protected ActionRequest(ActionRequest request) {
  * <p>When not executing on a thread, it will either be executed on the calling thread, or
  * on an expensive, IO based, thread.
  */
- public final boolean listenerThreaded() {
+ public final boolean isListenerThreaded() {
  return this.listenerThreaded;
  }
 
  /**
  * Sets if the response listener be executed on a thread or not.
  */
  @SuppressWarnings("unchecked")
- public final T listenerThreaded(boolean listenerThreaded) {
+ public final T setListenerThreaded(boolean listenerThreaded) {
  this.listenerThreaded = listenerThreaded;
  return (T) this;
  }

src/main/java/org/elasticsearch/action/ActionRequestBuilder.java

@@ -42,7 +42,7 @@ public Request request() {
 
  @SuppressWarnings("unchecked")
  public final RequestBuilder setListenerThreaded(boolean listenerThreaded) {
- request.listenerThreaded(listenerThreaded);
+ request.setListenerThreaded(listenerThreaded);
  return (RequestBuilder) this;
  }
 
@@ -53,7 +53,7 @@ public final RequestBuilder putHeader(String key, Object value) {
  }
 
  public ListenableActionFuture<Response> execute() {
- PlainListenableActionFuture<Response> future = new PlainListenableActionFuture<Response>(request.listenerThreaded(), client.threadPool());
+ PlainListenableActionFuture<Response> future = new PlainListenableActionFuture<Response>(request.isListenerThreaded(), client.threadPool());
  execute(future);
  return future;
  }

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

@@ -54,7 +54,7 @@ public TransportActionNodeProxy(Settings settings, GenericAction<Request, Respon
 
  public ActionFuture<Response> execute(DiscoveryNode node, Request request) throws ElasticSearchException {
  PlainActionFuture<Response> future = newFuture();
- request.listenerThreaded(false);
+ request.setListenerThreaded(false);
  execute(node, request, future);
  return future;
  }
@@ -68,7 +68,7 @@ public Response newInstance() {
 
  @Override
  public String executor() {
- if (request.listenerThreaded()) {
+ if (request.isListenerThreaded()) {
  return ThreadPool.Names.GENERIC;
  }
  return ThreadPool.Names.SAME;

src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java

@@ -57,84 +57,84 @@ public ClusterHealthRequest(String... indices) {
  this.indices = indices;
  }
 
- public String[] indices() {
+ public String[] getIndices() {
  return indices;
  }
 
- public ClusterHealthRequest indices(String[] indices) {
+ public ClusterHealthRequest setIndices(String[] indices) {
  this.indices = indices;
  return this;
  }
 
- public TimeValue timeout() {
+ public TimeValue getTimeout() {
  return timeout;
  }
 
- public ClusterHealthRequest timeout(TimeValue timeout) {
+ public ClusterHealthRequest setTimeout(TimeValue timeout) {
  this.timeout = timeout;
  if (masterNodeTimeout == DEFAULT_MASTER_NODE_TIMEOUT) {
  masterNodeTimeout = timeout;
  }
  return this;
  }
 
- public ClusterHealthRequest timeout(String timeout) {
- return timeout(TimeValue.parseTimeValue(timeout, null));
+ public ClusterHealthRequest setTimeout(String timeout) {
+ return setTimeout(TimeValue.parseTimeValue(timeout, null));
  }
 
- public ClusterHealthStatus waitForStatus() {
+ public ClusterHealthStatus getWaitForStatus() {
  return waitForStatus;
  }
 
- public ClusterHealthRequest waitForStatus(ClusterHealthStatus waitForStatus) {
+ public ClusterHealthRequest setWaitForStatus(ClusterHealthStatus waitForStatus) {
  this.waitForStatus = waitForStatus;
  return this;
  }
 
- public ClusterHealthRequest waitForGreenStatus() {
- return waitForStatus(ClusterHealthStatus.GREEN);
+ public ClusterHealthRequest setWaitForGreenStatus() {
+ return setWaitForStatus(ClusterHealthStatus.GREEN);
  }
 
- public ClusterHealthRequest waitForYellowStatus() {
- return waitForStatus(ClusterHealthStatus.YELLOW);
+ public ClusterHealthRequest setWaitForYellowStatus() {
+ return setWaitForStatus(ClusterHealthStatus.YELLOW);
  }
 
- public int waitForRelocatingShards() {
+ public int getWaitForRelocatingShards() {
  return waitForRelocatingShards;
  }
 
- public ClusterHealthRequest waitForRelocatingShards(int waitForRelocatingShards) {
+ public ClusterHealthRequest setWaitForRelocatingShards(int waitForRelocatingShards) {
  this.waitForRelocatingShards = waitForRelocatingShards;
  return this;
  }
 
- public int waitForActiveShards() {
+ public int getWaitForActiveShards() {
  return waitForActiveShards;
  }
 
- public ClusterHealthRequest waitForActiveShards(int waitForActiveShards) {
+ public ClusterHealthRequest setWaitForActiveShards(int waitForActiveShards) {
  this.waitForActiveShards = waitForActiveShards;
  return this;
  }
 
- public String waitForNodes() {
+ public String getWaitForNodes() {
  return waitForNodes;
  }
 
  /**
  * Waits for N number of nodes. Use "12" for exact mapping, ">12" and "<12" for range.
  */
- public ClusterHealthRequest waitForNodes(String waitForNodes) {
+ public ClusterHealthRequest setWaitForNodes(String waitForNodes) {
  this.waitForNodes = waitForNodes;
  return this;
  }
 
- public ClusterHealthRequest local(boolean local) {
+ public ClusterHealthRequest setLocal(boolean local) {
  this.local = local;
  return this;
  }
 
- public boolean local() {
+ public boolean getLocal() {
  return this.local;
  }
 

src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java

@@ -35,50 +35,50 @@ public ClusterHealthRequestBuilder(ClusterAdminClient clusterClient) {
  }
 
  public ClusterHealthRequestBuilder setIndices(String... indices) {
- request.indices(indices);
+ request.setIndices(indices);
  return this;
  }
 
  public ClusterHealthRequestBuilder setTimeout(TimeValue timeout) {
- request.timeout(timeout);
+ request.setTimeout(timeout);
  return this;
  }
 
  public ClusterHealthRequestBuilder setTimeout(String timeout) {
- request.timeout(timeout);
+ request.setTimeout(timeout);
  return this;
  }
 
  public ClusterHealthRequestBuilder setWaitForStatus(ClusterHealthStatus waitForStatus) {
- request.waitForStatus(waitForStatus);
+ request.setWaitForStatus(waitForStatus);
  return this;
  }
 
  public ClusterHealthRequestBuilder setWaitForGreenStatus() {
- request.waitForGreenStatus();
+ request.setWaitForGreenStatus();
  return this;
  }
 
  public ClusterHealthRequestBuilder setWaitForYellowStatus() {
- request.waitForYellowStatus();
+ request.setWaitForYellowStatus();
  return this;
  }
 
  public ClusterHealthRequestBuilder setWaitForRelocatingShards(int waitForRelocatingShards) {
- request.waitForRelocatingShards(waitForRelocatingShards);
+ request.setWaitForRelocatingShards(waitForRelocatingShards);
  return this;
  }
 
  public ClusterHealthRequestBuilder setWaitForActiveShards(int waitForActiveShards) {
- request.waitForActiveShards(waitForActiveShards);
+ request.setWaitForActiveShards(waitForActiveShards);
  return this;
  }
 
  /**
  * Waits for N number of nodes. Use "12" for exact mapping, ">12" and "<12" for range.
  */
  public ClusterHealthRequestBuilder setWaitForNodes(String waitForNodes) {
- request.waitForNodes(waitForNodes);
+ request.setWaitForNodes(waitForNodes);
  return this;
  }
 

src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java

@@ -59,128 +59,69 @@ public ClusterHealthResponse(String clusterName, List<String> validationFailures
  this.validationFailures = validationFailures;
  }
 
- public String clusterName() {
- return clusterName;
- }
-
  public String getClusterName() {
- return clusterName();
- }
-
- /**
- * The validation failures on the cluster level (without index validation failures).
- */
- public List<String> validationFailures() {
- return this.validationFailures;
+ return clusterName;
  }
 
  /**
  * The validation failures on the cluster level (without index validation failures).
  */
  public List<String> getValidationFailures() {
- return validationFailures();
+ return this.validationFailures;
  }
 
  /**
  * All the validation failures, including index level validation failures.
  */
- public List<String> allValidationFailures() {
- List<String> allFailures = newArrayList(validationFailures());
+ public List<String> getAllValidationFailures() {
+ List<String> allFailures = newArrayList(getValidationFailures());
  for (ClusterIndexHealth indexHealth : indices.values()) {
- allFailures.addAll(indexHealth.validationFailures());
+ allFailures.addAll(indexHealth.getValidationFailures());
  }
  return allFailures;
  }
 
- /**
- * All the validation failures, including index level validation failures.
- */
- public List<String> getAllValidationFailures() {
- return allValidationFailures();
- }
-
-
- public int activeShards() {
- return activeShards;
- }
-
  public int getActiveShards() {
- return activeShards();
- }
-
- public int relocatingShards() {
- return relocatingShards;
+ return activeShards;
  }
 
  public int getRelocatingShards() {
- return relocatingShards();
- }
-
- public int activePrimaryShards() {
- return activePrimaryShards;
+ return relocatingShards;
  }
 
  public int getActivePrimaryShards() {
- return activePrimaryShards();
- }
-
- public int initializingShards() {
- return initializingShards;
+ return activePrimaryShards;
  }
 
  public int getInitializingShards() {
- return initializingShards();
- }
-
- public int unassignedShards() {
- return unassignedShards;
+ return initializingShards;
  }
 
  public int getUnassignedShards() {
- return unassignedShards();
- }
-
- public int numberOfNodes() {
- return this.numberOfNodes;
+ return unassignedShards;
  }
 
  public int getNumberOfNodes() {
- return numberOfNodes();
- }
-
- public int numberOfDataNodes() {
- return this.numberOfDataNodes;
+ return this.numberOfNodes;
  }
 
  public int getNumberOfDataNodes() {
- return numberOfDataNodes();
+ return this.numberOfDataNodes;
  }
 
  /**
  * <tt>true</tt> if the waitForXXX has timeout out and did not match.
  */
- public boolean timedOut() {
- return this.timedOut;
- }
-
  public boolean isTimedOut() {
- return this.timedOut();
- }
-
- public ClusterHealthStatus status() {
- return status;
+ return this.timedOut;
  }
 
  public ClusterHealthStatus getStatus() {
- return status();
- }
-
- public Map<String, ClusterIndexHealth> indices() {
- return indices;
+ return status;
  }
 
  public Map<String, ClusterIndexHealth> getIndices() {
- return indices();
+ return indices;
  }
 
  @Override
@@ -203,7 +144,7 @@ public void readFrom(StreamInput in) throws IOException {
  int size = in.readVInt();
  for (int i = 0; i < size; i++) {
  ClusterIndexHealth indexHealth = readClusterIndexHealth(in);
- indices.put(indexHealth.index(), indexHealth);
+ indices.put(indexHealth.getIndex(), indexHealth);
  }
  timedOut = in.readBoolean();
  size = in.readVInt();