diff --git a/README.adoc b/README.adoc index 134c4948..b0267db4 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Do not edit this file (go instead to src/main/asciidoc) +// Do not edit this file (e.g. go instead to src/main/asciidoc) This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java index 7cb4c967..9a2c5549 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java @@ -39,4 +39,14 @@ public class RibbonAutoConfiguration { public RibbonInterceptor ribbonInterceptor(LoadBalancerClient loadBalancerClient) { return new RibbonInterceptor(loadBalancerClient); } + + @Bean + public ServerListInitializer serverListInitializer() { + return new ServerListInitializer() { + @Override + public void initialize(String serviceId) { + //no-op + } + }; + } } diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java index 7ae22dc6..a924a547 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java @@ -16,10 +16,9 @@ package org.springframework.cloud.netflix.ribbon.eureka; import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; import org.springframework.cloud.netflix.ribbon.ServerListInitializer; @@ -34,11 +33,10 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties @ConditionalOnClass(DiscoveryEnabledNIWSServerList.class) @ConditionalOnExpression("${ribbon.eureka.enabled:true}") -@AutoConfigureBefore(RibbonAutoConfiguration.class) +@AutoConfigureAfter(RibbonAutoConfiguration.class) public class RibbonEurekaAutoConfiguration { @Bean - @ConditionalOnMissingBean(ServerListInitializer.class) public ServerListInitializer serverListInitializer() { return new EurekaRibbonInitializer(); }