Skip to content

Commit 345b2a5

Browse files
committed
Fixs code review
1 parent 86030b3 commit 345b2a5

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,12 @@ version = "{project.version}"
5050

5151
{#insert java}
5252
java {
53-
{#if java.version == "11"}
54-
sourceCompatibility = JavaVersion.VERSION_11
55-
targetCompatibility = JavaVersion.VERSION_11
56-
{#else if java.version == "17"}
53+
{#if java.version == "17"}
5754
sourceCompatibility = JavaVersion.VERSION_17
5855
targetCompatibility = JavaVersion.VERSION_17
5956
{#else}
60-
sourceCompatibility = JavaVersion.VERSION_1_8
61-
targetCompatibility = JavaVersion.VERSION_1_8
57+
sourceCompatibility = JavaVersion.VERSION_11
58+
targetCompatibility = JavaVersion.VERSION_11
6259
{/if}
6360
}
6461
{/}

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,12 @@ version '{project.version}'
4646

4747
{#insert java}
4848
java {
49-
{#if java.version == "11"}
50-
sourceCompatibility = JavaVersion.VERSION_11
51-
targetCompatibility = JavaVersion.VERSION_11
52-
{#else if java.version == "17"}
49+
{#if java.version == "17"}
5350
sourceCompatibility = JavaVersion.VERSION_17
5451
targetCompatibility = JavaVersion.VERSION_17
5552
{#else}
56-
sourceCompatibility = JavaVersion.VERSION_1_8
57-
targetCompatibility = JavaVersion.VERSION_1_8
53+
sourceCompatibility = JavaVersion.VERSION_11
54+
targetCompatibility = JavaVersion.VERSION_11
5855
{/if}
5956
}
6057
{/}

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.nio.file.Path;
99
import java.util.Collection;
1010
import java.util.HashSet;
11-
import java.util.List;
1211
import java.util.Map;
1312
import java.util.Objects;
1413
import java.util.Optional;
@@ -20,7 +19,7 @@
2019

2120
public class CreateProjectHelper {
2221

23-
private static final List<String> JAVA_VERSIONS_LTS = List.of("11", "17");
22+
private static final Set<String> JAVA_VERSIONS_LTS = Set.of("11", "17");
2423
private static final String DEFAULT_JAVA_VERSION = "11";
2524
private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
2625

@@ -85,9 +84,7 @@ public static void setJavaVersion(Map<String, Object> values, String javaTarget)
8584

8685
if (matcher.matches()) {
8786
String versionExtracted = matcher.group(1);
88-
String version = JAVA_VERSIONS_LTS.stream()
89-
.filter(e -> e.equals(versionExtracted))
90-
.findFirst().orElse(DEFAULT_JAVA_VERSION);
87+
String version = JAVA_VERSIONS_LTS.contains(versionExtracted) ? versionExtracted : DEFAULT_JAVA_VERSION;
9188
values.put(ProjectGenerator.JAVA_TARGET, version);
9289
} else {
9390
values.put(ProjectGenerator.JAVA_TARGET, DEFAULT_JAVA_VERSION);

0 commit comments

Comments
 (0)