From b9b25644af80c2fdea71001605fefc74df34a0b1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 22 Jul 2022 19:39:14 +0100 Subject: [PATCH] Polish "Take MethodType into account to deduce main application class" See gh-31828 --- .../java/org/springframework/boot/SpringApplication.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 index 4e033eb9f0..f95b30320e 100644 --- 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 @@ public class SpringApplication { } private Optional> findMainClass(Stream 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); } /**