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

Options are passed to StubRunnerRule; fixes #466

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-11-23 11:25:49 +01:00
parent 8e7494add0
commit 0358629a1e
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.cloud.contract.stubrunner.util.StubsParser;
import org.springframework.util.StringUtils;
@@ -31,6 +32,7 @@ public class StubRunnerOptionsBuilder {
private static final String DELIMITER = ":";
private LinkedList<String> stubs = new LinkedList<>();
private Collection<StubConfiguration> stubConfigurations = new ArrayList<>();
private Map<StubConfiguration, Integer> stubIdsToPortMapping = new LinkedHashMap<>();
private Integer minPortValue = 10000;
@@ -41,7 +43,7 @@ public class StubRunnerOptionsBuilder {
private String username;
private String password;
private StubRunnerOptions.StubRunnerProxyOptions stubRunnerProxyOptions;
private boolean stubPerConsumer = false;
private boolean stubsPerConsumer = false;
private String consumerName;
private String mappingsOutputFolder;
@@ -107,6 +109,16 @@ public class StubRunnerOptionsBuilder {
this.stubRepositoryRoot = options.stubRepositoryRoot;
this.workOffline = options.workOffline;
this.stubsClassifier = options.stubsClassifier;
this.username = options.username;
this.password = options.password;
this.stubRunnerProxyOptions = options.getStubRunnerProxyOptions();
this.stubsPerConsumer = options.isStubsPerConsumer();
this.consumerName = options.getConsumerName();
this.mappingsOutputFolder = options.getMappingsOutputFolder();
this.stubConfigurations = options.dependencies != null ?
options.dependencies : new ArrayList<StubConfiguration>();
this.stubIdsToPortMapping = options.stubIdsToPortMapping != null ?
options.stubIdsToPortMapping : new LinkedHashMap<StubConfiguration, Integer>();
return this;
}
@@ -118,12 +130,15 @@ public class StubRunnerOptionsBuilder {
public StubRunnerOptions build() {
return new StubRunnerOptions(this.minPortValue, this.maxPortValue, this.stubRepositoryRoot,
this.workOffline, this.stubsClassifier, buildDependencies(), this.stubIdsToPortMapping,
this.username, this.password, this.stubRunnerProxyOptions, this.stubPerConsumer, this.consumerName,
this.username, this.password, this.stubRunnerProxyOptions, this.stubsPerConsumer, this.consumerName,
this.mappingsOutputFolder);
}
private Collection<StubConfiguration> buildDependencies() {
return StubsParser.fromString(this.stubs, this.stubsClassifier);
Set<StubConfiguration> stubConfigurations = StubsParser
.fromString(this.stubs, this.stubsClassifier);
this.stubConfigurations.addAll(stubConfigurations);
return this.stubConfigurations;
}
private static List<String> stubsToList(String[] stubIdsToPortMapping) {
@@ -196,7 +211,7 @@ public class StubRunnerOptionsBuilder {
}
public StubRunnerOptionsBuilder withStubPerConsumer(boolean stubPerConsumer) {
this.stubPerConsumer = stubPerConsumer;
this.stubsPerConsumer = stubPerConsumer;
return this;
}

26
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerOptionsBuilderSpec.groovy
View File

@@ -134,4 +134,30 @@ class StubRunnerOptionsBuilderSpec extends Specification {
then:
options.getDependencies().toString() == '[groupId2:artifactId2:[,0.0.2]:classifier2, groupId:artifactId:[,0.0.1]:classifier]'
}
@Issue("#466")
def shouldSetAllDependenciesFromOptions() {
given:
StubRunnerOptionsBuilder builder = builder.withOptions(new StubRunnerOptions(1, 2, "root", true, "classifier",
[new StubConfiguration("a:b:c")], [(new StubConfiguration("a:b:c")): 3], "foo", "bar",
new StubRunnerOptions.StubRunnerProxyOptions("host", 4), true, "consumer", "folder"))
builder.withStubs("foo:bar:baz")
when:
StubRunnerOptions options = builder.build()
then:
options.minPortValue == 1
options.maxPortValue == 2
options.stubRepositoryRoot == "root"
options.workOffline == true
options.stubsClassifier == "classifier"
options.dependencies == [new StubConfiguration("a:b:c"), new StubConfiguration("foo:bar:baz:classifier")]
options.stubIdsToPortMapping == [(new StubConfiguration("a:b:c")): 3]
options.username == "foo"
options.password == "bar"
options.proxyOptions.proxyHost == "host"
options.proxyOptions.proxyPort == 4
options.stubsPerConsumer == true
options.consumerName == "consumer"
options.mappingsOutputFolder == "folder"
}
}