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

Allows exposure of multiple versions via Stub Runner

Browse Source 
without this change for a single group and artifact id you can have only one entry in stub runner
with this change you can have multiple ones

fixes gh-474
This commit is contained in:
Marcin Grzejszczak
2018-03-19 14:45:09 +01:00
parent ed52de44ba
commit f433118a15
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ 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.spring.StubRunnerProperties;
import org.springframework.cloud.contract.stubrunner.util.StubsParser;
@@ -155,7 +154,7 @@ public class StubRunnerOptionsBuilder {
}
private Collection<StubConfiguration> buildDependencies() {
Set<StubConfiguration> stubConfigurations = StubsParser
List<StubConfiguration> stubConfigurations = StubsParser
.fromString(this.stubs, this.stubsClassifier);
this.stubConfigurations.addAll(stubConfigurations);
return this.stubConfigurations;
@@ -178,6 +177,7 @@ public class StubRunnerOptionsBuilder {
}
}
list.addAll(linkedList);
return list;
}
Collections.addAll(list, stubIdsToPortMapping);
return list;

8
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/util/StubsParser.java
View File

@@ -16,11 +16,11 @@
package org.springframework.cloud.contract.stubrunner.util;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.cloud.contract.stubrunner.StubConfiguration;
@@ -46,8 +46,8 @@ public class StubsParser {
*
* "a:b,c:d:e"
*/
public static Set<StubConfiguration> fromString(Collection<String> collection, String defaultClassifier) {
Set<StubConfiguration> stubs = new LinkedHashSet<>();
public static List<StubConfiguration> fromString(Collection<String> collection, String defaultClassifier) {
List<StubConfiguration> stubs = new ArrayList<>();
for (String config : collection) {
if (StringUtils.hasText(config)) {
stubs.add(StubSpecification.parse(config, defaultClassifier).stub);

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

@@ -38,6 +38,18 @@ class StubRunnerOptionsBuilderSpec extends Specification {
options.getDependencies().toString() == '[foo:bar:+:stubs]'
}
def shouldCreateDependenciesForStubWithSameGroupAndArtifactId() {
given:
builder.withStubs('foo:bar:1.0', 'foo:bar:2.0')
when:
StubRunnerOptions options = builder.build()
then:
options.getDependencies().toString() == '[foo:bar:1.0:stubs, foo:bar:2.0:stubs]'
}
def shouldCreateDependenciesForMultipleStubsWithSameGroup() {
given: