Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

End StartupSteps only once in SpringApplicationRunListeners

Browse Source 
Fixes gh-22776
This commit is contained in:
Brian Clozel
2020-08-07 17:29:20 +02:00
parent e240c180f3
commit 9343266c4f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java
View File

@@ -111,7 +111,6 @@ class SpringApplicationRunListeners {
StartupStep step = this.applicationStartup.start(stepName);
this.listeners.forEach(listenerAction);
stepAction.accept(step);
step.end();
}
}

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

@@ -122,6 +122,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -1171,6 +1172,11 @@ class SpringApplicationTests {
verify(applicationStartup).start("spring.boot.application.context-loaded");
verify(applicationStartup).start("spring.boot.application.started");
verify(applicationStartup).start("spring.boot.application.running");
long startCount = mockingDetails(applicationStartup).getInvocations().stream()
.filter((invocation) -> invocation.getMethod().toString().contains("start(")).count();
long endCount = mockingDetails(startupStep).getInvocations().stream()
.filter((invocation) -> invocation.getMethod().toString().contains("end(")).count();
assertThat(startCount).isEqualTo(endCount);
}
private <S extends AvailabilityState> ArgumentMatcher<ApplicationEvent> isAvailabilityChangeEventWithState(