From 8aca30f2747c0fd6d3d80268cb20ae4fd8e227e4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sat, 18 Apr 2015 08:44:24 +0200 Subject: [PATCH 1/2] [#51] Added wrapping of generated DSL with a factory method --- .../accurest/wiremock/WiremockToDslConverter.groovy | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy index d6da45bef5..925595b49c 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy @@ -139,14 +139,23 @@ class WiremockToDslConverter { if (!it.name.endsWith('json')) { return } - String wiremockStub = fromWiremockStub(it.text) + String dslFromWiremockStub = fromWiremockStub(it.text) + String dslWrappedWithFactoryMethod = wrapWithFactoryMethod(dslFromWiremockStub) File newGroovyFile = new File(it.parent, it.name.replaceAll('json', 'groovy')) println("Creating new groovy file [$newGroovyFile.path]") - newGroovyFile.text = wiremockStub + newGroovyFile.text = dslWrappedWithFactoryMethod } catch (Exception e) { System.err.println(e) } } } + + static String wrapWithFactoryMethod(String dslFromWiremockStub) { + return """\ +io.coderate.accurest.dsl.GroovyDsl.make { + $dslFromWiremockStub +} +""" + } } From 8113879dc03bc6294e1bd685df858f41b12e7d8d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sat, 18 Apr 2015 08:46:14 +0200 Subject: [PATCH 2/2] [#51] Made reference to the FQN of GroovyDsl --- .../codearte/accurest/wiremock/WiremockToDslConverter.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy index 925595b49c..bfc58cc17d 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy @@ -3,6 +3,7 @@ import groovy.io.FileType import groovy.json.JsonOutput import groovy.json.JsonSlurper import groovy.xml.XmlUtil +import io.codearte.accurest.dsl.GroovyDsl import static org.apache.commons.lang3.StringEscapeUtils.escapeJava @@ -153,7 +154,7 @@ class WiremockToDslConverter { static String wrapWithFactoryMethod(String dslFromWiremockStub) { return """\ -io.coderate.accurest.dsl.GroovyDsl.make { +${GroovyDsl.name}.make { $dslFromWiremockStub } """