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

renamed RibbonLoadBalancerClient to FeignRibbonClient

Browse Source
This commit is contained in:
Spencer Gibb
2014-12-01 13:14:14 -07:00
parent 3d7cc70757
commit a7c6c88ff0
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
View File

@@ -6,7 +6,7 @@ import feign.Feign;
import feign.Logger;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.cloud.netflix.feign.ribbon.RibbonLoadBalancerClient;
import org.springframework.cloud.netflix.feign.ribbon.FeignRibbonClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
@@ -15,6 +15,7 @@ import com.netflix.loadbalancer.ILoadBalancer;
/**
* @author Spencer Gibb
* @author Julien Roy
*/
@Configuration
@ConditionalOnClass(Feign.class)
@@ -43,5 +44,5 @@ public class FeignAutoConfiguration {
@Bean
@ConditionalOnClass(ILoadBalancer.class)
public Client feignRibbonClient() { return new RibbonLoadBalancerClient(); }
public Client feignRibbonClient() { return new FeignRibbonClient(); }
}

2
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java
View File

@@ -41,8 +41,6 @@ public class FeignConfigurer {
Client ribbonClient;
protected Feign.Builder feign() {
//ConfigurationManager.getConfigInstance().setProperty("exampleBackend.ribbon.listOfServers", "localhost:7080");
//exampleBackend.ribbon.NIWSServerListClassName=my.package.MyServerList
return Feign.builder()
.logger(logger)
.encoder(encoder)

12
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/RibbonLoadBalancerClient.java → spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClient.java
View File

@@ -7,9 +7,6 @@ import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSocketFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.netflix.ribbon.RibbonClientPreprocessor;
import com.google.common.base.Throwables;
import com.netflix.client.ClientException;
import com.netflix.client.ClientFactory;
@@ -22,9 +19,10 @@ import feign.Request;
import feign.Response;
/**
* @author: Julien Roy
* @author Julien Roy
* @author Spencer Gibb
*/
public class RibbonLoadBalancerClient implements Client {
public class FeignRibbonClient implements Client {
private Client defaultClient = new Default(
new Lazy<SSLSocketFactory>() {
@@ -62,4 +60,8 @@ public class RibbonLoadBalancerClient implements Client {
ILoadBalancer lb = ClientFactory.getNamedLoadBalancer(clientName);
return new RibbonLoadBalancer(defaultClient, lb, config);
}
public void setDefaultClient(Client defaultClient) {
this.defaultClient = defaultClient;
}
}