From 43eef1a1a8dcff20412cae2b14e60ad8129143f8 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 9 Oct 2017 18:22:19 +0200
Subject: [PATCH] Fixed quite a few tests

---
 .../wiremock/WireMockHttpServerStub.java      |   8 ++++----
 ...MultipleConsumers-0.0.1-SNAPSHOT-stubs.jar | Bin 3633 -> 3681 bytes
 .../wiremock/BaseWireMockStubStrategy.groovy  |  15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java
index 7146153c20..8413c934dd 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java
@@ -94,8 +94,8 @@ public class WireMockHttpServerStub implements HttpServerStub {
 	@Override
 	public HttpServerStub start() {
 		if (isRunning()) {
-			if (log.isDebugEnabled()) {
-				log.debug("The server is already running at port [" + port() + "]");
+			if (log.isTraceEnabled()) {
+				log.trace("The server is already running at port [" + port() + "]");
 			}
 			return this;
 		}
@@ -113,8 +113,8 @@ public class WireMockHttpServerStub implements HttpServerStub {
 	@Override
 	public HttpServerStub stop() {
 		if (!isRunning()) {
-			if (log.isDebugEnabled()) {
-				log.debug("Trying to stop a non started server!");
+			if (log.isTraceEnabled()) {
+				log.trace("Trying to stop a non started server!");
 			}
 			return this;
 		}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT-stubs.jar b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT-stubs.jar
index 73554a760b9826f3fefa11411160a3b7a5ac1285..b5a09c6c90c0f4b3a7d5777a9ece1091501589e7 100644
GIT binary patch
delta 763
zcmdle^H63(7o*^>iJsm(B2~es85kIJ7#SF>Cw`EayqAl2@&QJ<`t1vDM{WY*(h6<{
zMwahDX%-Qny3qcEs}30mxL$u5UNT)|i~NT&|H8#9q|22iElcKEJJY~(;-?q;XMfau
zk(AI@{p_BkO7wAubGNx)O5d5d>(&>GEn6Mud(57aYVh@w?cEagr}2tacOBxrnoK6x
zn|Iv(*))YaRdEi#bCOrOO3^hY$K4WB&n#M%656p+z+%an97VU>`E5!~{_G*2;uC#L
zZuGsHA)UAJ_EYY9uWdh12&t>BUl6_Ehe;K$m)^JEXKTLijy-wvd)QackBen&*-p&i
zTUhR<-d-nradp?tPXBpw0p83klN-1sHXmV9VG{fd42{nXKD*DtLSym<X4T1ZtaA0M
zfWc6NH7N3cLE&=#T=<hTcdefd_qbjy<=9c+tZ~ai`nuPLsBCwQRiED95K-B2Hsjv8
zcS5tRDz=^b!Xv&%h<~eG=Bq4UJ);*hlCFGx_EOIv;b(Y<V3dsaNeT5bUvCo=+rrCC
zr=236FQ1{ADR@(=x#w<Gm{IGhNui3<oGyq6Z$2z=;10K|gLwavC-svIF9w;f4i<{M
zw83AzZrUdGs++3kX8v(~G2!su7l~71<oRx2{g?e+*Z$t}RpDCpv%=5I3A5kp4|Cq~
zq>jllG_~xcy1qF$FcNtrCfBoxO`glczuA**4>K=H5}7Q-6)Ffy7bt0Bas`(T^8qG?
z$&QT5llQapO}@e9!MJv^B6m77CkseaY_cp5@8osd7K#`_%pd^_Yz78k;$moM{03L8
zEeHy7R9hl>beJsICM$4)T<6a;8N&R)#yeS%*NN#JjH@`ghu48=13Oe9FVICIlUe!H
K*ortnHUR)*Whhqw

delta 653
zcmaDTvr%S47b7ok(GsuvxS+3_8Gv9iFRRStw_LoF4=~Er&y?nltOw%K3T_5QmKV$n
z3}7PE?=)YNfq>2Q^$)I1(vW}P+oR4Lvq#dIYt2-VT`AE?9S`s41`6Be7)`Exqp<Qy
z-xbMHWy=H1p38mvgJ+v%$ecV@DLL!Qht%dP0`|(+PD}loA-tp0Csg^>tF|Znl}D_M
z{q%OsSnQ|it&p)fvOvG9MO`pjscrJ-c`|FJX6dGg^;j={kgs|pqW7(io*YZZt`FSh
zg)4skJi6{+CHqaLn_FKvvz$NmX^ZZ+pA+-{1uJfBkvz@4`2dpx6Yra<IbJ8U8#Zl)
zdewchB(r#ZXx~AQe_YN#)!wmH?G$^3@Z*yV;`zrWFnO!C>fM|sk@TZH`ie`w^-S~4
z%}a!=gVIC1iyGJ``Mr``uD0@`#iXsD&90pMxSDOHVx8NX>7ri@)eD4YZgRSk+8q)$
zsRHbwfHQ&1MFdP<>g+H-+Lo`h&4ow(`Ai<Lf2_oMb}x94ub!~xP?}hHeT#7EJMnkP
z_muwqN!spk&(X}GO!pVZ!OM#*-hXl~dvyDMh=)$%u}@3^-pnkMC-O*4Ue6{r`796r
z=1R6b%xID6#1+a6jKs+sImIRm@UTtZ#wEwRf{9_WBct*pW}pza1LM@mf!yhgAAzLm
z<a^u}iYP(E$iQIDAOQ+21|XB6q46FINVC}F2h6;aqj=;df9IA2x<Q4BgKcsE(2lb_
s{!GabrUE<fWJg{nrhPE3;^aNN4onT~P=&mcnE58_^XafTae#~m0L!-c(EtDd

diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy
index d7aecf5570..aaa49b7261 100755
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy
@@ -96,9 +96,7 @@ abstract class BaseWireMockStubStrategy {
 	 */
 	String parseBody(Map map, ContentType contentType) {
 		def transformedMap = MapConverter.getStubSideValues(map)
-		String responseSideBody = toJson(MapConverter.getTestSideValues(contract.request.body))
-		DocumentContext context = JsonPath.parse(responseSideBody)
-		transformedMap = processEntriesForTemplating(transformedMap, context)
+		transformedMap = transformMapIfRequestPresent(transformedMap)
 		String json = toJson(transformedMap)
 		// the space is important cause at the end of the json body you also have a }
 		// you can't have 4 } next to each other
@@ -106,6 +104,17 @@ abstract class BaseWireMockStubStrategy {
 		return parseBody(unquotedJson, contentType)
 	}
 
+	private Object transformMapIfRequestPresent(Object transformedMap) {
+		def requestBody = contract.request.body
+		if (requestBody == null) {
+			return transformedMap
+		}
+		String testSideBody = toJson(
+				MapConverter.getTestSideValues(requestBody))
+		DocumentContext context = JsonPath.parse(testSideBody)
+		return processEntriesForTemplating(transformedMap, context)
+	}
+
 	private Object processEntriesForTemplating(transformedMap, DocumentContext context) {
 		return transformValues(transformedMap, {
 			if (it instanceof String && processor.containsJsonPathTemplateEntry(it)) {