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

Fix StackOverflow exception when stubTrigger runs contract with body based on json file (#1311)

Browse Source 
* Fix StackOverflow exception when stubTrigger runs contract with body based on json file

* Add test for extracting body value from json file

* Extract value from file to map only in case file content is String
This commit is contained in:
abialas
2020-01-24 09:49:15 +01:00
committed by Marcin Grzejszczak
parent f849dc40c9
commit d6098bbf2d
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractor.groovy
View File

@@ -24,6 +24,7 @@ import groovy.transform.CompileStatic
import org.springframework.cloud.contract.spec.internal.CanBeDynamic
import org.springframework.cloud.contract.spec.internal.DslProperty
import org.springframework.cloud.contract.spec.internal.FromFileProperty
import org.springframework.cloud.contract.spec.internal.RegexProperty
import static ContentUtils.extractValue
@@ -89,6 +90,9 @@ class BodyExtractor {
else if (bodyValue instanceof DslProperty) {
return extractClientValueFromBody(bodyValue.clientValue)
}
else if (bodyValue instanceof FromFileProperty && bodyValue.isString()) {
return MapConverter.transformValues(bodyValue.asString(), Closure.IDENTITY)
}
else {
return MapConverter.transformValues(bodyValue, {
Object prop = it instanceof DslProperty ? it.clientValue : it

19
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractorSpec.groovy Normal file
View File

@@ -0,0 +1,19 @@
package org.springframework.cloud.contract.verifier.util
import org.springframework.cloud.contract.spec.internal.FromFileProperty
import spock.lang.Specification
/**
* @author Adam Białas
*/
class BodyExtractorSpec extends Specification {
def "should extract body from json file"() {
given:
def uri = BodyExtractorSpec.getResource("/classpath/response.json").toURI()
def jsonFromFile = new FromFileProperty(new File(uri), String.class)
expect:
["status" : "RESPONSE"] == BodyExtractor.extractClientValueFromBody(jsonFromFile)
}
}