checkstyle WhiteAround

WhiteAroundCheck script

Author: garyrussell

build.gradle

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

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java

@@ -331,7 +331,8 @@ public int getMessageCount() {
 				@Override
 				public String getQueue() {
 					return queue;
-				}};
+				}
+			};
 		}
 
 		@Override

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java

@@ -65,7 +65,7 @@
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
+@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 public class ChannelTests extends LogAdjustingTestSupport {
 
 	@ClassRule

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -102,7 +102,7 @@ public void verifyLifeCycle() {
 
 	@SuppressWarnings("rawtypes")
 	@Test
-	public void verifyUsageWithHeaderMapper() throws Exception{
+	public void verifyUsageWithHeaderMapper() throws Exception {
 		DirectChannel requestChannel = context.getBean("requestChannel", DirectChannel.class);
 		requestChannel.subscribe(new MessageHandler() {
 			@Override
@@ -129,8 +129,8 @@ public Object answer(InvocationOnMock invocation) {
 				MessageProperties properties = amqpReplyMessage.getMessageProperties();
 				assertEquals("bar", properties.getHeaders().get("bar"));
 				return null;
-			}})
-				.when(amqpTemplate).send(Mockito.any(String.class), Mockito.any(String.class),
+			}
+		}).when(amqpTemplate).send(Mockito.any(String.class), Mockito.any(String.class),
 				Mockito.any(Message.class), Mockito.any(CorrelationData.class));
 		ReflectionUtils.setField(amqpTemplateField, gateway, amqpTemplate);
 
@@ -166,6 +166,6 @@ public void testInt2971HeaderMapperAndMappedHeadersExclusivity() {
 		}
 	}
 
-	private static class TestConverter extends SimpleMessageConverter {}
+	private static class TestConverter extends SimpleMessageConverter { }
 
 }

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

@@ -51,7 +51,7 @@
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-@DirtiesContext(classMode=ClassMode.AFTER_EACH_TEST_METHOD)
+@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 public class AmqpOutboundEndpointTests {
 
 	@Rule

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

@@ -56,7 +56,7 @@ public Object getCorrelationKey(Message<?> message) {
 	}
 
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		if (beanFactory != null){
+		if (beanFactory != null) {
 			this.processor.setBeanFactory(beanFactory);
 		}
 	}

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

@@ -77,11 +77,11 @@ protected void afterRelease(MessageGroup messageGroup, Collection<Message<?>> co
 		int size = messageGroup.getMessages().size();
 		int sequenceSize = 0;
 		Message<?> message = messageGroup.getOne();
-		if (message != null){
+		if (message != null) {
 			sequenceSize = new IntegrationMessageHeaderAccessor(message).getSequenceSize();
 		}
 		// If there is no sequence then it must be incomplete or unbounded
-		if (sequenceSize > 0 && sequenceSize == size){
+		if (sequenceSize > 0 && sequenceSize == size) {
 			remove(messageGroup);
 		}
 		else {

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

@@ -38,7 +38,7 @@ public class SequenceNumberComparator implements Comparator<Message<?>> {
 	public int compare(Message<?> o1, Message<?> o2) {
 		Integer sequenceNumber1 = new IntegrationMessageHeaderAccessor(o1).getSequenceNumber();
 		Integer sequenceNumber2 = new IntegrationMessageHeaderAccessor(o2).getSequenceNumber();
-		if (sequenceNumber1 == sequenceNumber2) {//NOSONAR - early exit optimization
+		if (sequenceNumber1 == sequenceNumber2) { //NOSONAR - early exit optimization
 			return 0;
 		}
 		if (sequenceNumber1 == null) {

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

@@ -88,13 +88,13 @@ public boolean canRelease(MessageGroup messageGroup) {
 		else {
 			int size = messages.size();
 
-			if (size == 0){
+			if (size == 0) {
 				canRelease = true;
 			}
 			else {
 				int sequenceSize = new IntegrationMessageHeaderAccessor(messageGroup.getOne()).getSequenceSize();
 				// If there is no sequence then it must be incomplete....
-				if (sequenceSize == size){
+				if (sequenceSize == size) {
 					canRelease = true;
 				}
 			}

spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * 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.
@@ -142,7 +142,7 @@ public final Object invoke(final MethodInvocation invocation) throws Throwable {
 			context.setVariable(PublisherMetadataSource.RETURN_VALUE_VARIABLE_NAME, returnValue);
 			return returnValue;
 		}
-		catch (Throwable t) {//NOSONAR - rethrown below
+		catch (Throwable t) { //NOSONAR - rethrown below
 			context.setVariable(PublisherMetadataSource.EXCEPTION_VARIABLE_NAME, t);
 			throw t;
 		}
@@ -182,7 +182,7 @@ private void publishMessage(Method method, StandardEvaluationContext context) th
 			}
 			else {
 				if (this.defaultChannelName != null) {
-					synchronized(this) {
+					synchronized (this) {
 						if (this.defaultChannelName != null && this.messagingTemplate.getDefaultDestination() == null) {
 							Assert.state(this.channelResolver != null,
 									"ChannelResolver is required to resolve channel names.");