From b55c7cf09fb5b1819bab63596bba42f92fd50d12 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 2 Jul 2025 15:44:56 -0700 Subject: [PATCH 1/2] Test for duplicate transport versions (#130494) We used to have an assertion during transport version loading that duplicate ids were not found, but it appears to have been lost in refactorings. This commit adds a test to ensure duplicate ids do not occur. relates #130486 --- .../org/elasticsearch/TransportVersionTests.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index f0b0fde3af20f..1d1043e3a7e5f 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -15,6 +15,7 @@ import java.lang.reflect.Modifier; import java.util.Collections; import java.util.Map; +import java.util.List; import java.util.Set; import java.util.TreeSet; import java.util.regex.Matcher; @@ -256,4 +257,17 @@ public void testDenseTransportVersions() { fail(msg.toString()); } } + + + public void testDuplicateConstants() { + List tvs = TransportVersions.getAllVersions().stream().sorted().toList(); + TransportVersion previous = tvs.get(0); + for (int i = 1; i < tvs.size(); i++) { + TransportVersion next = tvs.get(i); + if (next.id() == previous.id()) { + throw new AssertionError("Duplicate transport version id: " + next.id()); + } + previous = next; + } + } } From 199b643ba065600a2a67f9cdd892d29b6bd11147 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Wed, 2 Jul 2025 23:42:30 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../src/test/java/org/elasticsearch/TransportVersionTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index 1d1043e3a7e5f..638b7587bcf7c 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -14,8 +14,8 @@ import java.lang.reflect.Modifier; import java.util.Collections; -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.regex.Matcher; @@ -258,7 +258,6 @@ public void testDenseTransportVersions() { } } - public void testDuplicateConstants() { List tvs = TransportVersions.getAllVersions().stream().sorted().toList(); TransportVersion previous = tvs.get(0);