diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilder.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilder.groovy
deleted file mode 100644
index 886968b473..0000000000
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilder.groovy
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.contract.verifier.builder
-
-import groovy.transform.CompileStatic
-import groovy.transform.PackageScope
-
-import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.spec.internal.BodyMatcher
-import org.springframework.cloud.contract.spec.internal.BodyMatchers
-import org.springframework.cloud.contract.spec.internal.ExecutionProperty
-import org.springframework.cloud.contract.spec.internal.MatchingType
-import org.springframework.cloud.contract.verifier.util.xml.XmlToXPathsConverter
-
-/**
- * @author Olga Maciaszek-Sharma
- * @since 2.1.0
- */
-@PackageScope
-@CompileStatic
-class XmlBodyVerificationBuilder implements BodyMethodGeneration {
-
-	private final Contract contract
-	private final Optional<String> lineSuffix
-
-	XmlBodyVerificationBuilder(Contract contract, Optional<String> lineSuffix) {
-		this.contract = contract
-		this.lineSuffix = lineSuffix
-	}
-
-	void addXmlResponseBodyCheck(BlockBuilder blockBuilder, Object responseBody,
-			BodyMatchers bodyMatchers, String responseString,
-			boolean shouldCommentOutBDDBlocks) {
-		addXmlProcessingLines(blockBuilder, responseString)
-		Object processedBody = XmlToXPathsConverter
-				.removeMatchingXPaths(responseBody, bodyMatchers)
-		List<BodyMatcher> matchers = new XmlToXPathsConverter()
-				.mapToMatchers(processedBody)
-		if (bodyMatchers?.hasMatchers()) {
-			matchers.addAll(bodyMatchers.matchers())
-		}
-		addBodyMatchingBlock(matchers, blockBuilder, responseBody, shouldCommentOutBDDBlocks)
-	}
-
-	private void addXmlProcessingLines(BlockBuilder blockBuilder, String responseString) {
-		['DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()',
-		 "Document parsedXml = documentBuilder.parse(new InputSource(new StringReader($responseString)))"]
-				.each {
-			blockBuilder.addLine(it as String)
-			addColonIfRequired(lineSuffix, blockBuilder)
-				}
-	}
-
-	@Override
-	void methodForNullCheck(BodyMatcher bodyMatcher, BlockBuilder bb) {
-		String quotedAndEscapedPath = quotedAndEscaped(bodyMatcher.path())
-		String method = "assertThat(nodeFromXPath(parsedXml, ${quotedAndEscapedPath})).isNull()"
-		bb.addLine(method.replace('$', '\\$'))
-		addColonIfRequired(lineSuffix, bb)
-	}
-
-	@Override
-	void methodForEqualityCheck(BodyMatcher bodyMatcher, BlockBuilder bb, Object body) {
-		Object retrievedValue =
-				quotedAndEscaped(XmlToXPathsConverter.
-						retrieveValue(bodyMatcher, body))
-		String comparisonMethod = bodyMatcher
-				.matchingType() == MatchingType.EQUALITY ? 'isEqualTo' : 'matches'
-		String method = "assertThat(valueFromXPath(parsedXml, ${quotedAndEscaped(bodyMatcher.path())})).$comparisonMethod(${retrievedValue})"
-		bb.addLine(method.replace('$', '\\$'))
-		addColonIfRequired(lineSuffix, bb)
-	}
-
-	@Override
-	void methodForCommandExecution(BodyMatcher bodyMatcher, BlockBuilder bb, Object body) {
-		Object retrievedValue =
-				quotedAndEscaped(XmlToXPathsConverter
-						.retrieveValueFromBody(bodyMatcher.path(), body))
-		ExecutionProperty property = bodyMatcher.value() as ExecutionProperty
-		bb.addLine(property.insertValue(retrievedValue.replace('$', '\\$')))
-		addColonIfRequired(lineSuffix, bb)
-	}
-
-	@Override
-	void methodForTypeCheck(BodyMatcher bodyMatcher, BlockBuilder bb, Object copiedBody) {
-		throw new UnsupportedOperationException("The `getNodeValue()` method in `org.w3c.dom.Node` always returns String.")
-	}
-}
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilder.java b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilder.java
new file mode 100644
index 0000000000..692726487e
--- /dev/null
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilder.java
@@ -0,0 +1,97 @@
+package org.springframework.cloud.contract.verifier.builder;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.cloud.contract.spec.Contract;
+import org.springframework.cloud.contract.spec.internal.BodyMatcher;
+import org.springframework.cloud.contract.spec.internal.BodyMatchers;
+import org.springframework.cloud.contract.spec.internal.ExecutionProperty;
+import org.springframework.cloud.contract.spec.internal.MatchingType;
+import org.springframework.cloud.contract.verifier.util.xml.XmlToXPathsConverter;
+
+/**
+ * @author Olga Maciaszek-Sharma
+ * @since 2.1.0
+ */
+class XmlBodyVerificationBuilder implements BodyMethodGeneration {
+
+	private final Contract contract;
+
+	private final Optional<String> lineSuffix;
+
+	XmlBodyVerificationBuilder(Contract contract, Optional<String> lineSuffix) {
+		this.contract = contract;
+		this.lineSuffix = lineSuffix;
+	}
+
+	void addXmlResponseBodyCheck(BlockBuilder blockBuilder, Object responseBody,
+			BodyMatchers bodyMatchers, String responseString,
+			boolean shouldCommentOutBDDBlocks) {
+		addXmlProcessingLines(blockBuilder, responseString);
+		Object processedBody = XmlToXPathsConverter.removeMatchingXPaths(responseBody,
+				bodyMatchers);
+		List<BodyMatcher> matchers = new XmlToXPathsConverter()
+				.mapToMatchers(processedBody);
+		if (bodyMatchers != null && bodyMatchers.hasMatchers()) {
+			matchers.addAll(bodyMatchers.matchers());
+		}
+
+		addBodyMatchingBlock(matchers, blockBuilder, responseBody,
+				shouldCommentOutBDDBlocks);
+	}
+
+	private void addXmlProcessingLines(final BlockBuilder blockBuilder,
+			String responseString) {
+		Arrays.asList(
+				"DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()",
+				"Document parsedXml = documentBuilder.parse(new InputSource(new StringReader("
+						+ responseString + ")))")
+				.forEach(it -> {
+					blockBuilder.addLine(it);
+					addColonIfRequired(lineSuffix, blockBuilder);
+				});
+	}
+
+	@Override
+	public void methodForNullCheck(BodyMatcher bodyMatcher, BlockBuilder bb) {
+		String quotedAndEscapedPath = quotedAndEscaped(bodyMatcher.path());
+		String method = "assertThat(nodeFromXPath(parsedXml, " + quotedAndEscapedPath
+				+ ")).isNull()";
+		bb.addLine(method.replace("$", "\\$"));
+		addColonIfRequired(lineSuffix, bb);
+	}
+
+	@Override
+	public void methodForEqualityCheck(BodyMatcher bodyMatcher, BlockBuilder bb,
+			Object body) {
+		Object retrievedValue = quotedAndEscaped(
+				XmlToXPathsConverter.retrieveValue(bodyMatcher, body));
+		String comparisonMethod = bodyMatcher.matchingType().equals(MatchingType.EQUALITY)
+				? "isEqualTo" : "matches";
+		String method = "assertThat(valueFromXPath(parsedXml, "
+				+ quotedAndEscaped(bodyMatcher.path()) + "))." + comparisonMethod + "("
+				+ retrievedValue + ")";
+		bb.addLine(method.replace("$", "\\$"));
+		addColonIfRequired(lineSuffix, bb);
+	}
+
+	@Override
+	public void methodForCommandExecution(BodyMatcher bodyMatcher, BlockBuilder bb,
+			Object body) {
+		Object retrievedValue = quotedAndEscaped(
+				XmlToXPathsConverter.retrieveValueFromBody(bodyMatcher.path(), body));
+		ExecutionProperty property = (ExecutionProperty) bodyMatcher.value();
+		bb.addLine(property.insertValue(((String) retrievedValue).replace("$", "\\$")));
+		addColonIfRequired(lineSuffix, bb);
+	}
+
+	@Override
+	public void methodForTypeCheck(BodyMatcher bodyMatcher, BlockBuilder bb,
+			Object copiedBody) {
+		throw new UnsupportedOperationException(
+				"The `getNodeValue()` method in `org.w3c.dom.Node` always returns String.");
+	}
+
+}