From 5506edb6434fb723e72e456951f1d22159bcb5d1 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sun, 22 Feb 2015 09:45:17 +0100 Subject: [PATCH] Added regex helper method instead of calling static Pattern.compile --- .../accurest/wiremock/WiremockToDslConverter.groovy | 2 +- .../groovy/io/coderate/accurest/dsl/internal/Common.groovy | 6 ++++++ 2 files changed, 7 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 55b06753dd..7cc47e2bf8 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 @@ -20,7 +20,7 @@ class WiremockToDslConverter { request { ${request.method ? "method \"\"\"$request.method\"\"\"" : ""} ${request.url ? "url \"\"\"$request.url\"\"\"" : ""} - ${request.urlPattern ? "url \$(client(java.util.regex.Pattern.compile('${escapeJava(request.urlPattern)}')), server(''))" : ""} + ${request.urlPattern ? "url \$(client(regex('${escapeJava(request.urlPattern)}')), server(''))" : ""} ${request.urlPath ? "url \"\"\"$request.urlPath\"\"\"" : ""} ${ request.headers ? """headers { diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy index 9d613c2ef6..934f98c2f5 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy @@ -3,6 +3,8 @@ package io.coderate.accurest.dsl.internal import groovy.transform.PackageScope import groovy.transform.TypeChecked +import java.util.regex.Pattern + /** * @TypeChecked instead of @CompileStatic due to usage of double dispatch. * Double dispatch doesn't work if you're using @CompileStatic @@ -60,6 +62,10 @@ class Common { return value(server, client) } + Pattern regex(String regex) { + return Pattern.compile(regex) + } + ClientDslProperty client(Object clientValue) { return new ClientDslProperty(clientValue) }