From 125b16edf65dc547f12c95d740a55da4b74715bb Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 22 Aug 2016 15:37:46 +0200 Subject: [PATCH] Added missing $ methods with the feature of passing only one side of the communication we've forgotten to add the $ version fixes #51 --- .../contract/spec/internal/Common.groovy | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy index 33332b29cc..c8704b79b0 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy @@ -76,28 +76,36 @@ class Common { return new NamedProperty(namedMap) } - DslProperty value(ClientDslProperty client, ServerDslProperty server) { - assertThatSidesMatch(client.clientValue, server.serverValue) - return new DslProperty(client.clientValue, server.serverValue) - } - - DslProperty value(ServerDslProperty server, ClientDslProperty client) { - assertThatSidesMatch(client.clientValue, server.serverValue) - return new DslProperty(client.clientValue, server.serverValue) - } - DslProperty value(DslProperty value) { return value } + DslProperty $(DslProperty value) { + return value + } + DslProperty value(Object value) { return new DslProperty(value) } + DslProperty $(Object value) { + return new DslProperty(value) + } + + DslProperty value(ClientDslProperty client, ServerDslProperty server) { + assertThatSidesMatch(client.clientValue, server.serverValue) + return new DslProperty(client.clientValue, server.serverValue) + } + DslProperty $(ClientDslProperty client, ServerDslProperty server) { return value(client, server) } + DslProperty value(ServerDslProperty server, ClientDslProperty client) { + assertThatSidesMatch(client.clientValue, server.serverValue) + return new DslProperty(client.clientValue, server.serverValue) + } + DslProperty $(ServerDslProperty server, ClientDslProperty client) { return value(server, client) }