diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index f873655cb3382..fe04d2e9c97a9 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -57,7 +57,6 @@ static TransportVersion def(int id) { * READ THE COMMENT BELOW THIS BLOCK OF DECLARATIONS BEFORE ADDING NEW TRANSPORT VERSIONS * Detached transport versions added below here. */ - public static final TransportVersion V_8_11_X = def(8_512_0_01); public static final TransportVersion V_8_12_0 = def(8_560_0_00); public static final TransportVersion V_8_12_1 = def(8_560_0_01); public static final TransportVersion V_8_13_0 = def(8_595_0_00); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java index 17df03c52dbc8..126f3a718b2bb 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java @@ -72,17 +72,9 @@ public NodeInfo(StreamInput in) throws IOException { Version legacyVersion = Version.readVersion(in); version = legacyVersion.toString(); compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions; - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - indexVersion = IndexVersion.readVersion(in); - } else { - indexVersion = IndexVersion.fromId(legacyVersion.id); - } - } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt); - } else { - componentVersions = Map.of(); + indexVersion = IndexVersion.readVersion(in); } + componentVersions = in.readImmutableMap(StreamInput::readString, StreamInput::readVInt); build = Build.readBuild(in); if (in.readBoolean()) { totalIndexingBuffer = ByteSizeValue.ofBytes(in.readLong()); @@ -242,10 +234,8 @@ public void writeTo(StreamOutput out) throws IOException { Version.writeVersion(Version.fromString(version), out); } compatibilityVersions.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - IndexVersion.writeVersion(indexVersion, out); - out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt); - } + IndexVersion.writeVersion(indexVersion, out); + out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt); Build.writeBuild(build, out); if (totalIndexingBuffer == null) { out.writeBoolean(false); diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java index a003d40aaa9ea..fb5e08bf901a3 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java @@ -47,7 +47,6 @@ import java.util.Map; import java.util.Objects; -import static org.elasticsearch.TransportVersions.V_8_11_X; import static org.elasticsearch.cluster.metadata.DataStream.AUTO_SHARDING_FIELD; public class GetDataStreamAction extends ActionType { @@ -340,10 +339,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(indexTemplate); out.writeOptionalString(ilmPolicyName); out.writeOptionalWriteable(timeSeries); - if (out.getTransportVersion().onOrAfter(V_8_11_X)) { - out.writeMap(indexSettingsValues); - out.writeBoolean(templatePreferIlmValue); - } + out.writeMap(indexSettingsValues); + out.writeBoolean(templatePreferIlmValue); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { out.writeOptionalVLong(maximumTimestamp); } diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java index a775ab2f2d731..b763be8966c6f 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java @@ -84,11 +84,7 @@ static List readList(StreamInput input) throws I responses.add(new FieldCapabilitiesIndexResponse(input)); } final int groups = input.readVInt(); - if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - collectCompressedResponses(input, groups, responses); - } else { - collectResponsesLegacyFormat(input, groups, responses); - } + collectCompressedResponses(input, groups, responses); return responses; } @@ -139,11 +135,7 @@ static void writeList(StreamOutput output, List } output.writeCollection(ungroupedResponses); - if (output.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - writeCompressedResponses(output, groupedResponsesMap); - } else { - writeResponsesLegacyFormat(output, groupedResponsesMap); - } + writeCompressedResponses(output, groupedResponsesMap); } private static void writeResponsesLegacyFormat( diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java index d3c2496b6fde3..3e1d86433472f 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -9,7 +9,6 @@ package org.elasticsearch.action.search; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.common.Strings; @@ -914,11 +913,7 @@ public Cluster(StreamInput in) throws IOException { } this.timedOut = in.readBoolean(); this.failures = Collections.unmodifiableList(in.readCollectionAsList(ShardSearchFailure::readShardSearchFailure)); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - this.skipUnavailable = in.readBoolean(); - } else { - this.skipUnavailable = SKIP_UNAVAILABLE_DEFAULT; - } + this.skipUnavailable = in.readBoolean(); } /** @@ -1019,9 +1014,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalLong(took == null ? null : took.millis()); out.writeBoolean(timedOut); out.writeCollection(failures); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeBoolean(skipUnavailable); - } + out.writeBoolean(skipUnavailable); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/version/CompatibilityVersions.java b/server/src/main/java/org/elasticsearch/cluster/version/CompatibilityVersions.java index 3c8438c93c977..f42ff523c8ad3 100644 --- a/server/src/main/java/org/elasticsearch/cluster/version/CompatibilityVersions.java +++ b/server/src/main/java/org/elasticsearch/cluster/version/CompatibilityVersions.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.version; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -109,9 +108,7 @@ public static CompatibilityVersions readVersion(StreamInput in) throws IOExcepti TransportVersion transportVersion = TransportVersion.readVersion(in); Map mappingsVersions = Map.of(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - mappingsVersions = in.readMap(SystemIndexDescriptor.MappingsVersion::new); - } + mappingsVersions = in.readMap(SystemIndexDescriptor.MappingsVersion::new); return new CompatibilityVersions(transportVersion, mappingsVersions); } @@ -120,9 +117,7 @@ public static CompatibilityVersions readVersion(StreamInput in) throws IOExcepti public void writeTo(StreamOutput out) throws IOException { TransportVersion.writeVersion(this.transportVersion(), out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeMap(this.systemIndexMappingsVersion(), StreamOutput::writeWriteable); - } + out.writeMap(this.systemIndexMappingsVersion(), StreamOutput::writeWriteable); } /** diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeoBoundingBox.java b/server/src/main/java/org/elasticsearch/common/geo/GeoBoundingBox.java index 0430266cd51cc..40522ad83f6bb 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/GeoBoundingBox.java +++ b/server/src/main/java/org/elasticsearch/common/geo/GeoBoundingBox.java @@ -10,7 +10,6 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ParseField; @@ -101,7 +100,7 @@ public final String getWriteableName() { @Override public final TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } protected static class GeoBoundsParser extends BoundsParser { diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java index 83c9d9e3f1af2..07444305c061c 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java @@ -9,7 +9,6 @@ package org.elasticsearch.indices.recovery; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -44,11 +43,7 @@ public StartRecoveryRequest(StreamInput in) throws IOException { targetAllocationId = in.readString(); sourceNode = new DiscoveryNode(in); targetNode = new DiscoveryNode(in); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - clusterStateVersion = in.readVLong(); - } else { - clusterStateVersion = 0L; // bwc: do not wait for cluster state to be applied - } + clusterStateVersion = in.readVLong(); metadataSnapshot = Store.MetadataSnapshot.readFrom(in); primaryRelocation = in.readBoolean(); startingSeqNo = in.readLong(); @@ -161,9 +156,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(targetAllocationId); sourceNode.writeTo(out); targetNode.writeTo(out); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeVLong(clusterStateVersion); - } // else bwc: just omit it, the receiver doesn't wait for a cluster state anyway + out.writeVLong(clusterStateVersion); metadataSnapshot.writeTo(out); out.writeBoolean(primaryRelocation); out.writeLong(startingSeqNo); diff --git a/server/src/main/java/org/elasticsearch/inference/ModelConfigurations.java b/server/src/main/java/org/elasticsearch/inference/ModelConfigurations.java index 53ce0bab63612..ffbf5128f5a5a 100644 --- a/server/src/main/java/org/elasticsearch/inference/ModelConfigurations.java +++ b/server/src/main/java/org/elasticsearch/inference/ModelConfigurations.java @@ -215,7 +215,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } @Override diff --git a/server/src/main/java/org/elasticsearch/inference/ModelSecrets.java b/server/src/main/java/org/elasticsearch/inference/ModelSecrets.java index 0181d9cdb5631..259d39e5931e4 100644 --- a/server/src/main/java/org/elasticsearch/inference/ModelSecrets.java +++ b/server/src/main/java/org/elasticsearch/inference/ModelSecrets.java @@ -10,7 +10,6 @@ package org.elasticsearch.inference; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.VersionedNamedWriteable; @@ -70,7 +69,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java index 66ae11509d014..c29f1ac9da6c3 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java +++ b/server/src/main/java/org/elasticsearch/search/dfs/DfsKnnResults.java @@ -17,8 +17,6 @@ import java.io.IOException; -import static org.elasticsearch.TransportVersions.V_8_11_X; - public class DfsKnnResults implements Writeable { private final String nestedPath; private final ScoreDoc[] scoreDocs; @@ -30,11 +28,7 @@ public DfsKnnResults(String nestedPath, ScoreDoc[] scoreDocs) { public DfsKnnResults(StreamInput in) throws IOException { scoreDocs = in.readArray(Lucene::readScoreDoc, ScoreDoc[]::new); - if (in.getTransportVersion().onOrAfter(V_8_11_X)) { - nestedPath = in.readOptionalString(); - } else { - nestedPath = null; - } + nestedPath = in.readOptionalString(); } public String getNestedPath() { @@ -47,8 +41,6 @@ public ScoreDoc[] scoreDocs() { public void writeTo(StreamOutput out) throws IOException { out.writeArray(Lucene::writeScoreDoc, scoreDocs); - if (out.getTransportVersion().onOrAfter(V_8_11_X)) { - out.writeOptionalString(nestedPath); - } + out.writeOptionalString(nestedPath); } } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java index a3b6d8c2cfc52..9be18ea90ce63 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnSearchBuilder.java @@ -33,7 +33,6 @@ import java.util.Objects; import java.util.function.Supplier; -import static org.elasticsearch.TransportVersions.V_8_11_X; import static org.elasticsearch.common.Strings.format; import static org.elasticsearch.index.query.AbstractQueryBuilder.DEFAULT_BOOST; import static org.elasticsearch.search.SearchService.DEFAULT_SIZE; @@ -347,9 +346,7 @@ public KnnSearchBuilder(StreamInput in) throws IOException { this.queryVectorBuilder = in.readOptionalNamedWriteable(QueryVectorBuilder.class); this.querySupplier = null; this.similarity = in.readOptionalFloat(); - if (in.getTransportVersion().onOrAfter(V_8_11_X)) { - this.innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new); - } + this.innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new); this.rescoreVectorBuilder = in.readOptional(RescoreVectorBuilder::new); } @@ -603,9 +600,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeOptionalNamedWriteable(queryVectorBuilder); out.writeOptionalFloat(similarity); - if (out.getTransportVersion().onOrAfter(V_8_11_X)) { - out.writeOptionalWriteable(innerHitBuilder); - } + out.writeOptionalWriteable(innerHitBuilder); out.writeOptionalWriteable(rescoreVectorBuilder); } diff --git a/server/src/test/java/org/elasticsearch/BuildTests.java b/server/src/test/java/org/elasticsearch/BuildTests.java index b99ba447e4002..12eaf9bb0d7a7 100644 --- a/server/src/test/java/org/elasticsearch/BuildTests.java +++ b/server/src/test/java/org/elasticsearch/BuildTests.java @@ -15,7 +15,6 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; -import org.elasticsearch.test.TransportVersionUtils; import java.io.IOException; import java.io.InputStream; @@ -90,16 +89,6 @@ public void testStrictTypeParsing() { assertThat(e, hasToString(containsString("unexpected distribution type [" + displayName + "]; your distribution is broken"))); } - public void testSerializationQualifierBwc() throws IOException { - var randomBuild = new WriteableBuild(randomBuild()); - var serializationVersion = TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_12_0); - var roundtrip = copyWriteable(randomBuild, writableRegistry(), WriteableBuild::new, serializationVersion); - assertThat(roundtrip.build.version(), equalTo(randomBuild.build.version())); - assertThat(roundtrip.build.qualifier(), equalTo(randomBuild.build.qualifier())); - assertThat(roundtrip.build.isSnapshot(), equalTo(randomBuild.build.isSnapshot())); - assertThat(roundtrip.build.displayString(), equalTo(randomBuild.build.displayString())); - } - private static Build randomBuild() { return new Build( randomAlphaOfLength(6), diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java index c6ab672c9f25b..f56b2ced6a7a0 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java @@ -10,7 +10,6 @@ package org.elasticsearch.indices.recovery; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNodeUtils; import org.elasticsearch.common.UUIDs; @@ -76,11 +75,7 @@ public void testSerialization() throws Exception { assertThat(outRequest.recoveryId(), equalTo(inRequest.recoveryId())); assertThat(outRequest.startingSeqNo(), equalTo(inRequest.startingSeqNo())); - if (serializationVersion.onOrAfter(TransportVersions.V_8_11_X)) { - assertEquals(outRequest.clusterStateVersion(), inRequest.clusterStateVersion()); - } else { - assertEquals(0L, inRequest.clusterStateVersion()); - } + assertEquals(outRequest.clusterStateVersion(), inRequest.clusterStateVersion()); } public void testDescription() { diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java index 60c378bd77b75..30e73efa73cd2 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java @@ -15,7 +15,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.io.stream.ByteArrayStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -342,11 +341,7 @@ && coerce() assert count >= 0; // we do not add elements with count == 0 if (count > 0) { - if (streamOutput.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - streamOutput.writeVLong(count); - } else { - streamOutput.writeVInt(Math.toIntExact(count)); - } + streamOutput.writeVLong(count); streamOutput.writeLong(Double.doubleToRawLongBits(parsedHistogram.values().get(i))); } } @@ -413,11 +408,7 @@ void reset(BytesRef bytesRef) { @Override public boolean next() throws IOException { if (streamInput.available() > 0) { - if (streamInput.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - count = streamInput.readVLong(); - } else { - count = streamInput.readVInt(); - } + count = streamInput.readVLong(); value = Double.longBitsToDouble(streamInput.readLong()); return true; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java index 665f8e7952363..6736e879851b4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.esql; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.XContentBuilder; @@ -36,7 +35,9 @@ private EsqlFeatureSetUsage(boolean available, boolean enabled, Map LENIENT_PARSER = createParser(true); public static final ObjectParser STRICT_PARSER = createParser(false); @@ -281,11 +278,7 @@ public TrainedModelConfig(StreamInput in) throws IOException { this.location = in.readOptionalNamedWriteable(TrainedModelLocation.class); modelPackageConfig = in.readOptionalWriteable(ModelPackageConfig::new); fullDefinition = in.readOptionalBoolean(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - platformArchitecture = in.readOptionalString(); - } else { - platformArchitecture = null; - } + platformArchitecture = in.readOptionalString(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { prefixStrings = in.readOptionalWriteable(TrainedModelPrefixStrings::new); } @@ -466,9 +459,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(modelPackageConfig); out.writeOptionalBoolean(fullDefinition); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeOptionalString(platformArchitecture); - } + out.writeOptionalString(platformArchitecture); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { out.writeOptionalWriteable(prefixStrings); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java index cfbc6c6701427..51667580f0fb5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java @@ -178,11 +178,7 @@ public ModelPackageConfig(StreamInput in) throws IOException { this.modelType = in.readOptionalString(); this.tags = in.readOptionalCollectionAsList(StreamInput::readString); this.vocabularyFile = in.readOptionalString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - this.platformArchitecture = in.readOptionalString(); - } else { - platformArchitecture = null; - } + this.platformArchitecture = in.readOptionalString(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { prefixStrings = in.readOptionalWriteable(TrainedModelPrefixStrings::new); } else { @@ -312,9 +308,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(modelType); out.writeOptionalStringCollection(tags); out.writeOptionalString(vocabularyFile); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) { - out.writeOptionalString(platformArchitecture); - } + out.writeOptionalString(platformArchitecture); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) { out.writeOptionalWriteable(prefixStrings); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java index 4f80dc8d86c50..402ec283655eb 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java @@ -456,9 +456,6 @@ protected TrainedModelConfig mutateInstanceForVersion(TrainedModelConfig instanc if (instance.getInferenceConfig() instanceof NlpConfig nlpConfig) { builder.setInferenceConfig(InferenceConfigItemTestCase.mutateForVersion(nlpConfig, version)); } - if (version.before(TransportVersions.V_8_11_X)) { - builder.setPlatformArchitecture(null); - } if (version.before(TransportVersions.V_8_12_0)) { builder.setPrefixStrings(null); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfigTests.java index f061d2976a8e9..752fcb02ba307 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfigTests.java @@ -125,9 +125,6 @@ protected ModelPackageConfig mutateInstance(ModelPackageConfig instance) { @Override protected ModelPackageConfig mutateInstanceForVersion(ModelPackageConfig instance, TransportVersion version) { var builder = new ModelPackageConfig.Builder(instance); - if (version.before(TransportVersions.V_8_11_X)) { - builder.setPlatformArchitecture(null); - } if (version.before(TransportVersions.V_8_12_0)) { builder.setPrefixStrings(null); } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplication.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplication.java index 7111533bbf24e..53933fb1b3dba 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplication.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/SearchApplication.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.application.search; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -54,7 +52,6 @@ public class SearchApplication implements Writeable, ToXContentObject { + "We recommend storing a template to avoid breaking changes."; public static final String NO_ALIAS_WARNING = "Alias is missing for the search application"; - private static final TransportVersion INDICES_REMOVED_TRANSPORT_VERSION = TransportVersions.V_8_11_X; private final String name; @Nullable @@ -100,11 +97,7 @@ public SearchApplication(StreamInput in) throws IOException { public SearchApplication(StreamInput in, String[] indices) throws IOException { this.name = in.readString(); - if (in.getTransportVersion().onOrAfter(INDICES_REMOVED_TRANSPORT_VERSION)) { - this.indices = indices; // Uses the provided indices, as they are no longer serialized - } else { - this.indices = in.readStringArray(); // old behaviour, read it from input as it was serialized - } + this.indices = indices; // Uses the provided indices, as they are no longer serialized; this.analyticsCollectionName = in.readOptionalString(); this.updatedAtMillis = in.readLong(); this.searchApplicationTemplate = in.readOptionalWriteable(SearchApplicationTemplate::new); @@ -113,9 +106,6 @@ public SearchApplication(StreamInput in, String[] indices) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(name); - if (out.getTransportVersion().before(INDICES_REMOVED_TRANSPORT_VERSION)) { - out.writeStringArray(indices); // old behaviour. New behaviour does not serialize indices, so no need to do anything else - } out.writeOptionalString(analyticsCollectionName); out.writeLong(updatedAtMillis); out.writeOptionalWriteable(searchApplicationTemplate); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java index 33d48efd3ee96..946ab2fca94d1 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java @@ -16,7 +16,6 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.util.Bits; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; @@ -519,7 +518,7 @@ public String toString() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AbstractPageMappingOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AbstractPageMappingOperator.java index 55c65fd59ae21..396e52bd9052d 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AbstractPageMappingOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AbstractPageMappingOperator.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; @@ -208,7 +207,7 @@ public String toString() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/LimitOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/LimitOperator.java index 3a6c92c12be8a..c2a0f854bbbcf 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/LimitOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/LimitOperator.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; @@ -280,7 +279,7 @@ public String toString() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/MvExpandOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/MvExpandOperator.java index b27c9c98d054e..b11b6e17f6915 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/MvExpandOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/MvExpandOperator.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; @@ -369,7 +368,7 @@ public String toString() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSinkOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSinkOperator.java index c22747acc4c13..0c91f8d6a7a64 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSinkOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSinkOperator.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator.exchange; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -164,7 +163,7 @@ public String toString() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSourceOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSourceOperator.java index 8882012f56dea..9c7a16fdfcb9d 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSourceOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/exchange/ExchangeSourceOperator.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator.exchange; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; @@ -173,7 +172,7 @@ public String toString() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java index dc150b5940980..1a4cb435cf8bf 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperatorStatus.java @@ -8,7 +8,6 @@ package org.elasticsearch.compute.operator.topn; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -173,6 +172,6 @@ public int hashCode() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/querydsl/query/SingleValueQuery.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/querydsl/query/SingleValueQuery.java index 58232035ca48d..3400ae64bb858 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/querydsl/query/SingleValueQuery.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/querydsl/query/SingleValueQuery.java @@ -13,7 +13,6 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.TermQuery; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -254,7 +253,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; // the first version of ESQL + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettings.java index d55a3d24632e4..1c264172218ba 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettings.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.inference.services.elasticsearch; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.inference.MinimalServiceSettings; import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings; @@ -59,6 +58,6 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserMlNodeTaskSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserMlNodeTaskSettings.java index 264d694703d89..389337b253947 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserMlNodeTaskSettings.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserMlNodeTaskSettings.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.inference.services.elasticsearch; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.inference.TaskSettings; @@ -47,7 +46,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/ModelSecretsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/ModelSecretsTests.java index 76fd87ea05b5b..e159e21b166cb 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/ModelSecretsTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/ModelSecretsTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.inference; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -82,7 +81,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettingsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettingsTests.java index dd4513db0d50a..c3311741c6619 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettingsTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceSettingsTests.java @@ -7,11 +7,9 @@ package org.elasticsearch.xpack.inference.services.elasticsearch; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.AbstractWireSerializingTestCase; -import java.io.IOException; import java.util.HashSet; import static org.elasticsearch.xpack.inference.services.elasticsearch.ElserModelsTests.randomElserModel; @@ -22,19 +20,6 @@ public static ElserInternalServiceSettings createRandom() { return new ElserInternalServiceSettings(ElasticsearchInternalServiceSettingsTests.validInstance(randomElserModel())); } - public void testBwcWrite() throws IOException { - { - var settings = new ElserInternalServiceSettings(new ElasticsearchInternalServiceSettings(1, 1, ".elser_model_1", null, null)); - var copy = copyInstance(settings, TransportVersions.V_8_12_0); - assertEquals(settings, copy); - } - { - var settings = new ElserInternalServiceSettings(new ElasticsearchInternalServiceSettings(1, 1, ".elser_model_1", null, null)); - var copy = copyInstance(settings, TransportVersions.V_8_11_X); - assertEquals(settings, copy); - } - } - @Override protected Writeable.Reader instanceReader() { return ElserInternalServiceSettings::new; diff --git a/x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/SpecifiedDocument.java b/x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/SpecifiedDocument.java index 59d32ecf0b68a..8709cf237e520 100644 --- a/x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/SpecifiedDocument.java +++ b/x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/SpecifiedDocument.java @@ -7,8 +7,6 @@ package org.elasticsearch.xpack.searchbusinessrules; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,8 +28,6 @@ */ public final class SpecifiedDocument implements ToXContentObject, Writeable { - public static final TransportVersion OPTIONAL_INDEX_IN_DOCS_VERSION = TransportVersions.V_8_11_X; - public static final String NAME = "specified_document"; public static final ParseField INDEX_FIELD = new ParseField("_index"); @@ -61,26 +57,13 @@ public SpecifiedDocument(String index, String id) { * Read from a stream. */ public SpecifiedDocument(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(OPTIONAL_INDEX_IN_DOCS_VERSION)) { - index = in.readOptionalString(); - } else { - index = in.readString(); - } + index = in.readOptionalString(); id = in.readString(); } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(OPTIONAL_INDEX_IN_DOCS_VERSION)) { - out.writeOptionalString(index); - } else { - if (index == null) { - throw new IllegalArgumentException( - "[_index] needs to be specified for docs elements when cluster nodes are not in the same version" - ); - } - out.writeString(index); - } + out.writeOptionalString(index); out.writeString(id); } diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianBoundingBox.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianBoundingBox.java index 4ab24c67ed955..30ec0d071ea45 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianBoundingBox.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/common/CartesianBoundingBox.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.spatial.common; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.geo.BoundingBox; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -61,6 +60,6 @@ public final String getWriteableName() { @Override public final TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_11_X; + return TransportVersion.minimumCompatible(); } } diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/fielddata/ShapeValuesGenericWriteableTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/fielddata/ShapeValuesGenericWriteableTests.java index e134d59771acb..5f4bae7e2f414 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/fielddata/ShapeValuesGenericWriteableTests.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/fielddata/ShapeValuesGenericWriteableTests.java @@ -8,8 +8,6 @@ package org.elasticsearch.xpack.spatial.index.fielddata; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; -import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.GenericNamedWriteable; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,8 +18,6 @@ import java.io.IOException; import java.util.List; -import static org.hamcrest.Matchers.containsString; - public abstract class ShapeValuesGenericWriteableTests extends AbstractWireTestCase< ShapeValuesGenericWriteableTests.GenericWriteableWrapper> { @@ -65,16 +61,4 @@ protected GenericWriteableWrapper copyInstance(GenericWriteableWrapper instance, } protected abstract String shapeValueName(); - - public void testSerializationFailsWithOlderVersion() { - TransportVersion older = TransportVersions.V_8_11_X; - final var testInstance = createTestInstance().shapeValue(); - try (var output = new BytesStreamOutput()) { - output.setTransportVersion(older); - assertThat( - expectThrows(Throwable.class, () -> output.writeGenericValue(testInstance)).getMessage(), - containsString("[" + shapeValueName() + "] doesn't support serialization with transport version") - ); - } - } }