checkstyle Misc Rules

checkstyle Nesting

checkstyle GenericWhitespace

checkstyle MethodParamPad

checkstyle NoWhiteSpace

checkstyle ParenPad Script

checkstyle ParenPad

Author: garyrussell

build.gradle

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

spring-integration-core/src/main/java/org/springframework/integration/annotation/Payloads.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -33,7 +33,7 @@
  * @author Dave Syer
  * @since 2.0
  */
-@Target( { ElementType.PARAMETER, ElementType.METHOD })
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface Payloads {

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

@@ -35,7 +35,7 @@ public abstract class AbstractMessageSourceAdvice implements MethodInterceptor {
 	public final Object invoke(MethodInvocation invocation) throws Throwable {
 		Object target = invocation.getThis();
 		if (!(target instanceof MessageSource)
-				|| invocation.getMethod().getName() != "receive") {
+				|| !invocation.getMethod().getName().equals("receive")) {
 			return invocation.proceed();
 		}
 

spring-integration-core/src/main/java/org/springframework/integration/config/xml/AnnotationConfigParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -36,12 +36,13 @@
  */
 public class AnnotationConfigParser implements BeanDefinitionParser {
 
+	@Override
 	public BeanDefinition parse(final Element element, ParserContext parserContext) {
 		new IntegrationRegistrar().registerBeanDefinitions(new StandardAnnotationMetadata(Object.class) {
 
 			@Override
 			public Map<String, Object> getAnnotationAttributes(String annotationType) {
-				return Collections.<String, Object> singletonMap("value", element.getAttribute("default-publisher-channel"));
+				return Collections.<String, Object>singletonMap("value", element.getAttribute("default-publisher-channel"));
 			}
 		}, parserContext.getRegistry());
 

spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java

@@ -119,7 +119,7 @@ public void setComponentNamePatternsSet(Set<String> componentNamePatternsSet) {
 		Assert.notNull(componentNamePatternsSet, "'componentNamePatternsSet' must not be null");
 		Assert.state(!this.running, "'componentNamePatternsSet' cannot be changed without invoking stop() first");
 		for (String s : componentNamePatternsSet) {
-			String[] componentNamePatterns = StringUtils.delimitedListToStringArray(s, "," , " ");
+			String[] componentNamePatterns = StringUtils.delimitedListToStringArray(s, ",", " ");
 			Arrays.sort(componentNamePatterns);
 			if (this.componentNamePatternsExplicitlySet
 					&& !Arrays.equals(this.componentNamePatterns, componentNamePatterns)) {

spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java

@@ -159,7 +159,7 @@ public int getMessageCountForAllMessageGroups() {
 	public int getMessageGroupCount() {
 		int count = 0;
 		for (@SuppressWarnings("unused") MessageGroup group : this) {
-			count ++;
+			count++;
 		}
 		return count;
 	}

spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroup.java

@@ -53,7 +53,7 @@ public class SimpleMessageGroup implements MessageGroup {
 	private volatile boolean complete;
 
 	public SimpleMessageGroup(Object groupId) {
-		this(Collections.<Message<?>> emptyList(), groupId);
+		this(Collections.<Message<?>>emptyList(), groupId);
 	}
 
 	public SimpleMessageGroup(Collection<? extends Message<?>> messages, Object groupId) {
@@ -90,6 +90,7 @@ public long getTimestamp() {
 		return this.timestamp;
 	}
 
+	@Override
 	public void setLastModified(long lastModified) {
 		this.lastModified = lastModified;
 	}
@@ -104,10 +105,12 @@ public boolean canAdd(Message<?> message) {
 		return true;
 	}
 
+	@Override
 	public void add(Message<?> messageToAdd) {
 		addMessage(messageToAdd);
 	}
 
+	@Override
 	public boolean remove(Message<?> message) {
 		return this.messages.remove(message);
 	}
@@ -126,6 +129,7 @@ public Collection<Message<?>> getMessages() {
 		return Collections.unmodifiableCollection(this.messages);
 	}
 
+	@Override
 	public void setLastReleasedMessageSequenceNumber(int sequenceNumber) {
 		this.lastReleasedMessageSequence = sequenceNumber;
 	}
@@ -166,6 +170,7 @@ public Message<?> getOne() {
 		}
 	}
 
+	@Override
 	public void clear() {
 		this.messages.clear();
 	}

spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroupFactory.java

@@ -45,7 +45,7 @@ public SimpleMessageGroupFactory(GroupType type) {
 
 	@Override
 	public MessageGroup create(Object groupId) {
-		return create(Collections.<Message<?>> emptyList(), groupId);
+		return create(Collections.<Message<?>>emptyList(), groupId);
 	}
 
 	@Override

spring-integration-core/src/main/java/org/springframework/integration/support/IdGenerators.java

@@ -37,12 +37,12 @@ public class IdGenerators {
 	 */
 	public static class JdkIdGenerator implements IdGenerator {
 
-        @Override
-        public UUID generateId() {
-            return UUID.randomUUID();
-        }
+		@Override
+		public UUID generateId() {
+			return UUID.randomUUID();
+		}
 
-    }
+	}
 
 	/**
 	 * Based on the two {@link AtomicLong}s, for {@code topBits} and {@code bottomBits},
@@ -59,23 +59,23 @@ public UUID generateId() {
 	 * is initialized. Therefore, it is not suitable when persisting messages based on their ID; it should
 	 * only be used when the absolute best performance is required and messages are not persisted.
 	 */
-    public static class SimpleIncrementingIdGenerator implements IdGenerator {
+	public static class SimpleIncrementingIdGenerator implements IdGenerator {
 
-        private final AtomicLong topBits = new AtomicLong();
+		private final AtomicLong topBits = new AtomicLong();
 
-        private final AtomicLong bottomBits = new AtomicLong();
+		private final AtomicLong bottomBits = new AtomicLong();
 
-        @Override
-        public UUID generateId() {
-            long bottomBits = this.bottomBits.incrementAndGet();
-            if (bottomBits == 0) {
-	            return new UUID(this.topBits.incrementAndGet(), bottomBits);
-            }
-	        else {
-	            return new UUID(this.topBits.get(), bottomBits);
-            }
-        }
+		@Override
+		public UUID generateId() {
+			long bottomBits = this.bottomBits.incrementAndGet();
+			if (bottomBits == 0) {
+				return new UUID(this.topBits.incrementAndGet(), bottomBits);
+			}
+			else {
+				return new UUID(this.topBits.get(), bottomBits);
+			}
+		}
 
-    }
+	}
 
 }

spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonObjectMapper.java

@@ -42,7 +42,7 @@ public abstract class AbstractJacksonJsonObjectMapper<N, P, J> extends JsonObjec
 		implements BeanClassLoaderAware {
 
 	protected static final Collection<Class<?>> supportedJsonTypes =
-			Arrays.<Class<?>> asList(String.class, byte[].class, File.class, URL.class, InputStream.class, Reader.class);
+			Arrays.<Class<?>>asList(String.class, byte[].class, File.class, URL.class, InputStream.class, Reader.class);
 
 	private volatile ClassLoader classLoader = ClassUtils.getDefaultClassLoader();