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

Added regex helper method instead of calling static Pattern.compile

Browse Source
This commit is contained in:
Marcin Grzejszczak
2015-02-22 09:45:17 +01:00
parent 078774c517
commit 5506edb643
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WiremockToDslConverter.groovy
View File

@@ -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 {

6
accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Common.groovy
View File

@@ -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)
}