diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 764ca018490f5..36157e4cac1a8 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -61,8 +61,6 @@ static TransportVersion def(int id) { public static final TransportVersion V_7_8_1 = def(7_08_01_99); public static final TransportVersion V_7_9_0 = def(7_09_00_99); public static final TransportVersion V_7_10_0 = def(7_10_00_99); - public static final TransportVersion V_7_11_0 = def(7_11_00_99); - public static final TransportVersion V_7_12_0 = def(7_12_00_99); public static final TransportVersion V_7_13_0 = def(7_13_00_99); public static final TransportVersion V_7_14_0 = def(7_14_00_99); public static final TransportVersion V_7_15_0 = def(7_15_00_99); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index cc96954c8a8e4..580da139aa0f1 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -105,9 +105,7 @@ public CreateIndexRequest(StreamInput in) throws IOException { aliases.add(new Alias(in)); } waitForActiveShards = ActiveShardCount.readFrom(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_12_0)) { - origin = in.readString(); - } + origin = in.readString(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { requireDataStream = in.readBoolean(); } else { @@ -518,9 +516,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeCollection(aliases); waitForActiveShards.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_12_0)) { - out.writeString(origin); - } + out.writeString(origin); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) { out.writeBoolean(this.requireDataStream); } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java index 0b9c359006b23..0695c284c5cac 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetadata.java @@ -143,11 +143,7 @@ public long pendingGeneration() { public RepositoryMetadata(StreamInput in) throws IOException { name = in.readString(); - if (in.getTransportVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_TRANSPORT_VERSION)) { - uuid = in.readString(); - } else { - uuid = RepositoryData.MISSING_UUID; - } + uuid = in.readString(); type = in.readString(); settings = Settings.readSettingsFromStream(in); generation = in.readLong(); @@ -162,9 +158,7 @@ public RepositoryMetadata(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(name); - if (out.getTransportVersion().onOrAfter(SnapshotsService.UUIDS_IN_REPO_DATA_TRANSPORT_VERSION)) { - out.writeString(uuid); - } + out.writeString(uuid); out.writeString(type); settings.writeTo(out); out.writeLong(generation); diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java index 5e5c7b3e00421..ba40e9ad2bdd8 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginDescriptor.java @@ -48,7 +48,6 @@ public class PluginDescriptor implements Writeable, ToXContentObject { public static final String ES_PLUGIN_POLICY = "plugin-security.policy"; - private static final TransportVersion LICENSED_PLUGINS_SUPPORT = TransportVersions.V_7_11_0; private static final TransportVersion MODULE_NAME_SUPPORT = TransportVersions.V_8_3_0; private static final TransportVersion BOOTSTRAP_SUPPORT_REMOVED = TransportVersions.V_8_4_0; @@ -140,15 +139,11 @@ public PluginDescriptor(final StreamInput in) throws IOException { extendedPlugins = in.readStringCollectionAsList(); hasNativeController = in.readBoolean(); - if (in.getTransportVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) { - if (in.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { - in.readString(); // plugin type - in.readOptionalString(); // java opts - } - isLicensed = in.readBoolean(); - } else { - isLicensed = false; + if (in.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { + in.readString(); // plugin type + in.readOptionalString(); // java opts } + isLicensed = in.readBoolean(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { isModular = in.readBoolean(); @@ -183,13 +178,11 @@ public void writeTo(final StreamOutput out) throws IOException { out.writeStringCollection(extendedPlugins); out.writeBoolean(hasNativeController); - if (out.getTransportVersion().onOrAfter(LICENSED_PLUGINS_SUPPORT)) { - if (out.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { - out.writeString("ISOLATED"); - out.writeOptionalString(null); - } - out.writeBoolean(isLicensed); + if (out.getTransportVersion().before(BOOTSTRAP_SUPPORT_REMOVED)) { + out.writeString("ISOLATED"); + out.writeOptionalString(null); } + out.writeBoolean(isLicensed); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { out.writeBoolean(isModular); out.writeBoolean(isStable); diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index 8bc7d3bcb840a..6ee1067d8149d 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -13,7 +13,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; @@ -146,7 +145,6 @@ public final class SnapshotsService extends AbstractLifecycleComponent implement public static final IndexVersion INDEX_GEN_IN_REPO_DATA_VERSION = IndexVersions.V_7_9_0; public static final IndexVersion UUIDS_IN_REPO_DATA_VERSION = IndexVersions.V_7_12_0; - public static final TransportVersion UUIDS_IN_REPO_DATA_TRANSPORT_VERSION = TransportVersions.V_7_12_0; public static final IndexVersion FILE_INFO_WRITER_UUIDS_IN_SHARD_DATA_VERSION = IndexVersions.V_7_16_0; diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java index 08f717dacf47d..9d9132ecdffe8 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java @@ -172,10 +172,6 @@ private static RescoreVectorBuilder randomRescoreVectorBuilder() { public void testRandomVersionSerialization() throws IOException { SearchRequest searchRequest = createSearchRequest(); TransportVersion version = TransportVersionUtils.randomVersion(random()); - if (version.before(TransportVersions.V_7_11_0) && searchRequest.source() != null) { - // Versions before 7.11.0 don't support runtime mappings - searchRequest.source().runtimeMappings(emptyMap()); - } if (version.before(TransportVersions.V_8_4_0)) { // Versions before 8.4.0 don't support force_synthetic_source searchRequest.setForceSyntheticSource(false); diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java index 744a12d5ab6e0..3a3e1414cf0e7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.node; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -113,24 +112,6 @@ public void testDiscoveryNodeRoleWithOldVersion() throws Exception { assertThat(role.roleNameAbbreviation(), equalTo("z")); assertTrue(role.canContainData()); } - - { - BytesStreamOutput streamOutput = new BytesStreamOutput(); - streamOutput.setTransportVersion(TransportVersions.V_7_11_0); - node.writeTo(streamOutput); - - StreamInput in = StreamInput.wrap(streamOutput.bytes().toBytesRef().bytes); - in.setTransportVersion(TransportVersions.V_7_11_0); - DiscoveryNode serialized = new DiscoveryNode(in); - final Set roles = serialized.getRoles(); - assertThat(roles, hasSize(1)); - @SuppressWarnings("OptionalGetWithoutIsPresent") - final DiscoveryNodeRole role = roles.stream().findFirst().get(); - assertThat(role.roleName(), equalTo("data_custom_role")); - assertThat(role.roleNameAbbreviation(), equalTo("z")); - assertTrue(role.canContainData()); - } - } public void testDiscoveryNodeIsRemoteClusterClientDefault() { diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregationBuilder.java index 6307cfa5b3674..bc1cd3fa05d52 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregationBuilder.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregationBuilder.java @@ -394,6 +394,6 @@ public boolean equals(Object obj) { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_7_12_0; + return TransportVersions.ZERO; } } diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java index 11de2032e27d7..0b2d3606854a4 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java @@ -88,10 +88,8 @@ public RateAggregationBuilder(StreamInput in) throws IOException { } else { rateUnit = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - if (in.readBoolean()) { - rateMode = in.readEnum(RateMode.class); - } + if (in.readBoolean()) { + rateMode = in.readEnum(RateMode.class); } } @@ -107,13 +105,11 @@ protected void innerWriteTo(StreamOutput out) throws IOException { } else { out.writeByte((byte) 0); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - if (rateMode != null) { - out.writeBoolean(true); - out.writeEnum(rateMode); - } else { - out.writeBoolean(false); - } + if (rateMode != null) { + out.writeBoolean(true); + out.writeEnum(rateMode); + } else { + out.writeBoolean(false); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/aggregatemetric/AggregateMetricFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/aggregatemetric/AggregateMetricFeatureSetUsage.java index 5505cf3271b8b..28f8b2013892e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/aggregatemetric/AggregateMetricFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/aggregatemetric/AggregateMetricFeatureSetUsage.java @@ -28,7 +28,7 @@ public AggregateMetricFeatureSetUsage(boolean available, boolean enabled) { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_7_11_0; + return TransportVersions.ZERO; } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java index 742b538b6ce4b..44151f992f75e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java @@ -10,7 +10,6 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.SimpleDiffable; @@ -86,8 +85,6 @@ */ public class DatafeedConfig implements SimpleDiffable, ToXContentObject { - private static final TransportVersion RUNTIME_MAPPINGS_INTRODUCED = TransportVersions.V_7_11_0; - public static final int DEFAULT_SCROLL_SIZE = 1000; private static final int SECONDS_IN_MINUTE = 60; @@ -341,9 +338,7 @@ public Integer getScrollSize() { } public Optional> minRequiredTransportVersion() { - return runtimeMappings.isEmpty() - ? Optional.empty() - : Optional.of(Tuple.tuple(RUNTIME_MAPPINGS_INTRODUCED, SearchSourceBuilder.RUNTIME_MAPPINGS_FIELD.getPreferredName())); + return Optional.empty(); } /** diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/snapshot/upgrade/SnapshotUpgradeTaskParams.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/snapshot/upgrade/SnapshotUpgradeTaskParams.java index c159f997798a9..7a0a524f55920 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/snapshot/upgrade/SnapshotUpgradeTaskParams.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/snapshot/upgrade/SnapshotUpgradeTaskParams.java @@ -69,7 +69,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_7_11_0; + return TransportVersions.ZERO; } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java index 3ebfad04a0f13..52ccc3c91985c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java @@ -64,9 +64,7 @@ public SecurityFeatureSetUsage(StreamInput in) throws IOException { anonymousUsage = in.readGenericMap(); roleMappingStoreUsage = in.readGenericMap(); fips140Usage = in.readGenericMap(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - operatorPrivilegesUsage = in.readGenericMap(); - } + operatorPrivilegesUsage = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { domainsUsage = in.readGenericMap(); } @@ -132,9 +130,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(anonymousUsage); out.writeGenericMap(roleMappingStoreUsage); out.writeGenericMap(fips140Usage); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - out.writeGenericMap(operatorPrivilegesUsage); - } + out.writeGenericMap(operatorPrivilegesUsage); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { out.writeGenericMap(domainsUsage); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationResponse.java index a5c8e10496b3b..70d0986ac6dc7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationResponse.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.security.action; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -45,9 +44,7 @@ public DelegatePkiAuthenticationResponse(StreamInput input) throws IOException { super(input); accessToken = input.readString(); expiresIn = input.readTimeValue(); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - authentication = new Authentication(input); - } + authentication = new Authentication(input); } public String getAccessToken() { @@ -66,9 +63,7 @@ public Authentication getAuthentication() { public void writeTo(StreamOutput out) throws IOException { out.writeString(accessToken); out.writeTimeValue(expiresIn); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - authentication.writeTo(out); - } + authentication.writeTo(out); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateResponse.java index 92b27826e8759..93cbdd40c10c9 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateResponse.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.oidc; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -61,8 +60,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(accessTokenString); out.writeString(refreshTokenString); out.writeTimeValue(expiresIn); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - authentication.writeTo(out); - } + authentication.writeTo(out); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationResponse.java index 5dcfadd3dd01c..5013da1b4abdf 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationResponse.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.oidc; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ToXContentObject; @@ -62,9 +61,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(authenticationRequestUrl); out.writeString(state); out.writeString(nonce); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - out.writeString(realmName); - } + out.writeString(realmName); } public String toString() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateResponse.java index 71b5e93e60a2c..6b9f1632a159e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateResponse.java @@ -69,9 +69,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(tokenString); out.writeString(refreshToken); out.writeTimeValue(expiresIn); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - authentication.writeTo(out); - } + authentication.writeTo(out); } - } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenResponse.java index 30522e3389a8a..a670482b7935c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenResponse.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.token; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -39,9 +38,7 @@ public CreateTokenResponse(StreamInput in) throws IOException { scope = in.readOptionalString(); refreshToken = in.readOptionalString(); kerberosAuthenticationResponseToken = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - authentication = new Authentication(in); - } + authentication = new Authentication(in); } public CreateTokenResponse( @@ -91,9 +88,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(scope); out.writeOptionalString(refreshToken); out.writeOptionalString(kerberosAuthenticationResponseToken); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - authentication.writeTo(out); - } + authentication.writeTo(out); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/spatial/SpatialFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/spatial/SpatialFeatureSetUsage.java index f6aa8b884105f..215043a7b4b8e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/spatial/SpatialFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/spatial/SpatialFeatureSetUsage.java @@ -29,11 +29,7 @@ public SpatialFeatureSetUsage(SpatialStatsAction.Response statsResponse) { public SpatialFeatureSetUsage(StreamInput input) throws IOException { super(input); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - this.statsResponse = new SpatialStatsAction.Response(input); - } else { - this.statsResponse = null; - } + this.statsResponse = new SpatialStatsAction.Response(input); } @Override @@ -48,9 +44,7 @@ SpatialStatsAction.Response statsResponse() { @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - this.statsResponse.writeTo(out); - } + this.statsResponse.writeTo(out); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java index 41279d83fdae1..9459605507c7b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java @@ -7,8 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.common.Strings; @@ -25,7 +23,6 @@ import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentParser; import org.elasticsearch.xpack.core.common.time.TimeUtils; -import org.elasticsearch.xpack.core.common.validation.SourceDestValidator; import org.elasticsearch.xpack.core.common.validation.SourceDestValidator.SourceDestValidation; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue.Level; @@ -63,8 +60,6 @@ public final class TransformConfig implements SimpleDiffable, W public static final TransformConfigVersion CONFIG_VERSION_LAST_DEFAULTS_CHANGED = TransformConfigVersion.V_7_15_0; public static final String NAME = "data_frame_transform_config"; public static final ParseField HEADERS = new ParseField("headers"); - /** Version in which {@code FieldCapabilitiesRequest.runtime_fields} field was introduced. */ - private static final TransportVersion FIELD_CAPS_RUNTIME_MAPPINGS_INTRODUCED_TRANSPORT_VERSION = TransportVersions.V_7_12_0; /** Specifies all the possible transform functions. */ public enum Function { @@ -341,15 +336,7 @@ public RetentionPolicyConfig getRetentionPolicyConfig() { * @return version */ public List getAdditionalSourceDestValidations() { - if ((source.getRuntimeMappings() == null || source.getRuntimeMappings().isEmpty()) == false) { - SourceDestValidation validation = new SourceDestValidator.RemoteClusterMinimumVersionValidation( - FIELD_CAPS_RUNTIME_MAPPINGS_INTRODUCED_TRANSPORT_VERSION, - "source.runtime_mappings field was set" - ); - return Collections.singletonList(validation); - } else { - return Collections.emptyList(); - } + return List.of(); } public ActionRequestValidationException validate(ActionRequestValidationException validationException) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java index e6b9e7f75a87d..bd97544f5b3e9 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigTests.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.transform.transforms; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -23,8 +22,6 @@ import org.elasticsearch.xcontent.XContentParser; import org.elasticsearch.xcontent.XContentParserConfiguration; import org.elasticsearch.xcontent.XContentType; -import org.elasticsearch.xpack.core.common.validation.SourceDestValidator.RemoteClusterMinimumVersionValidation; -import org.elasticsearch.xpack.core.common.validation.SourceDestValidator.SourceDestValidation; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue; import org.elasticsearch.xpack.core.deprecation.DeprecationIssue.Level; import org.elasticsearch.xpack.core.transform.AbstractSerializingTransformTestCase; @@ -50,8 +47,6 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; public class TransformConfigTests extends AbstractSerializingTransformTestCase { @@ -853,47 +848,6 @@ public void testGetAdditionalSourceDestValidations_WithNoRuntimeMappings() throw assertThat(transformConfig.getAdditionalSourceDestValidations(), is(empty())); } - public void testGetAdditionalSourceDestValidations_WithRuntimeMappings() throws IOException { - String json = """ - { - "id": "body_id", - "source": { - "index": "src", - "runtime_mappings": { - "some-field": "some-value" - } - }, - "dest": { - "index": "dest" - }, - "pivot": { - "group_by": { - "id": { - "terms": { - "field": "id" - } - } - }, - "aggs": { - "avg": { - "avg": { - "field": "points" - } - } - } - } - }"""; - - TransformConfig transformConfig = createTransformConfigFromString(json, "body_id", true); - List additiionalValidations = transformConfig.getAdditionalSourceDestValidations(); - assertThat(additiionalValidations, hasSize(1)); - assertThat(additiionalValidations.get(0), is(instanceOf(RemoteClusterMinimumVersionValidation.class))); - RemoteClusterMinimumVersionValidation remoteClusterMinimumVersionValidation = - (RemoteClusterMinimumVersionValidation) additiionalValidations.get(0); - assertThat(remoteClusterMinimumVersionValidation.getMinExpectedTransportVersion(), is(equalTo(TransportVersions.V_7_12_0))); - assertThat(remoteClusterMinimumVersionValidation.getReason(), is(equalTo("source.runtime_mappings field was set"))); - } - public void testGroupByStayInOrder() throws IOException { String json = Strings.format(""" { diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java index 1fceb917ece53..a8e6a0578c6a4 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java @@ -71,13 +71,7 @@ public Response(StreamInput in) throws IOException { .between(TransportVersions.DATA_STREAM_INDEX_VERSION_DEPRECATION_CHECK, TransportVersions.RESOURCE_DEPRECATION_CHECKS)) { mutableResourceDeprecations.put(DataStreamDeprecationChecker.NAME, in.readMapOfLists(DeprecationIssue::new)); } - if (in.getTransportVersion().before(TransportVersions.V_7_11_0)) { - List mlIssues = in.readCollectionAsList(DeprecationIssue::new); - pluginSettingsIssues = new HashMap<>(); - pluginSettingsIssues.put("ml_settings", mlIssues); - } else { - pluginSettingsIssues = in.readMapOfLists(DeprecationIssue::new); - } + pluginSettingsIssues = in.readMapOfLists(DeprecationIssue::new); if (in.getTransportVersion().onOrAfter(TransportVersions.RESOURCE_DEPRECATION_CHECKS)) { resourceDeprecationIssues = in.readMap(in2 -> in2.readMapOfLists(DeprecationIssue::new)); } else { @@ -144,11 +138,7 @@ public void writeTo(StreamOutput out) throws IOException { .between(TransportVersions.DATA_STREAM_INDEX_VERSION_DEPRECATION_CHECK, TransportVersions.RESOURCE_DEPRECATION_CHECKS)) { out.writeMap(getDataStreamDeprecationIssues(), StreamOutput::writeCollection); } - if (out.getTransportVersion().before(TransportVersions.V_7_11_0)) { - out.writeCollection(pluginSettingsIssues.getOrDefault("ml_settings", Collections.emptyList())); - } else { - out.writeMap(pluginSettingsIssues, StreamOutput::writeCollection); - } + out.writeMap(pluginSettingsIssues, StreamOutput::writeCollection); if (out.getTransportVersion().onOrAfter(TransportVersions.RESOURCE_DEPRECATION_CHECKS)) { out.writeMap(resourceDeprecationIssues, (o, v) -> o.writeMap(v, StreamOutput::writeCollection)); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java index 2ed0321e32c77..3b364721205cb 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java @@ -12,8 +12,6 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.ResourceNotFoundException; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.RetryableAction; import org.elasticsearch.client.internal.Client; @@ -82,10 +80,6 @@ public class OpenJobPersistentTasksExecutor extends AbstractJobPersistentTasksEx private static final Logger logger = LogManager.getLogger(OpenJobPersistentTasksExecutor.class); - // Resuming a job with a running datafeed from its current snapshot was added in 7.11 and - // can only be done if the master node is on or after that version. - private static final TransportVersion MIN_TRANSPORT_VERSION_FOR_REVERTING_TO_CURRENT_SNAPSHOT = TransportVersions.V_7_11_0; - public static String[] indicesOfInterest(String resultsIndex) { if (resultsIndex == null) { return new String[] { AnomalyDetectorsIndex.jobStateIndexPattern(), MlMetaIndex.indexName(), MlConfigIndex.indexName() }; @@ -308,14 +302,7 @@ private void runJob(JobTask jobTask, JobState jobState, OpenJobAction.JobParams } ActionListener getRunningDatafeedListener = ActionListener.wrap(runningDatafeedId -> { - if (runningDatafeedId != null - // If the minimum TransportVersion is on or above MIN_TRANSPORT_VERSION_FOR_REVERTING_TO_CURRENT_SNAPSHOT then so must be - // the version associated with the master node, which is what is required to perform this action - && TransportVersionUtils.isMinTransportVersionOnOrAfter( - clusterState, - MIN_TRANSPORT_VERSION_FOR_REVERTING_TO_CURRENT_SNAPSHOT - )) { - + if (runningDatafeedId != null) { // This job has a running datafeed attached to it. // In order to prevent gaps in the model we revert to the current snapshot deleting intervening results. RevertToCurrentSnapshotAction revertToCurrentSnapshotAction = new RevertToCurrentSnapshotAction( diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedActionTests.java index 8fd1082e0df5c..1ee1d0a30fa63 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedActionTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.ml.action; import org.elasticsearch.ElasticsearchStatusException; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.persistent.PersistentTasksCustomMetadata; import org.elasticsearch.search.SearchModule; @@ -18,21 +16,17 @@ import org.elasticsearch.xcontent.NamedXContentRegistry; import org.elasticsearch.xpack.core.ml.action.StartDatafeedAction; import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfig; -import org.elasticsearch.xpack.core.ml.datafeed.DatafeedConfigTests; import org.elasticsearch.xpack.core.ml.job.config.Job; import org.elasticsearch.xpack.core.ml.job.config.JobState; import org.elasticsearch.xpack.ml.datafeed.DatafeedRunner; import org.elasticsearch.xpack.ml.datafeed.DatafeedRunnerTests; import org.elasticsearch.xpack.ml.notifications.AnomalyDetectionAuditor; -import java.util.Arrays; import java.util.Collections; import java.util.Date; -import java.util.Map; import static org.elasticsearch.persistent.PersistentTasksCustomMetadata.INITIAL_ASSIGNMENT; import static org.elasticsearch.xpack.ml.job.task.OpenJobPersistentTasksExecutorTests.addJobTask; -import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; @@ -112,55 +106,6 @@ public void testNoDeprecationsLogged() { verify(auditor, never()).warning(any(), any()); } - public void testRemoteClusterVersionCheck() { - Map clusterVersions = Map.of( - "modern_cluster_1", - TransportVersion.current(), - "modern_cluster_2", - TransportVersion.current(), - "old_cluster_1", - TransportVersions.V_7_0_0 - ); - - Map field = Map.of("runtime_field_foo", Map.of("type", "keyword", "script", "")); - - DatafeedConfig config = new DatafeedConfig.Builder(DatafeedConfigTests.createRandomizedDatafeedConfig("foo")).setRuntimeMappings( - field - ).build(); - ElasticsearchStatusException ex = expectThrows( - ElasticsearchStatusException.class, - () -> TransportStartDatafeedAction.checkRemoteConfigVersions( - config, - Arrays.asList("old_cluster_1", "modern_cluster_2"), - clusterVersions::get - ) - ); - assertThat( - ex.getMessage(), - containsString( - "remote clusters are expected to run at least version [7.11.0] (reason: [runtime_mappings]), " - + "but the following clusters were too old: [old_cluster_1]" - ) - ); - - // The rest should not throw - TransportStartDatafeedAction.checkRemoteConfigVersions( - config, - Arrays.asList("modern_cluster_1", "modern_cluster_2"), - clusterVersions::get - ); - - DatafeedConfig configWithoutRuntimeMappings = new DatafeedConfig.Builder().setId("foo-datafeed") - .setIndices(Collections.singletonList("bar")) - .setJobId("foo") - .build(); - TransportStartDatafeedAction.checkRemoteConfigVersions( - configWithoutRuntimeMappings, - Arrays.asList("old_cluster_1", "modern_cluster_2"), - clusterVersions::get - ); - } - public static TransportStartDatafeedAction.DatafeedTask createDatafeedTask( long id, String type, diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregationBuilder.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregationBuilder.java index e232ec9e463d9..7c8b1545a3a94 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregationBuilder.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregationBuilder.java @@ -212,6 +212,6 @@ public String getType() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_7_11_0; + return TransportVersions.ZERO; } }