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

Revert "Add public delegate modifiers in order to avoid reflection in SC Sleuth."

Browse Source 
This reverts commit 05b58e087e.
This commit is contained in:
Olga Maciaszek-Sharma
2020-01-20 17:31:13 +01:00
parent 05b58e087e
commit ada2cb7913
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java
View File

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

7
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java
View File

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