fix naming bug

Author: jdconrad

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

@@ -85,7 +85,7 @@ private static Map<String, TransportVersionSet> loadTransportVersionSets() {
             String versionLocation = "transport/" + name;
             try (InputStream inputStream = TransportVersionSet.class.getResourceAsStream(versionLocation)) {
                 TransportVersionSet transportVersionSet = TransportVersionSet.fromXContent(inputStream, latestId);
-                transportVersionSets.put(name, transportVersionSet);
+                transportVersionSets.put(transportVersionSet.name, transportVersionSet);
             } catch (IOException ioe) {
                 throw new UncheckedIOException("transport version set file not found at [ " + versionLocation + "]", ioe);
             }
@@ -95,14 +95,12 @@ private static Map<String, TransportVersionSet> loadTransportVersionSets() {
     }
 
     private static List<TransportVersion> collectTransportVersions() {
-        List<TransportVersion> tranportVersions = new ArrayList<>();
+        List<TransportVersion> transportVersions = new ArrayList<>();
         for (TransportVersionSet transportVersionSet : TRANSPORT_VERSION_SETS.values()) {
-            for (TransportVersion transportVersion : transportVersionSet.versions) {
-                tranportVersions.add(transportVersion);
-            }
+            transportVersions.addAll(transportVersionSet.versions);
         }
-        tranportVersions.sort(TransportVersion::compareTo);
-        return tranportVersions;
+        transportVersions.sort(TransportVersion::compareTo);
+        return transportVersions;
     }
 
     private static TransportVersionSet fromXContent(InputStream inputStream, int maxTransportId) throws IOException {

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

@@ -326,8 +326,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
     public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
     public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
-    // Below is the first version in 9.2 and NOT in 9.1.
-    public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
+
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _

server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.cluster.project;
 
 import org.elasticsearch.TransportVersion;
+import org.elasticsearch.TransportVersionSet;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.AbstractNamedDiffable;
 import org.elasticsearch.cluster.ClusterState;
@@ -38,6 +39,10 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<ClusterState.Cus
     public static final String TYPE = "projects_registry";
     public static final ProjectStateRegistry EMPTY = new ProjectStateRegistry(Collections.emptyMap(), Collections.emptySet(), 0);
 
+    public static final TransportVersionSet PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = TransportVersionSet.get(
+        "project-state-registry-records-deletions"
+    );
+
     private final Map<ProjectId, Settings> projectsSettings;
     // Projects that have been marked for deletion based on their file-based setting
     private final Set<ProjectId> projectsMarkedForDeletion;
@@ -46,7 +51,7 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<ClusterState.Cus
 
     public ProjectStateRegistry(StreamInput in) throws IOException {
         projectsSettings = in.readMap(ProjectId::readFrom, Settings::readSettingsFromStream);
-        if (in.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
+        if (PROJECT_STATE_REGISTRY_RECORDS_DELETIONS.isCompatible(in.getTransportVersion())) {
             projectsMarkedForDeletion = in.readCollectionAsImmutableSet(ProjectId::readFrom);
             projectsMarkedForDeletionGeneration = in.readVLong();
         } else {
@@ -118,7 +123,7 @@ public TransportVersion getMinimalSupportedVersion() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeMap(projectsSettings);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.PROJECT_STATE_REGISTRY_RECORDS_DELETIONS)) {
+        if (PROJECT_STATE_REGISTRY_RECORDS_DELETIONS.isCompatible(out.getTransportVersion())) {
             out.writeCollection(projectsMarkedForDeletion);
             out.writeVLong(projectsMarkedForDeletionGeneration);
         } else {

server/src/main/resources/org/elasticsearch/transport/project-state-registry-records-deletions.json

@@ -0,0 +1,6 @@
+{
+  "name": "project-state-registry-records-deletions",
+  "ids": [
+    9113000
+  ]
+}