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

Throws exception when contract can't be serialized

Browse Source 
fixes gh-704
This commit is contained in:
Marcin Grzejszczak
2018-08-22 16:35:45 +02:00
parent 9ed08fb31b
commit 9eeb40e213
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/file/ContractFileScanner.groovy
View File

@@ -31,6 +31,7 @@ import java.nio.file.FileSystems
import java.nio.file.Path
import java.nio.file.PathMatcher
import java.util.regex.Pattern
/**
* Scans the provided file path for the DSLs. There's a possibility to provide
* inclusion and exclusion filters.
@@ -55,7 +56,7 @@ class ContractFileScanner {
private final Set<PathMatcher> includeMatchers
private final String includeMatcher
ContractFileScanner(File baseDir, Set<String> excluded, Set<String> ignored,
ContractFileScanner(File baseDir, Set<String> excluded, Set<String> ignored,
Set<String> included = [],
String includeMatcher = "") {
this.baseDir = baseDir
@@ -106,8 +107,8 @@ class ContractFileScanner {
boolean excluded = matchesPattern(file, excludeMatchers)
if (!excluded) {
boolean contractFile = isContractFile(file)
boolean included = includeMatcher ? file.absolutePath.matches(includeMatcher) : true
included = includeMatchers ? matchesPattern(file, includeMatchers) : included
boolean included = includeMatcher ? file.absolutePath.matches(includeMatcher) : true
included = includeMatchers ? matchesPattern(file, includeMatchers) : included
if (contractFile && included) {
addContractToTestGeneration(result, files, file, i, ContractVerifierDslConverter.convertAsCollection(baseDir, file))
} else if (!contractFile && included) {
@@ -131,7 +132,7 @@ class ContractFileScanner {
}
private void addContractToTestGeneration(List<ContractConverter> converters, ListMultimap<Path, ContractMetadata> result,
File[] files, File file, int index) {
File[] files, File file, int index) {
boolean converted = false
if (!file.isDirectory()) {
for (ContractConverter converter : converters) {
@@ -159,15 +160,12 @@ class ContractFileScanner {
try {
return converter.convertFrom(file)
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug("Exception occurred while trying to convert the file", e)
}
return null
throw new IllegalStateException("Failed to convert file [" + file + "]", e)
}
}
private void addContractToTestGeneration(ListMultimap<Path, ContractMetadata> result, File[] files, File file,
int index, Collection<Contract> convertedContract) {
int index, Collection<Contract> convertedContract) {
Path path = file.toPath()
Integer order = null
if (hasScenarioFilenamePattern(path)) {
@@ -202,7 +200,7 @@ class ContractFileScanner {
private boolean isContractFile(File file) {
return file.isFile() && getFilenameExtension(file.toString())?.equalsIgnoreCase("groovy")
}
private static String getFilenameExtension(String path) {
if (path == null) {
return null

8
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/file/ContractFileScannerSpec.groovy
View File

@@ -102,11 +102,11 @@ class ContractFileScannerSpec extends Specification {
}
}
when:
ListMultimap<Path, ContractMetadata> result = scanner.findContracts()
scanner.findContracts()
then:
result.keySet().size() == 1
result.entries().every { it.value.convertedContract }
result.entries().find { it.value.convertedContract.any { it.request.method.clientValue == "PUT" } }
IllegalStateException e = thrown(IllegalStateException)
e.cause.message == "boom"
e.message.matches(".*Failed to convert file .*invalid.json.*")
}
def "should prefer custom yaml converter over standard yaml converter"() {