Remove references to transport versions 7.3 and 7.4 (#118289)

thecoop · web-flow · commit 77590834e40e · 2024-12-10T14:57:20.000Z
diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilder.java
@@ -124,17 +124,13 @@ public AutoDateHistogramAggregationBuilder(String name) {
     public AutoDateHistogramAggregationBuilder(StreamInput in) throws IOException {
         super(in);
         numBuckets = in.readVInt();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            minimumIntervalExpression = in.readOptionalString();
-        }
+        minimumIntervalExpression = in.readOptionalString();
     }
 
     @Override
     protected void innerWriteTo(StreamOutput out) throws IOException {
         out.writeVInt(numBuckets);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            out.writeOptionalString(minimumIntervalExpression);
-        }
+        out.writeOptionalString(minimumIntervalExpression);
     }
 
     protected AutoDateHistogramAggregationBuilder(
diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/DerivativePipelineAggregationBuilder.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/DerivativePipelineAggregationBuilder.java
@@ -259,6 +259,6 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/cluster/RepositoryCleanupInProgress.java b/server/src/main/java/org/elasticsearch/cluster/RepositoryCleanupInProgress.java
@@ -93,7 +93,7 @@ public String toString() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 
     public record Entry(String repository, long repositoryStateId) implements Writeable, RepositoryOperation {
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregationBuilder.java
@@ -240,6 +240,6 @@ public String getType() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_3_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregationBuilder.java
@@ -370,6 +370,6 @@ public String getType() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_3_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregationBuilder.java
@@ -377,6 +377,6 @@ public String getType() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_3_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumPipelineAggregationBuilder.java
@@ -124,6 +124,6 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityPipelineAggregationBuilder.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityPipelineAggregationBuilder.java
@@ -133,6 +133,6 @@ protected boolean overrideBucketsPath() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardChangesAction.java
@@ -7,7 +7,6 @@
 package org.elasticsearch.xpack.ccr.action;
 
 import org.elasticsearch.ResourceNotFoundException;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
@@ -268,11 +267,7 @@ public long getTookInMillis() {
             super(in);
             mappingVersion = in.readVLong();
             settingsVersion = in.readVLong();
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-                aliasesVersion = in.readVLong();
-            } else {
-                aliasesVersion = 0;
-            }
+            aliasesVersion = in.readVLong();
             globalCheckpoint = in.readZLong();
             maxSeqNo = in.readZLong();
             maxSeqNoOfUpdatesOrDeletes = in.readZLong();
@@ -304,9 +299,7 @@ public long getTookInMillis() {
         public void writeTo(final StreamOutput out) throws IOException {
             out.writeVLong(mappingVersion);
             out.writeVLong(settingsVersion);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-                out.writeVLong(aliasesVersion);
-            }
+            out.writeVLong(aliasesVersion);
             out.writeZLong(globalCheckpoint);
             out.writeZLong(maxSeqNo);
             out.writeZLong(maxSeqNoOfUpdatesOrDeletes);
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
@@ -328,27 +328,15 @@ public FeatureSet(String name, boolean available, boolean enabled) {
             }
 
             public FeatureSet(StreamInput in) throws IOException {
-                this(in.readString(), readAvailable(in), in.readBoolean());
+                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
                 }
             }
 
-            // this is separated out so that the removed description can be read from the stream on construction
-            // TODO: remove this for 8.0
-            private static boolean readAvailable(StreamInput in) throws IOException {
-                if (in.getTransportVersion().before(TransportVersions.V_7_3_0)) {
-                    in.readOptionalString();
-                }
-                return in.readBoolean();
-            }
-
             @Override
             public void writeTo(StreamOutput out) throws IOException {
                 out.writeString(name);
-                if (out.getTransportVersion().before(TransportVersions.V_7_3_0)) {
-                    out.writeOptionalString(null);
-                }
                 out.writeBoolean(available);
                 out.writeBoolean(enabled);
                 if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/analytics/AnalyticsFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/analytics/AnalyticsFeatureSetUsage.java
@@ -48,7 +48,7 @@ protected void innerXContent(XContentBuilder builder, Params params) throws IOEx
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/ShardFollowNodeTaskStatus.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/ShardFollowNodeTaskStatus.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.core.ccr;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -413,11 +412,7 @@ public ShardFollowNodeTaskStatus(final StreamInput in) throws IOException {
         this.writeBufferSizeInBytes = in.readVLong();
         this.followerMappingVersion = in.readVLong();
         this.followerSettingsVersion = in.readVLong();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            this.followerAliasesVersion = in.readVLong();
-        } else {
-            this.followerAliasesVersion = 0L;
-        }
+        this.followerAliasesVersion = in.readVLong();
         this.totalReadTimeMillis = in.readVLong();
         this.totalReadRemoteExecTimeMillis = in.readVLong();
         this.successfulReadRequests = in.readVLong();
@@ -457,9 +452,7 @@ public void writeTo(final StreamOutput out) throws IOException {
         out.writeVLong(writeBufferSizeInBytes);
         out.writeVLong(followerMappingVersion);
         out.writeVLong(followerSettingsVersion);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            out.writeVLong(followerAliasesVersion);
-        }
+        out.writeVLong(followerAliasesVersion);
         out.writeVLong(totalReadTimeMillis);
         out.writeVLong(totalReadRemoteExecTimeMillis);
         out.writeVLong(successfulReadRequests);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/frozen/FrozenIndicesFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/frozen/FrozenIndicesFeatureSetUsage.java
@@ -28,7 +28,7 @@ public FrozenIndicesFeatureSetUsage(StreamInput input) throws IOException {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartDataFrameAnalyticsAction.java
@@ -149,7 +149,6 @@ public String toString() {
     public static class TaskParams implements PersistentTaskParams, MlTaskParams {
 
         public static final MlConfigVersion VERSION_INTRODUCED = MlConfigVersion.V_7_3_0;
-        public static final TransportVersion TRANSPORT_VERSION_INTRODUCED = TransportVersions.V_7_3_0;
         public static final MlConfigVersion VERSION_DESTINATION_INDEX_MAPPINGS_CHANGED = MlConfigVersion.V_7_10_0;
 
         public static final ConstructingObjectParser<TaskParams, Void> PARSER = new ConstructingObjectParser<>(
@@ -207,7 +206,7 @@ public String getWriteableName() {
 
         @Override
         public TransportVersion getMinimalSupportedVersion() {
-            return TRANSPORT_VERSION_INTRODUCED;
+            return TransportVersions.ZERO;
         }
 
         @Override
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java
@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.xpack.core.security.action.oidc;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.common.Strings;
@@ -54,10 +53,7 @@ public OpenIdConnectAuthenticateRequest(StreamInput in) throws IOException {
         redirectUri = in.readString();
         state = in.readString();
         nonce = in.readString();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_4_0)) {
-            realm = in.readOptionalString();
-        }
-
+        realm = in.readOptionalString();
     }
 
     public String getRedirectUri() {
@@ -113,9 +109,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(redirectUri);
         out.writeString(state);
         out.writeString(nonce);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_4_0)) {
-            out.writeOptionalString(realm);
-        }
+        out.writeOptionalString(realm);
     }
 
     public String toString() {
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java
@@ -131,7 +131,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 
     @Override
@@ -226,7 +226,7 @@ static Diff<SnapshotLifecyclePolicyMetadata> readLifecyclePolicyDiffFrom(StreamI
 
         @Override
         public TransportVersion getMinimalSupportedVersion() {
-            return TransportVersions.V_7_4_0;
+            return TransportVersions.ZERO;
         }
 
     }
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
@@ -38,7 +38,7 @@ public SpatialFeatureSetUsage(StreamInput input) throws IOException {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 
     SpatialStatsAction.Response statsResponse() {
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java
@@ -131,20 +131,11 @@ public TransformState(
     public TransformState(StreamInput in) throws IOException {
         taskState = TransformTaskState.fromStream(in);
         indexerState = IndexerState.fromStream(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            position = in.readOptionalWriteable(TransformIndexerPosition::new);
-        } else {
-            Map<String, Object> pos = in.readGenericMap();
-            position = new TransformIndexerPosition(pos, null);
-        }
+        position = in.readOptionalWriteable(TransformIndexerPosition::new);
         checkpoint = in.readLong();
         reason = in.readOptionalString();
         progress = in.readOptionalWriteable(TransformProgress::new);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            node = in.readOptionalWriteable(NodeAttributes::new);
-        } else {
-            node = null;
-        }
+        node = in.readOptionalWriteable(NodeAttributes::new);
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
             shouldStopAtNextCheckpoint = in.readBoolean();
         } else {
@@ -241,17 +232,11 @@ public String getWriteableName() {
     public void writeTo(StreamOutput out) throws IOException {
         taskState.writeTo(out);
         indexerState.writeTo(out);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            out.writeOptionalWriteable(position);
-        } else {
-            out.writeGenericMap(position != null ? position.getIndexerPosition() : null);
-        }
+        out.writeOptionalWriteable(position);
         out.writeLong(checkpoint);
         out.writeOptionalString(reason);
         out.writeOptionalWriteable(progress);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) {
-            out.writeOptionalWriteable(node);
-        }
+        out.writeOptionalWriteable(node);
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_6_0)) {
             out.writeBoolean(shouldStopAtNextCheckpoint);
         }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/votingonly/VotingOnlyNodeFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/votingonly/VotingOnlyNodeFeatureSetUsage.java
@@ -25,7 +25,7 @@ public VotingOnlyNodeFeatureSetUsage() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_3_0;
+        return TransportVersions.ZERO;
     }
 
 }
diff --git a/x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilder.java b/x-pack/plugin/search-business-rules/src/main/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilder.java
@@ -297,6 +297,6 @@ protected boolean doEquals(PinnedQueryBuilder other) {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 }
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryBuilder.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryBuilder.java
@@ -176,6 +176,6 @@ public static ShapeQueryBuilder fromXContent(XContentParser parser) throws IOExc
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_7_4_0;
+        return TransportVersions.ZERO;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,6 @@ public String getWriteableName() {`
`259`	`259`
`260`	`260`	`@Override`
`261`	`261`	`public TransportVersion getMinimalSupportedVersion() {`
`262`		`- return TransportVersions.V_7_4_0;`
	`262`	`+ return TransportVersions.ZERO;`
`263`	`263`	`}`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public String toString() {`
`93`	`93`
`94`	`94`	`@Override`
`95`	`95`	`public TransportVersion getMinimalSupportedVersion() {`
`96`		`- return TransportVersions.V_7_4_0;`
	`96`	`+ return TransportVersions.ZERO;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public record Entry(String repository, long repositoryStateId) implements Writeable, RepositoryOperation {`
Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,6 @@ public String getType() {`
`240`	`240`
`241`	`241`	`@Override`
`242`	`242`	`public TransportVersion getMinimalSupportedVersion() {`
`243`		`- return TransportVersions.V_7_3_0;`
	`243`	`+ return TransportVersions.ZERO;`
`244`	`244`	`}`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,6 @@ public String getType() {`
`370`	`370`
`371`	`371`	`@Override`
`372`	`372`	`public TransportVersion getMinimalSupportedVersion() {`
`373`		`- return TransportVersions.V_7_3_0;`
	`373`	`+ return TransportVersions.ZERO;`
`374`	`374`	`}`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,6 @@ public String getType() {`
`377`	`377`
`378`	`378`	`@Override`
`379`	`379`	`public TransportVersion getMinimalSupportedVersion() {`
`380`		`- return TransportVersions.V_7_3_0;`
	`380`	`+ return TransportVersions.ZERO;`
`381`	`381`	`}`
`382`	`382`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,6 @@ public String getWriteableName() {`
`124`	`124`
`125`	`125`	`@Override`
`126`	`126`	`public TransportVersion getMinimalSupportedVersion() {`
`127`		`- return TransportVersions.V_7_4_0;`
	`127`	`+ return TransportVersions.ZERO;`
`128`	`128`	`}`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,6 @@ protected boolean overrideBucketsPath() {`
`133`	`133`
`134`	`134`	`@Override`
`135`	`135`	`public TransportVersion getMinimalSupportedVersion() {`
`136`		`- return TransportVersions.V_7_4_0;`
	`136`	`+ return TransportVersions.ZERO;`
`137`	`137`	`}`
`138`	`138`	`}`