From 8127e306187cde2f841998d1f2dc1eb410b4d69b Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 2 Oct 2020 15:59:13 -0400 Subject: [PATCH] Fix compilation errors related to OpenFeign changes --- .../DependencyFeignClientAutoConfiguration.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java index ab208bb2..fb9211d0 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java @@ -32,6 +32,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; 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.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; @@ -64,18 +65,21 @@ public class DependencyFeignClientAutoConfiguration { private final BlockingLoadBalancerClient loadBalancerClient; + private final LoadBalancerProperties loadBalancerProperties; + public DependencyFeignClientAutoConfiguration(@Autowired(required = false) FeignBlockingLoadBalancerClient feignLoadBalancerClient, - ZookeeperDependencies zookeeperDependencies, BlockingLoadBalancerClient loadBalancerClient) { + ZookeeperDependencies zookeeperDependencies, BlockingLoadBalancerClient loadBalancerClient, LoadBalancerProperties loadBalancerProperties) { this.feignLoadBalancerClient = feignLoadBalancerClient; this.zookeeperDependencies = zookeeperDependencies; this.loadBalancerClient = loadBalancerClient; + this.loadBalancerProperties = loadBalancerProperties; } @Bean @Primary Client dependencyBasedFeignClient() { return new FeignBlockingLoadBalancerClient(new Client.Default(null, null), - loadBalancerClient) { + loadBalancerClient, loadBalancerProperties) { @Override public Response execute(Request request, Request.Options options)