Merge branch '2.1.x'

This commit is contained in:
Marcin Grzejszczak
2019-04-16 11:09:03 +04:00

View File

@@ -38,6 +38,7 @@ import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.util.StringUtils;
/**
* Stub downloader that picks stubs and contracts from the provided resource. If
@@ -206,7 +207,7 @@ public class ClasspathStubProvider implements StubDownloaderBuilder {
private List<RepoRoot> repoRoot(StubRunnerOptions stubRunnerOptions,
StubConfiguration configuration) {
if (stubRunnerOptions.getStubRepositoryRoot() != null) {
if (StringUtils.hasText(stubRunnerOptions.getStubRepositoryRootAsString())) {
return Collections.singletonList(
new RepoRoot(stubRunnerOptions.getStubRepositoryRootAsString()));
}