Browse Source

Change release version lookup to an instance method (#104902)

Simon Cooper 1 year ago
parent
commit
1395edf805

+ 8 - 0
server/src/main/java/org/elasticsearch/TransportVersion.java

@@ -101,6 +101,14 @@ public record TransportVersion(int id) implements VersionId<TransportVersion> {
         return TransportVersion.fromId(Integer.parseInt(str));
     }
 
+    /**
+     * Returns a string representing the Elasticsearch release version of this transport version,
+     * if applicable for this deployment, otherwise the raw version number.
+     */
+    public String toReleaseVersion() {
+        return TransportVersions.VERSION_LOOKUP.apply(id);
+    }
+
     @Override
     public String toString() {
         return Integer.toString(id);

+ 1 - 5
server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -286,11 +286,7 @@ public class TransportVersions {
         return VERSION_IDS.values();
     }
 
-    private static final IntFunction<String> VERSION_LOOKUP = ReleaseVersions.generateVersionsLookup(TransportVersions.class);
-
-    public static String toReleaseVersion(TransportVersion version) {
-        return VERSION_LOOKUP.apply(version.id());
-    }
+    static final IntFunction<String> VERSION_LOOKUP = ReleaseVersions.generateVersionsLookup(TransportVersions.class);
 
     // no instance
     private TransportVersions() {}

+ 8 - 0
server/src/main/java/org/elasticsearch/index/IndexVersion.java

@@ -143,6 +143,14 @@ public record IndexVersion(int id, Version luceneVersion) implements VersionId<I
         return builder.value(id);
     }
 
+    /**
+     * Returns a string representing the Elasticsearch release version of this index version,
+     * if applicable for this deployment, otherwise the raw version number.
+     */
+    public String toReleaseVersion() {
+        return IndexVersions.VERSION_LOOKUP.apply(id);
+    }
+
     @Override
     public String toString() {
         return Integer.toString(id);

+ 3 - 4
server/src/main/java/org/elasticsearch/index/IndexVersions.java

@@ -207,9 +207,8 @@ public class IndexVersions {
         return VERSION_IDS.values();
     }
 
-    private static final IntFunction<String> VERSION_LOOKUP = ReleaseVersions.generateVersionsLookup(IndexVersions.class);
+    static final IntFunction<String> VERSION_LOOKUP = ReleaseVersions.generateVersionsLookup(IndexVersions.class);
 
-    public static String toReleaseVersion(IndexVersion version) {
-        return VERSION_LOOKUP.apply(version.id());
-    }
+    // no instance
+    private IndexVersions() {}
 }