cleanup

Author: pgomulka

server/src/main/java/org/elasticsearch/TransportVersion.java

@@ -16,7 +16,10 @@
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.NavigableSet;
 import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 /**
  * Represents the version of the wire protocol used to communicate between ES nodes.
@@ -149,6 +152,8 @@ public class TransportVersion implements Comparable<TransportVersion> {
 
     private static final Map<Integer, TransportVersion> idToVersion;
 
+    private static final TreeSet<TransportVersion> declaredVersions;
+
     static {
         Map<Integer, TransportVersion> builder = new HashMap<>();
         Map<String, TransportVersion> uniqueIds = new HashMap<>();
@@ -181,6 +186,7 @@ public class TransportVersion implements Comparable<TransportVersion> {
             }
         }
         idToVersion = Map.copyOf(builder);
+        declaredVersions = idToVersion.values().stream().collect(Collectors.toCollection(() -> new TreeSet<>()));
     }
 
     public static TransportVersion readVersion(StreamInput in) throws IOException {
@@ -244,6 +250,13 @@ public int compareTo(TransportVersion other) {
         return Integer.compare(this.id, other.id);
     }
 
+    /**
+     * returns a sorted list of declared transport version constants
+     */
+    public static NavigableSet<TransportVersion> getDeclaredVersions() {
+        return declaredVersions;
+    }
+
     @Override
     public String toString() {
         return Integer.toString(id);
@@ -271,4 +284,5 @@ public boolean equals(Object o) {
     public int hashCode() {
         return id;
     }
+
 }

test/framework/src/main/java/org/elasticsearch/test/TransportVersionUtils.java

@@ -10,19 +10,15 @@
 
 import org.elasticsearch.TransportVersion;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.NavigableSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class TransportVersionUtils {
-    private static final List<TransportVersion> ALL_VERSIONS;
+    private static final NavigableSet<TransportVersion> ALL_VERSIONS;
 
     static {
-        ALL_VERSIONS = getDeclaredVersions();
+        ALL_VERSIONS = TransportVersion.getDeclaredVersions();
     }
 
     /** Returns a random {@link TransportVersion} from all available versions. */
@@ -35,50 +31,17 @@ public static TransportVersion randomVersion(Set<TransportVersion> ignore) {
         return ESTestCase.randomFrom(ALL_VERSIONS.stream().filter(v -> ignore.contains(v) == false).collect(Collectors.toList()));
     }
 
-    /**
-     * Extracts a sorted list of declared transport version constants from a class.
-     */
-    public static List<TransportVersion> getDeclaredVersions() {
-        final Field[] fields = TransportVersion.class.getFields();
-        final List<TransportVersion> versions = new ArrayList<>(fields.length);
-        for (final Field field : fields) {
-            final int mod = field.getModifiers();
-            if (false == Modifier.isStatic(mod) && Modifier.isFinal(mod) && Modifier.isPublic(mod)) {
-                continue;
-            }
-            if (field.getType() != TransportVersion.class) {
-                continue;
-            }
-            switch (field.getName()) {
-                case "CURRENT":
-                case "V_EMPTY":
-                    continue;
-            }
-            assert field.getName().matches("V(_\\d+){3}?") || field.getName().equals("ZERO") || field.getName().equals("MINIMUM_COMPATIBLE")
-                : field.getName();
-            try {
-                versions.add(((TransportVersion) field.get(null)));
-            } catch (final IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        Collections.sort(versions);
-        return versions;
-    }
-
     public static TransportVersion getPreviousVersion() {
         TransportVersion version = getPreviousVersion(TransportVersion.CURRENT);
         assert version.before(TransportVersion.CURRENT);
         return version;
     }
 
     public static TransportVersion getPreviousVersion(TransportVersion version) {
-        for (int i = ALL_VERSIONS.size() - 1; i >= 0; i--) {// TODO should be RELEASED_VERSIONS
-            TransportVersion v = ALL_VERSIONS.get(i);
-            if (v.before(version)) {
-                return v;
-            }
+        TransportVersion prev = ALL_VERSIONS.lower(version);
+        if (prev == null) {
+            throw new IllegalArgumentException("couldn't find any released versions before [" + version + "]");
         }
-        throw new IllegalArgumentException("couldn't find any released versions before [" + version + "]");
+        return prev;
     }
 }