From 3947a7d52fdb86957c165d05eb9f489b6ed94442 Mon Sep 17 00:00:00 2001 From: Sohaib Iftikhar Date: Tue, 3 Jul 2018 00:03:18 +0200 Subject: [PATCH] Switched to v6.4.0 --- .../action/admin/indices/get/GetIndexRequest.java | 4 ++-- .../action/admin/indices/get/GetIndexResponse.java | 4 ++-- .../action/admin/indices/get/GetIndexResponseTests.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java index c3f471e7a2cfd..fb8bd6b5684be 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java @@ -81,7 +81,7 @@ public GetIndexRequest(StreamInput in) throws IOException { features[i] = Feature.fromId(in.readByte()); } humanReadable = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { includeDefaults = in.readBoolean(); } } @@ -155,7 +155,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeByte(feature.id); } out.writeBoolean(humanReadable); - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { out.writeBoolean(includeDefaults); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java index 2cd47fd71fded..e2b72077b7f21 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java @@ -189,7 +189,7 @@ public void readFrom(StreamInput in) throws IOException { settings = settingsMapBuilder.build(); ImmutableOpenMap.Builder defaultSettingsMapBuilder = ImmutableOpenMap.builder(); - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { int defaultSettingsSize = in.readVInt(); for (int i = 0; i < defaultSettingsSize ; i++) { defaultSettingsMapBuilder.put(in.readString(), Settings.readSettingsFromStream(in)); @@ -224,7 +224,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(indexEntry.key); Settings.writeSettingsToStream(indexEntry.value, out); } - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { out.writeVInt(defaultSettings.size()); for (ObjectObjectCursor indexEntry : defaultSettings) { out.writeString(indexEntry.key); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexResponseTests.java index 8bd6caf936606..3991442fd5b87 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexResponseTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexResponseTests.java @@ -52,7 +52,7 @@ public class GetIndexResponseTests extends AbstractStreamableXContentTestCase { /** - * The following byte response was generated from the v6.3.0 tag with the following code snippet + * The following byte response was generated from the v6.3.0 tag */ private static final String TEST_6_3_0_RESPONSE_BYTES = "AQhteV9pbmRleAEIbXlfaW5kZXgBA2RvYwNkb2OePID6KURGTACqVkrLTM1JiTdUsqpWKqksSFWyUiouKcrMS1eqrQUAAAD//" +