From d0800f1ae6db96131333c2f81262a95a34810f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Mar 2025 09:42:12 +0100 Subject: [PATCH] Optimize imports --- .../support/WebServiceGatewaySupport.java | 1 + .../interceptor/ClientInterceptorAdapter.java | 1 + .../StaticWsdlBeanDefinitionParser.java | 3 ++- .../ws/soap/saaj/SaajSoapHeaderElement.java | 4 ++-- .../ws/config/web-services-1.5.xsd | 11 +++++----- .../client/core/WebServiceTemplateTest.java | 1 - .../InterceptorsBeanDefinitionParserTest.java | 5 +++-- .../ws/mime/AbstractMimeMessageTest.java | 5 +++-- .../MarshallingPayloadEndpointTest.java | 1 - .../adapter/MessageEndpointAdapterTest.java | 9 +++++--- .../adapter/PayloadEndpointAdapterTest.java | 13 ++++++++---- .../dom/Dom4jPayloadMethodProcessorTest.java | 5 +++-- .../dom/DomPayloadMethodProcessorTest.java | 9 ++++---- ...otAnnotationMethodEndpointMappingTest.java | 2 -- .../endpoint/support/NamespaceUtilsTest.java | 5 +++-- .../ws/soap/AbstractSoapBodyTest.java | 9 ++++---- .../client/AbstractActionCallbackTest.java | 15 +++++++------ .../AbstractAddressingInterceptorTest.java | 11 +++++++--- .../ws/soap/saaj/SaajSoap11MessageTest.java | 16 +++++++------- .../ws/soap/saaj/SaajSoap12MessageTest.java | 10 ++++----- .../ws/soap/saaj/support/SaajUtilsTest.java | 21 ++++++++++--------- ...idatingMarshallingPayloadEndpointTest.java | 1 - .../PayloadValidatingInterceptorTest.java | 1 - .../WsdlDefinitionHandlerAdapterTest.java | 17 ++++++++------- .../client/support/interceptor/sizeSchema.xsd | 4 ++-- .../config/webServiceNamespaceHandlerTest.xml | 9 ++++---- .../webServicesNamespaceHandlerTest-tiger.xml | 6 +++--- ...oadRootAnnotationMethodEndpointMapping.xml | 10 ++++----- .../springframework/ws/soap/axiom/SWS-502.xml | 4 ++-- .../interceptor/multipleNamespaces.xml | 4 ++-- .../interceptor/multipleNamespaces.xsd | 4 ++-- .../endpoint/interceptor/sizeSchema.xsd | 4 ++-- .../ws/wsdl/wsdl11/abstract.wsdl | 5 ++--- .../SaajWss4jMessageInterceptorSignTest.java | 1 - .../callback/KeyStoreCallbackHandlerTest.java | 5 +++-- .../mail/MailTransportException.java | 1 + .../ws/transport/xmpp/MessageInputStream.java | 1 + .../support/MockStrategiesHelperTest.java | 6 ++++-- .../matcher/SoapHeaderMatcherTest.java | 10 ++++----- .../xml/namespace/QNameUtilsTest.java | 7 ++++--- .../xml/transform/ResourceSourceTest.java | 7 ++++--- .../AbstractValidatorFactoryTest.java | 1 - .../AbstractXPathExpressionFactoryTest.java | 2 -- .../JaxenXPathExpressionFactoryTest.java | 3 --- .../xml/xsd/SimpleXsdSchemaTest.java | 5 +++-- 45 files changed, 148 insertions(+), 127 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java index a0011b14..35055a8b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java @@ -18,6 +18,7 @@ package org.springframework.ws.client.core.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.InitializingBean; import org.springframework.oxm.Marshaller; import org.springframework.oxm.Unmarshaller; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java index 4ef9fe79..c5fcf4e3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java @@ -17,6 +17,7 @@ package org.springframework.ws.client.support.interceptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.ws.client.WebServiceClientException; import org.springframework.ws.context.MessageContext; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java index 6ff35dd1..bb935067 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java @@ -16,13 +16,14 @@ package org.springframework.ws.config; +import org.w3c.dom.Element; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; /** * Parser for the {@code <sws:static-wsdl/>} element. diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java index 604ace68..0c6da8c9 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java @@ -16,11 +16,11 @@ package org.springframework.ws.soap.saaj; -import jakarta.xml.soap.SOAPHeaderElement; - import javax.xml.transform.Result; import javax.xml.transform.dom.DOMResult; +import jakarta.xml.soap.SOAPHeaderElement; + import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapHeaderException; diff --git a/spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd b/spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd index 0430f31c..54e775e7 100644 --- a/spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd +++ b/spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd @@ -1,9 +1,10 @@ - + diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java index 142bd4d2..585a8eb9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java @@ -16,7 +16,6 @@ package org.springframework.ws.client.core; -import java.io.IOException; import java.net.URI; import javax.xml.transform.Result; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java index 6e9b0d07..6b71b3fa 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java @@ -16,19 +16,20 @@ package org.springframework.ws.config; -import static org.assertj.core.api.Assertions.*; - import java.util.ArrayList; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.server.endpoint.interceptor.DelegatingSmartEndpointInterceptor; import org.springframework.ws.soap.server.endpoint.interceptor.PayloadRootSmartSoapEndpointInterceptor; import org.springframework.ws.soap.server.endpoint.interceptor.SoapActionSmartEndpointInterceptor; +import static org.assertj.core.api.Assertions.assertThat; + public class InterceptorsBeanDefinitionParserTest { @Test diff --git a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java index ecfa08df..18defb0f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java @@ -16,18 +16,19 @@ package org.springframework.ws.mime; -import static org.assertj.core.api.Assertions.*; - import java.io.IOException; import java.util.Iterator; import org.junit.jupiter.api.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.util.FileCopyUtils; import org.springframework.ws.AbstractWebServiceMessageTest; import org.springframework.ws.WebServiceMessage; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageTest { protected MimeMessage mimeMessage; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java index f261a076..63e27f2a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java @@ -16,7 +16,6 @@ package org.springframework.ws.server.endpoint; -import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java index 9f744d11..d6e5dcd0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java @@ -16,16 +16,19 @@ package org.springframework.ws.server.endpoint.adapter; -import static org.assertj.core.api.Assertions.*; -import static org.easymock.EasyMock.*; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.ws.MockWebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.server.endpoint.MessageEndpoint; +import static org.assertj.core.api.Assertions.assertThat; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + public class MessageEndpointAdapterTest { private MessageEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java index c21e0193..5b18611b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java @@ -16,9 +16,6 @@ package org.springframework.ws.server.endpoint.adapter; -import static org.assertj.core.api.Assertions.*; -import static org.easymock.EasyMock.*; - import java.io.StringReader; import java.io.StringWriter; @@ -29,13 +26,21 @@ import javax.xml.transform.stream.StreamSource; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.xmlunit.assertj.XmlAssert; + import org.springframework.ws.MockWebServiceMessage; import org.springframework.ws.MockWebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.server.endpoint.PayloadEndpoint; import org.springframework.xml.transform.TransformerFactoryUtils; -import org.xmlunit.assertj.XmlAssert; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; public class PayloadEndpointAdapterTest { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java index 41d972cb..b5409acf 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java @@ -16,17 +16,18 @@ package org.springframework.ws.server.endpoint.adapter.method.dom; -import static org.assertj.core.api.Assertions.*; - import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; + import org.springframework.core.MethodParameter; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor; import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; +import static org.assertj.core.api.Assertions.assertThat; + public class Dom4jPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java index b32ce07f..91d94814 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java @@ -16,20 +16,21 @@ package org.springframework.ws.server.endpoint.adapter.method.dom; -import static org.assertj.core.api.Assertions.*; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + import org.springframework.core.MethodParameter; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor; import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import org.springframework.xml.DocumentBuilderFactoryUtils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; + +import static org.assertj.core.api.Assertions.assertThat; public class DomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java index ffc94021..50246950 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java @@ -34,8 +34,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.server.EndpointAdapter; -import org.springframework.ws.server.EndpointMapping; import org.springframework.ws.server.MessageDispatcher; import org.springframework.ws.server.endpoint.MethodEndpoint; import org.springframework.ws.server.endpoint.adapter.DefaultMethodEndpointAdapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java index 38e2b04a..7e1931bb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java @@ -16,17 +16,18 @@ package org.springframework.ws.server.endpoint.support; -import static org.assertj.core.api.Assertions.*; - import java.lang.reflect.Method; import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; import org.junit.jupiter.api.Test; + import org.springframework.ws.server.endpoint.annotation.Namespace; import org.springframework.ws.server.endpoint.annotation.Namespaces; +import static org.assertj.core.api.Assertions.assertThat; + @Namespaces({ @Namespace(prefix = "prefix1", uri = "class1"), @Namespace(uri = "class2") }) public class NamespaceUtilsTest { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java index 9bbfc6d7..b7b26a78 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java @@ -16,20 +16,21 @@ package org.springframework.ws.soap; -import static org.assertj.core.api.Assertions.*; - import java.util.Locale; import javax.xml.transform.dom.DOMResult; import org.junit.jupiter.api.Test; -import org.springframework.xml.transform.StringResult; -import org.springframework.xml.transform.StringSource; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xmlunit.assertj.XmlAssert; +import org.springframework.xml.transform.StringResult; +import org.springframework.xml.transform.StringSource; + +import static org.assertj.core.api.Assertions.assertThat; + public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest { protected SoapBody soapBody; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java index b10364d4..d0b60780 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java @@ -16,21 +16,19 @@ package org.springframework.ws.soap.addressing.client; -import static org.easymock.EasyMock.*; +import java.net.URI; + +import javax.xml.namespace.QName; import jakarta.xml.soap.SOAPBody; import jakarta.xml.soap.SOAPBodyElement; import jakarta.xml.soap.SOAPElement; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; - -import java.net.URI; - -import javax.xml.namespace.QName; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.ws.soap.addressing.AbstractWsAddressingTest; import org.springframework.ws.soap.addressing.core.EndpointReference; import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy; @@ -41,6 +39,11 @@ import org.springframework.ws.transport.context.DefaultTransportContext; import org.springframework.ws.transport.context.TransportContext; import org.springframework.ws.transport.context.TransportContextHolder; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTest { private ActionCallback callback; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java index 9055635b..1a57704f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java @@ -16,15 +16,13 @@ package org.springframework.ws.soap.addressing.server; -import static org.assertj.core.api.Assertions.*; -import static org.easymock.EasyMock.*; - import java.net.URI; import java.util.Iterator; import java.util.Locale; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.SoapHeaderElement; @@ -37,6 +35,13 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.ws.transport.WebServiceConnection; import org.springframework.ws.transport.WebServiceMessageSender; +import static org.assertj.core.api.Assertions.assertThat; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddressingTest { protected AddressingEndpointInterceptor interceptor; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java index f4f39393..252c3d28 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java @@ -16,25 +16,25 @@ package org.springframework.ws.soap.saaj; -import static org.assertj.core.api.Assertions.*; +import java.util.Iterator; + +import javax.xml.transform.Result; +import javax.xml.transform.Source; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPBody; import jakarta.xml.soap.SOAPBodyElement; import jakarta.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPMessage; - -import java.util.Iterator; - -import javax.xml.transform.Result; -import javax.xml.transform.Source; - import org.junit.jupiter.api.Test; +import org.xmlunit.assertj.XmlAssert; + import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.soap11.AbstractSoap11MessageTest; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; -import org.xmlunit.assertj.XmlAssert; + +import static org.assertj.core.api.Assertions.assertThat; public class SaajSoap11MessageTest extends AbstractSoap11MessageTest { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java index 8803e014..b1e4dd2f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java @@ -16,20 +16,20 @@ package org.springframework.ws.soap.saaj; -import static org.assertj.core.api.Assertions.*; +import javax.xml.transform.Result; +import javax.xml.transform.Source; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPMessage; - -import javax.xml.transform.Result; -import javax.xml.transform.Source; +import org.xmlunit.assertj.XmlAssert; import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.soap12.AbstractSoap12MessageTest; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; -import org.xmlunit.assertj.XmlAssert; + +import static org.assertj.core.api.Assertions.assertThat; public class SaajSoap12MessageTest extends AbstractSoap12MessageTest { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java index 2d0fc2b0..1ccb8e7f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java @@ -16,7 +16,11 @@ package org.springframework.ws.soap.saaj.support; -import static org.assertj.core.api.Assertions.*; +import java.io.InputStream; + +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.MimeHeaders; @@ -24,21 +28,18 @@ import jakarta.xml.soap.Name; import jakarta.xml.soap.SOAPEnvelope; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; - -import java.io.InputStream; - -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.w3c.dom.Document; +import org.xmlunit.assertj.XmlAssert; + import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; import org.springframework.xml.DocumentBuilderFactoryUtils; -import org.w3c.dom.Document; -import org.xmlunit.assertj.XmlAssert; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class SaajUtilsTest { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java index 3b0f94c6..0660bf60 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java @@ -16,7 +16,6 @@ package org.springframework.ws.soap.server.endpoint; -import java.io.IOException; import java.util.Iterator; import javax.xml.namespace.QName; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java index 5c48cba7..683e303e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java @@ -28,7 +28,6 @@ import jakarta.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPMessage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.springframework.core.io.ClassPathResource; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java index 2f41ca3e..6c7857b9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java @@ -16,11 +16,6 @@ package org.springframework.ws.transport.http; -import static org.assertj.core.api.Assertions.*; -import static org.easymock.EasyMock.*; - -import jakarta.servlet.http.HttpServletResponse; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.net.URI; @@ -28,8 +23,12 @@ import java.net.URI; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.w3c.dom.Document; +import org.xmlunit.assertj.XmlAssert; + import org.springframework.core.io.ClassPathResource; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -37,8 +36,12 @@ import org.springframework.ws.wsdl.WsdlDefinition; import org.springframework.ws.wsdl.wsdl11.SimpleWsdl11Definition; import org.springframework.xml.DocumentBuilderFactoryUtils; import org.springframework.xml.transform.StringSource; -import org.w3c.dom.Document; -import org.xmlunit.assertj.XmlAssert; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; public class WsdlDefinitionHandlerAdapterTest { diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd index 60613d2b..d116366d 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd +++ b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.springframework.org/spring-ws/test/validation" + elementFormDefault="qualified"> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml index 14f40919..21da155a 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml @@ -1,9 +1,8 @@ - diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml index 0b33cb19..e84cf8a7 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml @@ -1,7 +1,7 @@ - diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml index 1adfd72c..395b775d 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml @@ -1,11 +1,9 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:aop="http://www.springframework.org/schema/aop" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml index e401f6eb..a5307201 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml index 12031f22..c2d2fa05 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd index b81c1170..03be6ca0 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd +++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://springframework.org/spring-ws" + elementFormDefault="qualified"> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd index 60613d2b..d116366d 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd +++ b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.springframework.org/spring-ws/test/validation" + elementFormDefault="qualified"> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl index 97d9e6e4..8fd793ba 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl +++ b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl @@ -1,8 +1,7 @@ + xmlns:tns="http://www.springframework.org/spring-ws/wsdl/definitions" + targetNamespace="http://www.springframework.org/spring-ws/wsdl/definitions"> diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java index 9b0fe1a5..3d2eb2ef 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java @@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.xml.transform.StringSource; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java index 40973168..b5a4e054 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java @@ -16,16 +16,17 @@ package org.springframework.ws.soap.security.wss4j2.callback; -import static org.assertj.core.api.Assertions.*; - import java.security.KeyStore; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.ws.soap.security.support.KeyStoreFactoryBean; +import static org.assertj.core.api.Assertions.assertThat; + public class KeyStoreCallbackHandlerTest { private KeyStoreCallbackHandler callbackHandler; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java index 869c6c77..ac5e0fbe 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java @@ -17,6 +17,7 @@ package org.springframework.ws.transport.mail; import jakarta.mail.MessagingException; + import org.springframework.ws.transport.TransportException; /** diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java index adca0c73..aa9fbb8e 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import org.jivesoftware.smack.packet.Message; + import org.springframework.util.Assert; /** diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java index 3745ecdf..5adce0e2 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java @@ -16,12 +16,14 @@ package org.springframework.ws.test.support; -import static org.assertj.core.api.Assertions.*; - import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.BeanInitializationException; import org.springframework.context.support.StaticApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + public class MockStrategiesHelperTest { @Test diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java index 4cee896b..0511f1c4 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java @@ -16,20 +16,20 @@ package org.springframework.ws.test.support.matcher; -import static org.assertj.core.api.Assertions.*; -import static org.easymock.EasyMock.*; +import javax.xml.namespace.QName; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPMessage; - -import javax.xml.namespace.QName; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.ws.WebServiceMessage; import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessage; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.easymock.EasyMock.createMock; + public class SoapHeaderMatcherTest { private SoapHeaderMatcher matcher; diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java index f4cece1a..a73b7770 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java @@ -16,17 +16,18 @@ package org.springframework.xml.namespace; -import static org.assertj.core.api.Assertions.*; - import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.junit.jupiter.api.Test; -import org.springframework.xml.DocumentBuilderFactoryUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.springframework.xml.DocumentBuilderFactoryUtils; + +import static org.assertj.core.api.Assertions.assertThat; + public class QNameUtilsTest { @Test diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java index 71f94292..176f8168 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java @@ -16,15 +16,16 @@ package org.springframework.xml.transform; -import static org.assertj.core.api.Assertions.*; - import javax.xml.transform.Transformer; import javax.xml.transform.dom.DOMResult; import org.junit.jupiter.api.Test; -import org.springframework.core.io.ClassPathResource; import org.w3c.dom.Element; +import org.springframework.core.io.ClassPathResource; + +import static org.assertj.core.api.Assertions.assertThat; + public class ResourceSourceTest { @Test diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java index 81abf1d9..cb87ab7b 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.springframework.core.io.ClassPathResource; diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java index 8eb7da7e..dd606611 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java @@ -16,7 +16,6 @@ package org.springframework.xml.xpath; -import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.List; @@ -30,7 +29,6 @@ import org.junit.jupiter.api.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.xml.sax.SAXException; import org.springframework.xml.DocumentBuilderFactoryUtils; diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java index 41d5caa2..66112aba 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java @@ -16,11 +16,8 @@ package org.springframework.xml.xpath; -import java.io.IOException; import java.util.Map; -import org.xml.sax.SAXException; - public class JaxenXPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTest { @Override diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java index c70957a6..a102f79d 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java @@ -16,11 +16,12 @@ package org.springframework.xml.xsd; -import static org.assertj.core.api.Assertions.*; - import org.junit.jupiter.api.Test; + import org.springframework.core.io.Resource; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + public class SimpleXsdSchemaTest extends AbstractXsdSchemaTest { @Override