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

Iterate over stub runner downloader builders

Browse Source 
with this change we try to retrieve a list of builders of stub runner downloaders. The idea is that if a builder can't build a stub runner downloader, it returns null. If a stub runner downloader can't download an artifact it returns null. That way we can iterate over builders and try to point to unpacked stubs when applicable. No longer do we pick only one applicatble builder. We pick the first matching one.
This commit is contained in:
Marcin Grzejszczak
2018-03-23 10:47:50 +01:00
parent b9740e900d
commit 01e682044c
18 changed files with 277 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderBuilder.java Normal file
View File

@@ -0,0 +1,21 @@
package org.springframework.cloud.contract.stubrunner;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
/**
* @author Marcin Grzejszczak
* @since 2.0.0
*/
public class AetherStubDownloaderBuilder implements StubDownloaderBuilder {
private static final Log log = LogFactory.getLog(AetherStubDownloaderBuilder.class);
@Override public StubDownloader build(StubRunnerOptions stubRunnerOptions) {
if (stubRunnerOptions.stubsMode == StubRunnerProperties.StubsMode.CLASSPATH) {
return null;
}
log.info("Will download stubs and contracts via Aether");
return new AetherStubDownloader(stubRunnerOptions);
}
}

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

@@ -41,7 +41,7 @@ public class BatchStubRunnerFactory {
private static StubDownloader aetherStubDownloader(StubRunnerOptions stubRunnerOptions) {
StubDownloaderBuilderProvider provider = new StubDownloaderBuilderProvider();
return provider.getOrDefaultDownloader(stubRunnerOptions);
return provider.get(stubRunnerOptions);
}
public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader) {

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

@@ -3,7 +3,6 @@ package org.springframework.cloud.contract.stubrunner;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.AbstractMap;
@@ -18,6 +17,7 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
import org.springframework.cloud.contract.stubrunner.util.StringUtils;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
@@ -53,7 +53,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
public class ClasspathStubProvider implements StubDownloaderBuilder {
private static final Log log = LogFactory
.getLog(MethodHandles.lookup().lookupClass());
.getLog(ClasspathStubProvider.class);
private static final int TEMP_DIR_ATTEMPTS = 10000;
private final PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(
@@ -61,6 +61,10 @@ public class ClasspathStubProvider implements StubDownloaderBuilder {
@Override
public StubDownloader build(final StubRunnerOptions stubRunnerOptions) {
if (stubRunnerOptions.stubsMode != StubRunnerProperties.StubsMode.CLASSPATH) {
return null;
}
log.info("Will download stubs from classpath");
return new StubDownloader() {
@Override
public Map.Entry<StubConfiguration, File> downloadAndUnpackStubJar(
@@ -133,7 +137,7 @@ public class ClasspathStubProvider implements StubDownloaderBuilder {
+ groupAndArtifactResult.group(3);
}
else {
throw new IllegalArgumentException("Illegal uri [${uri}]");
throw new IllegalArgumentException("Illegal uri [" + uri + "]");
}
}
};
@@ -206,4 +210,4 @@ public class ClasspathStubProvider implements StubDownloaderBuilder {
this.fullPath = repoRoot + suffix;
}
}
}
}

58
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/CompositeStubDownloaderBuilder.java Normal file
View File

@@ -0,0 +1,58 @@
package org.springframework.cloud.contract.stubrunner;
import java.io.File;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* @author Marcin Grzejszczak
* @since 2.0.0
*/
class CompositeStubDownloaderBuilder implements StubDownloaderBuilder {
private final List<StubDownloaderBuilder> builders;
CompositeStubDownloaderBuilder(List<StubDownloaderBuilder> builders) {
this.builders = builders;
}
@Override public StubDownloader build(StubRunnerOptions stubRunnerOptions) {
if (this.builders == null) {
return null;
}
return new CompositeStubDownloader(this.builders, stubRunnerOptions);
}
}
class CompositeStubDownloader implements StubDownloader {
private static final Log log = LogFactory.getLog(CompositeStubDownloader.class);
private final List<StubDownloaderBuilder> builders;
private final StubRunnerOptions stubRunnerOptions;
CompositeStubDownloader(List<StubDownloaderBuilder> builders,
StubRunnerOptions stubRunnerOptions) {
this.builders = builders;
this.stubRunnerOptions = stubRunnerOptions;
}
@Override public Map.Entry<StubConfiguration, File> downloadAndUnpackStubJar(
StubConfiguration stubConfiguration) {
for (StubDownloaderBuilder builder : this.builders) {
StubDownloader downloader = builder.build(this.stubRunnerOptions);
if (downloader == null) {
continue;
}
Map.Entry<StubConfiguration, File> entry = downloader
.downloadAndUnpackStubJar(stubConfiguration);
if (entry != null) {
return entry;
}
}
return null;
}
}

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

@@ -35,5 +35,5 @@ public interface StubDownloader {
* Returns a mapping of updated StubConfiguration (it will contain the resolved version) and the location of the downloaded JAR.
* If there was no artifact this method will return {@code null}.
*/
Map.Entry<StubConfiguration,File> downloadAndUnpackStubJar(StubConfiguration stubConfiguration);
Map.Entry<StubConfiguration, File> downloadAndUnpackStubJar(StubConfiguration stubConfiguration);
}

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

@@ -28,5 +28,8 @@ package org.springframework.cloud.contract.stubrunner;
*/
public interface StubDownloaderBuilder {
/**
* @return {@link StubDownloader} instance of {@code null} if current parameters don't allow building the instance
*/
StubDownloader build(StubRunnerOptions stubRunnerOptions);
}

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

@@ -1,12 +1,9 @@
package org.springframework.cloud.contract.stubrunner;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
import org.springframework.core.io.support.SpringFactoriesLoader;
/**
@@ -18,8 +15,6 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
*/
public class StubDownloaderBuilderProvider {
private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
private final List<StubDownloaderBuilder> builders = new ArrayList<>();
public StubDownloaderBuilderProvider() {
@@ -27,28 +22,28 @@ public class StubDownloaderBuilderProvider {
SpringFactoriesLoader.loadFactories(StubDownloaderBuilder.class, null));
}
public StubDownloaderBuilder get() {
return this.builders.isEmpty() ? null : this.builders.get(0);
StubDownloaderBuilderProvider(List<StubDownloaderBuilder> builders) {
this.builders.addAll(builders);
}
/**
* If a {@link StubDownloaderBuilder} is present will build a {@link StubDownloader} from it.
* If not will return the defaults basing on the {@link StubRunnerOptions} values
* @param stubRunnerOptions
* @param additionalBuilders - optional array of {@link StubDownloaderBuilder}s to append to the list of builders
* @return composite {@link StubDownloader} that iterates over a list of stub downloaders
*/
public StubDownloader getOrDefaultDownloader(StubRunnerOptions stubRunnerOptions) {
if (hasBuilder()) {
log.info("A custom Stub Downloader was passed - will pick [" + get() + "]");
return get().build(stubRunnerOptions);
public StubDownloader get(StubRunnerOptions stubRunnerOptions,
StubDownloaderBuilder... additionalBuilders) {
List<StubDownloaderBuilder> builders = this.builders;
if (additionalBuilders != null) {
builders.addAll(Arrays.asList(additionalBuilders));
}
if (stubRunnerOptions.stubsMode == StubRunnerProperties.StubsMode.CLASSPATH) {
log.info("Classpath scanning will be used due to passed properties");
return new ClasspathStubProvider().build(stubRunnerOptions);
}
log.info("Will download stubs using Aether");
return new AetherStubDownloader(stubRunnerOptions);
List<StubDownloaderBuilder> defaultBuilders = defaultStubDownloaderBuilders();
builders.addAll(defaultBuilders);
return new CompositeStubDownloader(builders, stubRunnerOptions);
}
public boolean hasBuilder() {
return get() != null;
List<StubDownloaderBuilder> defaultStubDownloaderBuilders() {
return Arrays
.asList(new ClasspathStubProvider(), new AetherStubDownloaderBuilder());
}
}

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

@@ -141,7 +141,7 @@ public class StubRunnerOptions {
.withMinPort(Integer.valueOf(System.getProperty("stubrunner.port.range.min", "10000")))
.withMaxPort(Integer.valueOf(System.getProperty("stubrunner.port.range.max", "15000")))
.withStubRepositoryRoot(System.getProperty("stubrunner.repository.root", ""))
.withStubsMode(System.getProperty("stubrunner.stubs-mode", "CLASSPATH"))
.withStubsMode(System.getProperty("stubrunner.stubs-mode", "LOCAL"))
.withStubsClassifier(System.getProperty("stubrunner.classifier", "stubs"))
.withStubs(System.getProperty("stubrunner.ids", ""))
.withUsername(System.getProperty("stubrunner.username"))

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

@@ -74,7 +74,7 @@ public class StubRunnerConfiguration {
}
StubRunnerOptions stubRunnerOptions = builder.build();
BatchStubRunner batchStubRunner = new BatchStubRunnerFactory(stubRunnerOptions,
this.provider.getOrDefaultDownloader(stubRunnerOptions),
this.provider.get(stubRunnerOptions),
this.contractVerifierMessaging != null ? this.contractVerifierMessaging
: new NoOpStubMessages()).buildBatchStubRunner();
// TODO: Consider running it in a separate thread

19
spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ClasspathStubProviderTest.java Normal file
View File

@@ -0,0 +1,19 @@
package org.springframework.cloud.contract.stubrunner;
import org.junit.Test;
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
import static org.assertj.core.api.BDDAssertions.then;
/**
* @author Marcin Grzejszczak
*/
public class ClasspathStubProviderTest {
@Test public void should_return_null_if_stub_mode_is_not_classpath() {
StubDownloader stubDownloader = new ClasspathStubProvider().build(new StubRunnerOptionsBuilder().withStubsMode(
StubRunnerProperties.StubsMode.REMOTE).build());
then(stubDownloader).isNull();
}
}

88
spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/CompositeStubDownloaderBuilderTests.java Normal file
View File

@@ -0,0 +1,88 @@
package org.springframework.cloud.contract.stubrunner;
import java.io.File;
import java.util.AbstractMap;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.assertj.core.api.BDDAssertions;
import org.junit.Test;
/**
* @author Marcin Grzejszczak
*/
public class CompositeStubDownloaderBuilderTests {
@Test public void should_delegate_work_to_other_stub_downloaders() {
EmptyStubDownloaderBuilder emptyStubDownloaderBuilder = new EmptyStubDownloaderBuilder();
ImpossibleToBuildStubDownloaderBuilder impossible = new ImpossibleToBuildStubDownloaderBuilder();
List<StubDownloaderBuilder> builders = Arrays.asList(emptyStubDownloaderBuilder, impossible, new SomeStubDownloaderBuilder());
CompositeStubDownloaderBuilder builder = new CompositeStubDownloaderBuilder(builders);
StubDownloader downloader = builder.build(new StubRunnerOptionsBuilder().build());
Map.Entry<StubConfiguration, File> entry = downloader
.downloadAndUnpackStubJar(new StubConfiguration("a:b:v"));
BDDAssertions.then(entry).isNotNull();
BDDAssertions.then(emptyStubDownloaderBuilder.downloaderCalled()).isTrue();
BDDAssertions.then(impossible.called).isTrue();
}
@Test public void should_return_null_if_no_builders_were_passed() {
CompositeStubDownloaderBuilder builder = new CompositeStubDownloaderBuilder(null);
StubDownloader downloader = builder.build(new StubRunnerOptionsBuilder().build());
BDDAssertions.then(downloader).isNull();
}
}
class EmptyStubDownloaderBuilder implements StubDownloaderBuilder {
EmptyStubDownloader emptyStubDownloader;
@Override public StubDownloader build(StubRunnerOptions stubRunnerOptions) {
this.emptyStubDownloader = new EmptyStubDownloader();
return this.emptyStubDownloader;
}
boolean downloaderCalled() {
return this.emptyStubDownloader.called;
}
}
class ImpossibleToBuildStubDownloaderBuilder implements StubDownloaderBuilder {
boolean called;
@Override public StubDownloader build(StubRunnerOptions stubRunnerOptions) {
this.called = true;
return null;
}
}
class EmptyStubDownloader implements StubDownloader {
boolean called;
@Override public Map.Entry<StubConfiguration, File> downloadAndUnpackStubJar(
StubConfiguration stubConfiguration) {
this.called = true;
return null;
}
}
class SomeStubDownloaderBuilder implements StubDownloaderBuilder {
@Override public StubDownloader build(StubRunnerOptions stubRunnerOptions) {
return new SomeStubDownloader();
}
}
class SomeStubDownloader implements StubDownloader {
@Override public Map.Entry<StubConfiguration, File> downloadAndUnpackStubJar(
StubConfiguration stubConfiguration) {
return new AbstractMap.SimpleEntry<>(stubConfiguration, new File("."));
}
}

37
spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/StubDownloaderBuilderProviderTests.java Normal file
View File

@@ -0,0 +1,37 @@
package org.springframework.cloud.contract.stubrunner;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.BDDMockito;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
/**
* @author Marcin Grzejszczak
*/
@RunWith(MockitoJUnitRunner.class)
public class StubDownloaderBuilderProviderTests {
@Mock StubDownloaderBuilder one;
@Mock StubDownloaderBuilder two;
@Mock StubDownloaderBuilder three;
@Test public void should_get_providers_from_factories_default_and_additional_ones() {
StubDownloaderBuilderProvider provider = new StubDownloaderBuilderProvider(Collections.singletonList(one)) {
@Override List<StubDownloaderBuilder> defaultStubDownloaderBuilders() {
return Collections.singletonList(two);
}
};
StubRunnerOptions options = new StubRunnerOptionsBuilder().build();
provider.get(options, three)
.downloadAndUnpackStubJar(new StubConfiguration("a:b:c"));
BDDMockito.then(one).should().build(options);
BDDMockito.then(two).should().build(options);
BDDMockito.then(three).should().build(options);
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy
View File

@@ -87,7 +87,7 @@ class GradleContractsDownloader {
if (extension.contractRepository.proxyPort) {
options = options.withProxy(extension.contractRepository.proxyHost, extension.contractRepository.proxyPort)
}
return provider.getOrDefaultDownloader(options.build())
return provider.get(options.build())
}
@PackageScope StubConfiguration stubConfiguration(ContractVerifierExtension.Dependency contractDependency) {

4
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/ConvertMojo.java
View File

@@ -181,8 +181,8 @@ public class ConvertMojo extends AbstractMojo {
config.setExcludeBuildFolders(this.excludeBuildFolders);
File contractsDirectory = new MavenContractsDownloader(this.project, this.contractDependency,
this.contractsPath, this.contractsRepositoryUrl, this.contractsMode, getLog(),
this.aetherStubDownloaderFactory, this.repoSession, this.contractsRepositoryUsername,
this.contractsRepositoryPassword, this.contractsRepositoryProxyHost, this.contractsRepositoryProxyPort,
this.contractsRepositoryUsername, this.contractsRepositoryPassword,
this.contractsRepositoryProxyHost, this.contractsRepositoryProxyPort,
this.contractsSnapshotCheckSkip, this.deleteStubsAfterTest)
.downloadAndUnpackContractsIfRequired(config, this.contractsDirectory);
getLog().info("Directory with contract is present at [" + contractsDirectory + "]");

1
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java
View File

@@ -230,7 +230,6 @@ public class GenerateTestsMojo extends AbstractMojo {
// download contracts, unzip them and pass as output directory
File contractsDirectory = new MavenContractsDownloader(this.project, this.contractDependency,
this.contractsPath, this.contractsRepositoryUrl, this.contractsMode, getLog(),
this.aetherStubDownloaderFactory, this.repoSession,
this.contractsRepositoryUsername, this.contractsRepositoryPassword,
this.contractsRepositoryProxyHost, this.contractsRepositoryProxyPort,
this.contractsSnapshotCheckSkip, this.deleteStubsAfterTest).downloadAndUnpackContractsIfRequired(config, this.contractsDirectory);

50
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/MavenContractsDownloader.java
View File

@@ -5,14 +5,9 @@ import java.io.File;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.eclipse.aether.RepositorySystemSession;
import org.springframework.cloud.contract.maven.verifier.stubrunner.AetherStubDownloaderFactory;
import org.springframework.cloud.contract.stubrunner.AetherStubDownloader;
import org.springframework.cloud.contract.stubrunner.ClasspathStubProvider;
import org.springframework.cloud.contract.stubrunner.ContractDownloader;
import org.springframework.cloud.contract.stubrunner.StubConfiguration;
import org.springframework.cloud.contract.stubrunner.StubDownloader;
import org.springframework.cloud.contract.stubrunner.StubDownloaderBuilder;
import org.springframework.cloud.contract.stubrunner.StubDownloaderBuilderProvider;
import org.springframework.cloud.contract.stubrunner.StubRunnerOptions;
import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder;
@@ -37,8 +32,6 @@ class MavenContractsDownloader {
private final String contractsRepositoryUrl;
private final StubRunnerProperties.StubsMode stubsMode;
private final Log log;
private final AetherStubDownloaderFactory aetherStubDownloaderFactory;
private final RepositorySystemSession repoSession;
private final StubDownloaderBuilderProvider stubDownloaderBuilderProvider;
private final String repositoryUsername;
private final String repositoryPassword;
@@ -50,8 +43,7 @@ class MavenContractsDownloader {
MavenContractsDownloader(MavenProject project, Dependency contractDependency,
String contractsPath, String contractsRepositoryUrl,
StubRunnerProperties.StubsMode stubsMode, Log log,
AetherStubDownloaderFactory aetherStubDownloaderFactory,
RepositorySystemSession repoSession, String repositoryUsername,
String repositoryUsername,
String repositoryPassword, String repositoryProxyHost,
Integer repositoryProxyPort, boolean contractsSnapshotCheckSkip,
boolean deleteStubsAfterTest) {
@@ -61,8 +53,6 @@ class MavenContractsDownloader {
this.contractsRepositoryUrl = contractsRepositoryUrl;
this.stubsMode = stubsMode;
this.log = log;
this.aetherStubDownloaderFactory = aetherStubDownloaderFactory;
this.repoSession = repoSession;
this.repositoryUsername = repositoryUsername;
this.repositoryPassword = repositoryPassword;
this.repositoryProxyHost = repositoryProxyHost;
@@ -101,41 +91,9 @@ class MavenContractsDownloader {
}
private StubDownloader stubDownloader() {
StubDownloaderBuilder builder = this.stubDownloaderBuilderProvider.get();
if (this.stubsMode == StubRunnerProperties.StubsMode.LOCAL || this.stubsMode == StubRunnerProperties.StubsMode.REMOTE) {
if (this.log.isDebugEnabled()) {
this.log.debug("Will download contracts from [" + this.contractsRepositoryUrl + "]. "
+ "Stubs mode equals [" + this.stubsMode + "]");
}
return stubDownloader(builder);
}
if (customStubDownloader(builder)) {
return builder.build(buildOptions());
}
if (this.stubsMode == StubRunnerProperties.StubsMode.CLASSPATH) {
return new ClasspathStubProvider().build(buildOptions());
}
this.log.info("Will download contracts using current build's Maven repository setup");
return this.aetherStubDownloaderFactory.build(this.repoSession);
}
private StubDownloader stubDownloader(StubDownloaderBuilder builder) {
if (customStubDownloader(builder)) {
return builder.build(buildOptions());
}
return new AetherStubDownloader(buildOptions());
}
private boolean customStubDownloader(StubDownloaderBuilder builder) {
if (builder != null) {
logStubDownloader(builder);
return true;
}
return false;
}
private void logStubDownloader(StubDownloaderBuilder builder) {
this.log.info("A custom stub downloader [" + builder + "] was provided");
StubRunnerOptions stubRunnerOptions = buildOptions();
return this.stubDownloaderBuilderProvider.
get(stubRunnerOptions);
}
StubRunnerOptions buildOptions() {

17
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/stubrunner/AetherStubDownloaderFactory.java
View File

@@ -19,15 +19,21 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.project.MavenProject;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.springframework.cloud.contract.stubrunner.AetherStubDownloader;
import org.springframework.cloud.contract.stubrunner.StubDownloader;
import org.springframework.cloud.contract.stubrunner.StubDownloaderBuilder;
import org.springframework.cloud.contract.stubrunner.StubRunnerOptions;
@Named
@Singleton
public class AetherStubDownloaderFactory {
private static final Log log = LogFactory.getLog(AetherStubDownloaderFactory.class);
private final MavenProject project;
private final RepositorySystem repoSystem;
@@ -38,8 +44,13 @@ public class AetherStubDownloaderFactory {
this.project = project;
}
public StubDownloader build(RepositorySystemSession repoSession) {
return new AetherStubDownloader(this.repoSystem,
this.project.getRemoteProjectRepositories(), repoSession);
public StubDownloaderBuilder build(final RepositorySystemSession repoSession) {
return new StubDownloaderBuilder() {
@Override public StubDownloader build(StubRunnerOptions stubRunnerOptions) {
log.info("Will download contracts using current build's Maven repository setup");
return new AetherStubDownloader(AetherStubDownloaderFactory.this.repoSystem,
AetherStubDownloaderFactory.this.project.getRemoteProjectRepositories(), repoSession);
}
};
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.java
View File

@@ -39,7 +39,7 @@ public class RemoteStubRunner {
}
public BatchStubRunner run(StubRunnerOptions options, RepositorySystemSession repositorySystemSession) {
StubDownloader stubDownloader = this.aetherStubDownloaderFactory.build(repositorySystemSession);
StubDownloader stubDownloader = this.aetherStubDownloaderFactory.build(repositorySystemSession).build(options);
try {
if (log.isDebugEnabled()) {
log.debug("Launching StubRunner with args: " + options);