Checkstyle ImportOrder for main and fixes

GregBragg · Jan 23, 2017 · 2659baa · 2659baa
1 parent 6ac0c73
commit 2659baa
Show file tree

Hide file tree

Showing 125 changed files with 396 additions and 323 deletions.
diff --git a/...gration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java b/...gration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java
@@ -23,8 +23,8 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
 
 import java.util.Collection;
@@ -79,7 +79,7 @@ public class ChannelTests extends LogAdjustingTestSupport {
 
 	@ClassRule
 	public static final BrokerRunning brokerIsRunning =
-		BrokerRunning.isRunningWithEmptyQueues("pollableWithEP", "withEP", "testConvertFail");
+			BrokerRunning.isRunningWithEmptyQueues("pollableWithEP", "withEP", "testConvertFail");
 
 	@Rule
 	public ExpectedException exception = ExpectedException.none();
@@ -257,7 +257,7 @@ public void messageConversionTests() throws Exception {
 		MessageListener listener = TestUtils.getPropertyValue(channel, "container.messageListener",
 				MessageListener.class);
 		willThrow(new MessageConversionException("foo", new IllegalStateException("bar")))
-			.given(messageConverter).fromMessage(any(org.springframework.amqp.core.Message.class));
+				.given(messageConverter).fromMessage(any(org.springframework.amqp.core.Message.class));
 		this.exception.expect(MessageConversionException.class);
 		this.exception.expectCause(instanceOf(IllegalStateException.class));
 		listener.onMessage(mock(org.springframework.amqp.core.Message.class));

diff --git a/...ation-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java b/...ation-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-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.
@@ -25,8 +25,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import com.rabbitmq.client.Channel;
-
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.AnonymousQueue;
 import org.springframework.amqp.core.Queue;
@@ -55,6 +53,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.rabbitmq.client.Channel;
+
 /**
  * @author Gary Russell
  * @since 4.0

diff --git a/...qp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java b/...qp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java
@@ -21,12 +21,12 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.BDDMockito.willAnswer;
-import static org.mockito.BDDMockito.willDoNothing;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.BDDMockito.willDoNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -67,7 +67,7 @@ public void testDelayExpression() {
 				.given(amqpTemplate).send(anyString(), anyString(), any(Message.class), isNull());
 		willAnswer(invocation -> invocation.getArgument(2))
 				.given(amqpTemplate)
-					.sendAndReceive(anyString(), anyString(), any(Message.class), isNull());
+				.sendAndReceive(anyString(), anyString(), any(Message.class), isNull());
 		endpoint.setExchangeName("foo");
 		endpoint.setRoutingKey("bar");
 		endpoint.setDelayExpressionString("42");

diff --git a/...a/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java b/...a/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.messaging.Message;
 import org.springframework.integration.store.MessageGroup;
+import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
 /**

diff --git a/...in/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java b/...in/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.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.
@@ -22,9 +22,9 @@
 import java.util.Comparator;
 import java.util.List;
 
-import org.springframework.messaging.Message;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
 import org.springframework.integration.store.MessageGroup;
+import org.springframework.messaging.Message;
 
 /**
  * This class implements all the strategy interfaces needed for a default resequencer.

diff --git a/...a/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.java b/...a/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.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.
@@ -16,8 +16,8 @@
 
 package org.springframework.integration.aggregator;
 
-import org.springframework.messaging.Message;
 import org.springframework.integration.store.MessageGroup;
+import org.springframework.messaging.Message;
 
 /**
  * A {@link ReleaseStrategy} that releases all messages if any of the following is true:

diff --git a/...integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java b/...integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.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.
@@ -19,8 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.messaging.Message;
 import org.springframework.integration.core.MessageSelector;
+import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
 /**
@@ -46,11 +46,11 @@ public class ChannelPurger {
 	private final MessageSelector selector;
 
 
-	public ChannelPurger(QueueChannel ... channels) {
+	public ChannelPurger(QueueChannel... channels) {
 		this(null, channels);
 	}
 
-	public ChannelPurger(MessageSelector selector, QueueChannel ... channels) {
+	public ChannelPurger(MessageSelector selector, QueueChannel... channels) {
 		Assert.notEmpty(channels, "at least one channel is required");
 		if (channels.length == 1) {
 			Assert.notNull(channels[0], "channel must not be null");

diff --git a/...e/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java b/...e/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -16,11 +16,12 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.transformer.MessageTransformingHandler;
-import org.w3c.dom.Element;
 
 /**
  * @author Mark Fisher

diff --git a/.../java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParser.java b/.../java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParser.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.
@@ -19,10 +19,10 @@
 import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.ExpressionFactoryBean;
 import org.springframework.integration.handler.ExpressionEvaluatingMessageHandler;

diff --git a/...on-core/src/main/java/org/springframework/integration/config/xml/DefaultRouterParser.java b/...on-core/src/main/java/org/springframework/integration/config/xml/DefaultRouterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 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.
@@ -18,13 +18,14 @@
 
 import java.util.List;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.RouterFactoryBean;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the &lt;router/&gt; element.

diff --git a/...tegration-core/src/main/java/org/springframework/integration/config/xml/FilterParser.java b/...tegration-core/src/main/java/org/springframework/integration/config/xml/FilterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 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.
@@ -16,11 +16,12 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.FilterFactoryBean;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the &lt;filter/&gt; element.

diff --git a/...src/main/java/org/springframework/integration/config/xml/IntegrationManagementParser.java b/...src/main/java/org/springframework/integration/config/xml/IntegrationManagementParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-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.
@@ -16,15 +16,15 @@
 
 package org.springframework.integration.config.xml;
 
+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.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.support.management.IntegrationManagementConfigurer;
 
-import org.w3c.dom.Element;
-
 /**
  * Parser for the &lt;management/&gt; element.
  *

diff --git a/...rc/main/java/org/springframework/integration/config/xml/MapToObjectTransformerParser.java b/...rc/main/java/org/springframework/integration/config/xml/MapToObjectTransformerParser.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.
@@ -16,11 +16,12 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.transformer.MapToObjectTransformer;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
  * @author Oleg Zhurakousky
@@ -40,7 +41,7 @@ protected void parseTransformer(Element element, ParserContext parserContext, Be
 		String type = element.getAttribute("type");
 		if (StringUtils.hasText(ref) && StringUtils.hasText(type)) {
 			parserContext.getReaderContext().error("'type' and 'ref' attributes are mutually-exclusive, " +
-					"but both have valid values; type: " + type + "; ref: " + ref,
+							"but both have valid values; type: " + type + "; ref: " + ref,
 					IntegrationNamespaceUtils.createElementDescription(element));
 		}
 		if (StringUtils.hasText(ref)) {

diff --git a/...main/java/org/springframework/integration/config/xml/ObjectToStringTransformerParser.java b/...main/java/org/springframework/integration/config/xml/ObjectToStringTransformerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 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.
@@ -16,11 +16,12 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.transformer.ObjectToStringTransformer;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the 'object-to-string-transformer' element.

diff --git a/...ore/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java b/...ore/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -16,11 +16,12 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.router.PayloadTypeRouter;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the &lt;payload-type-router/&gt; element.

diff --git a/.../java/org/springframework/integration/config/xml/ResourceInboundChannelAdapterParser.java b/.../java/org/springframework/integration/config/xml/ResourceInboundChannelAdapterParser.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.
@@ -16,15 +16,15 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.resource.ResourceRetrievingMessageSource;
 import org.springframework.integration.util.AcceptOnceCollectionFilter;
 import org.springframework.util.StringUtils;
 
-import org.w3c.dom.Element;
-
 /**
  * Parser for 'resource-inbound-channel-adapter'
  *

diff --git a/...on-core/src/main/java/org/springframework/integration/config/xml/ScatterGatherParser.java b/...on-core/src/main/java/org/springframework/integration/config/xml/ScatterGatherParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-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,8 +27,8 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.scattergather.ScatterGatherHandler;
 import org.springframework.integration.router.RecipientListRouter;
+import org.springframework.integration.scattergather.ScatterGatherHandler;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;