SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix circular dependency in ZuulProxyAutoConfiguration (#3769)

Browse Source 
ZuulProxyAutoConfiguration declared a ServiceRouteMapper bean and required it for a field injection at the same time.

Fixes gh-3733
This commit is contained in:
Eduard Wirch
2020-04-07 21:20:07 +02:00
committed by GitHub
parent bee39ec1bf
commit d6f375490a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java
View File

@@ -75,9 +75,6 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration {
@Autowired
private DiscoveryClient discovery;
@Autowired
private ServiceRouteMapper serviceRouteMapper;
@Override
public HasFeatures zuulFeature() {
return HasFeatures.namedFeature("Zuul (Discovery)",
@@ -86,9 +83,10 @@ public class ZuulProxyAutoConfiguration extends ZuulServerAutoConfiguration {
@Bean
@ConditionalOnMissingBean(DiscoveryClientRouteLocator.class)
public DiscoveryClientRouteLocator discoveryRouteLocator() {
public DiscoveryClientRouteLocator discoveryRouteLocator(
ServiceRouteMapper serviceRouteMapper) {
return new DiscoveryClientRouteLocator(this.server.getServlet().getContextPath(),
this.discovery, this.zuulProperties, this.serviceRouteMapper,
this.discovery, this.zuulProperties, serviceRouteMapper,
this.registration);
}