From c71661f9c8fbda4c9360abdd40b50d2b4b8fbddc Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Fri, 27 Apr 2018 14:19:06 -0600 Subject: [PATCH] Update versions for start_trial after backport This commit is a follow up to #30135. It updates the stream compatibility versions in the start_trial requests and responses to reflect that fact that this work has been backported to 6.3. --- .../org/elasticsearch/license/PostStartTrialRequest.java | 3 +-- .../org/elasticsearch/license/PostStartTrialResponse.java | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java index c6293646c09f7..cf94312b6a72b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java @@ -55,8 +55,7 @@ public void readFrom(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - // TODO: Change to 6.3 after backport - Version version = Version.V_7_0_0_alpha1; + Version version = Version.V_6_3_0; if (out.getVersion().onOrAfter(version)) { super.writeTo(out); out.writeString(type); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialResponse.java index 25f354d7765a1..93aa923483e79 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialResponse.java @@ -76,8 +76,7 @@ public Status getStatus() { @Override public void readFrom(StreamInput in) throws IOException { status = in.readEnum(Status.class); - // TODO: Change to 6.3 after backport - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_3_0)) { acknowledgeMessage = in.readOptionalString(); int size = in.readVInt(); Map acknowledgeMessages = new HashMap<>(size); @@ -98,8 +97,7 @@ public void readFrom(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - // TODO: Change to 6.3 after backport - Version version = Version.V_7_0_0_alpha1; + Version version = Version.V_6_3_0; if (out.getVersion().onOrAfter(version)) { out.writeEnum(status); out.writeOptionalString(acknowledgeMessage);