Checkstyle ImportOrder for main and fixes

spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -27,11 +27,11 @@ import org.springframework.integration.config.ExpressionFactoryBean;
 import org.springframework.integration.config.xml.AbstractOutboundGatewayParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.ws.DefaultSoapHeaderMapper;
+import org.springframework.integration.ws.MarshallingWebServiceOutboundGateway;
+import org.springframework.integration.ws.SimpleWebServiceOutboundGateway;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
-import org.springframework.integration.ws.MarshallingWebServiceOutboundGateway;
-import org.springframework.integration.ws.SimpleWebServiceOutboundGateway;
 
 /**
  * Parser for the <outbound-gateway/> element in the 'ws' namespace.
@@ -76,7 +76,7 @@ public class WebServiceOutboundGatewayParser extends AbstractOutboundGatewayPars
 					String expression = uriVariableElement.getAttribute("expression");
 					BeanDefinitionBuilder factoryBeanBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class);
 					factoryBeanBuilder.addConstructorArgValue(expression);
-					uriVariableExpressions.put(name,  factoryBeanBuilder.getBeanDefinition());
+					uriVariableExpressions.put(name, factoryBeanBuilder.getBeanDefinition());
 				}
 				builder.addPropertyValue("uriVariableExpressions", uriVariableExpressions);
 			}

spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -35,6 +35,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.oxm.Marshaller;
@@ -59,7 +60,8 @@ public class MarshallingWebServiceIntegrationTests {
 
 	private static final String input = "<hello/>";
 
-	@Autowired MarshallingWebServiceInboundGateway gateway;
+	@Autowired
+	MarshallingWebServiceInboundGateway gateway;
 
 	@Mock
 	private MessageContext context;
@@ -76,7 +78,8 @@ public class MarshallingWebServiceIntegrationTests {
 
 	private Result stringResult = new StreamResult(output);
 
-	@Before public void setupMocks() {
+	@Before
+	public void setupMocks() {
 		MockitoAnnotations.initMocks(this);
 	}
 
@@ -125,6 +128,7 @@ public class MarshallingWebServiceIntegrationTests {
 	}
 
 	public static class StubEndpoint {
+
 		@ServiceActivator(inputChannel = "requests")
 		public Object handle(Object o) {
 			return o;

spring-integration-ws/src/test/java/org/springframework/integration/ws/WebServiceInboundGatewayJavaConfigTests.java

@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when;
 
 import java.io.StringWriter;
 import java.util.Locale;
+
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamResult;

spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -22,13 +22,14 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.messaging.support.GenericMessage;
+import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.ws.WebServiceHeaders;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
-import org.springframework.integration.core.MessagingTemplate;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -40,10 +41,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 public class WebServiceHeaderEnricherTests {
 
-	@Autowired @Qualifier("literalValueInput")
+	@Autowired
+	@Qualifier("literalValueInput")
 	private MessageChannel literalValueInput;
 
-	@Autowired @Qualifier("expressionInput")
+	@Autowired
+	@Qualifier("expressionInput")
 	private MessageChannel expressionInput;
 
 	@Test