From 1d4e2dc88b89170a3701ecafe817b583c916ddfe Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Fri, 14 Jul 2023 14:40:29 -0500
Subject: [PATCH] Polishing.

See #1203.
---
 .../support/matcher/xmlunit2/PayloadDiffMatcher.java | 12 +++++++++++-
 .../matcher/xmlunit2/PayloadDiffMatcherTest.java     | 11 +++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java
index bea3cc62..1974a25c 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java
@@ -16,7 +16,7 @@
 
 package org.springframework.ws.test.support.matcher.xmlunit2;
 
-import static org.springframework.ws.test.support.AssertionErrors.fail;
+import static org.springframework.ws.test.support.AssertionErrors.*;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
@@ -33,6 +33,7 @@ import org.xmlunit.diff.Diff;
  * Matches {@link Source} payloads.
  *
  * @author Greg Turnquist
+ * @author Mikołaj Fejzer
  * @since 3.1
  */
 public class PayloadDiffMatcher extends DiffMatcher {
@@ -42,22 +43,28 @@ public class PayloadDiffMatcher extends DiffMatcher {
 	private final TransformerHelper transformerHelper = new TransformerHelper();
 
 	public PayloadDiffMatcher(Source expected) {
+
 		Assert.notNull(expected, "'expected' must not be null");
 		this.expected = expected;
 	}
 
 	@Override
 	protected final Diff createDiff(WebServiceMessage message) {
+
 		Source payload = message.getPayloadSource();
+
 		if (payload == null) {
 			fail("Request message does not contain payload");
 		}
+
 		return createDiff(payload);
 	}
 
 	protected Diff createDiff(Source payload) {
+
 		Document expectedDocument = createDocumentFromSource(expected);
 		Document actualDocument = createDocumentFromSource(payload);
+
 		return DiffBuilder.compare(expectedDocument) //
 				.withTest(actualDocument) //
 				.ignoreWhitespace() //
@@ -66,11 +73,14 @@ public class PayloadDiffMatcher extends DiffMatcher {
 	}
 
 	private Document createDocumentFromSource(Source source) {
+
 		try {
+
 			DOMResult result = new DOMResult();
 			transformerHelper.transform(source, result);
 			return (Document) result.getNode();
 		} catch (TransformerException ex) {
+
 			fail("Could not transform source to DOMResult" + ex.getMessage());
 			return null;
 		}
diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java
index 3e3c14eb..2f7d8987 100644
--- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java
+++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java
@@ -16,11 +16,8 @@
 
 package org.springframework.ws.test.support.matcher.xmlunit2;
 
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static org.assertj.core.api.Assertions.*;
+import static org.easymock.EasyMock.*;
 
 import javax.xml.soap.MessageFactory;
 
@@ -37,6 +34,7 @@ public class PayloadDiffMatcherTest {
 
 		String xml = "<element xmlns='http://example.com'/>";
 		WebServiceMessage message = createMock(WebServiceMessage.class);
+
 		expect(message.getPayloadSource()).andReturn(new StringSource(xml)).times(2);
 		replay(message);
 
@@ -52,6 +50,7 @@ public class PayloadDiffMatcherTest {
 		String xml = "<response><success>true</success></response>";
 		String xmlWithAdditionalWhitespace = "<response> <success>true</success> </response>";
 		WebServiceMessage message = createMock(WebServiceMessage.class);
+
 		expect(message.getPayloadSource()).andReturn(new StringSource(xml)).times(2);
 		replay(message);
 
@@ -61,7 +60,6 @@ public class PayloadDiffMatcherTest {
 		verify(message);
 	}
 
-
 	@Test
 	public void nonMatch() {
 
@@ -69,6 +67,7 @@ public class PayloadDiffMatcherTest {
 
 			String actual = "<element1 xmlns='http://example.com'/>";
 			WebServiceMessage message = createMock(WebServiceMessage.class);
+
 			expect(message.getPayloadSource()).andReturn(new StringSource(actual)).times(2);
 			replay(message);