From 9aa1eab48368af63b325a5bf73efc322f75dc793 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Sat, 31 Mar 2018 18:43:39 +0200
Subject: [PATCH] Bumped wiremock to 2.16.0; fixes gh-600

---
 spring-cloud-contract-dependencies/pom.xml                | 2 +-
 .../cloud/contract/wiremock/file/ResourcesFileSource.java | 2 +-
 .../contract/wiremock/restdocs/BasicMappingBuilder.java   | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index 97d7b7d8ac..438fe30744 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -14,7 +14,7 @@
 	<name>spring-cloud-contract-dependencies</name>
 	<description>Spring Cloud Contract Dependencies</description>
 	<properties>
-		<wiremock.version>2.15.0</wiremock.version>
+		<wiremock.version>2.16.0</wiremock.version>
 		<jsonassert.version>0.4.11</jsonassert.version>
 		<aether.version>1.0.2.v20150114</aether.version>
 		<rest-assured.version>3.0.7</rest-assured.version>
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java
index 52b3a709fb..174b1caab1 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/file/ResourcesFileSource.java
@@ -71,7 +71,7 @@ public class ResourcesFileSource implements FileSource {
 	public BinaryFile getBinaryFileNamed(String name) {
 		for (FileSource resource : this.sources) {
 			try {
-				UrlResource uri = new UrlResource(resource.getBinaryFileNamed(name).getUri());
+				UrlResource uri = new UrlResource(resource.getUri());
 				if (uri.exists()) {
 					return resource.getBinaryFileNamed(name);
 				}
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 7d9a176813..a9ebaa1db5 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
@@ -77,6 +77,14 @@ class BasicMappingBuilder implements ScenarioMappingBuilder {
 		return this;
 	}
 
+	@Override public ScenarioMappingBuilder withQueryParams(
+			Map<String, StringValuePattern> queryParams) {
+		for (Map.Entry<String, StringValuePattern> entry : queryParams.entrySet()) {
+			this.requestPatternBuilder.withQueryParam(entry.getKey(), entry.getValue());
+		}
+		return this;
+	}
+
 	@Override public ScenarioMappingBuilder withRequestBody(
 			ContentPattern<?> bodyPattern) {
 		this.requestPatternBuilder.withRequestBody(bodyPattern);