From ca7ce7522c738f82fc47b854dbde0b0b19331bca Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 29 May 2018 17:08:39 +0200 Subject: [PATCH] Bumped WireMock to 2.18.0; fixes gh-659 --- spring-cloud-contract-dependencies/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../sampleJerseyProject/gradle.properties | 2 +- .../functionalTest/sampleProject/gradle.properties | 2 +- .../scenarioProject/gradle.properties | 2 +- .../wiremock/restdocs/BasicMappingBuilder.java | 13 +++++++++++++ .../wiremock/restdocs/ContractExchangeHandler.java | 12 ++++++++++++ 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index c4d2312890..fe614fb362 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.17.0 + 2.18.0 0.4.12 1.0.2.v20150114 3.0.7 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 60b93febf8..3643670a05 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.17.0 +wiremockVersion=2.18.0 jsonAssertVersion=0.4.12 verifierVersion=2.0.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 c98aae7429..1ae8b4638b 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.17.0 +wiremockVersion=2.18.0 jsonAssertVersion=0.4.12 verifierVersion=2.0.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 2ccc777609..1f273d5c74 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.17.0 +wiremockVersion=2.18.0 jsonAssertVersion=0.4.12 verifierVersion=2.0.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 60b93febf8..3643670a05 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.17.0 +wiremockVersion=2.18.0 jsonAssertVersion=0.4.12 verifierVersion=2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java index a9ebaa1db5..92ced4f27a 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/BasicMappingBuilder.java @@ -7,6 +7,7 @@ import java.util.UUID; import com.github.tomakehurst.wiremock.client.BasicCredentials; import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; import com.github.tomakehurst.wiremock.client.ScenarioMappingBuilder; +import com.github.tomakehurst.wiremock.common.Metadata; import com.github.tomakehurst.wiremock.extension.Parameters; import com.github.tomakehurst.wiremock.http.Request; import com.github.tomakehurst.wiremock.http.RequestMethod; @@ -142,6 +143,18 @@ class BasicMappingBuilder implements ScenarioMappingBuilder { return this; } + @Override public ScenarioMappingBuilder withMetadata(Map map) { + throw new UnsupportedOperationException("Metadata not supported"); + } + + @Override public ScenarioMappingBuilder withMetadata(Metadata metadata) { + throw new UnsupportedOperationException("Metadata not supported"); + } + + @Override public ScenarioMappingBuilder withMetadata(Metadata.Builder builder) { + throw new UnsupportedOperationException("Metadata not supported"); + } + @Override public StubMapping build() { if (this.scenarioName == null && (this.requiredScenarioState != null || this.newScenarioState != null)) { diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java index 6e84cd2077..f1dc5e56f3 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractExchangeHandler.java @@ -131,6 +131,18 @@ class WireMockHttpRequestAdapter implements Request { return new RequestMethod(this.result.getMethod().name()); } + @Override public String getScheme() { + return this.result.getUrl().getScheme(); + } + + @Override public String getHost() { + return this.result.getUrl().getHost(); + } + + @Override public int getPort() { + return this.result.getUrl().getPort(); + } + @Override public String getClientIp() { return "127.0.0.1"; }