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

Publish ApplicationPreparedEvent before AOT processing abandons run

This commit is contained in:
Andy Wilkinson 2022-09-23 12:02:25 +01:00
parent afce559050
commit 26eff5ae7a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -456,7 +456,7 @@ public class SpringApplication {
SpringApplicationRunListener hookListener = (hook != null) ? hook.getRunListener(this) : null;
if (hookListener != null) {
listeners = new ArrayList<>(listeners);
listeners.add(0, hookListener);
listeners.add(hookListener);
}
return new SpringApplicationRunListeners(logger, listeners, this.applicationStartup);
}

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@ -1302,8 +1302,11 @@ class SpringApplicationTests {
}
@Test
@SuppressWarnings({ "rawtypes", "unchecked" })
void withHookWhenHookThrowsAbandonedRunExceptionAbandonsRun() {
SpringApplication application = new SpringApplication(ExampleConfig.class);
ApplicationListener listener = mock(ApplicationListener.class);
application.addListeners(listener);
application.setWebApplicationType(WebApplicationType.NONE);
SpringApplicationRunListener runListener = spy(new SpringApplicationRunListener() {
@ -1321,6 +1324,11 @@ class SpringApplicationTests {
then(runListener).should().contextPrepared(any());
then(runListener).should(never()).ready(any(), any());
then(runListener).should(never()).failed(any(), any());
then(listener).should().onApplicationEvent(any(ApplicationStartingEvent.class));
then(listener).should().onApplicationEvent(any(ApplicationEnvironmentPreparedEvent.class));
then(listener).should().onApplicationEvent(any(ApplicationPreparedEvent.class));
then(listener).should(never()).onApplicationEvent(any(ApplicationReadyEvent.class));
then(listener).should(never()).onApplicationEvent(any(ApplicationFailedEvent.class));
}
@Test