diff --git a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java index 6b2c82a7b67..405520e2302 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java @@ -19,8 +19,6 @@ package org.elasticsearch.search.sort; -import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD; - import org.apache.lucene.search.SortField; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; @@ -46,6 +44,8 @@ import org.elasticsearch.search.MultiValueMode; import java.io.IOException; import java.util.Objects; +import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD; + /** * A sort builder to sort based on a document field. */ @@ -118,7 +118,7 @@ public class FieldSortBuilder extends SortBuilder { order = in.readOptionalWriteable(SortOrder::readFromStream); sortMode = in.readOptionalWriteable(SortMode::readFromStream); unmappedType = in.readOptionalString(); - if (in.getVersion().onOrAfter(Version.V_6_1_0)) { + if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { nestedSort = in.readOptionalWriteable(NestedSortBuilder::new); } } @@ -132,7 +132,7 @@ public class FieldSortBuilder extends SortBuilder { out.writeOptionalWriteable(order); out.writeOptionalWriteable(sortMode); out.writeOptionalString(unmappedType); - if (out.getVersion().onOrAfter(Version.V_6_1_0)) { + if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { out.writeOptionalWriteable(nestedSort); } } diff --git a/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java index f639f760223..686b241489b 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java @@ -166,7 +166,7 @@ public class GeoDistanceSortBuilder extends SortBuilder sortMode = in.readOptionalWriteable(SortMode::readFromStream); nestedFilter = in.readOptionalNamedWriteable(QueryBuilder.class); nestedPath = in.readOptionalString(); - if (in.getVersion().onOrAfter(Version.V_6_1_0)) { + if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { nestedSort = in.readOptionalWriteable(NestedSortBuilder::new); } validation = GeoValidationMethod.readFromStream(in); @@ -182,7 +182,7 @@ public class GeoDistanceSortBuilder extends SortBuilder out.writeOptionalWriteable(sortMode); out.writeOptionalNamedWriteable(nestedFilter); out.writeOptionalString(nestedPath); - if (out.getVersion().onOrAfter(Version.V_6_1_0)) { + if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { out.writeOptionalWriteable(nestedSort); } validation.writeTo(out); diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index e9f28f4617e..866ace6313e 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -120,7 +120,7 @@ public class ScriptSortBuilder extends SortBuilder { sortMode = in.readOptionalWriteable(SortMode::readFromStream); nestedPath = in.readOptionalString(); nestedFilter = in.readOptionalNamedWriteable(QueryBuilder.class); - if (in.getVersion().onOrAfter(Version.V_6_1_0)) { + if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { nestedSort = in.readOptionalWriteable(NestedSortBuilder::new); } } @@ -133,7 +133,7 @@ public class ScriptSortBuilder extends SortBuilder { out.writeOptionalWriteable(sortMode); out.writeOptionalString(nestedPath); out.writeOptionalNamedWriteable(nestedFilter); - if (out.getVersion().onOrAfter(Version.V_6_1_0)) { + if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { out.writeOptionalWriteable(nestedSort); } }