Merge branch '3.5.x'

Closes gh-47996

Author: snicoll

module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/MainMethod.java

@@ -62,7 +62,7 @@ private boolean isLoaderClass(String className) {
 	private @Nullable Method getMainMethod(StackTraceElement element) {
 		try {
 			Class<?> elementClass = Class.forName(element.getClassName());
-			Method method = elementClass.getDeclaredMethod("main", String[].class);
+			Method method = getMainMethod(elementClass);
 			if (Modifier.isStatic(method.getModifiers())) {
 				return method;
 			}
@@ -73,6 +73,15 @@ private boolean isLoaderClass(String className) {
 		return null;
 	}
 
+	private static Method getMainMethod(Class<?> clazz) throws Exception {
+		try {
+			return clazz.getDeclaredMethod("main", String[].class);
+		}
+		catch (NoSuchMethodException ex) {
+			return clazz.getDeclaredMethod("main");
+		}
+	}
+
 	/**
 	 * Returns the actual main method.
 	 * @return the main method

module/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java

@@ -19,7 +19,6 @@
 import java.lang.reflect.Method;
 
 import org.jspecify.annotations.Nullable;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.loader.launch.FakeJarLauncher;
@@ -38,13 +37,6 @@ class MainMethodTests {
 
 	private static final ThreadLocal<MainMethod> mainMethod = new ThreadLocal<>();
 
-	private Method actualMain;
-
-	@BeforeEach
-	void setup() throws Exception {
-		this.actualMain = Valid.class.getMethod("main", String[].class);
-	}
-
 	@Test
 	@SuppressWarnings("NullAway") // Test null check
 	void threadMustNotBeNull() {
@@ -54,9 +46,10 @@ void threadMustNotBeNull() {
 
 	@Test
 	void validMainMethod() throws Exception {
+		Method actualMain = Valid.class.getMethod("main", String[].class);
 		MainMethod method = new TestThread(Valid::main).test();
-		assertThat(method.getMethod()).isEqualTo(this.actualMain);
-		assertThat(method.getDeclaringClassName()).isEqualTo(this.actualMain.getDeclaringClass().getName());
+		assertThat(method.getMethod()).isEqualTo(actualMain);
+		assertThat(method.getDeclaringClassName()).isEqualTo(actualMain.getDeclaringClass().getName());
 	}
 
 	@Test // gh-35214
@@ -77,14 +70,41 @@ void viaJarLauncher() throws Exception {
 	}
 
 	@Test
-	void missingArgsMainMethod() {
-		assertThatIllegalStateException().isThrownBy(() -> new TestThread(MissingArgs::main).test())
-			.withMessageContaining("Unable to find main method");
+	void detectPublicMainMethod() throws Exception {
+		Method actualMain = PublicMainMethod.class.getMethod("main", String[].class);
+		MainMethod method = new TestThread(PublicMainMethod::main).test();
+		assertThat(method.getMethod()).isEqualTo(actualMain);
+		assertThat(method.getDeclaringClassName()).isEqualTo(actualMain.getDeclaringClass().getName());
+	}
+
+	@Test
+	void detectPublicParameterlessMainMethod() throws Exception {
+		Method actualMain = PublicParameterlessMainMethod.class.getMethod("main");
+		MainMethod method = new TestThread(PublicParameterlessMainMethod::main).test();
+		assertThat(method.getMethod()).isEqualTo(actualMain);
+		assertThat(method.getDeclaringClassName()).isEqualTo(actualMain.getDeclaringClass().getName());
+	}
+
+	@Test
+	void detectPackagePrivateMainMethod() throws Exception {
+		Method actualMain = PackagePrivateMainMethod.class.getDeclaredMethod("main", String[].class);
+		MainMethod method = new TestThread(PackagePrivateMainMethod::main).test();
+		assertThat(method.getMethod()).isEqualTo(actualMain);
+		assertThat(method.getDeclaringClassName()).isEqualTo(actualMain.getDeclaringClass().getName());
+	}
+
+	@Test
+	void detectPackagePrivateParameterlessMainMethod() throws Exception {
+		Method actualMain = PackagePrivateParameterlessMainMethod.class.getDeclaredMethod("main");
+		MainMethod method = new TestThread(PackagePrivateParameterlessMainMethod::main).test();
+		assertThat(method.getMethod()).isEqualTo(actualMain);
+		assertThat(method.getDeclaringClassName()).isEqualTo(actualMain.getDeclaringClass().getName());
 	}
 
 	@Test
 	void nonStatic() {
-		assertThatIllegalStateException().isThrownBy(() -> new TestThread(() -> new NonStaticMain().main()).test())
+		assertThatIllegalStateException()
+			.isThrownBy(() -> new TestThread(() -> new NonStaticMainMethod().main()).test())
 			.withMessageContaining("Unable to find main method");
 	}
 
@@ -145,15 +165,39 @@ public static void main(String... args) {
 
 	}
 
-	public static class MissingArgs {
+	public static class PublicMainMethod {
+
+		public static void main(String... args) {
+			mainMethod.set(new MainMethod());
+		}
+
+	}
+
+	public static class PublicParameterlessMainMethod {
 
 		public static void main() {
 			mainMethod.set(new MainMethod());
 		}
 
 	}
 
-	public static class NonStaticMain {
+	public static class PackagePrivateMainMethod {
+
+		static void main(String... args) {
+			mainMethod.set(new MainMethod());
+		}
+
+	}
+
+	public static class PackagePrivateParameterlessMainMethod {
+
+		static void main() {
+			mainMethod.set(new MainMethod());
+		}
+
+	}
+
+	public static class NonStaticMainMethod {
 
 		void main(String... args) {
 			mainMethod.set(new MainMethod());