From 24ed4ca43f7926e352f1020b63ff0624f3dd2ef3 Mon Sep 17 00:00:00 2001
From: Simon Cooper <simon.cooper@elastic.co>
Date: Thu, 5 Oct 2023 11:41:11 +0100
Subject: [PATCH] Collapse transport versions 8,500,021-8,500,039 to 8,500,040
 (#100075)

---
 .../main/java/org/elasticsearch/Build.java    |  4 ++--
 .../org/elasticsearch/TransportVersions.java  | 19 -------------------
 .../analyze/ReloadAnalyzersRequest.java       |  5 ++---
 .../cluster/metadata/DataStreamLifecycle.java |  4 ++--
 .../cluster/node/DiscoveryNode.java           |  4 ++--
 .../index/query/MatchNoneQueryBuilder.java    |  4 ++--
 .../index/query/SimpleQueryStringBuilder.java |  2 +-
 .../downsample/DownsampleIndexerAction.java   |  4 ++--
 .../downsample/DownsampleShardStatus.java     |  4 ++--
 .../search/action/AsyncStatusResponse.java    |  4 ++--
 .../action/user/AuthenticateResponse.java     |  2 +-
 .../application/rules/RuleQueryBuilder.java   |  2 +-
 .../xpack/eql/action/EqlSearchResponse.java   |  4 ++--
 .../eql/action/EqlSearchResponseTests.java    |  2 +-
 14 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java
index be76564e52f6b..6c354b2fb5fa1 100644
--- a/server/src/main/java/org/elasticsearch/Build.java
+++ b/server/src/main/java/org/elasticsearch/Build.java
@@ -190,7 +190,7 @@ static URL getElasticsearchCodeSourceLocation() {
     public static Build readBuild(StreamInput in) throws IOException {
         final String flavor;
         if (in.getTransportVersion().before(TransportVersions.V_8_3_0)
-            || in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_039)) {
+            || in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             flavor = in.readString();
         } else {
             flavor = "default";
@@ -221,7 +221,7 @@ public static Build readBuild(StreamInput in) throws IOException {
 
     public static void writeBuild(Build build, StreamOutput out) throws IOException {
         if (out.getTransportVersion().before(TransportVersions.V_8_3_0)
-            || out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_039)) {
+            || out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             out.writeString(build.flavor());
         }
         out.writeString(build.type().displayName());
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
index c80383476b8c3..c49ff1b1f0d29 100644
--- a/server/src/main/java/org/elasticsearch/TransportVersions.java
+++ b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -85,25 +85,6 @@ static TransportVersion def(int id) {
      * Detached transport versions added below here.
      */
     public static final TransportVersion V_8_500_020 = def(8_500_020);
-    public static final TransportVersion V_8_500_021 = def(8_500_021);
-    public static final TransportVersion V_8_500_022 = def(8_500_022);
-    public static final TransportVersion V_8_500_023 = def(8_500_023);
-    public static final TransportVersion V_8_500_024 = def(8_500_024);
-    public static final TransportVersion V_8_500_025 = def(8_500_025);
-    public static final TransportVersion V_8_500_026 = def(8_500_026);
-    public static final TransportVersion V_8_500_027 = def(8_500_027);
-    public static final TransportVersion V_8_500_028 = def(8_500_028);
-    public static final TransportVersion V_8_500_029 = def(8_500_029);
-    public static final TransportVersion V_8_500_030 = def(8_500_030);
-    public static final TransportVersion V_8_500_031 = def(8_500_031);
-    public static final TransportVersion V_8_500_032 = def(8_500_032);
-    public static final TransportVersion V_8_500_033 = def(8_500_033);
-    public static final TransportVersion V_8_500_034 = def(8_500_034);
-    public static final TransportVersion V_8_500_035 = def(8_500_035);
-    public static final TransportVersion V_8_500_036 = def(8_500_036);
-    public static final TransportVersion V_8_500_037 = def(8_500_037);
-    public static final TransportVersion V_8_500_038 = def(8_500_038);
-    public static final TransportVersion V_8_500_039 = def(8_500_039);
     public static final TransportVersion V_8_500_040 = def(8_500_040);
     public static final TransportVersion V_8_500_041 = def(8_500_041);
     public static final TransportVersion V_8_500_042 = def(8_500_042);
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/ReloadAnalyzersRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/ReloadAnalyzersRequest.java
index 26432922c1f24..31c5f57ab5eef 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/ReloadAnalyzersRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/ReloadAnalyzersRequest.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.action.admin.indices.analyze;
 
 import org.elasticsearch.TransportVersion;
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -17,8 +18,6 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static org.elasticsearch.TransportVersions.V_8_500_034;
-
 /**
  * Request for reloading index search analyzers
  */
@@ -26,7 +25,7 @@ public class ReloadAnalyzersRequest extends BroadcastRequest<ReloadAnalyzersRequ
     private final String resource;
     private final boolean preview;
 
-    private static final TransportVersion PREVIEW_OPTION_TRANSPORT_VERSION = V_8_500_034;
+    private static final TransportVersion PREVIEW_OPTION_TRANSPORT_VERSION = TransportVersions.V_8_500_040;
 
     /**
      * Constructs a request for reloading index search analyzers
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
index 514cc55ceed35..a3a6e34d445d2 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
@@ -174,7 +174,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_020)) {
             out.writeOptionalWriteable(dataRetention);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_026)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             out.writeOptionalWriteable(downsampling);
         }
         if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
@@ -188,7 +188,7 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
         } else {
             dataRetention = null;
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_026)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             downsampling = in.readOptionalWriteable(Downsampling::read);
         } else {
             downsampling = null;
diff --git a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
index ff5496aaef83e..554bdce72a2ff 100644
--- a/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
+++ b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
@@ -335,7 +335,7 @@ public DiscoveryNode(StreamInput in) throws IOException {
             }
         }
         this.roles = Collections.unmodifiableSortedSet(roles);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_024)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             versionInfo = new VersionInformation(Version.readVersion(in), IndexVersion.readVersion(in), IndexVersion.readVersion(in));
         } else {
             versionInfo = inferVersionInformation(Version.readVersion(in));
@@ -372,7 +372,7 @@ public void writeTo(StreamOutput out) throws IOException {
             o.writeString(role.roleNameAbbreviation());
             o.writeBoolean(role.canContainData());
         });
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_024)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             Version.writeVersion(versionInfo.nodeVersion(), out);
             IndexVersion.writeVersion(versionInfo.minIndexVersion(), out);
             IndexVersion.writeVersion(versionInfo.maxIndexVersion(), out);
diff --git a/server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java
index 97bea569a3c95..fae3dd4069076 100644
--- a/server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java
@@ -39,14 +39,14 @@ public MatchNoneQueryBuilder(String rewriteReason) {
      */
     public MatchNoneQueryBuilder(StreamInput in) throws IOException {
         super(in);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_029)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             rewriteReason = in.readOptionalString();
         }
     }
 
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_029)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             out.writeOptionalString(rewriteReason);
         }
     }
