Minor Version cleanup (elastic#104461)

* Some minor cleanup - removing some useless Version reference * Using TransportVersion#toReleaseVersion
szabosteve · Feb 12, 2024 · 4f2c264 · 4f2c264
1 parent 6ae7d18
commit 4f2c264
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
@@ -13,7 +13,6 @@
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.CompositeIndicesRequest;
 import org.elasticsearch.action.DocWriteRequest;
@@ -24,6 +23,7 @@
 import org.elasticsearch.cluster.metadata.IndexAbstraction;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.routing.IndexRouting;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -758,7 +758,12 @@ private void writeBody(StreamOutput out) throws IOException {
             out.writeMap(dynamicTemplates, StreamOutput::writeString);
         } else {
             if (dynamicTemplates.isEmpty() == false) {
-                throw new IllegalArgumentException("[dynamic_templates] parameter requires all nodes on " + Version.V_7_13_0 + " or later");
+                throw new IllegalArgumentException(
+                    Strings.format(
+                        "[dynamic_templates] parameter requires all nodes on %s or later",
+                        TransportVersions.V_7_13_0.toReleaseVersion()
+                    )
+                );
             }
         }
         if (out.getTransportVersion().onOrAfter(PIPELINES_HAVE_RUN_FIELD_ADDED)) {

diff --git a/server/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java
@@ -9,7 +9,6 @@
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.support.ActiveShardCount;
@@ -232,10 +231,7 @@ public void testSerializeDynamicTemplates() throws Exception {
             BytesStreamOutput out = new BytesStreamOutput();
             out.setTransportVersion(ver);
             IllegalArgumentException error = expectThrows(IllegalArgumentException.class, () -> indexRequest.writeTo(out));
-            assertThat(
-                error.getMessage(),
-                equalTo("[dynamic_templates] parameter requires all nodes on " + Version.V_7_13_0 + " or later")
-            );
+            assertThat(error.getMessage(), equalTo("[dynamic_templates] parameter requires all nodes on 7.13.0 or later"));
         }
         // new version
         {

diff --git a/...plugin/stack/src/main/java/org/elasticsearch/xpack/stack/LegacyStackTemplateRegistry.java b/...plugin/stack/src/main/java/org/elasticsearch/xpack/stack/LegacyStackTemplateRegistry.java
@@ -9,7 +9,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.elasticsearch.Version;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.metadata.ComponentTemplate;
@@ -42,9 +41,6 @@
 public class LegacyStackTemplateRegistry extends IndexTemplateRegistry {
     private static final Logger logger = LogManager.getLogger(LegacyStackTemplateRegistry.class);
 
-    // Current version of the registry requires all nodes to be at least 8.9.0.
-    public static final Version MIN_NODE_VERSION = Version.V_8_9_0;
-
     // The stack template registry version. This number must be incremented when we make changes
     // to built-in templates.
     public static final int REGISTRY_VERSION = 4;