lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-07-16 16:50:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Stephane Nicoll 2018-11-01 16:51:51 +09:00
parent 39dd9792cd
commit cdee263c0b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
initializr-service/src/main/java/io/spring/initializr/service/extension/JavaVersionRequestPostProcessor.java
View File

@ -20,7 +20,6 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import io.spring.initializr.generator.ProjectRequest; import io.spring.initializr.generator.ProjectRequest;
import io.spring.initializr.generator.ProjectRequestPostProcessor;
import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadata;
import io.spring.initializr.util.Version; import io.spring.initializr.util.Version;
@ -33,7 +32,7 @@ import org.springframework.stereotype.Component;
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
@Component @Component
class JavaVersionRequestPostProcessor implements ProjectRequestPostProcessor { class JavaVersionRequestPostProcessor extends AbstractProjectRequestPostProcessor {
private static final Version VERSION_2_0_0_M1 = Version.parse("2.0.0.M1"); private static final Version VERSION_2_0_0_M1 = Version.parse("2.0.0.M1");
@ -51,9 +50,8 @@ class JavaVersionRequestPostProcessor implements ProjectRequestPostProcessor {
if (javaGeneration == null) { if (javaGeneration == null) {
return; return;
} }
Version requestVersion = Version.safeParse(request.getBootVersion());
// Not supported for Spring Boot 1.x // Not supported for Spring Boot 1.x
if (VERSION_2_0_0_M1.compareTo(requestVersion) > 0) { if (isSpringBootVersionBefore(request, VERSION_2_0_0_M1)) {
request.setJavaVersion("1.8"); request.setJavaVersion("1.8");
} }
// Not supported for Kotlin & Groovy // Not supported for Kotlin & Groovy
@ -61,11 +59,12 @@ class JavaVersionRequestPostProcessor implements ProjectRequestPostProcessor {
request.setJavaVersion("1.8"); request.setJavaVersion("1.8");
} }
// 10 support only as of 2.0.1 // 10 support only as of 2.0.1
if (javaGeneration == 10 && VERSION_2_0_1.compareTo(requestVersion) > 0) { if (javaGeneration == 10 && isSpringBootVersionBefore(request, VERSION_2_0_1)) {
request.setJavaVersion("1.8"); request.setJavaVersion("1.8");
} }
// 11 support only as of 2.1.x // 11 support only as of 2.1.x
if (javaGeneration == 11 && VERSION_2_1_0_M1.compareTo(requestVersion) > 0) { if (javaGeneration == 11
&& isSpringBootVersionBefore(request, VERSION_2_1_0_M1)) {
request.setJavaVersion("1.8"); request.setJavaVersion("1.8");
} }
} }