From 4f652ad1e6d9e2f29e8443daab587b0fadcbb831 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 5 Aug 2019 21:32:15 +0200
Subject: [PATCH] Sets a defaultInstance for WireMock server

without this change we're not resetting default instances upon test finish
with this change we're resetting the default intance and setting it once more upon configuration startup

fixes gh-1081
---
 .../cloud/contract/wiremock/WireMockConfiguration.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
index d2cf3f7229..86229cc907 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
@@ -119,6 +119,9 @@ public class WireMockConfiguration implements SmartLifecycle {
 		if (!this.beanFactory.containsBean(WIREMOCK_SERVER_BEAN_NAME)) {
 			this.beanFactory.registerSingleton(WIREMOCK_SERVER_BEAN_NAME, this.server);
 		}
+		if (isRunning()) {
+			updateCurrentServer();
+		}
 	}
 
 	private void logRegisteredMappings() {
@@ -130,6 +133,7 @@ public class WireMockConfiguration implements SmartLifecycle {
 
 	void resetMappings() {
 		this.server.resetAll();
+		WireMock.reset();
 		logRegisteredMappings();
 	}