From e2f1f368b5d580e88940795da64f63d68b5b4b0b Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 13 May 2019 09:04:55 +0100 Subject: [PATCH] Make http trace filter bean injection conditional Recent changes in Spring Boot have meant that there is no longer an httpTraceFilter bean by default. We can just make it conditional. Fixes gh-3528 --- .../eureka/server/EurekaServerAutoConfiguration.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java index f97d8e580..846364e8a 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java @@ -178,9 +178,9 @@ public class EurekaServerAutoConfiguration extends WebMvcConfigurerAdapter { * @return a jersey {@link FilterRegistrationBean} */ @Bean - public FilterRegistrationBean jerseyFilterRegistration( + public FilterRegistrationBean jerseyFilterRegistration( javax.ws.rs.core.Application eurekaJerseyApp) { - FilterRegistrationBean bean = new FilterRegistrationBean(); + FilterRegistrationBean bean = new FilterRegistrationBean(); bean.setFilter(new ServletContainer(eurekaJerseyApp)); bean.setOrder(Ordered.LOWEST_PRECEDENCE); bean.setUrlPatterns( @@ -234,9 +234,10 @@ public class EurekaServerAutoConfiguration extends WebMvcConfigurerAdapter { } @Bean - public FilterRegistrationBean traceFilterRegistration( + @ConditionalOnBean(name = "httpTraceFilter") + public FilterRegistrationBean traceFilterRegistration( @Qualifier("httpTraceFilter") Filter filter) { - FilterRegistrationBean bean = new FilterRegistrationBean(); + FilterRegistrationBean bean = new FilterRegistrationBean(); bean.setFilter(filter); bean.setOrder(Ordered.LOWEST_PRECEDENCE - 10); return bean; @@ -296,7 +297,7 @@ public class EurekaServerAutoConfiguration extends WebMvcConfigurerAdapter { // if eureka.client.use-dns-for-fetching-service-urls is true, then // service-url will not be fetched from environment. - if (clientConfig.shouldUseDnsForFetchingServiceUrls()) { + if (this.clientConfig.shouldUseDnsForFetchingServiceUrls()) { return false; }