exec.main -> exec.imports

Author: rwinch

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/CommonsExecWebServerFactoryBean.java

@@ -29,6 +29,7 @@
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.SmartFactoryBean;
+import org.springframework.experimental.boot.server.exec.imports.SpringBootApplicationMain;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -46,7 +47,7 @@ public class CommonsExecWebServerFactoryBean
 
 	private static Log logger = LogFactory.getLog(CommonsExecWebServerFactoryBean.class);
 
-	private static final String DEFAULT_SPRING_BOOT_MAIN_CLASSNAME = "org.springframework.experimental.boot.server.exec.main.SpringBootApplicationMain";
+	private static final String DEFAULT_SPRING_BOOT_MAIN_CLASSNAME = SpringBootApplicationMain.class.getName();
 
 	private String executable = currentJavaExecutable();
 

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/detector/JarLauncherDetector.java

@@ -18,7 +18,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 
-import org.springframework.experimental.boot.server.exec.main.SpringBootApplicationMain;
+import org.springframework.experimental.boot.server.exec.imports.SpringBootApplicationMain;
 
 /**
  * Detect which JarLauncher main class to use, and call its {@code main(String[] args)}

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/main/SpringBootApplicationMain.java renamed to spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/imports/SpringBootApplicationMain.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.experimental.boot.server.exec.main;
+package org.springframework.experimental.boot.server.exec.imports;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/main/package-info.java renamed to spring-boot-testjars/src/main/java/org/springframework/experimental/boot/server/exec/imports/package-info.java

@@ -19,4 +19,4 @@
  * provides a default class to run Spring Boot applications against. This is intentionally
  * left otherwise empty to avoid scanning classes unnecessarily.
  */
-package org.springframework.experimental.boot.server.exec.main;
+package org.springframework.experimental.boot.server.exec.imports;

spring-boot-testjars/src/test/java/org/springframework/experimental/boot/server/exec/detector/JarLauncherDetectorTests.java

@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import org.springframework.experimental.boot.server.exec.main.SpringBootApplicationMain;
+import org.springframework.experimental.boot.server.exec.imports.SpringBootApplicationMain;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;