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

Adjust to changes in OpenFeign.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-10-29 17:07:41 +01:00
parent d0c75f7d03
commit 026c0cc19b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java
View File

@@ -35,6 +35,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.client.loadbalancer.reactive.LoadBalancerProperties;
import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
import org.springframework.cloud.loadbalancer.config.BlockingLoadBalancerClientAutoConfiguration;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
import org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration;
import org.springframework.cloud.zookeeper.ConditionalOnZookeeperEnabled;
@@ -67,19 +68,22 @@ public class DependencyFeignClientAutoConfiguration {
private final LoadBalancerProperties loadBalancerProperties;
private final LoadBalancerClientFactory loadBalancerClientFactory;
public DependencyFeignClientAutoConfiguration(@Autowired(required = false) FeignBlockingLoadBalancerClient feignLoadBalancerClient,
ZookeeperDependencies zookeeperDependencies, BlockingLoadBalancerClient loadBalancerClient, LoadBalancerProperties loadBalancerProperties) {
ZookeeperDependencies zookeeperDependencies, BlockingLoadBalancerClient loadBalancerClient, LoadBalancerProperties loadBalancerProperties, LoadBalancerClientFactory loadBalancerClientFactory) {
this.feignLoadBalancerClient = feignLoadBalancerClient;
this.zookeeperDependencies = zookeeperDependencies;
this.loadBalancerClient = loadBalancerClient;
this.loadBalancerProperties = loadBalancerProperties;
this.loadBalancerClientFactory = loadBalancerClientFactory;
}
@Bean
@Primary
Client dependencyBasedFeignClient() {
return new FeignBlockingLoadBalancerClient(new Client.Default(null, null),
loadBalancerClient, loadBalancerProperties) {
loadBalancerClient, loadBalancerProperties, loadBalancerClientFactory) {
@Override
public Response execute(Request request, Request.Options options)