Skip to content

Commit c591e99

Browse files
authored
Make transport version ids have descending ordering (#133185)
Transport version ids must be in descending order in definition files. However, the compareTo for them was ascending and the validation used reverse ordering. This commit fixes the compareTo so it uses desending ordering and the validation uses natural ordering.
1 parent 9924907 commit c591e99

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ static TransportVersionId fromString(String s) {
2222

2323
@Override
2424
public int compareTo(TransportVersionId o) {
25-
return Integer.compare(complete, o.complete);
25+
// note: this is descending order so the arguments are reversed
26+
return Integer.compare(o.complete, complete);
2627
}
2728

2829
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void validateDefinition(TransportVersionDefinition definition, Set<Strin
122122
if (definition.ids().isEmpty()) {
123123
throwDefinitionFailure(definition, "does not contain any ids");
124124
}
125-
if (Comparators.isInOrder(definition.ids(), Comparator.reverseOrder()) == false) {
125+
if (Comparators.isInOrder(definition.ids(), Comparator.naturalOrder()) == false) {
126126
throwDefinitionFailure(definition, "does not have ordered ids");
127127
}
128128
for (int ndx = 0; ndx < definition.ids().size(); ++ndx) {

0 commit comments

Comments
 (0)