diff --git a/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
index 7b7997ce78007..4f6ba803eb7ac 100644
--- a/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
+++ b/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java
@@ -91,7 +91,7 @@ public class SimpleQueryStringBuilder extends AbstractQueryBuilder<SimpleQuerySt
     /** Name for (de-)serialization. */
     public static final String NAME = "simple_query_string";
 
-    public static final TransportVersion TYPE_FIELD_ADDED_VERSION = TransportVersions.V_8_500_023;
+    public static final TransportVersion TYPE_FIELD_ADDED_VERSION = TransportVersions.V_8_500_040;
 
     private static final ParseField MINIMUM_SHOULD_MATCH_FIELD = new ParseField("minimum_should_match");
     private static final ParseField ANALYZE_WILDCARD_FIELD = new ParseField("analyze_wildcard");
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleIndexerAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleIndexerAction.java
index 2949ddfdaf5f6..10ae1846e91dc 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleIndexerAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleIndexerAction.java
@@ -69,7 +69,7 @@ public Request() {}
 
         public Request(StreamInput in) throws IOException {
             super(in);
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_030) && in.readBoolean()) {
+            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040) && in.readBoolean()) {
                 this.indexStartTimeMillis = in.readVLong();
                 this.indexEndTimeMillis = in.readVLong();
             } else {
@@ -132,7 +132,7 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId,
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_030)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
                 out.writeBoolean(true);
                 out.writeVLong(indexStartTimeMillis);
                 out.writeVLong(indexEndTimeMillis);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleShardStatus.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleShardStatus.java
