Sonar Fixes

SMLC major smells

Author: garyrussell

spring-amqp/src/main/java/org/springframework/amqp/AmqpConnectException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 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.
@@ -16,11 +16,9 @@
 
 package org.springframework.amqp;
 
-import java.net.ConnectException;
-
 /**
- * RuntimeException wrapper for an {@link ConnectException} which can be commonly thrown from AMQP operations if the
- * remote process dies or there is a network issue.
+ * RuntimeException wrapper for an {@link java.net.ConnectException} which can be commonly
+ * thrown from AMQP operations if the remote process dies or there is a network issue.
  *
  * @author Dave Syer
  * @author Gary Russell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -141,8 +141,9 @@
  *
  * @since 1.0
  */
-public class RabbitTemplate extends RabbitAccessor implements BeanFactoryAware, RabbitOperations, MessageListener,
-		ListenerContainerAware, PublisherCallbackChannel.Listener, Lifecycle, BeanNameAware {
+public class RabbitTemplate extends RabbitAccessor // NOSONAR type line count/comment density
+		implements BeanFactoryAware, RabbitOperations, MessageListener,
+			ListenerContainerAware, PublisherCallbackChannel.Listener, Lifecycle, BeanNameAware {
 
 	private static final String UNCHECKED = "unchecked";
 
@@ -2628,4 +2629,4 @@ void returnedMessage(Message message, int replyCode, String replyText,
 				String exchange, String routingKey);
 	}
 
-} // NOSONAR type line count/comment density
+}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/MethodRabbitListenerEndpoint.java

@@ -159,25 +159,25 @@ protected MessagingMessageListenerAdapter createMessageListenerInstance() {
 
 	@Nullable
 	private String getDefaultReplyToAddress() {
-		Method method = getMethod();
-		if (method != null) {
-			SendTo ann = AnnotationUtils.getAnnotation(method, SendTo.class);
+		Method listenerMethod = getMethod();
+		if (listenerMethod != null) {
+			SendTo ann = AnnotationUtils.getAnnotation(listenerMethod, SendTo.class);
 			if (ann != null) {
 				String[] destinations = ann.value();
 				if (destinations.length > 1) {
 					throw new IllegalStateException("Invalid @" + SendTo.class.getSimpleName() + " annotation on '"
-							+ method + "' one destination must be set (got " + Arrays.toString(destinations) + ")");
+							+ listenerMethod + "' one destination must be set (got " + Arrays.toString(destinations) + ")");
 				}
-				return destinations.length == 1 ? resolve(destinations[0]) : "";
+				return destinations.length == 1 ? resolveSendTo(destinations[0]) : "";
 			}
 		}
 		return null;
 	}
 
-	private String resolve(String value) {
+	private String resolveSendTo(String value) {
 		if (getBeanFactory() != null) {
-			value = getBeanExpressionContext().getBeanFactory().resolveEmbeddedValue(value);
-			Object newValue = getResolver().evaluate(value, getBeanExpressionContext());
+			String resolvedValue = getBeanExpressionContext().getBeanFactory().resolveEmbeddedValue(value);
+			Object newValue = getResolver().evaluate(resolvedValue, getBeanExpressionContext());
 			Assert.isInstanceOf(String.class, newValue, "Invalid @SendTo expression");
 			return (String) newValue;
 		}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/RabbitListenerEndpointRegistry.java

@@ -67,7 +67,7 @@
 public class RabbitListenerEndpointRegistry implements DisposableBean, SmartLifecycle, ApplicationContextAware,
 		ApplicationListener<ContextRefreshedEvent> {
 
-	protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR protected
 
 	private final Map<String, MessageListenerContainer> listenerContainers =
 			new ConcurrentHashMap<String, MessageListenerContainer>();
@@ -256,9 +256,9 @@ public void stop() {
 
 	@Override
 	public void stop(Runnable callback) {
-		Collection<MessageListenerContainer> listenerContainers = getListenerContainers();
-		AggregatingCallback aggregatingCallback = new AggregatingCallback(listenerContainers.size(), callback);
-		for (MessageListenerContainer listenerContainer : listenerContainers) {
+		Collection<MessageListenerContainer> containers = getListenerContainers();
+		AggregatingCallback aggregatingCallback = new AggregatingCallback(containers.size(), callback);
+		for (MessageListenerContainer listenerContainer : containers) {
 			try {
 				listenerContainer.stop(aggregatingCallback);
 			}