diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java index b0db6d7083e4b..10ba0b6e922ed 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.dataframe; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; @@ -89,16 +88,8 @@ public DataFrameAnalyticsSource(String[] index, @Nullable QueryProvider queryPro public DataFrameAnalyticsSource(StreamInput in) throws IOException { index = in.readStringArray(); queryProvider = QueryProvider.fromStream(in); - if (in.getVersion().onOrAfter(Version.V_7_6_0)) { - sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new); - } else { - sourceFiltering = null; - } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { - runtimeMappings = in.readMap(); - } else { - runtimeMappings = Collections.emptyMap(); - } + sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new); + runtimeMappings = in.readMap(); } public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) { @@ -113,12 +104,8 @@ public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) { public void writeTo(StreamOutput out) throws IOException { out.writeStringArray(index); queryProvider.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_6_0)) { - out.writeOptionalWriteable(sourceFiltering); - } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { - out.writeMap(runtimeMappings); - } + out.writeOptionalWriteable(sourceFiltering); + out.writeMap(runtimeMappings); } @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java index 25b4d17a00bcb..a238b445efff8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSourceTests.java @@ -84,12 +84,6 @@ public static DataFrameAnalyticsSource createRandom() { } public static DataFrameAnalyticsSource mutateForVersion(DataFrameAnalyticsSource instance, Version version) { - if (version.before(Version.V_7_6_0)) { - return new DataFrameAnalyticsSource(instance.getIndex(), instance.getQueryProvider(), null, null); - } - if (version.before(Version.V_8_0_0)) { - return new DataFrameAnalyticsSource(instance.getIndex(), instance.getQueryProvider(), instance.getSourceFiltering(), null); - } return instance; } diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml index 2657a84e90eea..03bf508a6e9f6 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml @@ -1,8 +1,3 @@ -setup: - - skip: - version: "all" - reason: "Until backport of https://github.com/elastic/elasticsearch/pull/69183" - --- "Get old outlier_detection job": diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml index 3abbf42d1e409..923a56395e8a4 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml @@ -1,7 +1,4 @@ setup: - - skip: - version: "all" - reason: "Until backport of https://github.com/elastic/elasticsearch/pull/69183" - do: index: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml index a8fe3494ff085..92fedf52a1622 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml @@ -1,8 +1,3 @@ -setup: - - skip: - version: "all" - reason: "Until backport of https://github.com/elastic/elasticsearch/pull/69183" - --- "Get old cluster outlier_detection job":