From 3c3af5725f4d3b3d61c6aaba8e6c5453c87535b4 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 6 Oct 2025 09:23:56 -0700 Subject: [PATCH] Remove V_8_0_0 transport version from xpack --- .../protocol/xpack/XPackInfoRequest.java | 13 ------- .../protocol/xpack/XPackInfoResponse.java | 7 ---- .../xpack/graph/GraphExploreRequest.java | 8 ----- .../core/ilm/ExplainLifecycleRequest.java | 4 --- .../xpack/core/ml/MlMetadata.java | 35 ------------------- .../action/GetTrainedModelsStatsAction.java | 21 +++-------- .../xpack/core/ml/datafeed/AggProvider.java | 7 ++-- .../core/ml/inference/TrainedModelConfig.java | 28 ++++----------- .../TrainedModelAssignmentMetadata.java | 5 ++- .../trainedmodel/FillMaskConfig.java | 3 +- .../trainedmodel/FillMaskConfigUpdate.java | 3 +- .../ml/inference/trainedmodel/NerConfig.java | 3 +- .../trainedmodel/NerConfigUpdate.java | 3 +- .../trainedmodel/PassThroughConfig.java | 3 +- .../trainedmodel/PassThroughConfigUpdate.java | 3 +- .../TextClassificationConfig.java | 3 +- .../TextClassificationConfigUpdate.java | 3 +- .../trainedmodel/TextEmbeddingConfig.java | 2 +- .../TextEmbeddingConfigUpdate.java | 3 +- .../ZeroShotClassificationConfig.java | 3 +- .../ZeroShotClassificationConfigUpdate.java | 3 +- .../core/ml/job/config/DataDescription.java | 23 ------------ .../core/rollup/job/RollupJobStatus.java | 13 ------- .../action/saml/SamlAuthenticateResponse.java | 5 +-- .../support/TokensInvalidationResult.java | 8 ++--- .../xpack/core/ssl/cert/CertificateInfo.java | 12 ++----- .../ml/inference/TrainedModelConfigTests.java | 4 --- 27 files changed, 31 insertions(+), 197 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java index c80adc7712dae..fe5ad4238331d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java @@ -6,13 +6,10 @@ */ package org.elasticsearch.protocol.xpack; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.license.License; import java.io.IOException; import java.util.EnumSet; @@ -58,9 +55,6 @@ public XPackInfoRequest(StreamInput in) throws IOException { categories.add(Category.valueOf(in.readString())); } this.categories = categories; - if (hasLicenseVersionField(in.getTransportVersion())) { - int ignoredLicenseVersion = in.readVInt(); - } } public void setVerbose(boolean verbose) { @@ -92,12 +86,5 @@ public void writeTo(StreamOutput out) throws IOException { for (Category category : categories) { out.writeString(category.name()); } - if (hasLicenseVersionField(out.getTransportVersion())) { - out.writeVInt(License.VERSION_CURRENT); - } - } - - private static boolean hasLicenseVersionField(TransportVersion streamVersion) { - return streamVersion.between(TransportVersions.V_7_8_1, TransportVersions.V_8_0_0); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java index 906143742bb3d..2890565510f22 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.protocol.xpack; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -328,9 +327,6 @@ public FeatureSet(String name, boolean available, boolean enabled) { public FeatureSet(StreamInput in) throws IOException { this(in.readString(), in.readBoolean(), in.readBoolean()); - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - in.readGenericMap(); // backcompat reading native code info, but no longer used here - } } @Override @@ -338,9 +334,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeBoolean(available); out.writeBoolean(enabled); - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - out.writeGenericMap(Collections.emptyMap()); - } } public String name() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java index 33242294b723c..8591f49fb32c3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.protocol.xpack.graph; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.LegacyActionRequest; @@ -111,10 +110,6 @@ public GraphExploreRequest(StreamInput in) throws IOException { indices = in.readStringArray(); indicesOptions = IndicesOptions.readIndicesOptions(in); - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - String[] types = in.readStringArray(); - assert types.length == 0; - } routing = in.readOptionalString(); timeout = in.readOptionalTimeValue(); sampleSize = in.readInt(); @@ -174,9 +169,6 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(indices); indicesOptions.writeIndicesOptions(out); - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - out.writeStringArray(Strings.EMPTY_ARRAY); - } out.writeOptionalString(routing); out.writeOptionalTimeValue(timeout); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ExplainLifecycleRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ExplainLifecycleRequest.java index 1b898b3b8d198..f68d8af7841e5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ExplainLifecycleRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ExplainLifecycleRequest.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ilm; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -51,9 +50,6 @@ public ExplainLifecycleRequest(TimeValue masterTimeout) { public ExplainLifecycleRequest(StreamInput in) throws IOException { super(in); indices = in.readStringArray(); - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - in.readStringArray(); - } indicesOptions = IndicesOptions.readIndicesOptions(in); onlyErrors = in.readBoolean(); onlyManaged = in.readBoolean(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java index 85481b90edf11..81e6601cfb850 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java @@ -7,10 +7,8 @@ package org.elasticsearch.xpack.core.ml; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.Diff; -import org.elasticsearch.cluster.DiffableUtils; import org.elasticsearch.cluster.NamedDiff; import org.elasticsearch.cluster.SimpleDiffable; import org.elasticsearch.cluster.metadata.Metadata; @@ -28,12 +26,10 @@ import org.elasticsearch.xpack.core.ml.job.config.Job; import java.io.IOException; -import java.util.Collections; import java.util.EnumSet; import java.util.Iterator; import java.util.Map; import java.util.Objects; -import java.util.SortedMap; public class MlMetadata implements Metadata.ProjectCustom { @@ -87,28 +83,12 @@ public Diff diff(Metadata.ProjectCustom previousState) { } public MlMetadata(StreamInput in) throws IOException { - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - int size = in.readVInt(); - for (int i = 0; i < size; i++) { - in.readString(); - new Job(in); - } - size = in.readVInt(); - for (int i = 0; i < size; i++) { - in.readString(); - new DatafeedConfig(in); - } - } this.upgradeMode = in.readBoolean(); this.resetMode = in.readBoolean(); } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - writeMap(Collections.emptySortedMap(), out); - writeMap(Collections.emptySortedMap(), out); - } out.writeBoolean(upgradeMode); out.writeBoolean(resetMode); } @@ -140,15 +120,6 @@ public static class MlMetadataDiff implements NamedDiff } public MlMetadataDiff(StreamInput in) throws IOException { - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(), Job::new, MlMetadataDiff::readJobDiffFrom); - DiffableUtils.readJdkMapDiff( - in, - DiffableUtils.getStringKeySerializer(), - DatafeedConfig::new, - MlMetadataDiff::readDatafeedDiffFrom - ); - } upgradeMode = in.readBoolean(); resetMode = in.readBoolean(); } @@ -165,12 +136,6 @@ public Metadata.ProjectCustom apply(Metadata.ProjectCustom part) { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - SortedMap jobs = Collections.emptySortedMap(); - DiffableUtils.diff(jobs, jobs, DiffableUtils.getStringKeySerializer()).writeTo(out); - SortedMap datafeeds = Collections.emptySortedMap(); - DiffableUtils.diff(datafeeds, datafeeds, DiffableUtils.getStringKeySerializer()).writeTo(out); - } out.writeBoolean(upgradeMode); out.writeBoolean(resetMode); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java index 3dce7b465bc76..edef190c33c6d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetTrainedModelsStatsAction.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionType; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -110,19 +109,11 @@ public TrainedModelStats( public TrainedModelStats(StreamInput in) throws IOException { modelId = in.readString(); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - modelSizeStats = in.readOptionalWriteable(TrainedModelSizeStats::new); - } else { - modelSizeStats = null; - } + modelSizeStats = in.readOptionalWriteable(TrainedModelSizeStats::new); ingestStats = IngestStats.read(in); pipelineCount = in.readVInt(); inferenceStats = in.readOptionalWriteable(InferenceStats::new); - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - this.deploymentStats = in.readOptionalWriteable(AssignmentStats::new); - } else { - this.deploymentStats = null; - } + this.deploymentStats = in.readOptionalWriteable(AssignmentStats::new); } public String getModelId() { @@ -174,15 +165,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(modelId); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - out.writeOptionalWriteable(modelSizeStats); - } + out.writeOptionalWriteable(modelSizeStats); ingestStats.writeTo(out); out.writeVInt(pipelineCount); out.writeOptionalWriteable(inferenceStats); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - out.writeOptionalWriteable(deploymentStats); - } + out.writeOptionalWriteable(deploymentStats); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java index aa7e21fcd1aed..79cf1c32e223a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java @@ -8,7 +8,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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; @@ -117,7 +116,7 @@ static AggProvider fromStream(StreamInput in) throws IOException { in.readGenericMap(), in.readOptionalWriteable(AggregatorFactories.Builder::new), in.readException(), - in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0) ? in.readBoolean() : false + in.readBoolean() ); } @@ -140,9 +139,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeGenericMap(aggs); out.writeOptionalWriteable(parsedAggs); out.writeException(parsingException); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - out.writeBoolean(rewroteAggs); - } + out.writeBoolean(rewroteAggs); } public Exception getParsingException() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java index 3fb4bb7fa598b..9fc42d9fa5de7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java @@ -104,7 +104,6 @@ public class TrainedModelConfig implements ToXContentObject, Writeable { public static final ParseField PER_ALLOCATION_MEMORY_BYTES = new ParseField("per_allocation_memory_bytes"); public static final ParseField PLATFORM_ARCHITECTURE = new ParseField("platform_architecture"); - public static final TransportVersion VERSION_3RD_PARTY_CONFIG_ADDED = TransportVersions.V_8_0_0; public static final TransportVersion VERSION_ALLOCATION_MEMORY_ADDED = TransportVersions.V_8_11_X; // These parsers follow the pattern that metadata is parsed leniently (to allow for enhancements), whilst config is parsed strictly @@ -278,13 +277,8 @@ public TrainedModelConfig(StreamInput in) throws IOException { this.defaultFieldMap = in.readBoolean() ? in.readImmutableMap(StreamInput::readString) : null; this.inferenceConfig = in.readOptionalNamedWriteable(InferenceConfig.class); - if (in.getTransportVersion().onOrAfter(VERSION_3RD_PARTY_CONFIG_ADDED)) { - this.modelType = in.readOptionalEnum(TrainedModelType.class); - this.location = in.readOptionalNamedWriteable(TrainedModelLocation.class); - } else { - this.modelType = null; - this.location = null; - } + this.modelType = in.readOptionalEnum(TrainedModelType.class); + this.location = in.readOptionalNamedWriteable(TrainedModelLocation.class); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { modelPackageConfig = in.readOptionalWriteable(ModelPackageConfig::new); fullDefinition = in.readOptionalBoolean(); @@ -471,10 +465,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(false); } out.writeOptionalNamedWriteable(inferenceConfig); - if (out.getTransportVersion().onOrAfter(VERSION_3RD_PARTY_CONFIG_ADDED)) { - out.writeOptionalEnum(modelType); - out.writeOptionalNamedWriteable(location); - } + out.writeOptionalEnum(modelType); + out.writeOptionalNamedWriteable(location); if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeOptionalWriteable(modelPackageConfig); @@ -1094,11 +1086,7 @@ public static LazyModelDefinition fromBase64String(String base64String) { } public static LazyModelDefinition fromStreamInput(StreamInput input) throws IOException { - if (input.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - return new LazyModelDefinition(input.readBytesReference(), null); - } else { - return fromBase64String(input.readString()); - } + return new LazyModelDefinition(input.readBytesReference(), null); } private LazyModelDefinition(LazyModelDefinition definition) { @@ -1158,11 +1146,7 @@ private void ensureParsedDefinitionUnsafe(NamedXContentRegistry xContentRegistry @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - out.writeBytesReference(getCompressedDefinition()); - } else { - out.writeString(getBase64CompressedDefinition()); - } + out.writeBytesReference(getCompressedDefinition()); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/TrainedModelAssignmentMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/TrainedModelAssignmentMetadata.java index c71b07c83d3e9..960291a4e498e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/TrainedModelAssignmentMetadata.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/TrainedModelAssignmentMetadata.java @@ -10,7 +10,6 @@ import org.elasticsearch.ResourceAlreadyExistsException; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.Diff; import org.elasticsearch.cluster.DiffableUtils; @@ -156,7 +155,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override @@ -321,7 +320,7 @@ public String getWriteableName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfig.java index 71e67b5c89bfe..14edc88dc7952 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfig.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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; @@ -162,7 +161,7 @@ public MlConfigVersion getMinimalSupportedMlConfigVersion() { @Override public TransportVersion getMinimalSupportedTransportVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfigUpdate.java index 9ac4ea9cf18e7..8d19ff0517c20 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/FillMaskConfigUpdate.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.ObjectParser; @@ -105,7 +104,7 @@ public String getName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfig.java index a5693e1b6f6e7..e02c640f01502 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfig.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.core.Nullable; @@ -181,7 +180,7 @@ public MlConfigVersion getMinimalSupportedMlConfigVersion() { @Override public TransportVersion getMinimalSupportedTransportVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfigUpdate.java index 015aa658b1658..004deb31005c4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/NerConfigUpdate.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.ObjectParser; @@ -125,7 +124,7 @@ public int hashCode() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } public static class Builder implements InferenceConfigUpdate.Builder { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfig.java index 0c17c6d458dde..451de0ed1dd49 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfig.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.core.Nullable; @@ -143,7 +142,7 @@ public MlConfigVersion getMinimalSupportedMlConfigVersion() { @Override public TransportVersion getMinimalSupportedTransportVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfigUpdate.java index 1a7832a70cfdf..8268eb7fa419f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/PassThroughConfigUpdate.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.ObjectParser; @@ -126,7 +125,7 @@ public int hashCode() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } public static class Builder implements InferenceConfigUpdate.Builder { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfig.java index e37ffcb212810..7d62058c41457 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfig.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.core.Nullable; @@ -174,7 +173,7 @@ public MlConfigVersion getMinimalSupportedMlConfigVersion() { @Override public TransportVersion getMinimalSupportedTransportVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfigUpdate.java index 5379e3eeb17f7..7d902448fb234 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextClassificationConfigUpdate.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.ObjectParser; @@ -100,7 +99,7 @@ public String getName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java index 6be122c0ccfa1..e21d594fbd9f4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfig.java @@ -180,7 +180,7 @@ public MlConfigVersion getMinimalSupportedMlConfigVersion() { @Override public TransportVersion getMinimalSupportedTransportVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdate.java index 67b54b3642860..0c2332cc9a91c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/TextEmbeddingConfigUpdate.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.ObjectParser; @@ -101,7 +100,7 @@ public String getName() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfig.java index 29d9868bb0de1..0a09857bd44af 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfig.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.core.Nullable; @@ -242,7 +241,7 @@ public MlConfigVersion getMinimalSupportedMlConfigVersion() { @Override public TransportVersion getMinimalSupportedTransportVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdate.java index 8f03d5e3d01cf..164f79afb664b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ZeroShotClassificationConfigUpdate.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.core.ml.inference.trainedmodel; 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.core.Nullable; @@ -205,6 +204,6 @@ public ZeroShotClassificationConfigUpdate build() { @Override public TransportVersion getMinimalSupportedVersion() { - return TransportVersions.V_8_0_0; + return TransportVersion.minimumCompatible(); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DataDescription.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DataDescription.java index 65a4524b1bcff..d2b4b8cc7c46d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DataDescription.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DataDescription.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.ml.job.config; -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; @@ -131,36 +130,14 @@ public DataDescription(String timeFieldName, String timeFormat) { } public DataDescription(StreamInput in) throws IOException { - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - DataFormat.readFromStream(in); - } timeFieldName = in.readString(); timeFormat = in.readString(); - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - // fieldDelimiter - if (in.readBoolean()) { - in.read(); - } - // quoteCharacter - if (in.readBoolean()) { - in.read(); - } - } } @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - DataFormat.XCONTENT.writeTo(out); - } out.writeString(timeFieldName); out.writeString(timeFormat); - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - // fieldDelimiter - out.writeBoolean(false); - // quoteCharacter - out.writeBoolean(false); - } } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java index f7ad1f65628b2..9e183d402c087 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.rollup.job; -import org.elasticsearch.TransportVersions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -75,12 +74,6 @@ public RollupJobStatus(IndexerState state, @Nullable Map positio public RollupJobStatus(StreamInput in) throws IOException { state = IndexerState.fromStream(in); currentPosition = in.readOptional(CURRENT_POSITION_READER); - if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - // 7.x nodes serialize `upgradedDocumentID` flag. We don't need it anymore, but - // we need to pull it off the stream - // This can go away completely in 9.0 - in.readBoolean(); - } } private static final Reader> CURRENT_POSITION_READER = in -> new TreeMap<>(in.readGenericMap()); @@ -121,12 +114,6 @@ public String getWriteableName() { public void writeTo(StreamOutput out) throws IOException { state.writeTo(out); out.writeOptional(StreamOutput::writeGenericMap, currentPosition); - if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { - // 7.x nodes expect a boolean `upgradedDocumentID` flag. We don't have it anymore, - // but we need to tell them we are upgraded in case there is a mixed cluster - // This can go away completely in 9.0 - out.writeBoolean(true); - } } @Override 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 6b9f1632a159e..24ba6c0172efa 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 @@ -6,7 +6,6 @@ */ package org.elasticsearch.xpack.core.security.action.saml; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -63,9 +62,7 @@ public Authentication getAuthentication() { @Override public void writeTo(StreamOutput out) throws IOException { out.writeString(principal); - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - out.writeString(realm); - } + out.writeString(realm); out.writeString(tokenString); out.writeString(refreshToken); out.writeTimeValue(expiresIn); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/TokensInvalidationResult.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/TokensInvalidationResult.java index 8fe018a825468..e73efd9d6dd9e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/TokensInvalidationResult.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/TokensInvalidationResult.java @@ -62,9 +62,7 @@ public TokensInvalidationResult(StreamInput in) throws IOException { if (in.getTransportVersion().before(TransportVersions.V_7_2_0)) { in.readVInt(); } - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - this.restStatus = RestStatus.readFrom(in); - } + this.restStatus = RestStatus.readFrom(in); } public static TokensInvalidationResult emptyResult(RestStatus restStatus) { @@ -114,8 +112,6 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().before(TransportVersions.V_7_2_0)) { out.writeVInt(5); } - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - RestStatus.writeTo(out, restStatus); - } + RestStatus.writeTo(out, restStatus); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java index 06ff971ecf890..d477b7a58f8ad 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/cert/CertificateInfo.java @@ -56,11 +56,7 @@ public CertificateInfo(String path, String format, String alias, boolean hasPriv } public CertificateInfo(StreamInput in) throws IOException { - if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - this.path = in.readOptionalString(); - } else { - this.path = in.readString(); - } + this.path = in.readOptionalString(); this.format = in.readString(); this.alias = in.readOptionalString(); this.subjectDn = in.readString(); @@ -76,11 +72,7 @@ public CertificateInfo(StreamInput in) throws IOException { @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - out.writeOptionalString(this.path); - } else { - out.writeString(this.path == null ? "" : this.path); - } + out.writeOptionalString(this.path); out.writeString(format); out.writeOptionalString(alias); out.writeString(subjectDn); 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 84a4dc412e827..4f80dc8d86c50 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 @@ -453,10 +453,6 @@ public void testValidatePackagedModelRequiredFields() { @Override protected TrainedModelConfig mutateInstanceForVersion(TrainedModelConfig instance, TransportVersion version) { TrainedModelConfig.Builder builder = new TrainedModelConfig.Builder(instance); - if (version.before(TrainedModelConfig.VERSION_3RD_PARTY_CONFIG_ADDED)) { - builder.setModelType(null); - builder.setLocation(null); - } if (instance.getInferenceConfig() instanceof NlpConfig nlpConfig) { builder.setInferenceConfig(InferenceConfigItemTestCase.mutateForVersion(nlpConfig, version)); }