Polish "Take MethodType into account to deduce main application class"

wilkinsona · wilkinsona · commit b9b25644af80 · 2022-07-22T19:39:14.000+01:00
See gh-31828
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -285,10 +285,10 @@ private Class<?> deduceMainApplicationClass() {
 	}
 
 	private Optional<Class<?>> findMainClass(Stream<StackFrame> stack) {
-		return stack
-				.filter((frame) -> Objects.equals(frame.getMethodName(), "main")
-						&& Objects.equals(frame.getMethodType(), MethodType.methodType(void.class, String[].class)))
-				.findFirst().map(StackWalker.StackFrame::getDeclaringClass);
+		MethodType mainMethodType = MethodType.methodType(void.class, String[].class);
+		return stack.filter((frame) -> Objects.equals(frame.getMethodName(), "main"))
+				.filter((frame) -> Objects.equals(frame.getMethodType(), mainMethodType)).findFirst()
+				.map(StackWalker.StackFrame::getDeclaringClass);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -285,10 +285,10 @@ private Class<?> deduceMainApplicationClass() {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`private Optional<Class<?>> findMainClass(Stream<StackFrame> stack) {`
`288`		`- return stack`
`289`		`- .filter((frame) -> Objects.equals(frame.getMethodName(), "main")`
`290`		`- && Objects.equals(frame.getMethodType(), MethodType.methodType(void.class, String[].class)))`
`291`		`- .findFirst().map(StackWalker.StackFrame::getDeclaringClass);`
	`288`	`+ MethodType mainMethodType = MethodType.methodType(void.class, String[].class);`
	`289`	`+ return stack.filter((frame) -> Objects.equals(frame.getMethodName(), "main"))`
	`290`	`+ .filter((frame) -> Objects.equals(frame.getMethodType(), mainMethodType)).findFirst()`
	`291`	`+ .map(StackWalker.StackFrame::getDeclaringClass);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`/**`