Skip to content

Commit 1682fd0

Browse files
committed
Fixs of code review
Remove the conversion to integer from the java_version Remove java 8 and set java 11 to default
1 parent c338e50 commit 1682fd0

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
public class CreateProjectHelper {
2222

23-
private static final List<Integer> JAVA_VERSIONS_LTS = List.of(8, 11, 17);
24-
private static final int DEFAULT_JAVA_VERSION = 11;
23+
private static final List<String> JAVA_VERSIONS_LTS = List.of("11", "17");
24+
private static final String DEFAULT_JAVA_VERSION = "11";
2525
private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
2626

2727
public static final String DEFAULT_GROUP_ID = "org.acme";
@@ -84,14 +84,13 @@ public static void setJavaVersion(Map<String, Object> values, String javaTarget)
8484
.matcher(javaTarget != null ? javaTarget : System.getProperty("java.version", ""));
8585

8686
if (matcher.matches()) {
87-
int versionExtracted = Integer.parseInt(matcher.group(1));
88-
int version = JAVA_VERSIONS_LTS.stream()
87+
String versionExtracted = matcher.group(1);
88+
String version = JAVA_VERSIONS_LTS.stream()
8989
.filter(e -> e.equals(versionExtracted))
9090
.findFirst().orElse(DEFAULT_JAVA_VERSION);
91-
92-
values.put(ProjectGenerator.JAVA_TARGET, String.valueOf(version));
91+
values.put(ProjectGenerator.JAVA_TARGET, version);
9392
} else {
94-
values.put(ProjectGenerator.JAVA_TARGET, String.valueOf(DEFAULT_JAVA_VERSION));
93+
values.put(ProjectGenerator.JAVA_TARGET, DEFAULT_JAVA_VERSION);
9594
}
9695
}
9796

0 commit comments

Comments
 (0)