From 17bc150dba4e2f8c1cc266439cce048cc1205aab Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Fri, 23 Sep 2022 10:42:53 +0200
Subject: [PATCH] Fixed missing imports

---
 spring-cloud-contract-wiremock/pom.xml          |  4 ++--
 .../WireMockRestAssuredConfiguration.java       | 17 +++++++++--------
 .../main/resources/META-INF/spring.factories    |  5 -----
 ...igure.restdocs.AutoConfigureRestDocs.imports |  3 +++
 4 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 spring-cloud-contract-wiremock/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs.imports

diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml
index ada8352823..212b14526d 100644
--- a/spring-cloud-contract-wiremock/pom.xml
+++ b/spring-cloud-contract-wiremock/pom.xml
@@ -61,11 +61,11 @@
 			<artifactId>spring-restdocs-webtestclient</artifactId>
 			<optional>true</optional>
 		</dependency>
-	<!--	<dependency>
+		<dependency>
 			<groupId>org.springframework.restdocs</groupId>
 			<artifactId>spring-restdocs-restassured</artifactId>
 			<optional>true</optional>
-		</dependency>-->
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestAssuredConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestAssuredConfiguration.java
index f56c0fe678..f82b6ec024 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestAssuredConfiguration.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestAssuredConfiguration.java
@@ -16,7 +16,10 @@
 
 package org.springframework.cloud.contract.wiremock.restdocs;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.test.autoconfigure.restdocs.RestDocsRestAssuredConfigurationCustomizer;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.restdocs.restassured.RestAssuredRestDocumentationConfigurer;
 
 /**
  * Custom configuration for Spring RestDocs that adds a WireMock snippet (for generating
@@ -31,14 +34,12 @@ import org.springframework.context.annotation.Configuration;
  * stub behaviour
  */
 @Configuration(proxyBeanMethods = false)
-// @ConditionalOnClass(RestAssuredRestDocumentationConfigurer.class)
-// public class WireMockRestAssuredConfiguration implements
-// RestDocsRestAssuredConfigurationCustomizer {
-public class WireMockRestAssuredConfiguration {
+@ConditionalOnClass(RestAssuredRestDocumentationConfigurer.class)
+public class WireMockRestAssuredConfiguration implements RestDocsRestAssuredConfigurationCustomizer {
 
-	// @Override
-	// public void customize(RestAssuredRestDocumentationConfigurer configurer) {
-	// configurer.snippets().withAdditionalDefaults(new WireMockSnippet());
-	// }
+	@Override
+	public void customize(RestAssuredRestDocumentationConfigurer configurer) {
+		configurer.snippets().withAdditionalDefaults(new WireMockSnippet());
+	}
 
 }
diff --git a/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring.factories
index 3547d7954f..a55333b024 100644
--- a/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring.factories
@@ -1,11 +1,6 @@
 # Application Listeners
 org.springframework.context.ApplicationListener=\
 org.springframework.cloud.contract.wiremock.WireMockApplicationListener
-# RestDocs Auto Configuration
-org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs=\
-org.springframework.cloud.contract.wiremock.restdocs.WireMockRestDocsConfiguration,\
-org.springframework.cloud.contract.wiremock.restdocs.WireMockWebTestClientConfiguration,\
-org.springframework.cloud.contract.wiremock.restdocs.WireMockRestAssuredConfiguration
 # Test Execution Listeners
 org.springframework.test.context.TestExecutionListener=\
 org.springframework.cloud.contract.wiremock.WireMockTestExecutionListener
diff --git a/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs.imports b/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs.imports
new file mode 100644
index 0000000000..c0d7a1e9c7
--- /dev/null
+++ b/spring-cloud-contract-wiremock/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs.imports
@@ -0,0 +1,3 @@
+org.springframework.cloud.contract.wiremock.restdocs.WireMockRestDocsConfiguration
+org.springframework.cloud.contract.wiremock.restdocs.WireMockWebTestClientConfiguration
+org.springframework.cloud.contract.wiremock.restdocs.WireMockRestAssuredConfiguration