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

Fixed broken compilation

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-08-29 16:19:41 +02:00
parent 8bd931cb4f
commit d22b94ab83
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy
View File

@@ -1,6 +1,7 @@
package org.springframework.cloud.contract.verifier.builder.handlebars
import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WireMockHelpers
import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WiremockHelpers
import wiremock.com.github.jknack.handlebars.Helper
import wiremock.com.github.jknack.handlebars.Options
import com.github.tomakehurst.wiremock.extension.responsetemplating.RequestTemplateModel
@@ -35,7 +36,7 @@ class HandlebarsJsonPathHelper implements Helper<Map<String, Object>> {
}
throw new IllegalArgumentException("Unsupported model")
} else if (context instanceof String) {
Object value = WireMockHelpers.jsonPath.apply(context, options)
Object value = WiremockHelpers.jsonPath.apply(context, options)
if (testSideModel(options)) {
return processTestResponseValue(value)
}

9
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.groovy
View File

@@ -1,6 +1,7 @@
package org.springframework.cloud.contract.verifier.template
import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WireMockHelpers
import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.WiremockHelpers
import wiremock.com.github.jknack.handlebars.Handlebars
import wiremock.com.github.jknack.handlebars.Template
import groovy.transform.CompileStatic
@@ -72,10 +73,10 @@ class HandlebarsTemplateProcessor implements TemplateProcessor, ContractTemplate
try {
Handlebars handlebars = new Handlebars()
handlebars.registerHelper(HandlebarsJsonPathHelper.NAME, new HandlebarsJsonPathHelper())
handlebars.registerHelper(WireMockHelpers.jsonPath.name(), new HandlebarsJsonPathHelper())
WireMockHelpers.values()
.findAll { it != WireMockHelpers.jsonPath}
.each { WireMockHelpers helper ->
handlebars.registerHelper(WiremockHelpers.jsonPath.name(), new HandlebarsJsonPathHelper())
WiremockHelpers.values()
.findAll { it != WiremockHelpers.jsonPath}
.each { WiremockHelpers helper ->
handlebars.registerHelper(helper.name(), helper)
}
return handlebars.compileInline(content)