Support pattern properties in messaging contracts (#564)

spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Input.groovy

@@ -35,6 +35,8 @@ import java.util.regex.Pattern
 @ToString(includePackage = false, includeNames = true)
 class Input extends Common {
 
+	@Delegate ClientPatternValueDslProperty property = new ClientPatternValueDslProperty()
+
 	DslProperty<String> messageFrom
 	ExecutionProperty triggeredBy
 	Headers messageHeaders = new Headers()
@@ -111,6 +113,17 @@ class Input extends Common {
 		closure.delegate = this.matchers
 		closure()
 	}
+
+	@CompileStatic
+	@EqualsAndHashCode(includeFields = true)
+	@ToString(includePackage = false)
+	private class ClientPatternValueDslProperty extends PatternValueDslProperty<ClientDslProperty> {
+
+		@Override
+		protected ClientDslProperty createProperty(Pattern pattern, Object generatedValue) {
+			return new ClientDslProperty(pattern, generatedValue)
+		}
+	}
 }
 
 

spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OutputMessage.groovy

@@ -29,6 +29,8 @@ import java.util.regex.Pattern
 @ToString(includePackage = false, includeNames = true)
 class OutputMessage extends Common {
 
+	@Delegate ServerPatternValueDslProperty property = new ServerPatternValueDslProperty()
+
 	DslProperty<String> sentTo
 	Headers headers
 	DslProperty body
@@ -82,6 +84,17 @@ class OutputMessage extends Common {
 		closure.delegate = this.matchers
 		closure()
 	}
+
+	@CompileStatic
+	@EqualsAndHashCode(includeFields = true)
+	@ToString(includePackage = false)
+	private class ServerPatternValueDslProperty extends PatternValueDslProperty<ServerDslProperty> {
+
+		@Override
+		protected ServerDslProperty createProperty(Pattern pattern, Object generatedValue) {
+			return new ServerDslProperty(pattern, generatedValue)
+		}
+	}
 }
 
 @CompileStatic

spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ContractSpec.groovy

@@ -66,6 +66,36 @@ class ContractSpec extends Specification {
 			noExceptionThrown()
 	}
 
+	def 'should work for messaging with pattern properties'() {
+		when:
+			Contract.make {
+				input {
+					messageFrom('input')
+					messageBody([
+							foo: anyNonBlankString()
+					])
+					messageHeaders {
+						header([
+								foo: anyNumber()
+						])
+					}
+				}
+				outputMessage {
+					sentTo('output')
+					body([
+							foo2: anyNonEmptyString()
+					])
+					headers {
+						header([
+								foo2: anyIpAddress()
+						])
+					}
+				}
+			}
+		then:
+			noExceptionThrown()
+	}
+
 	def 'should generate a value if only regex is passed for client'() {
 		given:
 			Request request = new Request()