#235: fix VersionIdentifier to compare java versions correctly (#384)

devonfw · Jun 12, 2024 · 4fac5c5 · 4fac5c5
1 parent 4823886
commit 4fac5c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/cli/src/main/java/com/devonfw/tools/ide/version/VersionSegment.java b/cli/src/main/java/com/devonfw/tools/ide/version/VersionSegment.java
@@ -222,6 +222,12 @@ public VersionComparisonResult compareVersion(VersionSegment other) {
     if (!lettersResult.isEqual()) {
       return lettersResult;
     }
+    if (!"_".equals(this.separator) && "_".equals(other.separator)) {
+      return VersionComparisonResult.GREATER;
+    } else if ("_".equals(this.separator) && !"_".equals(other.separator)) {
+      return VersionComparisonResult.LESS;
+    }
+
     if (this.number < other.number) {
       return VersionComparisonResult.LESS;
     } else if (this.number > other.number) {

diff --git a/cli/src/test/java/com/devonfw/tools/ide/version/VersionIdentifierTest.java b/cli/src/test/java/com/devonfw/tools/ide/version/VersionIdentifierTest.java
@@ -249,4 +249,15 @@ public void testMatchAny() {
     assertThat(pattern.matches(VersionIdentifier.of("17.0-SNAPSHOT"))).isTrue();
   }
 
+  @Test
+  public void testCompareJavaVersions() {
+
+    VersionIdentifier v21_35 = VersionIdentifier.of("21_35");
+    VersionIdentifier v21_0_2_13 = VersionIdentifier.of("21.0.2_13");
+    VersionIdentifier v21_0_3_9 = VersionIdentifier.of("21.0.3_9");
+    assertThat(v21_35).isLessThan(v21_0_2_13);
+    assertThat(v21_0_2_13).isLessThan(v21_0_3_9);
+    assertThat(v21_0_3_9).isGreaterThan(v21_35);
+  }
+
 }