From f56976c2b3a70eec9980bb8784e973c52ddb671e Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Thu, 13 Nov 2014 14:20:29 +0000 Subject: [PATCH] Removed bwc for GetIndexRequest serialisation --- .../admin/indices/get/GetIndexRequest.java | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java index 2dc51a962ba..417744176be 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java @@ -22,7 +22,6 @@ package org.elasticsearch.action.admin.indices.get; import com.google.common.collect.ObjectArrays; import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.info.ClusterInfoRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -140,31 +139,19 @@ public class GetIndexRequest extends ClusterInfoRequest { @Override public void readFrom(StreamInput in) throws IOException { super.readFrom(in); - if (in.getVersion().before(Version.V_1_4_1)) { - Feature.convertToFeatures(in.readStringArray()); - } else { - int size = in.readVInt(); - features = new Feature[size]; - for (int i = 0; i < size; i++) { - features[i] = Feature.fromId(in.readByte()); - } + int size = in.readVInt(); + features = new Feature[size]; + for (int i = 0; i < size; i++) { + features[i] = Feature.fromId(in.readByte()); } } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().before(Version.V_1_4_1)) { - String[] featureNames = new String[features.length]; - for (int i = 0; i< features.length; i++) { - featureNames[i] = features[i].preferredName(); - } - out.writeStringArray(featureNames); - } else { - out.writeVInt(features.length); - for (Feature feature : features) { - out.writeByte(feature.id); - } + out.writeVInt(features.length); + for (Feature feature : features) { + out.writeByte(feature.id); } }