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

Remove uses of DiscoveryClient.getLocalServiceInstance()

Browse Source 
This was previously deprecated previously and removed in spring-cloud-commons 2.0.x
This commit is contained in:
Spencer Gibb
2017-10-19 11:15:52 -04:00
parent 2aac2cc7c2
commit 0d7ac46e2e
1 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerDiscoveryClient.java
View File

@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.contract.stubrunner.RunningStubs;
@@ -51,7 +50,7 @@ class StubRunnerDiscoveryClient implements DiscoveryClient {
public StubRunnerDiscoveryClient(DiscoveryClient delegate, StubFinder stubFinder,
StubMapperProperties stubMapperProperties, String springAppName) {
this.delegate = delegate instanceof StubRunnerDiscoveryClient ?
noOpDiscoveryClient(springAppName) : delegate;
noOpDiscoveryClient() : delegate;
if (log.isDebugEnabled()) {
log.debug("Will delegate calls to discovery service [" + this.delegate + "] if a stub is not found");
}
@@ -61,7 +60,7 @@ class StubRunnerDiscoveryClient implements DiscoveryClient {
public StubRunnerDiscoveryClient(StubFinder stubFinder,
StubMapperProperties stubMapperProperties, String springAppName) {
this.delegate = noOpDiscoveryClient(springAppName);
this.delegate = noOpDiscoveryClient();
if (log.isDebugEnabled()) {
log.debug("Will delegate calls to discovery service [" + this.delegate + "] if a stub is not found");
}
@@ -69,8 +68,8 @@ class StubRunnerDiscoveryClient implements DiscoveryClient {
this.stubMapperProperties = stubMapperProperties;
}
private StubRunnerNoOpDiscoveryClient noOpDiscoveryClient(String springAppName) {
return new StubRunnerNoOpDiscoveryClient(new DefaultServiceInstance(springAppName, "localhost", 0, false));
private StubRunnerNoOpDiscoveryClient noOpDiscoveryClient() {
return new StubRunnerNoOpDiscoveryClient();
}
@Override
@@ -85,18 +84,6 @@ class StubRunnerDiscoveryClient implements DiscoveryClient {
return "";
}
@Override
public ServiceInstance getLocalServiceInstance() {
try {
return this.delegate.getLocalServiceInstance();
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug("Failed to get local service instance from delegate", e);
}
}
return null;
}
@Override
public List<ServiceInstance> getInstances(String serviceId) {
String ivyNotation = this.stubMapperProperties.fromServiceIdToIvyNotation(serviceId);
@@ -155,22 +142,11 @@ class StubRunnerDiscoveryClient implements DiscoveryClient {
class StubRunnerNoOpDiscoveryClient implements DiscoveryClient {
private final ServiceInstance instance;
public StubRunnerNoOpDiscoveryClient(ServiceInstance instance) {
this.instance = instance;
}
@Override
public String description() {
return "Spring Cloud Stub Runner No-op DiscoveryClient";
}
@Override
public ServiceInstance getLocalServiceInstance() {
return this.instance;
}
@Override
public List<ServiceInstance> getInstances(String serviceId) {
return Collections.emptyList();