checkstyle MutableException

checkstyle EmptyBlock

checkstyle fixRightCurly Script

checkstyle EmptyStatement

checkstyle RightCurly

checkstyle TailingWhite

checkstyle NeedBraces

Fix the line separator in the `fixRightCurly.gradle`

Author: garyrussell

build.gradle

@@ -68,6 +68,7 @@ subprojects { subproject ->
 	apply from:   "${rootDir}/src/checkstyle/fixHeaders.gradle"
 	apply from:   "${rootDir}/src/checkstyle/fixModifiers.gradle"
 	apply from:   "${rootDir}/src/checkstyle/fixThis.gradle"
+	apply from:   "${rootDir}/src/checkstyle/fixRightCurly.gradle"
 
 	if (project.hasProperty('platformVersion')) {
 		apply plugin: 'spring-io'

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpHeaderMapper.java

@@ -23,7 +23,7 @@
 /**
  * A convenience interface that extends {@link HeaderMapper}
  * but parameterized with {@link MessageProperties}.
- *  
+ *
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @since 2.1

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java

@@ -90,7 +90,7 @@ public class AmqpOutboundEndpointTests {
 	@Test
 	public void testGatewayPublisherConfirms() throws Exception {
 		while (this.amqpTemplateConfirms.receive(this.queue.getName()) != null) {
-			;
+			// drain
 		}
 
 		Message<?> message = MessageBuilder.withPayload("hello")
@@ -119,7 +119,7 @@ public void testGatewayPublisherConfirms() throws Exception {
 		assertEquals(Boolean.TRUE, ack.getHeaders().get(AmqpHeaders.PUBLISH_CONFIRM));
 
 		while (this.amqpTemplateConfirms.receive(this.queue.getName()) != null) {
-			;
+			// drain
 		}
 	}
 
@@ -149,7 +149,7 @@ public void adapterWithContentType() throws Exception {
 		RabbitTemplate template = new RabbitTemplate(this.connectionFactory);
 		template.setQueue(this.queue.getName());
 		while (template.receive() != null) {
-			;
+			// drain
 		}
 		Message<?> message = MessageBuilder.withPayload("hello")
 				.setHeader(AmqpHeaders.CONTENT_TYPE, "application/json")
@@ -169,7 +169,7 @@ public void adapterWithContentType() throws Exception {
 		assertEquals("hello", new String(m.getBody(), "UTF-8"));
 		assertEquals("text/plain", m.getMessageProperties().getContentType());
 		while (template.receive() != null) {
-			;
+			// drain
 		}
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java

@@ -126,7 +126,8 @@ public Message<Object> receive() {
 							if (log.isDebugEnabled()) {
 								log.debug(String.format("Released message for key [%s]: %s.", key, nextMessage));
 							}
-						} else {
+						}
+						else {
 							remove(key);
 						}
 						@SuppressWarnings("unchecked")

spring-integration-core/src/main/java/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java

@@ -28,7 +28,7 @@
 /**
  * This implementation of MessageGroupProcessor will take the messages from the
  * MessageGroup and pass them on in a single message with a Collection as a payload.
- * 
+ *
  * @author Iwein Fuld
  * @author Alexander Peters
  * @author Mark Fisher

spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategy.java

@@ -20,7 +20,7 @@
 
 /**
  * A {@link ReleaseStrategy} that evaluates an expression.
- * 
+ *
  * @author Dave Syer
  */
 public class ExpressionEvaluatingReleaseStrategy extends ExpressionEvaluatingMessageListProcessor implements

spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageCountReleaseStrategy.java

@@ -1,56 +1,57 @@
-/*
- * Copyright 2002-2016 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.aggregator;
-
-import org.springframework.integration.store.MessageGroup;
-
-/**
- * A {@link ReleaseStrategy} that releases only the first <code>n</code> messages, where <code>n</code> is a threshold.
- * 
- * @author Dave Syer
- * @author Oleg Zhurakousky
- * 
- */
-public class MessageCountReleaseStrategy implements ReleaseStrategy {
-
-	private final int threshold;
-
-	/**
-	 * @param threshold the number of messages to accept before releasing
-	 */
-	public MessageCountReleaseStrategy(int threshold) {
-		super();
-		this.threshold = threshold;
-	}
-
-	/**
-	 * Convenient constructor is only one message is required (threshold=1).
-	 */
-	public MessageCountReleaseStrategy() {
-		this(1);
-	}
-
-	/**
-	 * Release the group if it has more messages than the threshold and has not previously been released. 
-	 * It is possible that more messages than the threshold could be released, but only if multiple consumers 
-	 * receive messages from the same group concurrently.
-	 */
-	public boolean canRelease(MessageGroup group) {
-		return group.size() >= this.threshold;
-	}
-
-}
+/*
+ * Copyright 2002-2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.aggregator;
+
+import org.springframework.integration.store.MessageGroup;
+
+/**
+ * A {@link ReleaseStrategy} that releases only the first <code>n</code> messages, where <code>n</code> is a threshold.
+ *
+ * @author Dave Syer
+ * @author Oleg Zhurakousky
+ *
+ */
+public class MessageCountReleaseStrategy implements ReleaseStrategy {
+
+	private final int threshold;
+
+	/**
+	 * @param threshold the number of messages to accept before releasing
+	 */
+	public MessageCountReleaseStrategy(int threshold) {
+		super();
+		this.threshold = threshold;
+	}
+
+	/**
+	 * Convenient constructor is only one message is required (threshold=1).
+	 */
+	public MessageCountReleaseStrategy() {
+		this(1);
+	}
+
+	/**
+	 * Release the group if it has more messages than the threshold and has not previously been released.
+	 * It is possible that more messages than the threshold could be released, but only if multiple consumers
+	 * receive messages from the same group concurrently.
+	 */
+	@Override
+	public boolean canRelease(MessageGroup group) {
+		return group.size() >= this.threshold;
+	}
+
+}

spring-integration-core/src/main/java/org/springframework/integration/aggregator/ReleaseStrategy.java

@@ -23,7 +23,7 @@
 /**
  * Strategy for determining when a group of messages reaches a state of
  * completion (i.e. can trip a barrier).
- * 
+ *
  * @author Mark Fisher
  * @author Dave Syer
  */

spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategy.java

@@ -81,8 +81,8 @@ public boolean canRelease(MessageGroup messageGroup) {
 			int nextSequenceNumber = new IntegrationMessageHeaderAccessor(minMessage).getSequenceNumber();
 			int lastReleasedMessageSequence = messageGroup.getLastReleasedMessageSequenceNumber();
 
-			if (nextSequenceNumber - lastReleasedMessageSequence == 1){
-				canRelease = true;;
+			if (nextSequenceNumber - lastReleasedMessageSequence == 1) {
+				canRelease = true;
 			}
 		}
 		else {

spring-integration-core/src/main/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.java

@@ -21,15 +21,15 @@
 
 /**
  * A {@link ReleaseStrategy} that releases all messages if any of the following is true:
- * 
+ *
  * <ul>
  * <li>The sequence is complete (if there is one).</li>
  * <li>There are more messages than a threshold set by the user.</li>
  * <li>The time elapsed since the earliest message, according to their timestamps, exceeds a timeout set by the user.</li>
  * </ul>
- * 
+ *
  * @author Dave Syer
- * 
+ *
  * @since 2.0
  */
 public class TimeoutCountSequenceSizeReleaseStrategy implements ReleaseStrategy {