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

Fixed unnecessary file renaming for scenarios when converting to yaml; fixes gh-1132

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-07-08 17:06:24 +02:00
parent 89c213f593
commit a1f308b0cf
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
View File

@@ -34,8 +34,6 @@ import org.springframework.util.StringUtils
@Commons
class ContractVerifierDslConverter {
private static final String SCENARIO_MATCHER = '^[0-9].*$'
/**
* @deprecated - use {@link ContractVerifierDslConverter#convertAsCollection(java.io.File, java.lang.String)}
*/
@@ -136,7 +134,7 @@ class ContractVerifierDslConverter {
private static Collection<Contract> withName(File file, Collection<Contract> contracts) {
int counter = 0
return contracts.collect {
if (contractNameEmpty(it) && !relatedToScenarios(file, it)) {
if (contractNameEmpty(it)) {
it.name(NamesUtil.defaultContractName(file, contracts, counter))
}
counter++
@@ -147,8 +145,4 @@ class ContractVerifierDslConverter {
private static boolean contractNameEmpty(Contract it) {
return it != null && StringUtils.isEmpty(it.name)
}
private static boolean relatedToScenarios(File file, Contract contract) {
return contract.name?.matches(SCENARIO_MATCHER) || file.name.matches(SCENARIO_MATCHER)
}
}