Adapt bwc version after backport #28310

elastic · Jan 24, 2018 · b10d166 · b10d166
1 parent c675407
commit b10d166
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
@@ -240,8 +240,8 @@ setup:
 ---
 "Composite aggregation with format":
   - skip:
-      version: " - 6.99.99"
-      reason:  this uses a new option (format) added in 7.0.0
+      version: " - 6.2.99"
+      reason:  this uses a new option (format) added in 6.3.0
 
   - do:
       search:

diff --git a/.../org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/.../org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
@@ -74,7 +74,7 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
         }
         this.missing = in.readGenericValue();
         this.order = SortOrder.readFromStream(in);
-        if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
             this.format = in.readOptionalString();
         } else {
             this.format = null;
@@ -97,7 +97,7 @@ public final void writeTo(StreamOutput out) throws IOException {
         }
         out.writeGenericValue(missing);
         order.writeTo(out);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
             out.writeOptionalString(format);
         }
         innerWriteTo(out);

diff --git a/...c/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java b/...c/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java
@@ -71,7 +71,7 @@ public InternalComposite(StreamInput in) throws IOException {
         this.sourceNames = in.readList(StreamInput::readString);
         this.formats = new ArrayList<>(sourceNames.size());
         for (int i = 0; i < sourceNames.size(); i++) {
-            if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+            if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
                 formats.add(in.readNamedWriteable(DocValueFormat.class));
             } else {
                 formats.add(DocValueFormat.RAW);
@@ -85,7 +85,7 @@ public InternalComposite(StreamInput in) throws IOException {
     protected void doWriteTo(StreamOutput out) throws IOException {
         out.writeVInt(size);
         out.writeStringList(sourceNames);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
             for (DocValueFormat format : formats) {
                 out.writeNamedWriteable(format);
             }