From adb83182a5039fdeebd640b517aebf27a1c90e17 Mon Sep 17 00:00:00 2001
From: Luca Cavanna <cavannaluca@gmail.com>
Date: Wed, 20 Nov 2013 09:44:48 +0100
Subject: [PATCH] Added readTimeout, writeTimeout, readAcknowledged and
 writeAcknowledged methods variation without version as parameter, to be used
 by api that always read and write those parameters. Helps avoiding to call
 the variation that accepts a Version with actual version null.

---
 .../delete/DeleteRepositoryRequest.java            |  4 ++--
 .../delete/DeleteRepositoryResponse.java           |  4 ++--
 .../repositories/put/PutRepositoryRequest.java     |  5 ++---
 .../repositories/put/PutRepositoryResponse.java    |  5 ++---
 .../snapshots/delete/DeleteSnapshotResponse.java   |  4 ++--
 .../admin/indices/alias/IndicesAliasesRequest.java |  4 ++--
 .../indices/alias/IndicesAliasesResponse.java      |  4 ++--
 .../admin/indices/close/CloseIndexRequest.java     |  4 ++--
 .../admin/indices/close/CloseIndexResponse.java    |  4 ++--
 .../admin/indices/open/OpenIndexRequest.java       |  4 ++--
 .../admin/indices/open/OpenIndexResponse.java      |  4 ++--
 .../warmer/delete/DeleteWarmerResponse.java        |  4 ++--
 .../indices/warmer/put/PutWarmerResponse.java      |  4 ++--
 .../action/support/master/AcknowledgedRequest.java | 14 ++++++++++++++
 .../support/master/AcknowledgedResponse.java       | 14 ++++++++++++++
 15 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java
index f8c95539394..43ec265858c 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java
@@ -81,13 +81,13 @@ public class DeleteRepositoryRequest extends AcknowledgedRequest<DeleteRepositor
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         name = in.readString();
-        readTimeout(in, null);
+        readTimeout(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeString(name);
-        writeTimeout(out, null);
+        writeTimeout(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java
index 623714e3b8b..8d65f1c9faa 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java
@@ -40,13 +40,13 @@ public class DeleteRepositoryResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
index 81cf9cc1dda..9daa6e7bde2 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
@@ -23,7 +23,6 @@ import org.elasticsearch.ElasticSearchGenerationException;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -268,7 +267,7 @@ public class PutRepositoryRequest extends AcknowledgedRequest<PutRepositoryReque
         name = in.readString();
         type = in.readString();
         settings = readSettingsFromStream(in);
-        readTimeout(in, null);
+        readTimeout(in);
     }
 
     @Override
@@ -277,6 +276,6 @@ public class PutRepositoryRequest extends AcknowledgedRequest<PutRepositoryReque
         out.writeString(name);
         out.writeString(type);
         writeSettingsToStream(settings, out);
-        writeTimeout(out, null);
+        writeTimeout(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java
index 6132c64bf2d..d9fe05ec04b 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.cluster.repositories.put;
 
-import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -41,13 +40,13 @@ public class PutRepositoryResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java
index 87dfbec9b5b..241028a0ccd 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java
@@ -40,13 +40,13 @@ public class DeleteSnapshotResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
index 8c420131075..eb8446899aa 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java
@@ -167,7 +167,7 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
         for (int i = 0; i < size; i++) {
             aliasActions.add(readAliasAction(in));
         }
-        readTimeout(in, null);
+        readTimeout(in);
     }
 
     @Override
@@ -177,6 +177,6 @@ public class IndicesAliasesRequest extends AcknowledgedRequest<IndicesAliasesReq
         for (AliasAction aliasAction : aliasActions) {
             aliasAction.writeTo(out);
         }
-        writeTimeout(out, null);
+        writeTimeout(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java
index 580ee04475b..00e2ba28287 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java
@@ -41,12 +41,12 @@ public class IndicesAliasesResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java
index 93c0b13fc21..6a5f426fcf8 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java
@@ -96,7 +96,7 @@ public class CloseIndexRequest extends AcknowledgedRequest<CloseIndexRequest> {
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         indices = in.readStringArray();
-        readTimeout(in, null);
+        readTimeout(in);
         ignoreIndices = IgnoreIndices.fromId(in.readByte());
     }
 
@@ -104,7 +104,7 @@ public class CloseIndexRequest extends AcknowledgedRequest<CloseIndexRequest> {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(indices);
-        writeTimeout(out, null);
+        writeTimeout(out);
         out.writeByte(ignoreIndices.id());
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
index 685e0cc11cd..1fca82d620b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java
@@ -40,12 +40,12 @@ public class CloseIndexResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java
index 0b7f579fda1..a61ceaa1595 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java
@@ -96,7 +96,7 @@ public class OpenIndexRequest extends AcknowledgedRequest<OpenIndexRequest> {
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         indices = in.readStringArray();
-        readTimeout(in, null);
+        readTimeout(in);
         ignoreIndices = IgnoreIndices.fromId(in.readByte());
     }
 
@@ -104,7 +104,7 @@ public class OpenIndexRequest extends AcknowledgedRequest<OpenIndexRequest> {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(indices);
-        writeTimeout(out, null);
+        writeTimeout(out);
         out.writeByte(ignoreIndices.id());
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java
index 0a8ce844aea..7411e6a5b72 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java
@@ -40,12 +40,12 @@ public class OpenIndexResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java
index 6b83fed11fd..4695b5e753e 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerResponse.java
@@ -41,12 +41,12 @@ public class DeleteWarmerResponse  extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java
index 114fb1d5a93..4d511256a86 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerResponse.java
@@ -41,12 +41,12 @@ public class PutWarmerResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, null);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, null);
+        writeAcknowledged(out);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
index 02fb99925fd..6ffc7aa8e54 100644
--- a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
@@ -69,6 +69,13 @@ public abstract class AcknowledgedRequest<T extends MasterNodeOperationRequest>
         return  timeout;
     }
 
+    /**
+     * Reads the timeout value
+     */
+    protected void readTimeout(StreamInput in) throws IOException {
+        readTimeout(in, null);
+    }
+
     /**
      * Reads the timeout value if on or after the specified min version or if the version is <code>null</code>.
      */
@@ -78,6 +85,13 @@ public abstract class AcknowledgedRequest<T extends MasterNodeOperationRequest>
         }
     }
 
+    /**
+     * writes the timeout value
+     */
+    protected void writeTimeout(StreamOutput out) throws IOException {
+        writeTimeout(out, null);
+    }
+
     /**
      * writes the timeout value if on or after the specified min version or if the version is <code>null</code>.
      */
diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
index a8067daa99d..01215c96ae7 100644
--- a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
+++ b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
@@ -49,6 +49,13 @@ public abstract class AcknowledgedResponse extends ActionResponse {
         return acknowledged;
     }
 
+    /**
+     * Reads the timeout value
+     */
+    protected void readAcknowledged(StreamInput in) throws IOException {
+        readAcknowledged(in, null);
+    }
+
     /**
      * Reads the timeout value if on or after the specified min version or if the version is <code>null</code>.
      */
@@ -58,6 +65,13 @@ public abstract class AcknowledgedResponse extends ActionResponse {
         }
     }
 
+    /**
+     * Writes the timeout value
+     */
+    protected void writeAcknowledged(StreamOutput out) throws IOException {
+        writeAcknowledged(out, null);
+    }
+
     /**
      * Writes the timeout value if on or after the specified min version or if the version is <code>null</code>.
      */