root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Reuse SpringApplicationClassFinder 

See gh-31682
This commit is contained in:
Stephane Nicoll 2022-07-28 14:29:25 +02:00
parent 472b0b8bcb
commit c3ae6519f4
1 changed files with 3 additions and 21 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/AbstractRunMojo.java
View File

@ -42,7 +42,6 @@ import org.apache.maven.toolchain.ToolchainManager;
import org.springframework.boot.loader.tools.FileUtils; import org.springframework.boot.loader.tools.FileUtils;
import org.springframework.boot.loader.tools.JavaExecutable; import org.springframework.boot.loader.tools.JavaExecutable;
import org.springframework.boot.loader.tools.MainClassFinder;
/** /**
* Base class to run a Spring Boot application. * Base class to run a Spring Boot application.
@ -58,8 +57,6 @@ import org.springframework.boot.loader.tools.MainClassFinder;
*/ */
public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private static final String SPRING_BOOT_APPLICATION_CLASS_NAME = "org.springframework.boot.autoconfigure.SpringBootApplication";
/** /**
* The Maven project. * The Maven project.
* @since 1.0.0 * @since 1.0.0
@ -206,7 +203,9 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
getLog().debug("skipping run as per configuration."); getLog().debug("skipping run as per configuration.");
return; return;
} }
run(getStartClass()); String startClass = (this.mainClass != null) ? this.mainClass
: SpringBootApplicationClassFinder.findSingleClass(this.classesDirectory);
run(startClass);
} }
private void run(String startClassName) throws MojoExecutionException, MojoFailureException { private void run(String startClassName) throws MojoExecutionException, MojoFailureException {
@ -343,23 +342,6 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
} }
} }
private String getStartClass() throws MojoExecutionException {
String mainClass = this.mainClass;
if (mainClass == null) {
try {
mainClass = MainClassFinder.findSingleMainClass(this.classesDirectory,
SPRING_BOOT_APPLICATION_CLASS_NAME);
}
catch (IOException ex) {
throw new MojoExecutionException(ex.getMessage(), ex);
}
}
if (mainClass == null) {
throw new MojoExecutionException("Unable to find a suitable main class, please add a 'mainClass' property");
}
return mainClass;
}
protected URL[] getClassPathUrls() throws MojoExecutionException { protected URL[] getClassPathUrls() throws MojoExecutionException {
try { try {
List<URL> urls = new ArrayList<>(); List<URL> urls = new ArrayList<>();