Fixs code review

quarkusio · Nov 24, 2021 · 345b2a5 · 345b2a5
1 parent 86030b3
commit 345b2a5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/...n/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute b/...n/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
@@ -50,15 +50,12 @@ version = "{project.version}"
 
 {#insert java}
 java {
-    {#if java.version == "11"}
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-    {#else if java.version == "17"}
+    {#if java.version == "17"}
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
     {#else}
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     {/if}
 }
 {/}
diff --git a/...rts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute b/...rts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute
@@ -46,15 +46,12 @@ version '{project.version}'
 
 {#insert java}
 java {
-    {#if java.version == "11"}
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-    {#else if java.version == "17"}
+    {#if java.version == "17"}
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
     {#else}
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     {/if}
 }
 {/}
diff --git a/...evtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java b/...evtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java
@@ -8,7 +8,6 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -20,7 +19,7 @@
 
 public class CreateProjectHelper {
 
-    private static final List<String> JAVA_VERSIONS_LTS = List.of("11", "17");
+    private static final Set<String> JAVA_VERSIONS_LTS = Set.of("11", "17");
     private static final String DEFAULT_JAVA_VERSION = "11";
     private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
 
@@ -85,9 +84,7 @@ public static void setJavaVersion(Map<String, Object> values, String javaTarget)
 
         if (matcher.matches()) {
             String versionExtracted = matcher.group(1);
-            String version = JAVA_VERSIONS_LTS.stream()
-                    .filter(e -> e.equals(versionExtracted))
-                    .findFirst().orElse(DEFAULT_JAVA_VERSION);
+            String version = JAVA_VERSIONS_LTS.contains(versionExtracted) ? versionExtracted : DEFAULT_JAVA_VERSION;
             values.put(ProjectGenerator.JAVA_TARGET, version);
         } else {
             values.put(ProjectGenerator.JAVA_TARGET, DEFAULT_JAVA_VERSION);