From ada2cb79130dbe5fe0fda74d3a27219f67224d01 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 20 Jan 2020 17:31:13 +0100 Subject: [PATCH] Revert "Add public delegate modifiers in order to avoid reflection in SC Sleuth." This reverts commit 05b58e087ed0eff7753fbeae768a6b7946fb7872. --- .../FeignBlockingLoadBalancerClient.java | 16 +++++----------- .../ribbon/LoadBalancerFeignClient.java | 7 +------ 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java index a6ef870e..12e797ec 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java @@ -41,14 +41,14 @@ import org.springframework.util.Assert; public class FeignBlockingLoadBalancerClient implements Client { private static final Log LOG = LogFactory - .getLog(FeignBlockingLoadBalancerClient.class); + .getLog(FeignBlockingLoadBalancerClient.class); + + private final Client delegate; private final BlockingLoadBalancerClient loadBalancerClient; - private Client delegate; - public FeignBlockingLoadBalancerClient(Client delegate, - BlockingLoadBalancerClient loadBalancerClient) { + BlockingLoadBalancerClient loadBalancerClient) { this.delegate = delegate; this.loadBalancerClient = loadBalancerClient; } @@ -58,7 +58,7 @@ public class FeignBlockingLoadBalancerClient implements Client { final URI originalUri = URI.create(request.url()); String serviceId = originalUri.getHost(); Assert.state(serviceId != null, - "Request URI does not contain a valid hostname: " + originalUri); + "Request URI does not contain a valid hostname: " + originalUri); ServiceInstance instance = loadBalancerClient.choose(serviceId); if (instance == null) { String message = "Load balancer does not contain an instance for the service " @@ -78,14 +78,8 @@ public class FeignBlockingLoadBalancerClient implements Client { return delegate.execute(newRequest, options); } - // Visible for Sleuth instrumentation public Client getDelegate() { return delegate; } - // Visible for Sleuth instrumentation - public void setDelegate(Client delegate) { - this.delegate = delegate; - } - } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java index 19b9ea2a..9ed17419 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java @@ -37,7 +37,7 @@ public class LoadBalancerFeignClient implements Client { static final Request.Options DEFAULT_OPTIONS = new Request.Options(); - private Client delegate; + private final Client delegate; private CachingSpringLoadBalancerFactory lbClientFactory; @@ -116,11 +116,6 @@ public class LoadBalancerFeignClient implements Client { return this.delegate; } - // Visible for Sleuth instrumentation - public void setDelegate(Client delegate) { - this.delegate = delegate; - } - private FeignLoadBalancer lbClient(String clientName) { return this.lbClientFactory.create(clientName); }