Unable ImportOrder Checkstyle rule for tests

* Fix wrong import order in tests
* Polishing for not closed application contexts
* Use diamonds
* Use proper assertion operators
* Remove redundant classes
* Improve performance in JPA tests
* Fix typos

Author: artembilan

spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -24,8 +24,8 @@
 import org.junit.Test;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.messaging.support.GenericMessage;
 import org.springframework.integration.store.SimpleMessageGroup;
+import org.springframework.messaging.support.GenericMessage;
 
 /**
  * @author Alex Peters
@@ -49,21 +49,21 @@ public void setup() {
 	}
 
 	@Test
-	public void testCompletedWithSizeSpelEvaluated() throws Exception {
+	public void testCompletedWithSizeSpelEvaluated() {
 		strategy = new ExpressionEvaluatingReleaseStrategy("#root.size()==5");
 		strategy.setBeanFactory(mock(BeanFactory.class));
 		assertThat(strategy.canRelease(messages), is(true));
 	}
 
 	@Test
-	public void testCompletedWithFilterSpelEvaluated() throws Exception {
+	public void testCompletedWithFilterSpelEvaluated() {
 		strategy = new ExpressionEvaluatingReleaseStrategy("!messages.?[payload==5].empty");
 		strategy.setBeanFactory(mock(BeanFactory.class));
 		assertThat(strategy.canRelease(messages), is(true));
 	}
 
 	@Test
-	public void testCompletedWithFilterSpelReturnsNotCompleted() throws Exception {
+	public void testCompletedWithFilterSpelReturnsNotCompleted() {
 		strategy = new ExpressionEvaluatingReleaseStrategy("!messages.?[payload==6].empty");
 		strategy.setBeanFactory(mock(BeanFactory.class));
 		assertThat(strategy.canRelease(messages), is(false));

spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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,8 +22,8 @@
 
 import org.junit.Test;
 
-import org.springframework.messaging.Message;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
 
 /**
  * @author Mark Fisher

spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -20,14 +20,16 @@
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.springframework.messaging.Message;
+
 import org.springframework.integration.store.MessageGroup;
 import org.springframework.integration.store.SimpleMessageGroup;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
 
 /**
  * @author Mark Fisher
  * @author Iwein Fuld
+ * @author Artem Bilan
  */
 public class SequenceSizeReleaseStrategyTests {
 

spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -20,12 +20,14 @@
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.springframework.messaging.Message;
+
 import org.springframework.integration.store.SimpleMessageGroup;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
 
 /**
  * @author Dave Syer
+ * @author Artme Bilan
  */
 public class TimeoutCountSequenceSizeReleaseStrategyTests {
 
@@ -45,7 +47,9 @@ public void testIncompleteListWithTimeout() {
 				.setSequenceSize(2).build();
 		SimpleMessageGroup messages = new SimpleMessageGroup("FOO");
 		messages.add(message);
-		TimeoutCountSequenceSizeReleaseStrategy releaseStrategy = new TimeoutCountSequenceSizeReleaseStrategy(TimeoutCountSequenceSizeReleaseStrategy.DEFAULT_THRESHOLD, -100);
+		TimeoutCountSequenceSizeReleaseStrategy releaseStrategy =
+				new TimeoutCountSequenceSizeReleaseStrategy(TimeoutCountSequenceSizeReleaseStrategy.DEFAULT_THRESHOLD,
+						-100);
 		assertTrue(releaseStrategy.canRelease(messages));
 	}
 
@@ -55,7 +59,9 @@ public void testIncompleteListWithCount() {
 				.setSequenceSize(2).build();
 		SimpleMessageGroup messages = new SimpleMessageGroup("FOO");
 		messages.add(message);
-		TimeoutCountSequenceSizeReleaseStrategy releaseStrategy = new TimeoutCountSequenceSizeReleaseStrategy(1, TimeoutCountSequenceSizeReleaseStrategy.DEFAULT_TIMEOUT);
+		TimeoutCountSequenceSizeReleaseStrategy releaseStrategy =
+				new TimeoutCountSequenceSizeReleaseStrategy(1,
+						TimeoutCountSequenceSizeReleaseStrategy.DEFAULT_TIMEOUT);
 		assertTrue(releaseStrategy.canRelease(messages));
 	}
 

spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -23,19 +23,21 @@
 
 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.integration.IntegrationMessageHeaderAccessor;
-import org.springframework.messaging.support.GenericMessage;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Iwein Fuld
  * @author Alex Peters
  * @author Oleg Zhurakousky
+ * @author Artem Bilan
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -50,16 +52,16 @@ public class AggregatorExpressionIntegrationTests {
 	private PollableChannel output;
 
 	@Test//(timeout=5000)
-	public void testVanillaAggregation() throws Exception {
+	public void testVanillaAggregation() {
 		for (int i = 0; i < 5; i++) {
 			Map<String, Object> headers = stubHeaders(i, 5, 1);
-			input.send(new GenericMessage<Integer>(i, headers));
+			this.input.send(new GenericMessage<>(i, headers));
 		}
-		assertEquals("[0, 1, 2, 3, 4]", output.receive().getPayload());
+		assertEquals("[0, 1, 2, 3, 4]", this.output.receive().getPayload());
 	}
 
 	private Map<String, Object> stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) {
-		Map<String, Object> headers = new HashMap<String, Object>();
+		Map<String, Object> headers = new HashMap<>();
 		headers.put(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber);
 		headers.put(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize);
 		headers.put(IntegrationMessageHeaderAccessor.CORRELATION_ID, correllationId);

spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -28,19 +28,21 @@
 
 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.integration.IntegrationMessageHeaderAccessor;
-import org.springframework.messaging.support.GenericMessage;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Alex Peters
  * @author Iwein Fuld
  * @author Gunnar Hillert
+ * @author Artem Bilan
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -56,20 +58,20 @@ public class DefaultMessageAggregatorIntegrationTests {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Test(timeout = 10000)
-	public void testAggregation() throws Exception {
+	public void testAggregation() {
 		for (int i = 0; i < 5; i++) {
 			Map<String, Object> headers = stubHeaders(i, 5, 1);
-			input.send(new GenericMessage<Integer>(i, headers));
+			this.input.send(new GenericMessage<>(i, headers));
 		}
-		Object payload = output.receive().getPayload();
+		Object payload = this.output.receive().getPayload();
 		assertThat(payload, is(instanceOf(List.class)));
 		assertTrue(payload + " doesn't contain all of {0,1,2,3,4}",
 				((List) payload).containsAll(Arrays.asList(0, 1, 2, 3, 4)));
 	}
 
 
 	private Map<String, Object> stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) {
-		Map<String, Object> headers = new HashMap<String, Object>();
+		Map<String, Object> headers = new HashMap<>();
 		headers.put(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber);
 		headers.put(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize);
 		headers.put(IntegrationMessageHeaderAccessor.CORRELATION_ID, correllationId);

spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -23,16 +23,18 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.Message;
 import org.springframework.integration.channel.DirectChannel;
-import org.springframework.messaging.PollableChannel;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.PollableChannel;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -54,16 +56,16 @@ public class MethodInvokingAggregatorReturningMessageTests {
 	@Test // INT-1107
 	public void messageReturningPojoAggregatorResultIsNotWrappedInAnotherMessage() {
 		List<String> payload = Collections.singletonList("test");
-		pojoInput.send(MessageBuilder.withPayload(payload).build());
-		Message<?> result = pojoOutput.receive();
+		this.pojoInput.send(MessageBuilder.withPayload(payload).build());
+		Message<?> result = this.pojoOutput.receive();
 		assertFalse(Message.class.isAssignableFrom(result.getPayload().getClass()));
 	}
 
 	@Test
 	public void defaultAggregatorResultIsNotWrappedInAnotherMessage() {
 		List<String> payload = Collections.singletonList("test");
-		defaultInput.send(MessageBuilder.withPayload(payload).build());
-		Message<?> result = defaultOutput.receive();
+		this.defaultInput.send(MessageBuilder.withPayload(payload).build());
+		Message<?> result = this.defaultOutput.receive();
 		assertFalse(Message.class.isAssignableFrom(result.getPayload().getClass()));
 	}
 
@@ -75,6 +77,7 @@ public Message<?> aggregate(final List<Message<?>> messages) {
 			List<String> payload = Collections.singletonList("foo");
 			return MessageBuilder.withPayload(payload).setHeader("bar", 123).build();
 		}
+
 	}
 
 }

spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -20,16 +20,15 @@
 import java.util.List;
 
 import org.junit.Assert;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.Message;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -38,6 +37,7 @@
  *
  * @author Iwein Fuld
  * @author Gunnar Hillert
+ * @author Artem Bilan
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -62,8 +62,8 @@ public class AggregationResendTests {
 	 */
 	@Test
 	@Ignore // timeout is no longer supported
-	public void testAggregatorWithoutExplicitTimeoutReturnsOnlyOneMessage() throws Exception {
-		sendMessage(input_for_aggregator_with_explicit_timeout, 2000);
+	public void testAggregatorWithoutExplicitTimeoutReturnsOnlyOneMessage() {
+		sendMessage(this.input_for_aggregator_with_explicit_timeout, 2000);
 	}
 
 	/**
@@ -76,17 +76,17 @@ public void testAggregatorWithoutExplicitTimeoutReturnsOnlyOneMessage() throws E
 	 */
 	@Test
 	@Ignore // disabling from normal testing, should be the same behavior whether explicit or default
-	public void testAggregatorWithTimeoutReturnsOnlyOneMessage() throws Exception {
-		sendMessage(input_for_aggregator_without_explicit_timeout, 62000);
+	public void testAggregatorWithTimeoutReturnsOnlyOneMessage() {
+		sendMessage(this.input_for_aggregator_without_explicit_timeout, 62000);
 	}
 
 	private void sendMessage(DirectChannel channel, int waitSeconds) {
-		List<String> list = new ArrayList<String>();
+		List<String> list = new ArrayList<>();
 		list.add("foo");
 		list.add("bar");
 		list.add("baz");
 
-		reply.purge(null);
+		this.reply.purge(null);
 		channel.send(MessageBuilder.withPayload(list).setReplyChannel(reply).build());
 
 		Message<?> replyMessage;
@@ -96,8 +96,10 @@ private void sendMessage(DirectChannel channel, int waitSeconds) {
 			if (null != replyMessage) {
 				messageCount++;
 			}
-		} while (null != replyMessage);
+		}
+		while (null != replyMessage);
 
 		Assert.assertEquals(1, messageCount);
 	}
+
 }