switch map to list

Author: jdconrad

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionDefinitionsTask.java

@@ -107,7 +107,7 @@ public void validateTransportVersions() throws IOException {
         // now load all definitions, do some validation and record them by various keys for later quick lookup
         // NOTE: this must run after loading referenced names and existing definitions
         // NOTE: this is sorted so that the order of cross validation is deterministic
-        for (String subDir: List.of("initial", "named")) {
+        for (String subDir : List.of("initial", "named")) {
             try (var definitionsStream = Files.list(definitionsDir.resolve(subDir)).sorted()) {
                 for (var definitionFile : definitionsStream.toList()) {
                     recordAndValidateDefinition(readDefinitionFile(definitionFile));

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

@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -113,6 +112,7 @@ public static TransportVersion fromBufferedReader(
         String component,
         String path,
         boolean nameInFile,
+        boolean ignoreName,
         BufferedReader bufferedReader,
         Integer latest
     ) {
@@ -128,7 +128,14 @@ public static TransportVersion fromBufferedReader(
             if (parts.length < (nameInFile ? 2 : 1)) {
                 throw new IllegalStateException("invalid transport version file format [" + toComponentPath(component, path) + "]");
             }
-            String name = nameInFile ? parts[0] : path.substring(path.lastIndexOf('/') + 1, path.length() - 4);
+            String name = null;
+            if (ignoreName == false) {
+                if (nameInFile) {
+                    name = path.substring(path.lastIndexOf('/') + 1, path.length() - 4);
+                } else {
+                    name = parts[0];
+                }
+            }
             List<Integer> ids = new ArrayList<>();
             for (int i = nameInFile ? 1 : 0; i < parts.length; ++i) {
                 try {
@@ -156,7 +163,7 @@ public static TransportVersion fromBufferedReader(
         }
     }
 
-    public static Map<String, TransportVersion> collectFromInputStreams(
+    public static List<TransportVersion> collectFromInputStreams(
         String component,
         Function<String, InputStream> nameToStream,
         String latestFileName
@@ -165,35 +172,32 @@ public static Map<String, TransportVersion> collectFromInputStreams(
             component,
             "/transport/latest/" + latestFileName,
             nameToStream,
-            (c, p, br) -> fromBufferedReader(c, p, true, br, Integer.MAX_VALUE)
+            (c, p, br) -> fromBufferedReader(c, p, true, false, br, Integer.MAX_VALUE)
         );
         if (latest != null) {
-            List<String> versionFilesNames = parseFromBufferedReader(
+            List<String> versionRelativePaths = parseFromBufferedReader(
                 component,
                 "/transport/definitions/manifest.txt",
                 nameToStream,
                 (c, p, br) -> br.lines().filter(line -> line.isBlank() == false).toList()
             );
-            if (versionFilesNames != null) {
-                Map<String, TransportVersion> transportVersions = new HashMap<>();
-                for (String versionFileName : versionFilesNames) {
+            if (versionRelativePaths != null) {
+                List<TransportVersion> transportVersions = new ArrayList<>();
+                for (String versionRelativePath : versionRelativePaths) {
                     TransportVersion transportVersion = parseFromBufferedReader(
                         component,
-                        "/transport/definitions/" + versionFileName,
+                        "/transport/definitions/" + versionRelativePath,
                         nameToStream,
-                        (c, p, br) -> fromBufferedReader(c, p, false, br, latest.id())
+                        (c, p, br) -> fromBufferedReader(c, p, false, versionRelativePath.startsWith("initial/"), br, latest.id())
                     );
                     if (transportVersion != null) {
-                        transportVersions.put(
-                            versionFileName.substring(versionFileName.lastIndexOf("/") + 1, versionFileName.length() - 4),
-                            transportVersion
-                        );
+                        transportVersions.add(transportVersion);
                     }
                 }
                 return transportVersions;
             }
         }
-        return Map.of();
+        return List.of();
     }
 
     private static String toComponentPath(String component, String path) {
@@ -422,12 +426,15 @@ private static class VersionsHolder {
         static {
             // collect all the transport versions from server and es modules/plugins (defined in server)
             List<TransportVersion> allVersions = new ArrayList<>(TransportVersions.DEFINED_VERSIONS);
-            Map<String, TransportVersion> allVersionsByName = collectFromInputStreams(
+            List<TransportVersion> streamVersions = collectFromInputStreams(
                 "<server>",
                 TransportVersion.class::getResourceAsStream,
                 Version.CURRENT.major + "." + Version.CURRENT.minor + ".csv"
             );
-            addTransportVersions(allVersionsByName.values(), allVersions).sort(TransportVersion::compareTo);
+            Map<String, TransportVersion> allVersionsByName = streamVersions.stream()
+                .filter(tv -> tv.name() != null)
+                .collect(Collectors.toMap(TransportVersion::name, v -> v));
+            addTransportVersions(streamVersions, allVersions).sort(TransportVersion::compareTo);
 
             // set version lookup by release before adding serverless versions
             // serverless versions should not affect release version

server/src/test/java/org/elasticsearch/TransportVersionTests.java

@@ -230,7 +230,7 @@ public void testLatest() {
             "<test>",
             "/transport/definitions/" + Version.CURRENT.major + "." + Version.CURRENT.minor + ".csv",
             TransportVersion.class::getResourceAsStream,
-            (c, p, br) -> TransportVersion.fromBufferedReader(c, p, true, br, Integer.MAX_VALUE)
+            (c, p, br) -> TransportVersion.fromBufferedReader(c, p, true, false, br, Integer.MAX_VALUE)
         );
         // TODO: once placeholder is removed, test the latest known version can be found fromName
         // assertThat(latest, is(TransportVersion.fromName(latest.name())));
@@ -242,6 +242,7 @@ public void testSupports() {
             "<test>",
             "testSupports0",
             false,
+            false,
             new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data0), StandardCharsets.UTF_8)),
             5000000
         );
@@ -254,6 +255,7 @@ public void testSupports() {
             "<test>",
             "testSupports1",
             false,
+            false,
             new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data1), StandardCharsets.UTF_8)),
             5000000
         );
@@ -269,6 +271,7 @@ public void testSupports() {
             "<test>",
             "testSupports2",
             false,
+            false,
             new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data2), StandardCharsets.UTF_8)),
             5000000
         );
@@ -296,6 +299,7 @@ public void testSupports() {
             "<test>",
             "testSupports3",
             false,
+            false,
             new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data3), StandardCharsets.UTF_8)),
             5000000
         );
@@ -324,6 +328,7 @@ public void testSupports() {
             "<test>",
             "testSupports3",
             false,
+            false,
             new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data4), StandardCharsets.UTF_8)),
             5000000
         );