Removed redundant version checks in transport serialization (elastic#…

…4731 leftover)
mute · Jan 24, 2014 · a2828cc · a2828cc
1 parent 055e7dd
commit a2828cc
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 38 deletions.
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.cluster.reroute;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -54,13 +53,13 @@ public ClusterState getState() {
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         state = ClusterState.Builder.readFrom(in, null);
-        readAcknowledged(in, Version.V_0_90_6);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         ClusterState.Builder.writeTo(state, out);
-        writeAcknowledged(out, Version.V_0_90_6);
+        writeAcknowledged(out);
     }
 }
diff --git a/...n/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java b/...n/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.cluster.settings;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -52,7 +51,7 @@ public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         transientSettings = ImmutableSettings.readSettingsFromStream(in);
         persistentSettings = ImmutableSettings.readSettingsFromStream(in);
-        readAcknowledged(in, Version.V_0_90_6);
+        readAcknowledged(in);
     }
 
     public Settings getTransientSettings() {
@@ -68,6 +67,6 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         ImmutableSettings.writeSettingsToStream(transientSettings, out);
         ImmutableSettings.writeSettingsToStream(persistentSettings, out);
-        writeAcknowledged(out, Version.V_0_90_6);
+        writeAcknowledged(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java
@@ -40,12 +40,12 @@ public class CreateIndexResponse 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/...ain/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java b/...ain/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingResponse.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.indices.mapping.delete;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -42,12 +41,12 @@ public class DeleteMappingResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, Version.V_0_90_6);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, Version.V_0_90_6);
+        writeAcknowledged(out);
     }
 }
diff --git a/...main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java b/...main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.indices.settings.put;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -41,12 +40,12 @@ public class UpdateSettingsResponse extends AcknowledgedResponse {
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readAcknowledged(in, Version.V_0_90_6);
+        readAcknowledged(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeAcknowledged(out, Version.V_0_90_6);
+        writeAcknowledged(out);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/DeleteWarmerRequest.java
@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.action.admin.indices.warmer.delete;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;

diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java
@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.action.support.master;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -53,31 +52,13 @@ public final boolean isAcknowledged() {
      * 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>.
-     */
-    protected void readAcknowledged(StreamInput in, Version minVersion) throws IOException {
-        if (minVersion == null || in.getVersion().onOrAfter(minVersion)) {
-            acknowledged = in.readBoolean();
-        }
+        acknowledged = in.readBoolean();
     }
 
     /**
      * 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>.
-     */
-    protected void writeAcknowledged(StreamOutput out, Version minVersion) throws IOException {
-        if (minVersion == null || out.getVersion().onOrAfter(minVersion)) {
-            out.writeBoolean(acknowledged);
-        }
+        out.writeBoolean(acknowledged);
     }
 }
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.cluster.metadata;
 
 import org.elasticsearch.ElasticsearchIllegalStateException;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.TimestampParsingException;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;

diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
@@ -26,7 +26,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.*;
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.cluster.block.ClusterBlock;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;