From 10aa6986315054a53ac61bc998ebfde005b21741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 14 May 2025 15:44:48 +0200 Subject: [PATCH] Rename xmlunit2 package This can be harmonized now that support for XmlUnit 1 has been removed. Closes gh-1561 --- .../org/springframework/ws/test/client/RequestMatchers.java | 4 ++-- .../org/springframework/ws/test/server/ResponseMatchers.java | 4 ++-- .../support/matcher/{xmlunit2 => xmlunit}/DiffMatcher.java | 2 +- .../matcher/{xmlunit2 => xmlunit}/PayloadDiffMatcher.java | 2 +- .../{xmlunit2 => xmlunit}/SoapEnvelopeDiffMatcher.java | 2 +- .../support/matcher/{xmlunit2 => xmlunit}/package-info.java | 2 +- .../{xmlunit2 => xmlunit}/PayloadDiffMatcherTests.java | 2 +- .../{xmlunit2 => xmlunit}/SoapEnvelopeDiffMatcherTests.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/{xmlunit2 => xmlunit}/DiffMatcher.java (96%) rename spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/{xmlunit2 => xmlunit}/PayloadDiffMatcher.java (97%) rename spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/{xmlunit2 => xmlunit}/SoapEnvelopeDiffMatcher.java (97%) rename spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/{xmlunit2 => xmlunit}/package-info.java (91%) rename spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/{xmlunit2 => xmlunit}/PayloadDiffMatcherTests.java (98%) rename spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/{xmlunit2 => xmlunit}/SoapEnvelopeDiffMatcherTests.java (98%) diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java index 392c78db..d08059c9 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java @@ -27,8 +27,8 @@ import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.ws.test.support.matcher.SchemaValidatingMatcher; import org.springframework.ws.test.support.matcher.SoapHeaderMatcher; -import org.springframework.ws.test.support.matcher.xmlunit2.PayloadDiffMatcher; -import org.springframework.ws.test.support.matcher.xmlunit2.SoapEnvelopeDiffMatcher; +import org.springframework.ws.test.support.matcher.xmlunit.PayloadDiffMatcher; +import org.springframework.ws.test.support.matcher.xmlunit.SoapEnvelopeDiffMatcher; import org.springframework.xml.transform.ResourceSource; /** diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java index b83d73f4..748cbf6a 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java @@ -31,8 +31,8 @@ import org.springframework.ws.soap.SoapVersion; import org.springframework.ws.test.support.AssertionErrors; import org.springframework.ws.test.support.matcher.SchemaValidatingMatcher; import org.springframework.ws.test.support.matcher.SoapHeaderMatcher; -import org.springframework.ws.test.support.matcher.xmlunit2.PayloadDiffMatcher; -import org.springframework.ws.test.support.matcher.xmlunit2.SoapEnvelopeDiffMatcher; +import org.springframework.ws.test.support.matcher.xmlunit.PayloadDiffMatcher; +import org.springframework.ws.test.support.matcher.xmlunit.SoapEnvelopeDiffMatcher; import org.springframework.xml.transform.ResourceSource; /** diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/DiffMatcher.java similarity index 96% rename from spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/DiffMatcher.java index 9b25e703..b84a91c1 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/DiffMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.test.support.matcher.xmlunit2; +package org.springframework.ws.test.support.matcher.xmlunit; import org.xmlunit.diff.Diff; 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/xmlunit/PayloadDiffMatcher.java similarity index 97% rename from spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/PayloadDiffMatcher.java index e3da596b..b55f6751 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/xmlunit/PayloadDiffMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.test.support.matcher.xmlunit2; +package org.springframework.ws.test.support.matcher.xmlunit; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcher.java similarity index 97% rename from spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcher.java index b13fae1b..a788ac0d 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.test.support.matcher.xmlunit2; +package org.springframework.ws.test.support.matcher.xmlunit; import java.io.IOException; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/package-info.java similarity index 91% rename from spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/package-info.java index baaf0fa9..df976cbd 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/package-info.java @@ -17,4 +17,4 @@ /** * Matcher support for XMLUnit. */ -package org.springframework.ws.test.support.matcher.xmlunit2; +package org.springframework.ws.test.support.matcher.xmlunit; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/PayloadDiffMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/PayloadDiffMatcherTests.java index a725abd4..c1e84214 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/PayloadDiffMatcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.test.support.matcher.xmlunit2; +package org.springframework.ws.test.support.matcher.xmlunit; import jakarta.xml.soap.MessageFactory; import org.junit.jupiter.api.Test; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcherTests.java index 4bc050f9..e9668f8b 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.test.support.matcher.xmlunit2; +package org.springframework.ws.test.support.matcher.xmlunit; import java.io.IOException;