Optimize imports

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java

@@ -18,6 +18,7 @@
 
 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;

spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java

@@ -17,6 +17,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.ws.client.WebServiceClientException;
 import org.springframework.ws.context.MessageContext;
 

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.

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;
 

spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/web-services" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:beans="http://www.springframework.org/schema/beans"
-            xmlns:tool="http://www.springframework.org/schema/tool"
-            targetNamespace="http://www.springframework.org/schema/web-services" elementFormDefault="qualified"
-            attributeFormDefault="unqualified">
+<xsd:schema xmlns="http://www.springframework.org/schema/web-services"
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/web-services"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>
     <xsd:import namespace="http://www.springframework.org/schema/tool"/>

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;

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

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;

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;
 

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;