Add support for specifying application arguments

This commit makes sure that application arguments can be provided when
optimizing an application at build-time. It uses the same mechanism of
the regular run goal, merging the profile property if set.

Closes gh-32579
pull/32585/head
Stephane Nicoll 2 years ago
parent 39cf17ed81
commit 44c843145a

@ -92,6 +92,15 @@ public class AotTests {
}); });
} }
@TestTemplate
void whenAotRunsWithArgumentsSourcesAreGenerated(MavenBuild mavenBuild) {
mavenBuild.project("aot-arguments").goals("package").execute((project) -> {
Path aotDirectory = project.toPath().resolve("target/spring-aot/main");
assertThat(collectRelativePaths(aotDirectory.resolve("sources")))
.contains(Path.of("org", "test", "TestProfileConfiguration__BeanDefinitions.java"));
});
}
@TestTemplate @TestTemplate
void whenAotRunsSourcesAreCompiled(MavenBuild mavenBuild) { void whenAotRunsSourcesAreCompiled(MavenBuild mavenBuild) {
mavenBuild.project("aot").goals("package").execute((project) -> { mavenBuild.project("aot").goals("package").execute((project) -> {

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.boot.maven.it</groupId>
<artifactId>aot</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>@java.version@</maven.compiler.source>
<maven.compiler.target>@java.version@</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
<goal>process-aot</goal>
</goals>
<configuration>
<arguments>
<argument>--spring.profiles.active=abc</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>@project.version@</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>@jakarta-servlet.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

@ -0,0 +1,31 @@
/*
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.test;
import org.springframework.boot.SpringApplication;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@Configuration(proxyBeanMethods = false)
@Import(TestProfileConfiguration.class)
public class SampleApplication {
public static void main(String[] args) {
SpringApplication.run(SampleApplication.class, args);
}
}

@ -0,0 +1,32 @@
/*
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration(proxyBeanMethods = false)
@Profile("abc")
class TestProfileConfiguration {
@Bean
public String abc() {
return "abc";
}
}

@ -74,6 +74,12 @@ public class ProcessAotMojo extends AbstractAotMojo {
@Parameter(property = "spring-boot.aot.main-class") @Parameter(property = "spring-boot.aot.main-class")
private String mainClass; private String mainClass;
/**
* Application arguments that should be taken into account for AOT processing.
*/
@Parameter
private String[] arguments;
/** /**
* Spring profiles to take into account for AOT processing. * Spring profiles to take into account for AOT processing.
*/ */
@ -100,15 +106,21 @@ public class ProcessAotMojo extends AbstractAotMojo {
aotArguments.add(this.generatedClasses.toString()); aotArguments.add(this.generatedClasses.toString());
aotArguments.add(this.project.getGroupId()); aotArguments.add(this.project.getGroupId());
aotArguments.add(this.project.getArtifactId()); aotArguments.add(this.project.getArtifactId());
if (!ObjectUtils.isEmpty(this.profiles)) { aotArguments.addAll(resolveArguments().getArgs());
aotArguments.add("--spring.profiles.active=" + String.join(",", this.profiles));
}
return aotArguments.toArray(String[]::new); return aotArguments.toArray(String[]::new);
} }
protected URL[] getClassPath() throws Exception { private URL[] getClassPath() throws Exception {
File[] directories = new File[] { this.classesDirectory, this.generatedClasses }; File[] directories = new File[] { this.classesDirectory, this.generatedClasses };
return getClassPath(directories, new ExcludeTestScopeArtifactFilter()); return getClassPath(directories, new ExcludeTestScopeArtifactFilter());
} }
private RunArguments resolveArguments() {
RunArguments runArguments = new RunArguments(this.arguments);
if (!ObjectUtils.isEmpty(this.profiles)) {
runArguments.getArgs().addFirst("--spring.profiles.active=" + String.join(",", this.profiles));
}
return runArguments;
}
} }

Loading…
Cancel
Save