Add method to retrieve the list of compatible java versions

(cherry picked from commit 542e2b9)
quarkusio · Nov 21, 2023 · 0083447 · 0083447
1 parent 00720c4
commit 0083447
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/...projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java b/...projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java
@@ -6,6 +6,7 @@
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public final class JavaVersion {
 
@@ -71,6 +72,15 @@ public static int determineBestJavaLtsVersion() {
         return determineBestJavaLtsVersion(Runtime.version().feature());
     }
 
+    public static SortedSet<Integer> getCompatibleLTSVersions(JavaVersion minimumJavaVersion) {
+        if (minimumJavaVersion.isEmpty()) {
+            return JAVA_VERSIONS_LTS;
+        }
+        return JAVA_VERSIONS_LTS.stream()
+                .filter(v -> v >= minimumJavaVersion.getAsInt())
+                .collect(Collectors.toCollection(TreeSet::new));
+    }
+
     public static int determineBestJavaLtsVersion(int runtimeVersion) {
         int bestLtsVersion = DEFAULT_JAVA_VERSION;
         for (int ltsVersion : JAVA_VERSIONS_LTS) {

diff --git a/...ects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java b/...ects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java
@@ -1,10 +1,13 @@
 package io.quarkus.devtools.project;
 
 import static io.quarkus.devtools.project.JavaVersion.DETECT_JAVA_RUNTIME_VERSION;
+import static io.quarkus.devtools.project.JavaVersion.JAVA_VERSIONS_LTS;
 import static io.quarkus.devtools.project.JavaVersion.computeJavaVersion;
 import static io.quarkus.devtools.project.JavaVersion.determineBestJavaLtsVersion;
+import static io.quarkus.devtools.project.JavaVersion.getCompatibleLTSVersions;
 import static io.quarkus.devtools.project.SourceType.JAVA;
 import static io.quarkus.devtools.project.SourceType.KOTLIN;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
@@ -31,6 +34,14 @@ public void givenJavaVersion18ShouldReturn17() {
         assertEquals("17", computeJavaVersion(JAVA, "18"));
     }
 
+    @Test
+    void shouldProperlyUseMinJavaVersion() {
+        assertThat(getCompatibleLTSVersions(new JavaVersion("11"))).isEqualTo(JAVA_VERSIONS_LTS);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).containsExactly(17, 21);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("100"))).isEmpty();
+        assertThat(getCompatibleLTSVersions(JavaVersion.NA)).isEqualTo(JAVA_VERSIONS_LTS);
+    }
+
     @Test
     public void givenAutoDetectShouldReturnAppropriateVersion() {
         final String bestJavaLtsVersion = String.valueOf(determineBestJavaLtsVersion(Runtime.version().feature()));