From 9f96bb87d99ca9a61d9c5d1fecba40946dccc796 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Mon, 11 Apr 2022 14:13:37 +0200
Subject: [PATCH] Upgraded WireMock to 2.33.0; fixes gh-1771

---
 spring-cloud-contract-dependencies/pom.xml         |  2 +-
 .../wiremock/TestWireMockExtensions.groovy         |  1 -
 .../wiremock/DefaultWireMockStubPostProcessor.java | 14 ++++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index 697604b9e8..72736d94b5 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -15,7 +15,7 @@
 	<name>spring-cloud-contract-dependencies</name>
 	<description>Spring Cloud Contract Dependencies</description>
 	<properties>
-		<wiremock.version>2.31.0</wiremock.version>
+		<wiremock.version>2.33.0</wiremock.version>
 		<jsonassert.version>0.6.1</jsonassert.version>
 	</properties>
 	<dependencyManagement>
diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy
index bb69a4b1fc..346f457730 100644
--- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy
+++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy
@@ -24,7 +24,6 @@ import com.github.tomakehurst.wiremock.http.ChunkedDribbleDelay
 import com.github.tomakehurst.wiremock.http.HttpHeader
 import com.github.tomakehurst.wiremock.http.Request
 import com.github.tomakehurst.wiremock.http.Response
-import wiremock.org.apache.http.HttpHeaders
 
 import org.springframework.cloud.contract.verifier.dsl.wiremock.DefaultResponseTransformer
 import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockExtensions
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessor.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessor.java
index 6126e7fcf0..c7a646d4c9 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessor.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessor.java
@@ -66,7 +66,7 @@ class DefaultWireMockStubPostProcessor implements WireMockStubPostProcessor {
 	}
 
 	public ResponseDefinition mergedResponse(StubMapping stubMapping, StubMapping stubMappingFromMetadata) {
-		ResponseDefinition responseDefinition = new ResponseDefinition(stubMapping.getResponse().getStatus(),
+		return new ResponseDefinition(stubMapping.getResponse().getStatus(),
 				stubMapping.getResponse().getStatusMessage(), stubMapping.getResponse().getBody(),
 				stubMapping.getResponse().getJsonBody(), stubMapping.getResponse().getBase64Body(),
 				stubMapping.getResponse().getBodyFileName(), stubMapping.getResponse().getHeaders(),
@@ -74,11 +74,11 @@ class DefaultWireMockStubPostProcessor implements WireMockStubPostProcessor {
 				fixedDelayMilliseconds(stubMapping, stubMappingFromMetadata),
 				delayDistribution(stubMapping, stubMappingFromMetadata),
 				chunkedDribbleDelay(stubMapping, stubMappingFromMetadata),
-				proxyBaseUrl(stubMapping, stubMappingFromMetadata), fault(stubMapping, stubMappingFromMetadata),
-				transformers(stubMapping, stubMappingFromMetadata),
+				proxyBaseUrl(stubMapping, stubMappingFromMetadata),
+				proxyUrlPrefixToRemove(stubMapping, stubMappingFromMetadata),
+				fault(stubMapping, stubMappingFromMetadata), transformers(stubMapping, stubMappingFromMetadata),
 				transformerParameters(stubMapping, stubMappingFromMetadata),
 				wasConfigured(stubMapping, stubMappingFromMetadata));
-		return responseDefinition;
 	}
 
 	public Boolean wasConfigured(StubMapping stubMapping, StubMapping stubMappingFromMetadata) {
@@ -108,6 +108,12 @@ class DefaultWireMockStubPostProcessor implements WireMockStubPostProcessor {
 				? stubMappingFromMetadata.getResponse().getProxyBaseUrl() : stubMapping.getResponse().getProxyBaseUrl();
 	}
 
+	public String proxyUrlPrefixToRemove(StubMapping stubMapping, StubMapping stubMappingFromMetadata) {
+		return stubMappingFromMetadata.getResponse().getProxyUrlPrefixToRemove() != null
+				? stubMappingFromMetadata.getResponse().getProxyUrlPrefixToRemove()
+				: stubMapping.getResponse().getProxyUrlPrefixToRemove();
+	}
+
 	public ChunkedDribbleDelay chunkedDribbleDelay(StubMapping stubMapping, StubMapping stubMappingFromMetadata) {
 		return stubMappingFromMetadata.getResponse().getChunkedDribbleDelay() != null
 				? stubMappingFromMetadata.getResponse().getChunkedDribbleDelay()