From 0097b6db6eac274391b2322740ea1c5c8254a3d3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 13 Nov 2017 10:16:29 +0100 Subject: [PATCH 1/2] Filters headers from response for Groovy DSL creation from rest docs; fixes #455 --- .../cloud/contract/wiremock/restdocs/ContractDslSnippet.java | 5 +++-- .../contract/wiremock/restdocs/ContractDslSnippetTests.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippet.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippet.java index c0a4036841..f9fee052f8 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippet.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippet.java @@ -73,9 +73,10 @@ public class ContractDslSnippet extends TemplatedSnippet { model.put("response_status", response.getStatus().value()); model.put("response_body_present", response.getContent().length > 0); model.put("response_body", response.getContentAsString()); - HttpHeaders headers = response.getHeaders(); + Map headers = response.getHeaders().toSingleValueMap(); + filterHeaders(headers); model.put("response_headers_present", !headers.isEmpty()); - model.put("response_headers", headers.toSingleValueMap().entrySet()); + model.put("response_headers", headers.entrySet()); @SuppressWarnings("unchecked") Set jsonPaths = (Set) operation.getAttributes() .get("contract.jsonPaths"); model.put("response_json_paths_present", jsonPaths != null && !jsonPaths.isEmpty()); diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippetTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippetTests.java index 0006f6c5b5..1f223f94bd 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippetTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippetTests.java @@ -87,6 +87,8 @@ public class ContractDslSnippetTests { then(parsedContract.getRequest().getHeaders().getEntries()).isNotNull(); then(headerNames(parsedContract.getRequest().getHeaders().getEntries())).doesNotContain (HttpHeaders.HOST, HttpHeaders.CONTENT_LENGTH); + then(headerNames(parsedContract.getResponse().getHeaders().getEntries())).doesNotContain + (HttpHeaders.HOST, HttpHeaders.CONTENT_LENGTH); then(parsedContract.getRequest().getMethod().getClientValue()).isNotNull(); then(parsedContract.getRequest().getUrl().getClientValue()).isNotNull(); then(parsedContract.getRequest().getUrl().getClientValue().toString()).startsWith("/"); From 1460606ba5c85af0295993e8b2f857a576487316 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 13 Nov 2017 10:18:24 +0100 Subject: [PATCH 2/2] Bumped WireMock to 2.11.0; fixes #454 --- spring-cloud-contract-dependencies/pom.xml | 2 +- .../test/resources/functionalTest/bootSimple/gradle.properties | 2 +- .../functionalTest/sampleJerseyProject/gradle.properties | 2 +- .../resources/functionalTest/sampleProject/gradle.properties | 2 +- .../resources/functionalTest/scenarioProject/gradle.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 109ac43a60..e0e785dd11 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -14,7 +14,7 @@ spring-cloud-contract-dependencies Spring Cloud Contract Dependencies - 2.10.0 + 2.11.0 0.4.10 1.0.2.v20150114 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties index c7e131c3d2..fdd9021844 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.10.0 +wiremockVersion=2.11.0 jsonAssertVersion=0.4.10 verifierVersion=1.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties index 1e6908cc6e..b476b08756 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.10.0 +wiremockVersion=2.11.0 jsonAssertVersion=0.4.10 verifierVersion=1.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties index bd7546d4ef..ce8c34d94b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.10.0 +wiremockVersion=2.11.0 jsonAssertVersion=0.4.10 verifierVersion=1.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties index c7e131c3d2..fdd9021844 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.10.0 +wiremockVersion=2.11.0 jsonAssertVersion=0.4.10 verifierVersion=1.2.0.BUILD-SNAPSHOT