Remove deprecated CLusterState.Builder methods

williamrandolph · Nov 16, 2023 · 56c22b5 · 56c22b5
1 parent e03b0a5
commit 56c22b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java
@@ -818,12 +818,6 @@ public DiscoveryNodes nodes() {
             return nodes;
         }
 
-        // Deprecate to keep downstream projects compiling
-        @Deprecated(forRemoval = true)
-        public Builder putTransportVersion(String nodeId, TransportVersion transportVersion) {
-            return putCompatibilityVersions(nodeId, transportVersion, Map.of());
-        }
-
         public Builder putCompatibilityVersions(
             String nodeId,
             TransportVersion transportVersion,
@@ -841,10 +835,6 @@ public Builder putCompatibilityVersions(String nodeId, CompatibilityVersions ver
         }
 
         // Deprecate to keep downstream projects compiling
-        @Deprecated(forRemoval = true)
-        public Builder compatibilityVersions(Map<String, CompatibilityVersions> versions) {
-            return nodeIdsToCompatibilityVersions(versions);
-        }
 
         public Builder nodeIdsToCompatibilityVersions(Map<String, CompatibilityVersions> versions) {
             versions.forEach((key, value) -> Objects.requireNonNull(value, key));

diff --git a/...t/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexActionTests.java b/...t/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexActionTests.java
@@ -67,7 +67,7 @@ public class TransportCreateIndexActionTests extends ESTestCase {
                 )
                 .build()
         )
-        .compatibilityVersions(
+        .nodeIdsToCompatibilityVersions(
             Map.of(
                 "node-1",
                 new CompatibilityVersions(

diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java
@@ -1248,7 +1248,7 @@ public void testHasMixedSystemIndexVersions() throws IOException {
         // equal mappings versions
         {
             var builder = ClusterState.builder(buildClusterState());
-            builder.compatibilityVersions(
+            builder.nodeIdsToCompatibilityVersions(
                 Map.of(
                     "node1",
                     new CompatibilityVersions(
@@ -1268,7 +1268,7 @@ public void testHasMixedSystemIndexVersions() throws IOException {
         // unequal mappings versions
         {
             var builder = ClusterState.builder(buildClusterState());
-            builder.compatibilityVersions(
+            builder.nodeIdsToCompatibilityVersions(
                 Map.of(
                     "node1",
                     new CompatibilityVersions(
@@ -1288,7 +1288,7 @@ public void testHasMixedSystemIndexVersions() throws IOException {
         // one node has a mappings version that the other is missing
         {
             var builder = ClusterState.builder(buildClusterState());
-            builder.compatibilityVersions(
+            builder.nodeIdsToCompatibilityVersions(
                 Map.of(
                     "node1",
                     new CompatibilityVersions(