Skip to content

Register ErrorPageRegistrarBeanPostProcessor in WAR deployments #49176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jayychoi wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −0
Open

Register ErrorPageRegistrarBeanPostProcessor in WAR deployments #49176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .../main/java/org/springframework/boot/web/servlet/support/ErrorPageFilterConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import jakarta.servlet.DispatcherType;

import org.springframework.boot.web.error.ErrorPageRegistrarBeanPostProcessor;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -26,6 +27,7 @@
* Configuration for {@link ErrorPageFilter}.
*
* @author Andy Wilkinson
* @author Jay Choi
*/
@Configuration(proxyBeanMethods = false)
class ErrorPageFilterConfiguration {
Expand All @@ -43,4 +45,9 @@ FilterRegistrationBean<ErrorPageFilter> errorPageFilterRegistration(ErrorPageFil
return registration;
}

@Bean
static ErrorPageRegistrarBeanPostProcessor errorPageRegistrarBeanPostProcessor() {
return new ErrorPageRegistrarBeanPostProcessor();
}

}
17 changes: 17 additions & 0 deletions .../java/org/springframework/boot/web/servlet/support/SpringBootServletInitializerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.springframework.boot.context.logging.LoggingApplicationListener;
import org.springframework.boot.testsupport.system.CapturedOutput;
import org.springframework.boot.testsupport.system.OutputCaptureExtension;
import org.springframework.boot.web.error.ErrorPageRegistrarBeanPostProcessor;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
Expand All @@ -66,6 +67,7 @@
*
* @author Phillip Webb
* @author Andy Wilkinson
* @author Jay Choi
*/
@ExtendWith(OutputCaptureExtension.class)
class SpringBootServletInitializerTests {
Expand Down Expand Up @@ -135,6 +137,21 @@ void errorPageFilterRegistrationCanBeDisabled() {
}
}

@Test
void errorPageRegistrarBeanPostProcessorIsRegistered() {
ServletContext servletContext = mock(ServletContext.class);
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()
.createRootApplicationContext(servletContext)) {
assertThat(context).isNotNull();
Map<String, ErrorPageRegistrarBeanPostProcessor> beans = context
.getBeansOfType(ErrorPageRegistrarBeanPostProcessor.class);
assertThat(beans).hasSize(1);
}
}

@Test
@SuppressWarnings("rawtypes")
void errorPageFilterIsRegisteredWithNearHighestPrecedence() {
Expand Down
Loading