From 167a5dbc1706dcf2807773944de4fbb3226668e9 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 28 Jun 2019 13:51:42 +0200 Subject: [PATCH 1/6] Bumped Camel to 2.24.0; fixes gh-1090 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ea94c40ac..78b082e046 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 5.12.1 - 2.22.1 + 2.24.0 2.17 3.5.13 0.0.9 From 0dbb331a1cb5dc932e04ba8b70ab8b45a52dd193 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 28 Jun 2019 14:08:32 +0200 Subject: [PATCH 2/6] Bumped activemq to 5.15.9; fixes gh-1089 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78b082e046..955bffd0fc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2016 - 5.12.1 + 5.15.9 2.24.0 2.17 3.5.13 From e0303fcec695f7c4a3c2db6fba7bcab4c9ebe8bc Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 28 Jun 2019 14:24:58 +0200 Subject: [PATCH 3/6] Bumped jgit to 5.3.1; fixes gh-1097 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 955bffd0fc..e59381dce0 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 0.2.2 1.6 4.1.2 - 5.1.3.201810200350-r + 5.3.1.201904271842-r 1 1.3.2 From ebd3037d6771de3debdfd948a2d4a7a8a2583d6f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 28 Jun 2019 14:25:41 +0200 Subject: [PATCH 4/6] Bumped groovy to 2.4.17; fixes gh-1096 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e59381dce0..548be38962 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 1.6.3 - 2.4.16 + 2.4.17 3.3.9 1.1.0 From 8fcb45441511e64d8f3b3a64dfd2babf5244af08 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 28 Jun 2019 14:39:29 +0200 Subject: [PATCH 5/6] Bumped moco; fixes gh-1117 --- tests/spring-cloud-contract-stub-runner-moco/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml index 77c47667a2..b0d977908d 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml @@ -30,7 +30,7 @@ com.github.dreamhead moco-runner - 0.11.0 + 0.11.1 org.springframework.cloud From 03ce42294c3326d2a1fe312248c125c46c228e37 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 8 Jul 2019 15:38:56 +0200 Subject: [PATCH 6/6] Ensures that execute(...) is resolved properly for YAML conversion; fixes gh-1129 --- .../verifier/converter/ContractsToYaml.groovy | 8 ++++++-- .../verifier/converter/YamlContractConverter.groovy | 3 ++- .../converter/DslToYamlContractConverterSpec.groovy | 12 +++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/ContractsToYaml.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/ContractsToYaml.groovy index e305f17710..6871327d74 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/ContractsToYaml.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/ContractsToYaml.groovy @@ -16,6 +16,7 @@ package org.springframework.cloud.contract.verifier.converter + import java.util.regex.Pattern import groovy.transform.CompileStatic @@ -41,7 +42,6 @@ import org.springframework.cloud.contract.verifier.util.MapConverter import static org.springframework.cloud.contract.verifier.util.ContentType.XML import static org.springframework.cloud.contract.verifier.util.ContentUtils.evaluateContentType - /** * @author Marcin Grzejszczak * @author Olga Maciaszek-Sharma @@ -141,7 +141,11 @@ class ContractsToYaml { request.urlPath = contract.request?.urlPath?.serverValue request.headers = (contract.request?.headers as Headers)?.asMap { String headerName, DslProperty prop -> - MapConverter.getTestSideValues(prop).toString() + def testSideValue = MapConverter.getTestSideValues(prop) + if (testSideValue instanceof ExecutionProperty) { + return MapConverter.getStubSideValuesForNonBody(prop).toString() + } + return testSideValue.toString() } request.cookies = (contract.request?.cookies as Cookies)?.asTestSideMap() Object body = contract.request?.body?.serverValue diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy index 9362ed127f..e2d814577f 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy @@ -25,7 +25,8 @@ import org.springframework.cloud.contract.spec.ContractConverter /** * Simple converter from and to a {@link YamlContract} to a collection of {@link Contract} * - * @since 1.2.1* @author Marcin Grzejszczak + * @since 1.2.1 + * @author Marcin Grzejszczak * @author Tim Ysewyn */ @CompileStatic diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/DslToYamlContractConverterSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/DslToYamlContractConverterSpec.groovy index f55846f899..cc1f702518 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/DslToYamlContractConverterSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/DslToYamlContractConverterSpec.groovy @@ -361,6 +361,7 @@ class DslToYamlContractConverterSpec extends Specification { ]) headers { // (5) contentType('application/json') + header(authorization(), $(c('Bearer SOMETOKEN'), p(execute('authToken()')))) } } response { // (6) @@ -384,7 +385,8 @@ class DslToYamlContractConverterSpec extends Specification { yamlContract.request.body["client.id"] =~ /[0-9]{10}/ yamlContract.request.body["loanAmount"] == 99999 yamlContract.request.headers == [ - "Content-Type": "application/json" + "Content-Type": "application/json", + "Authorization": 'Bearer SOMETOKEN' ] yamlContract.request.matchers.headers == [ new YamlContract.KeyValueMatcher( @@ -553,8 +555,8 @@ class DslToYamlContractConverterSpec extends Specification { yamlContract.request.method == 'GET' yamlContract.request.url == '/get' yamlContract.request.body.replaceAll("\n", "") - .replaceAll(' ', '') == xmlContractBody.replaceAll("\n", "") - .replaceAll(' ', '') + .replaceAll(' ', '') == xmlContractBody.replaceAll("\n", "") + .replaceAll(' ', '') yamlContract.request.headers == [ "Content-Type": "application/xml" ] @@ -566,8 +568,8 @@ class DslToYamlContractConverterSpec extends Specification { ] yamlContract.response.status == 200 yamlContract.response.body.replaceAll("\n", "") - .replaceAll(' ', '') == xmlContractBody.replaceAll("\n", "") - .replaceAll(' ', '') + .replaceAll(' ', '') == xmlContractBody.replaceAll("\n", "") + .replaceAll(' ', '') yamlContract.response.matchers.body == [ new YamlContract.BodyTestMatcher( path: '/test/duck/xxx',