Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish "Avoid setting null compiler option"

Browse Source 
See gh-36971
This commit is contained in:
Stephane Nicoll 2023-08-14 16:07:25 +02:00
parent a0ad00c542
commit 0271efae4c
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java
View File

@ -153,7 +153,16 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
options.add(releaseVersion);
}
else {
setSourceAndTargetVersions(compilerConfiguration, options);
String source = compilerConfiguration.getSourceMajorVersion();
if (source != null) {
options.add("--source");
options.add(source);
}
String target = compilerConfiguration.getTargetMajorVersion();
if (target != null) {
options.add("--target");
options.add(target);
}
}
options.addAll(new RunArguments(this.compilerArguments).getArgs());
Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles);
@ -165,19 +174,6 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
}
}
}
private static void setSourceAndTargetVersions(JavaCompilerPluginConfiguration compilerConfiguration,
List<String> options) {
String sourceMajorVersion = compilerConfiguration.getSourceMajorVersion();
if (sourceMajorVersion != null && !sourceMajorVersion.isEmpty()) {
options.add("--source");
options.add(sourceMajorVersion);
}
String targetMajorVersion = compilerConfiguration.getTargetMajorVersion();
if (targetMajorVersion != null && !targetMajorVersion.isEmpty()) {
options.add("--target");
options.add(targetMajorVersion);
}
}
protected final URL[] getClassPath(File[] directories, ArtifactsFilter... artifactFilters)
throws MojoExecutionException {