From b094e28081bf733215679d4a22014ddd477ccde7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Nov 2018 15:39:46 +0000 Subject: [PATCH] Remove auto-configuration of RequestContextFilter when using Jersey Closes gh-15048 --- .../autoconfigure/jersey/JerseyAutoConfiguration.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index f6bf034c37..d795029f6b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -65,7 +65,6 @@ import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ServletContextAware; -import org.springframework.web.filter.RequestContextFilter; /** * {@link EnableAutoConfiguration Auto-configuration} for Jersey. @@ -124,16 +123,6 @@ public class JerseyAutoConfiguration implements ServletContextAware { .forEach((customizer) -> customizer.customize(this.config)); } - @Bean - @ConditionalOnMissingBean - public FilterRegistrationBean requestContextFilter() { - FilterRegistrationBean registration = new FilterRegistrationBean<>(); - registration.setFilter(new RequestContextFilter()); - registration.setOrder(this.jersey.getFilter().getOrder() - 1); - registration.setName("requestContextFilter"); - return registration; - } - @Bean @ConditionalOnMissingBean(name = "jerseyFilterRegistration") @ConditionalOnProperty(prefix = "spring.jersey", name = "type", havingValue = "filter")