From 22b7187784ce09088ef465c325dd1ee4c4e2e26c Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 19 Sep 2016 16:52:26 -0400
Subject: [PATCH] Some polishing according Sonar violations

---
 build.gradle                                      |  3 +--
 .../management/graph/IntegrationGraphServer.java  |  4 ++--
 .../util/MessagingMethodInvokerHelper.java        | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index d0a51d4510..1f5a223a96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,8 +34,7 @@ allprojects {
 			maven { url 'https://repo.spring.io/libs-snapshot' }
 		}
 		maven { url 'https://repo.spring.io/libs-milestone' }
-		maven { url 'https://repo.spring.io/libs-staging-local' }
-		mavenCentral()
+//		maven { url 'https://repo.spring.io/libs-staging-local' }
 	}
 
 	ext.javadocLinks = [
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/graph/IntegrationGraphServer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/graph/IntegrationGraphServer.java
index 5400f8d7fc..ba0bb66f59 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/graph/IntegrationGraphServer.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/graph/IntegrationGraphServer.java
@@ -68,7 +68,7 @@ public class IntegrationGraphServer implements ApplicationContextAware, Applicat
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
+		this.applicationContext = applicationContext; //NOSONAR (sync)
 	}
 
 	/**
@@ -78,7 +78,7 @@ public class IntegrationGraphServer implements ApplicationContextAware, Applicat
 	 * @param applicationName the application name.
 	 */
 	public void setApplicationName(String applicationName) {
-		this.applicationName = applicationName;
+		this.applicationName = applicationName; //NOSONAR (sync)
 	}
 
 	/**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
index 379574390c..8ba2949461 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
@@ -104,7 +104,7 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
 
 	private final Map<Class<?>, HandlerMethod> handlerMessageMethods;
 
-	private final LinkedList<Map<Class<?>, HandlerMethod>> handlerMethodsList;
+	private final List<Map<Class<?>, HandlerMethod>> handlerMethodsList;
 
 	private final HandlerMethod handlerMethod;
 
@@ -190,6 +190,7 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
 
 	private MessagingMethodInvokerHelper(Object targetObject, Class<? extends Annotation> annotationType,
 			Method method, Class<?> expectedType, boolean canProcessMessageList) {
+		this.annotationType = annotationType;
 		this.canProcessMessageList = canProcessMessageList;
 		Assert.notNull(method, "method must not be null");
 		this.method = method;
@@ -254,10 +255,12 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
 	private void setDisplayString(Object targetObject, Object targetMethod) {
 		StringBuilder sb = new StringBuilder(targetObject.getClass().getName());
 		if (targetMethod instanceof Method) {
-			sb.append("." + ((Method) targetMethod).getName());
+			sb.append(".")
+					.append(((Method) targetMethod).getName());
 		}
 		else if (targetMethod instanceof String) {
-			sb.append("." + targetMethod);
+			sb.append(".")
+					.append(targetMethod);
 		}
 		this.displayString = sb.toString() + "]";
 	}
@@ -717,7 +720,8 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
 						sb.append("payload");
 						String qualifierExpression = (String) AnnotationUtils.getValue(mappingAnnotation);
 						if (StringUtils.hasText(qualifierExpression)) {
-							sb.append("." + qualifierExpression);
+							sb.append(".")
+									.append(qualifierExpression);
 						}
 						if (!StringUtils.hasText(qualifierExpression)) {
 							this.setExclusiveTargetParameterType(parameterTypeDescriptor, methodParameter);
@@ -727,7 +731,8 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
 						sb.append("messages.![payload");
 						String qualifierExpression = ((Payloads) mappingAnnotation).value();
 						if (StringUtils.hasText(qualifierExpression)) {
-							sb.append("." + qualifierExpression);
+							sb.append(".")
+									.append(qualifierExpression);
 						}
 						sb.append("]");
 						if (!StringUtils.hasText(qualifierExpression)) {