From 4e5a3f4f80d5d32006ddead7c221115957a7f13f Mon Sep 17 00:00:00 2001 From: Alykoff Date: Wed, 23 May 2018 16:51:06 +0300 Subject: [PATCH] Add ConditionalOnMissingBean for beans (#2957) Added `@ConditionalOnMissingBean` for `PreDecorationFilter`, `RibbonRoutingFilter` beans in `org.springframework.cloud.netflix.zuul.ZuulProxyAutoConfiguration` class. --- .../cloud/netflix/zuul/ZuulProxyAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java index dfde8cf6f..4fcf94a6e 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java @@ -94,6 +94,7 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration { // pre filters @Bean + @ConditionalOnMissingBean(PreDecorationFilter.class) public PreDecorationFilter preDecorationFilter(RouteLocator routeLocator, ProxyRequestHelper proxyRequestHelper) { return new PreDecorationFilter(routeLocator, this.server.getServlet().getServletPrefix(), this.zuulProperties, proxyRequestHelper); @@ -101,6 +102,7 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration { // route filters @Bean + @ConditionalOnMissingBean(RibbonRoutingFilter.class) public RibbonRoutingFilter ribbonRoutingFilter(ProxyRequestHelper helper, RibbonCommandFactory ribbonCommandFactory) { RibbonRoutingFilter filter = new RibbonRoutingFilter(helper, ribbonCommandFactory,