From 4a127e7785f8b0cf3528a267697e70158b450131 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 15 Jan 2019 17:36:25 +0100
Subject: [PATCH] Removed unnecessary duplicated call to rest doc's document
 method; fixes gh-816

---
 .../test/java/com/example/fraud/StubGeneratorTests.java  | 7 +++++--
 .../wiremock/restdocs/ContractExchangeHandler.java       | 9 ++++-----
 .../wiremock/restdocs/ContractResultHandler.java         | 2 --
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/samples/standalone/webclient/http-server/src/test/java/com/example/fraud/StubGeneratorTests.java b/samples/standalone/webclient/http-server/src/test/java/com/example/fraud/StubGeneratorTests.java
index 01367f7c04..57debe95cc 100644
--- a/samples/standalone/webclient/http-server/src/test/java/com/example/fraud/StubGeneratorTests.java
+++ b/samples/standalone/webclient/http-server/src/test/java/com/example/fraud/StubGeneratorTests.java
@@ -16,6 +16,7 @@ import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWeb
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.json.JacksonTester;
 import org.springframework.http.MediaType;
+import org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -54,7 +55,8 @@ public class StubGeneratorTests {
 				.consumeWith(verify().jsonPath("$.clientId")
 						.jsonPath("$[?(@.loanAmount > 1000)]")
 						.contentType(MediaType.valueOf("application/vnd.fraud.v1+json"))
-						.stub("markClientAsFraud"));
+						.stub("markClientAsFraud"))
+				.consumeWith(WebTestClientRestDocumentation.document("markClientAsFraud"));
 	}
 
 	@Test
@@ -70,7 +72,8 @@ public class StubGeneratorTests {
 				.consumeWith(verify().jsonPath("$.clientId")
 						.jsonPath("$[?(@.loanAmount <= 1000)]")
 						.contentType(MediaType.valueOf("application/vnd.fraud.v1+json"))
-						.stub("markClientAsNotFraud"));
+						.stub("markClientAsNotFraud"))
+				.consumeWith(WebTestClientRestDocumentation.document("markClientAsNotFraud"));
 	}
 
 }
\ No newline at end of file
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 6274cd5edb..62d8b0a489 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
@@ -35,10 +35,13 @@ import com.github.tomakehurst.wiremock.http.HttpHeader;
 import com.github.tomakehurst.wiremock.http.QueryParameter;
 import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.RequestMethod;
+import wiremock.com.google.common.base.Optional;
+import wiremock.org.apache.commons.codec.binary.Base64;
+import wiremock.org.eclipse.jetty.server.handler.ContextHandler;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation;
 import org.springframework.restdocs.webtestclient.WebTestClientRestDocumentationConfigurer;
 import org.springframework.test.web.reactive.server.EntityExchangeResult;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -46,9 +49,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
-import wiremock.com.google.common.base.Optional;
-import wiremock.org.apache.commons.codec.binary.Base64;
-import wiremock.org.eclipse.jetty.server.handler.ContextHandler;
 
 /**
  * @author Dave Syer
@@ -61,7 +61,6 @@ public class ContractExchangeHandler
 	@Override
 	public void accept(EntityExchangeResult<byte[]> result) {
 		configure(result);
-		WebTestClientRestDocumentation.document(getName()).accept(result);
 	}
 
 	@Override
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
index 5245c4d671..4de99ead8e 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
@@ -55,7 +55,6 @@ import wiremock.org.eclipse.jetty.util.MultiPartInputStreamParser;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultHandler;
 
@@ -79,7 +78,6 @@ public class ContractResultHandler extends
 	@Override
 	public void handle(MvcResult result) throws Exception {
 		configure(result);
-		MockMvcRestDocumentation.document(getName()).handle(result);
 	}
 
 	@Override