spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-09 02:49:02 +00:00
Code Issues Projects Releases Wiki Activity

Polish "Restore error page support in WAR deployments"

Browse Source 
See gh-49176
This commit is contained in:
Stéphane Nicoll
2026-03-03 10:41:17 +01:00
parent 1a42b5c282
commit 2a80a3cac6
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
+13 -19
View File
@@ -35,6 +35,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.springframework.boot.DefaultApplicationArguments;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
@@ -132,8 +133,8 @@ class SpringBootServletInitializerTests {
try (AbstractApplicationContext context = (AbstractApplicationContext) new WithErrorPageFilterNotRegistered()
.createRootApplicationContext(this.servletContext)) {
assertThat(context).isNotNull();
Map<String, ErrorPageFilter> errorPageFilterBeans = context.getBeansOfType(ErrorPageFilter.class);
assertThat(errorPageFilterBeans).isEmpty();
assertThat(context.getBeansOfType(ErrorPageFilter.class)).isEmpty();
assertThat(context.getBeansOfType(ErrorPageRegistrarBeanPostProcessor.class)).isEmpty();
}
}
@@ -143,12 +144,10 @@ class SpringBootServletInitializerTests {
given(servletContext.addFilter(any(), any(Filter.class))).willReturn(mock(Dynamic.class));
given(servletContext.getInitParameterNames()).willReturn(Collections.emptyEnumeration());
given(servletContext.getAttributeNames()).willReturn(Collections.emptyEnumeration());
try (AbstractApplicationContext context = (AbstractApplicationContext) new WithErrorPageFilter()
try (AbstractApplicationContext context = (AbstractApplicationContext) new DefaultSpringBootServletInitializer()
.createRootApplicationContext(servletContext)) {
assertThat(context).isNotNull();
Map<String, ErrorPageRegistrarBeanPostProcessor> beans = context
.getBeansOfType(ErrorPageRegistrarBeanPostProcessor.class);
assertThat(beans).hasSize(1);
assertThat(context.getBeansOfType(ErrorPageRegistrarBeanPostProcessor.class)).hasSize(1);
}
}
@@ -159,7 +158,7 @@ class SpringBootServletInitializerTests {
given(servletContext.addFilter(any(), any(Filter.class))).willReturn(mock(Dynamic.class));
given(servletContext.getInitParameterNames()).willReturn(Collections.emptyEnumeration());
given(servletContext.getAttributeNames()).willReturn(Collections.emptyEnumeration());
try (AbstractApplicationContext context = (AbstractApplicationContext) new WithErrorPageFilter()
try (AbstractApplicationContext context = (AbstractApplicationContext) new DefaultSpringBootServletInitializer()
.createRootApplicationContext(servletContext)) {
assertThat(context).isNotNull();
Map<String, FilterRegistrationBean> registrations = context.getBeansOfType(FilterRegistrationBean.class);
@@ -177,7 +176,7 @@ class SpringBootServletInitializerTests {
given(servletContext.addFilter(any(), any(Filter.class))).willReturn(mock(Dynamic.class));
given(servletContext.getInitParameterNames()).willReturn(Collections.emptyEnumeration());
given(servletContext.getAttributeNames()).willReturn(Collections.emptyEnumeration());
try (AbstractApplicationContext context = (AbstractApplicationContext) new WithErrorPageFilter()
try (AbstractApplicationContext context = (AbstractApplicationContext) new DefaultSpringBootServletInitializer()
.createRootApplicationContext(servletContext)) {
assertThat(context).isNotNull();
Map<String, FilterRegistrationBean> registrations = context.getBeansOfType(FilterRegistrationBean.class);
@@ -190,7 +189,7 @@ class SpringBootServletInitializerTests {
@Test
void executableWarThatUsesServletInitializerDoesNotHaveErrorPageFilterConfigured() {
try (ConfigurableApplicationContext context = new SpringApplication(ExecutableWar.class).run()) {
try (ConfigurableApplicationContext context = new SpringApplication(DefaultApplicationArguments.class).run()) {
assertThat(context.getBeansOfType(ErrorPageFilter.class)).isEmpty();
}
}
@@ -339,6 +338,11 @@ class SpringBootServletInitializerTests {
}
@Configuration(proxyBeanMethods = false)
static class DefaultSpringBootServletInitializer extends SpringBootServletInitializer {
}
@Configuration(proxyBeanMethods = false)
static class WithErrorPageFilterNotRegistered extends SpringBootServletInitializer {
@@ -348,16 +352,6 @@ class SpringBootServletInitializerTests {
}
@Configuration(proxyBeanMethods = false)
static class WithErrorPageFilter extends SpringBootServletInitializer {
}
@Configuration(proxyBeanMethods = false)
static class ExecutableWar extends SpringBootServletInitializer {
}
@Configuration(proxyBeanMethods = false)
static class Config {
system-test/spring-boot-deployment-system-tests/src/systemTest/java/org/springframework/boot/deployment/AbstractDeploymentTests.java
+8
View File
@@ -56,6 +56,14 @@ abstract class AbstractDeploymentTests {
});
}
@Test
void errorPage() {
getDeployedApplication().test((rest) -> {
ResponseEntity<String> response = rest.getForEntity("/does-not-exist", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
});
}
@Test
void health() {
getDeployedApplication().test((rest) -> {