From 0271efae4c111afb481e1f0fc3e039f30b8ba61e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Aug 2023 16:07:25 +0200 Subject: [PATCH] Polish "Avoid setting null compiler option" See gh-36971 --- .../boot/maven/AbstractAotMojo.java | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java index eeda61f53e..53881fff3e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java @@ -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 compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles); @@ -165,19 +174,6 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo { } } } - private static void setSourceAndTargetVersions(JavaCompilerPluginConfiguration compilerConfiguration, - List 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 {