Fix YamlToContracts implementation. Fix exception handling.

Signed-off-by: Olga Maciaszek-Sharma <[email protected]>

Author: OlgaMaciaszek

docs/pom.xml

@@ -113,10 +113,14 @@
 									<goal>exec</goal>
 								</goals>
 								<configuration>
-									<workingDirectory>${maven.multiModuleProjectDirectory}/docker/spring-cloud-contract-docker</workingDirectory>
+									<workingDirectory>
+										${maven.multiModuleProjectDirectory}/docker/spring-cloud-contract-docker
+									</workingDirectory>
 									<executable>./build_adocs.sh</executable>
 									<arguments>
-										<argument>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</argument>
+										<argument>
+											${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/
+										</argument>
 									</arguments>
 								</configuration>
 							</execution>
@@ -127,9 +131,13 @@
 									<goal>java</goal>
 								</goals>
 								<configuration>
-									<mainClass>org.springframework.cloud.contract.docs.Main</mainClass>
+									<mainClass>
+										org.springframework.cloud.contract.docs.Main
+									</mainClass>
 									<arguments>
-										<argument>${maven.multiModuleProjectDirectory}/docs</argument>
+										<argument>
+											${maven.multiModuleProjectDirectory}/docs
+										</argument>
 									</arguments>
 								</configuration>
 							</execution>
@@ -185,11 +193,13 @@
 					<groupId>org.springframework.amqp</groupId>
 					<artifactId>spring-amqp</artifactId>
 				</dependency>
+				<!-- TODO: remove when replacements with Jackson 3 integration become available -->
 				<dependency>
 					<groupId>com.fasterxml.jackson.module</groupId>
 					<artifactId>jackson-module-jsonSchema</artifactId>
 					<version>${jackson-module-jsonSchema.version}</version>
 				</dependency>
+				<!-- TODO: switch to Jackson 3 when jsonSchema replacements with Jackson 3 integration become available -->
 				<dependency>
 					<groupId>com.fasterxml.jackson.dataformat</groupId>
 					<artifactId>jackson-dataformat-yaml</artifactId>

spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessor.java

@@ -28,6 +28,7 @@
 import com.github.tomakehurst.wiremock.http.Fault;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
+import tools.jackson.core.JacksonException;
 import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.cloud.contract.spec.Contract;
@@ -145,7 +146,12 @@ else if (wiremock instanceof StubMapping) {
 			return (StubMapping) wiremock;
 		}
 		else if (wiremock instanceof Map) {
-			return StubMapping.buildFrom(this.objectMapper.writeValueAsString(wiremock));
+			try {
+				return StubMapping.buildFrom(this.objectMapper.writeValueAsString(wiremock));
+			}
+			catch (JacksonException e) {
+				throw new IllegalStateException("Failed to build StubMapping for map [" + wiremock + "]", e);
+			}
 		}
 		throw new UnsupportedOperationException("Unsupported type for wiremock metadata extension");
 	}

spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverter.java

@@ -119,7 +119,7 @@ private String buildRequestMethod(JsonNode wireMockStub) {
 		String requestMethod = "";
 		JsonNode requestMethodNode = wireMockStub.at(REQUEST_METHOD_POINTER);
 		if (requestMethodNode != null) {
-			requestMethod = "method '" + requestMethodNode.asText() + "'\n";
+			requestMethod = "method '" + requestMethodNode.asString() + "'\n";
 		}
 		return requestMethod;
 	}
@@ -128,7 +128,7 @@ private String buildRequestUrl(JsonNode wireMockStub) {
 		String requestUrl = "";
 		JsonNode requestUrlNode = wireMockStub.at(REQUEST_URL_POINTER);
 		if (!requestUrlNode.isMissingNode()) {
-			requestUrl = "url '" + requestUrlNode.asText() + "'\n";
+			requestUrl = "url '" + requestUrlNode.asString() + "'\n";
 		}
 		return requestUrl;
 	}
@@ -137,7 +137,7 @@ private String buildRequestUrlPath(JsonNode wireMockStub) {
 		String requestUrlPath = "";
 		JsonNode requestUrlPathNode = wireMockStub.at(REQUEST_URL_PATH_POINTER);
 		if (!requestUrlPathNode.isMissingNode()) {
-			requestUrlPath = "url '" + requestUrlPathNode.asText() + "'\n";
+			requestUrlPath = "url '" + requestUrlPathNode.asString() + "'\n";
 		}
 		return requestUrlPath;
 	}
@@ -146,7 +146,7 @@ private String buildRequestUrlPattern(JsonNode wireMockStub) {
 		String requestUrlPattern = "";
 		JsonNode requestUrlPatternNode = wireMockStub.at(REQUEST_URL_PATTERN_POINTER);
 		if (!requestUrlPatternNode.isMissingNode()) {
-			String escapedRequestUrlPatternValue = escapeJava(requestUrlPatternNode.asText());
+			String escapedRequestUrlPatternValue = escapeJava(requestUrlPatternNode.asString());
 			requestUrlPattern = "url $(consumer(regex('" + escapedRequestUrlPatternValue + "')), producer('"
 					+ new Xeger(escapedRequestUrlPatternValue).generate() + "'))\n";
 		}
@@ -157,7 +157,7 @@ private String buildRequestUrlPathPattern(JsonNode wireMockStub) {
 		String requestUrlPathPattern = "";
 		JsonNode requestUrlPathPatternNode = wireMockStub.at(REQUEST_URL_PATH_PATTERN_POINTER);
 		if (!requestUrlPathPatternNode.isMissingNode()) {
-			String escapedRequestUrlPathPatternValue = escapeJava(requestUrlPathPatternNode.asText());
+			String escapedRequestUrlPathPatternValue = escapeJava(requestUrlPathPatternNode.asString());
 			requestUrlPathPattern = "urlPath $(consumer(regex('" + escapedRequestUrlPathPatternValue + "')), producer('"
 					+ new Xeger(escapedRequestUrlPathPatternValue).generate() + "'))'\n";
 		}
@@ -261,12 +261,12 @@ private String buildResponseBody(JsonNode wireMockStub) {
 	}
 
 	private String buildPrettyPrintResponseBody(IntNode node) {
-		return node.asText();
+		return node.asString();
 	}
 
 	private String buildPrettyPrintResponseBody(StringNode node) {
 		try {
-			String stringNode = node.asText();
+			String stringNode = node.asString();
 			Object intermediateObjectForPrettyPrinting =
 					OBJECT_MAPPER.readerFor(Object.class).readValue(stringNode);
 

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.java

@@ -47,7 +47,7 @@
 import org.springframework.cloud.contract.verifier.config.TestFramework;
 import org.springframework.cloud.contract.verifier.config.TestMode;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 
 /**
  * Task used to generate server side tests