Review checkstyle rules of spring-ws-test

snicoll · snicoll · commit 17c4dd41d858 · 2025-03-07T15:36:50.000+01:00
See gh-1479
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java
@@ -48,7 +48,7 @@ public interface RequestXPathExpectations {
 	 * @param expectedValue the expected value
 	 * @return the request matcher
 	 */
-	RequestMatcher evaluatesTo(final boolean expectedValue);
+	RequestMatcher evaluatesTo(boolean expectedValue);
 
 	/**
 	 * Expects the XPath expression to evaluate to the given integer.
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java
@@ -22,8 +22,7 @@
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapMessage;
-
-import static org.springframework.ws.test.support.AssertionErrors.fail;
+import org.springframework.ws.test.support.AssertionErrors;
 
 /**
  * Implementation of {@link ResponseCreator} that responds with a SOAP fault.
@@ -36,12 +35,12 @@ abstract class SoapFaultResponseCreator extends AbstractResponseCreator {
 	@Override
 	protected void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response) throws IOException {
 		if (!(response instanceof SoapMessage soapResponse)) {
-			fail("Response is not a SOAP message");
+			AssertionErrors.fail("Response is not a SOAP message");
 			return;
 		}
 		SoapBody responseBody = soapResponse.getSoapBody();
 		if (responseBody == null) {
-			fail("SOAP message [" + response + "] does not contain SOAP body");
+			AssertionErrors.fail("SOAP message [" + response + "] does not contain SOAP body");
 		}
 		addSoapFault(responseBody);
 	}
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java
@@ -19,8 +19,7 @@
 import java.net.URI;
 
 import org.springframework.ws.WebServiceMessage;
-
-import static org.springframework.ws.test.support.AssertionErrors.assertEquals;
+import org.springframework.ws.test.support.AssertionErrors;
 
 /**
  * Matches {@link URI}s.
@@ -38,7 +37,8 @@ class UriMatcher implements RequestMatcher {
 
 	@Override
 	public void match(URI actual, WebServiceMessage request) {
-		assertEquals("Unexpected connection", this.expected, actual, "Payload", request.getPayloadSource());
+		AssertionErrors.assertEquals("Unexpected connection", this.expected, actual, "Payload",
+				request.getPayloadSource());
 	}
 
 }
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2005-2025 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
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
@@ -29,11 +29,10 @@
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.soap.server.SoapMessageDispatcher;
+import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.ws.test.support.MockStrategiesHelper;
 import org.springframework.ws.transport.WebServiceMessageReceiver;
 
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * <strong>Main entry point for server-side Web service testing</strong>. Typically used
  * to test a {@link org.springframework.ws.server.MessageDispatcher MessageDispatcher}
@@ -105,7 +104,7 @@
  * @author Lukas Krecan
  * @since 2.0
  */
-public class MockWebServiceClient {
+public final class MockWebServiceClient {
 
 	private static final Log logger = LogFactory.getLog(MockWebServiceClient.class);
 
@@ -186,7 +185,7 @@ public ResponseActions sendRequest(RequestCreator requestCreator) {
 		}
 		catch (Exception ex) {
 			logger.error("Could not send request", ex);
-			fail(ex.getMessage());
+			AssertionErrors.fail(ex.getMessage());
 			return null;
 		}
 	}
@@ -207,7 +206,7 @@ public ResponseActions andExpect(ResponseMatcher responseMatcher) {
 			WebServiceMessage request = this.messageContext.getRequest();
 			WebServiceMessage response = this.messageContext.getResponse();
 			if (response == null) {
-				fail("No response received");
+				AssertionErrors.fail("No response received");
 				return null;
 			}
 			try {
@@ -216,7 +215,7 @@ public ResponseActions andExpect(ResponseMatcher responseMatcher) {
 			}
 			catch (IOException ex) {
 				logger.error("Could not match request", ex);
-				fail(ex.getMessage());
+				AssertionErrors.fail(ex.getMessage());
 				return null;
 			}
 		}
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
@@ -28,14 +28,13 @@
 import org.springframework.ws.FaultAwareWebServiceMessage;
 import org.springframework.ws.WebServiceMessage;
 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.xml.transform.ResourceSource;
 
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * Factory methods for {@link ResponseMatcher} classes. Typically used to provide input
  * for {@link ResponseActions#andExpect(ResponseMatcher)}.
@@ -139,7 +138,7 @@ public void match(WebServiceMessage request, WebServiceMessage response)
 					throws IOException, AssertionError {
 				if (response instanceof FaultAwareWebServiceMessage faultMessage) {
 					if (faultMessage.hasFault()) {
-						fail("Response has a SOAP Fault: \"" + faultMessage.getFaultReason() + "\"");
+						AssertionErrors.fail("Response has a SOAP Fault: \"" + faultMessage.getFaultReason() + "\"");
 					}
 				}
 			}
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java
@@ -50,7 +50,7 @@ public interface ResponseXPathExpectations {
 	 * @param expectedValue the expected value
 	 * @return the request matcher
 	 */
-	ResponseMatcher evaluatesTo(final boolean expectedValue);
+	ResponseMatcher evaluatesTo(boolean expectedValue);
 
 	/**
 	 * Expects the XPath expression to evaluate to the given integer.
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java
@@ -25,9 +25,7 @@
 import org.springframework.ws.soap.SoapFault;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapVersion;
-
-import static org.springframework.ws.test.support.AssertionErrors.assertEquals;
-import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
+import org.springframework.ws.test.support.AssertionErrors;
 
 /**
  * Abstract Implementation of {@link ResponseMatcher} that checks for a SOAP fault.
@@ -45,16 +43,16 @@ abstract class SoapFaultResponseMatcher implements ResponseMatcher {
 
 	@Override
 	public void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError {
-		assertTrue("Response is not a SOAP message", response instanceof SoapMessage);
+		AssertionErrors.assertTrue("Response is not a SOAP message", response instanceof SoapMessage);
 		SoapMessage soapResponse = (SoapMessage) response;
 		SoapBody responseBody = soapResponse.getSoapBody();
-		assertTrue("Response has no SOAP Body", responseBody != null);
-		assertTrue("Response has no SOAP Fault", responseBody.hasFault());
+		AssertionErrors.assertTrue("Response has no SOAP Body", responseBody != null);
+		AssertionErrors.assertTrue("Response has no SOAP Fault", responseBody.hasFault());
 		SoapFault soapFault = responseBody.getFault();
 		QName expectedFaultCode = getExpectedFaultCode(soapResponse.getVersion());
-		assertEquals("Invalid SOAP Fault code", expectedFaultCode, soapFault.getFaultCode());
+		AssertionErrors.assertEquals("Invalid SOAP Fault code", expectedFaultCode, soapFault.getFaultCode());
 		if (this.expectedFaultStringOrReason != null) {
-			assertEquals("Invalid SOAP Fault string/reason", this.expectedFaultStringOrReason,
+			AssertionErrors.assertEquals("Invalid SOAP Fault string/reason", this.expectedFaultStringOrReason,
 					soapFault.getFaultStringOrReason());
 		}
 	}
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2005-2025 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
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java
@@ -68,7 +68,7 @@ public String getMessage() {
 		if (sourceString != null) {
 			String newLine = System.lineSeparator();
 			builder.append(newLine);
-			String label = this.sourceLabel != null ? this.sourceLabel : "Source";
+			String label = (this.sourceLabel != null) ? this.sourceLabel : "Source";
 			builder.append(label);
 			builder.append(": ");
 			builder.append(sourceString);
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java
@@ -23,10 +23,9 @@
 
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
+import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.xml.transform.TransformerHelper;
 
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * Implementation of {@link WebServiceMessageCreator} that creates a request based on a
  * {@link Source}.
@@ -56,7 +55,7 @@ protected void doWithMessage(WebServiceMessage message) throws IOException {
 			this.transformerHelper.transform(this.payload, message.getPayloadResult());
 		}
 		catch (TransformerException ex) {
-			fail("Could not transform request payload to message: " + ex.getMessage());
+			AssertionErrors.fail("Could not transform request payload to message: " + ex.getMessage());
 		}
 	}
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java
@@ -27,11 +27,9 @@
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.soap.SoapMessage;
+import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.xml.transform.TransformerHelper;
 
-import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * Implementation of {@link WebServiceMessageCreator} that creates a request based on a
  * SOAP envelope {@link Source}.
@@ -57,15 +55,16 @@ public SoapEnvelopeMessageCreator(Source soapEnvelope) {
 
 	@Override
 	protected void doWithMessage(WebServiceMessage message) throws IOException {
-		assertTrue("Message created with factory is not a SOAP message", message instanceof SoapMessage);
+		AssertionErrors.assertTrue("Message created with factory is not a SOAP message",
+				message instanceof SoapMessage);
 		SoapMessage soapMessage = (SoapMessage) message;
 		try {
 			DOMResult result = new DOMResult();
 			this.transformerHelper.transform(this.soapEnvelope, result);
 			soapMessage.setDocument((Document) result.getNode());
 		}
 		catch (TransformerException ex) {
-			fail("Could not transform request SOAP envelope to message: " + ex.getMessage());
+			AssertionErrors.fail("Could not transform request SOAP envelope to message: " + ex.getMessage());
 		}
 	}
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2005-2022 the original author or authors.
+ * Copyright 2005-2025 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
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java
@@ -20,8 +20,7 @@
 
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.soap.SoapMessage;
-
-import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
+import org.springframework.ws.test.support.AssertionErrors;
 
 /**
  * Abstract base class for SOAP-specific {@link WebServiceMessageMatcher} implementations.
@@ -36,7 +35,7 @@ public abstract class AbstractSoapMessageMatcher implements WebServiceMessageMat
 
 	@Override
 	public final void match(WebServiceMessage message) throws IOException, AssertionError {
-		assertTrue("Message is not a SOAP message", message instanceof SoapMessage);
+		AssertionErrors.assertTrue("Message is not a SOAP message", message instanceof SoapMessage);
 		match((SoapMessage) message);
 	}
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
@@ -19,8 +19,7 @@
 import org.custommonkey.xmlunit.Diff;
 
 import org.springframework.ws.WebServiceMessage;
-
-import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
+import org.springframework.ws.test.support.AssertionErrors;
 
 /**
  * Implementation of {@link WebServiceMessageMatcher} based on XMLUnit's {@link Diff}.
@@ -37,7 +36,8 @@ public abstract class DiffMatcher implements WebServiceMessageMatcher {
 	public final void match(WebServiceMessage message) throws AssertionError {
 
 		Diff diff = createDiff(message);
-		assertTrue("Messages are different, " + diff.toString(), diff.similar(), "Payload", message.getPayloadSource());
+		AssertionErrors.assertTrue("Messages are different, " + diff.toString(), diff.similar(), "Payload",
+				message.getPayloadSource());
 	}
 
 	/**
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
@@ -25,10 +25,9 @@
 
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
+import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.xml.transform.TransformerHelper;
 
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * Matches {@link Source} payloads.
  *
@@ -54,7 +53,7 @@ public PayloadDiffMatcher(Source expected) {
 	protected final Diff createDiff(WebServiceMessage message) {
 		Source payload = message.getPayloadSource();
 		if (payload == null) {
-			fail("Request message does not contain payload");
+			AssertionErrors.fail("Request message does not contain payload");
 		}
 		return createDiff(payload);
 	}
@@ -72,7 +71,7 @@ private Document createDocumentFromSource(Source source) {
 			return (Document) result.getNode();
 		}
 		catch (TransformerException ex) {
-			fail("Could not transform source to DOMResult" + ex.getMessage());
+			AssertionErrors.fail("Could not transform source to DOMResult" + ex.getMessage());
 			return null;
 		}
 	}
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java
@@ -25,11 +25,10 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.ws.WebServiceMessage;
+import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.xml.validation.XmlValidator;
 import org.springframework.xml.validation.XmlValidatorFactory;
 
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * Uses the {@link XmlValidator} to validate request payload.
  *
@@ -60,7 +59,8 @@ public SchemaValidatingMatcher(Resource schema, Resource... furtherSchemas) thro
 	public void match(WebServiceMessage message) throws IOException, AssertionError {
 		SAXParseException[] exceptions = this.xmlValidator.validate(message.getPayloadSource());
 		if (!ObjectUtils.isEmpty(exceptions)) {
-			fail("XML is not valid: " + Arrays.toString(exceptions), "Payload", message.getPayloadSource());
+			AssertionErrors.fail("XML is not valid: " + Arrays.toString(exceptions), "Payload",
+					message.getPayloadSource());
 		}
 	}
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
@@ -28,11 +28,9 @@
 
 import org.springframework.util.Assert;
 import org.springframework.ws.soap.SoapMessage;
+import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.xml.transform.TransformerHelper;
 
-import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
-import static org.springframework.ws.test.support.AssertionErrors.fail;
-
 /**
  * Matches {@link Source} SOAP envelopes.
  *
@@ -64,7 +62,7 @@ protected void match(SoapMessage soapMessage) throws IOException, AssertionError
 		Document actualDocument = soapMessage.getDocument();
 		Document expectedDocument = createDocumentFromSource(this.expected);
 		Diff diff = new Diff(expectedDocument, actualDocument);
-		assertTrue("Envelopes are different, " + diff, diff.similar());
+		AssertionErrors.assertTrue("Envelopes are different, " + diff, diff.similar());
 	}
 
 	private Document createDocumentFromSource(Source source) {
@@ -75,7 +73,7 @@ private Document createDocumentFromSource(Source source) {
 			return (Document) result.getNode();
 		}
 		catch (TransformerException ex) {
-			fail("Could not transform source to DOMResult" + ex.getMessage());
+			AssertionErrors.fail("Could not transform source to DOMResult" + ex.getMessage());
 			return null;
 		}
 	}
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java
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/xmlunit2/DiffMatcher.java
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
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/xmlunit2/SoapEnvelopeDiffMatcher.java
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/xmlunit2/package-info.java
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2005-2022 the original author or authors.`
	`2`	`+ * Copyright 2005-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`6`	`6`	`* You may obtain a copy of the License at`
`7`	`7`	`*`
`8`		`- * http://www.apache.org/licenses/LICENSE-2.0`
	`8`	`+ * https://www.apache.org/licenses/LICENSE-2.0`
`9`	`9`	`*`
`10`	`10`	`* Unless required by applicable law or agreed to in writing, software`
`11`	`11`	`* distributed under the License is distributed on an "AS IS" BASIS,`