Adjust WireMockToDslConverter implementation to Jackson 3 changes.

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

Author: OlgaMaciaszek

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

@@ -72,11 +72,11 @@ public class WireMockToDslConverter {
 	private static final JsonPointer RESPONSE_HEADERS_POINTER = JsonPointer.compile("/response/headers");
 
 	private static final JsonMapper OBJECT_MAPPER = JsonMapper.builder()
-		.configure(ALLOW_JAVA_COMMENTS, true)
-		.configure(ALLOW_YAML_COMMENTS, true)
-		.configure(ALLOW_UNQUOTED_PROPERTY_NAMES, true)
-		.configure(ALLOW_SINGLE_QUOTES, true)
-		.build();
+			.configure(ALLOW_JAVA_COMMENTS, true)
+			.configure(ALLOW_YAML_COMMENTS, true)
+			.configure(ALLOW_UNQUOTED_PROPERTY_NAMES, true)
+			.configure(ALLOW_SINGLE_QUOTES, true)
+			.build();
 
 	/**
 	 * Returns the string content of the contract.
@@ -108,7 +108,7 @@ private JsonNode parseStubDefinition(String wireMockStringStub) {
 	private String buildPriority(JsonNode wireMockStub) {
 		String priority = "";
 		JsonNode priorityNode = wireMockStub.at(PRIORITY_POINTER);
-		if (priorityNode != null && priorityNode.asInt() > 0) {
+		if (!priorityNode.isMissingNode() && priorityNode.asInt() > 0) {
 			priority = "priority " + priorityNode.asInt() + "\n";
 		}
 		return priority;
@@ -174,10 +174,12 @@ private String buildRequestHeaders(JsonNode wireMockStub) {
 			fields.forEach(c -> {
 				requestHeadersBuilder.append("header('").append(c.getKey()).append("',");
 				ObjectNode headersNode = (ObjectNode) c.getValue().deepCopy();
-				Iterator<Map.Entry<String, JsonNode>> headersNodeIterator = headersNode.properties().iterator();
+				Iterator<Map.Entry<String, JsonNode>> headersNodeIterator = headersNode.properties()
+						.iterator();
 				if (headersNodeIterator.hasNext()) {
 					Map.Entry<String, JsonNode> headerValue = headersNodeIterator.next();
-					String header = buildHeader(headerValue.getKey(), headerValue.getValue().asString());
+					String header = buildHeader(headerValue.getKey(), headerValue.getValue()
+							.asString());
 					requestHeadersBuilder.append(header).append(")").append("\n");
 				}
 			});
@@ -188,13 +190,13 @@ private String buildRequestHeaders(JsonNode wireMockStub) {
 
 	private String buildHeader(String method, String value) {
 		switch (method) {
-			case "equalTo":
-				return "'" + value + "'";
-			case "contains":
-				String regex = "^.*" + value + ".*$";
-				return "c(regex('" + escapeJava(regex) + "'))";
-			default:
-				return "c(regex('" + escapeJava(value) + "'))";
+		case "equalTo":
+			return "'" + value + "'";
+		case "contains":
+			String regex = "^.*" + value + ".*$";
+			return "c(regex('" + escapeJava(regex) + "'))";
+		default:
+			return "c(regex('" + escapeJava(value) + "'))";
 		}
 	}
 
@@ -207,26 +209,29 @@ private String buildRequestBody(JsonNode wireMockStub) {
 			List<Map.Entry<String, JsonNode>> requestBodyObjectNodes = new ArrayList<>();
 
 			elements.stream()
-				.filter(f -> f instanceof ObjectNode)
-				.map(f -> (ObjectNode) f)
-				.map(ObjectNode::properties)
-				.forEachOrdered(requestBodyObjectNodes::addAll);
+					.filter(f -> f instanceof ObjectNode)
+					.map(f -> (ObjectNode) f)
+					.map(ObjectNode::properties)
+					.forEachOrdered(requestBodyObjectNodes::addAll);
 			requestBodyObjectNodes.stream()
-				.filter(b -> b.getKey().equals("equalTo"))
-				.findFirst()
-				.ifPresent(b -> requestBody.append("body ('").append(b.getValue().asString()).append("')"));
+					.filter(b -> b.getKey().equals("equalTo"))
+					.findFirst()
+					.ifPresent(b -> requestBody.append("body ('")
+							.append(b.getValue().asString()).append("')"));
 			requestBodyObjectNodes.stream()
-				.filter(b -> b.getKey().equals("equalToJson"))
-				.findFirst()
-				.ifPresent(b -> requestBody.append("body ('").append(b.getValue().asString()).append("')"));
+					.filter(b -> b.getKey().equals("equalToJson"))
+					.findFirst()
+					.ifPresent(b -> requestBody.append("body ('")
+							.append(b.getValue().asString()).append("')"));
 			requestBodyObjectNodes.stream()
-				.filter(b -> b.getKey().equals("matches"))
-				.findFirst()
-				.ifPresent(b -> requestBody.append("body $(consumer(regex('")
-					.append(escapeJava(b.getValue().asString()))
-					.append("')), producer('")
-					.append(new Xeger(escapeJava(b.getValue().asString())).generate())
-					.append("'))"));
+					.filter(b -> b.getKey().equals("matches"))
+					.findFirst()
+					.ifPresent(b -> requestBody.append("body $(consumer(regex('")
+							.append(escapeJava(b.getValue().asString()))
+							.append("')), producer('")
+							.append(new Xeger(escapeJava(b.getValue()
+									.asString())).generate())
+							.append("'))"));
 		}
 		return requestBody.toString();
 	}
@@ -261,12 +266,14 @@ private String buildPrettyPrintResponseBody(IntNode node) {
 	private String buildPrettyPrintResponseBody(StringNode node) {
 		try {
 			String stringNode = node.asString();
-			Object intermediateObjectForPrettyPrinting = OBJECT_MAPPER.readerFor(Object.class).readValue(stringNode);
+			Object intermediateObjectForPrettyPrinting = OBJECT_MAPPER.readerFor(Object.class)
+					.readValue(stringNode);
 
 			DefaultIndenter customIndenter = new DefaultIndenter("    ", "\n");
 			return OBJECT_MAPPER.writer()
-				.with(new DefaultPrettyPrinter().withArrayIndenter(customIndenter).withObjectIndenter(customIndenter))
-				.writeValueAsString(intermediateObjectForPrettyPrinting);
+					.with(new DefaultPrettyPrinter().withArrayIndenter(customIndenter)
+							.withObjectIndenter(customIndenter))
+					.writeValueAsString(intermediateObjectForPrettyPrinting);
 		}
 		catch (Exception e) {
 			throw new RuntimeException("WireMock response body could not be pretty printed", e);
@@ -282,11 +289,11 @@ private String buildResponseHeaders(JsonNode wireMockStub) {
 			JsonNode responseHeadersObjectNode = requestHeadersNode.deepCopy();
 			Set<Map.Entry<String, JsonNode>> fields = responseHeadersObjectNode.properties();
 			fields.forEach(c -> responseHeadersBuilder.append("header('")
-				.append(c.getKey())
-				.append("',")
-				.append("'")
-				.append(c.getValue().asString())
-				.append("')\n"));
+					.append(c.getKey())
+					.append("',")
+					.append("'")
+					.append(c.getValue().asString())
+					.append("')\n"));
 			responseHeadersBuilder.append("}");
 		}
 		return responseHeadersBuilder.toString();