index 3190fb095cbca..8f254043cf7c2 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleShardStatus.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/downsample/DownsampleShardStatus.java
@@ -144,7 +144,7 @@ public DownsampleShardStatus(StreamInput in) throws IOException {
         numSent = in.readLong();
         numIndexed = in.readLong();
         numFailed = in.readLong();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_030) && in.readBoolean()) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040) && in.readBoolean()) {
             totalShardDocCount = in.readVLong();
             lastSourceTimestamp = in.readVLong();
             lastTargetTimestamp = in.readVLong();
@@ -254,7 +254,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeLong(numSent);
         out.writeLong(numIndexed);
         out.writeLong(numFailed);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_030)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             out.writeBoolean(true);
             out.writeVLong(totalShardDocCount);
             out.writeVLong(lastSourceTimestamp);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java
index 9a5f59b84b347..c2d15e54ed667 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncStatusResponse.java
@@ -139,7 +139,7 @@ public AsyncStatusResponse(StreamInput in) throws IOException {
         } else {
             this.clusters = null;
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_035)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             this.completionTimeMillis = in.readOptionalVLong();
         } else {
             this.completionTimeMillis = null;
@@ -164,7 +164,7 @@ public void writeTo(StreamOutput out) throws IOException {
             // optional since only CCS uses is; it is null for local-only searches
             out.writeOptionalWriteable(clusters);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_035)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
             out.writeOptionalVLong(completionTimeMillis);
         }
     }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateResponse.java
index 70ffdb8bb9c9c..5c75bf685c330 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateResponse.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateResponse.java
@@ -20,7 +20,7 @@
 
 public class AuthenticateResponse extends ActionResponse implements ToXContent {
 
-    public static final TransportVersion VERSION_OPERATOR_FIELD = TransportVersions.V_8_500_028;
+    public static final TransportVersion VERSION_OPERATOR_FIELD = TransportVersions.V_8_500_040;
 
     private final Authentication authentication;
     private final boolean operator;
diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java
index 0f445fe50e9d7..ad1626fd2f4b3 100644
--- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java
+++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java
@@ -73,7 +73,7 @@ public class RuleQueryBuilder extends AbstractQueryBuilder<RuleQueryBuilder> {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.V_8_500_033;
+        return TransportVersions.V_8_500_040;
     }
 
     public RuleQueryBuilder(QueryBuilder organicQuery, Map<String, Object> matchCriteria, String rulesetId) {
diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchResponse.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchResponse.java
index 0640347a7ea91..c22cf7d390628 100644
--- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchResponse.java
+++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchResponse.java
@@ -281,7 +281,7 @@ private Event(StreamInput in) throws IOException {
             } else {
                 fetchFields = null;
             }
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_038)) {
+            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
                 missing = in.readBoolean();
             } else {
                 missing = index.isEmpty();
@@ -304,7 +304,7 @@ public void writeTo(StreamOutput out) throws IOException {
                     out.writeMap(fetchFields, StreamOutput::writeWriteable);
                 }
             }
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_038)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_500_040)) {
                 // for BWC, 8.9.1+ does not have "missing" attribute, but it considers events with an empty index "" as missing events
                 // see https://github.com/elastic/elasticsearch/pull/98130
                 out.writeBoolean(missing);
diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchResponseTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchResponseTests.java
index 765fd94d4c6be..080cc26d81eb2 100644
--- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchResponseTests.java
+++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchResponseTests.java
@@ -289,7 +289,7 @@ private List<Event> mutateEvents(List<Event> original, TransportVersion version)
                     e.id(),
                     e.source(),
                     version.onOrAfter(TransportVersions.V_7_13_0) ? e.fetchFields() : null,
-                    version.onOrAfter(TransportVersions.V_8_500_038) ? e.missing() : e.index().isEmpty()
+                    version.onOrAfter(TransportVersions.V_8_500_040) ? e.missing() : e.index().isEmpty()
                 )
             );
         }