Commit 99d43ba3 by Spencer Gibb

fix EurekaRibbonAutoConfiguration

parent 03e63083
// 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 This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
......
...@@ -39,4 +39,14 @@ public class RibbonAutoConfiguration { ...@@ -39,4 +39,14 @@ public class RibbonAutoConfiguration {
public RibbonInterceptor ribbonInterceptor(LoadBalancerClient loadBalancerClient) { public RibbonInterceptor ribbonInterceptor(LoadBalancerClient loadBalancerClient) {
return new RibbonInterceptor(loadBalancerClient); return new RibbonInterceptor(loadBalancerClient);
} }
@Bean
public ServerListInitializer serverListInitializer() {
return new ServerListInitializer() {
@Override
public void initialize(String serviceId) {
//no-op
}
};
}
} }
...@@ -16,10 +16,9 @@ ...@@ -16,10 +16,9 @@
package org.springframework.cloud.netflix.ribbon.eureka; package org.springframework.cloud.netflix.ribbon.eureka;
import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList; 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.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
import org.springframework.cloud.netflix.ribbon.ServerListInitializer; import org.springframework.cloud.netflix.ribbon.ServerListInitializer;
...@@ -34,11 +33,10 @@ import org.springframework.context.annotation.Configuration; ...@@ -34,11 +33,10 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties @EnableConfigurationProperties
@ConditionalOnClass(DiscoveryEnabledNIWSServerList.class) @ConditionalOnClass(DiscoveryEnabledNIWSServerList.class)
@ConditionalOnExpression("${ribbon.eureka.enabled:true}") @ConditionalOnExpression("${ribbon.eureka.enabled:true}")
@AutoConfigureBefore(RibbonAutoConfiguration.class) @AutoConfigureAfter(RibbonAutoConfiguration.class)
public class RibbonEurekaAutoConfiguration { public class RibbonEurekaAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(ServerListInitializer.class)
public ServerListInitializer serverListInitializer() { public ServerListInitializer serverListInitializer() {
return new EurekaRibbonInitializer(); return new EurekaRibbonInitializer();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment