From d22b94ab8375ad1cc1c6728475749483bab16584 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 29 Aug 2018 16:19:41 +0200 Subject: [PATCH] Fixed broken compilation --- .../builder/handlebars/HandlebarsJsonPathHelper.groovy | 3 ++- .../verifier/template/HandlebarsTemplateProcessor.groovy | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy index dffc6c9f72..a8d4d0d9ec 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy @@ -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> { } 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) } diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.groovy index a2f4b4b533..dc7b1ae022 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.groovy @@ -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)