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

fix EurekaRibbonAutoConfiguration

Browse Source
This commit is contained in:
Spencer Gibb
2014-10-02 01:18:32 -06:00
parent 03e6308335
commit 99d43ba3a7
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@@ -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

10
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
View File

@@ -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
}
};
}
}

6
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
View File

@@ -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();
}