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

Removed server delegation; fixes #487

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-12-08 10:25:00 -08:00
parent 2981b54b82
commit 7caa3102aa
1 changed files with 6 additions and 26 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/ribbon/StubRunnerRibbonServerList.java
View File

@@ -18,10 +18,12 @@ package org.springframework.cloud.contract.stubrunner.spring.cloud.ribbon;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.contract.stubrunner.RunningStubs; import org.springframework.cloud.contract.stubrunner.RunningStubs;
@@ -30,10 +32,6 @@ import org.springframework.cloud.contract.stubrunner.StubFinder;
import org.springframework.cloud.contract.stubrunner.spring.cloud.StubMapperProperties; import org.springframework.cloud.contract.stubrunner.spring.cloud.StubMapperProperties;
import org.springframework.cloud.contract.stubrunner.util.StringUtils; import org.springframework.cloud.contract.stubrunner.util.StringUtils;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
/** /**
* Stub Runner representation of a server list * Stub Runner representation of a server list
* *
@@ -56,7 +54,7 @@ class StubRunnerRibbonServerList implements ServerList<Server> {
stubMapperProperties.fromServiceIdToIvyNotation(serviceName) : serviceName; stubMapperProperties.fromServiceIdToIvyNotation(serviceName) : serviceName;
RunningStubs runningStubs = stubFinder.findAllRunningStubs(); RunningStubs runningStubs = stubFinder.findAllRunningStubs();
final Map.Entry<StubConfiguration, Integer> entry = runningStubs.getEntry(mappedServiceName); final Map.Entry<StubConfiguration, Integer> entry = runningStubs.getEntry(mappedServiceName);
final Collection<Server> servers = new ArrayList<>(); final List<Server> servers = new ArrayList<>();
if (entry != null) { if (entry != null) {
servers.add(new Server("localhost", entry.getValue()) { servers.add(new Server("localhost", entry.getValue()) {
@Override @Override
@@ -88,30 +86,12 @@ class StubRunnerRibbonServerList implements ServerList<Server> {
this.serverList = new ServerList<Server>() { this.serverList = new ServerList<Server>() {
@Override @Override
public List<Server> getInitialListOfServers() { public List<Server> getInitialListOfServers() {
List<Server> combinedList = new ArrayList<>(); return servers;
combinedList.addAll(servers);
try {
combinedList.addAll(delegate.getInitialListOfServers());
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug("Exception occurred while trying to get list of servers", e);
}
}
return combinedList;
} }
@Override @Override
public List<Server> getUpdatedListOfServers() { public List<Server> getUpdatedListOfServers() {
List<Server> combinedList = new ArrayList<>(); return servers;
combinedList.addAll(servers);
try {
combinedList.addAll(delegate.getUpdatedListOfServers());
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug("Exception occurred while trying to get list of servers", e);
}
}
return combinedList;
} }
}; };
} }