From b01145a203bf2052a219a37e0bdd25ccb60411fa Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 30 Mar 2016 09:54:36 +0200 Subject: [PATCH] Trying to fix Travis --- .travis.yml | 1 - .../ribbon/StubRunnerRibbonConfiguration.java | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index feb2c653e4..b51e928166 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ before_install: jdk: - oraclejdk7 - - openjdk7 - oraclejdk8 install: ./gradlew assemble diff --git a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java index c598caeaab..dc2735c0cd 100644 --- a/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java +++ b/stub-runner/stub-runner-spring-cloud/src/main/groovy/io/codearte/accurest/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java @@ -7,6 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -30,6 +31,22 @@ import io.codearte.accurest.stubrunner.util.StringUtils; @Configuration public class StubRunnerRibbonConfiguration { + @Bean + @ConditionalOnMissingBean + public ServerList noOpServerList() { + return new ServerList() { + @Override + public List getInitialListOfServers() { + return new ArrayList<>(); + } + + @Override + public List getUpdatedListOfServers() { + return new ArrayList<>(); + } + }; + } + @Bean @Primary @SuppressWarnings("unchecked")