More Sonar issue resolutions

Author: garyrussell

spring-amqp/src/main/java/org/springframework/amqp/core/AbstractDeclarable.java

@@ -78,19 +78,19 @@ public void setIgnoreDeclarationExceptions(boolean ignoreDeclarationExceptions)
 	 * ({@code setAdminsThatShouldDeclare((AmqpAdmin) null)} or
 	 * {@code setAdminsThatShouldDeclare((AmqpAdmin[]) null)}). Clearing the collection resets
 	 * the behavior such that all admins will declare the object.
-	 * @param admins The admins.
+	 * @param adminArgs The admins.
 	 */
-	public void setAdminsThatShouldDeclare(Object... admins) {
-		Collection<Object> declaringAdmins = new ArrayList<Object>();
-		if (admins != null) {
-			if (admins.length > 1) {
-				Assert.noNullElements(admins, "'admins' cannot contain null elements");
+	public void setAdminsThatShouldDeclare(Object... adminArgs) {
+		Collection<Object> admins = new ArrayList<Object>();
+		if (adminArgs != null) {
+			if (adminArgs.length > 1) {
+				Assert.noNullElements(adminArgs, "'admins' cannot contain null elements");
 			}
-			if (admins.length > 0 && !(admins.length == 1 && admins[0] == null)) {
-				declaringAdmins.addAll(Arrays.asList(admins));
+			if (adminArgs.length > 0 && !(adminArgs.length == 1 && adminArgs[0] == null)) {
+				admins.addAll(Arrays.asList(adminArgs));
 			}
 		}
-		this.declaringAdmins = declaringAdmins;
+		this.declaringAdmins = admins;
 	}
 
 }

spring-amqp/src/main/java/org/springframework/amqp/core/Address.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 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.
@@ -137,7 +137,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		StringBuilder sb = new StringBuilder(this.exchangeName + "/");
+		StringBuilder sb = new StringBuilder(this.exchangeName).append('/');
 		if (StringUtils.hasText(this.routingKey)) {
 			sb.append(this.routingKey);
 		}

spring-amqp/src/main/java/org/springframework/amqp/core/BindingBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 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.
@@ -58,8 +58,9 @@ private static Map<String, Object> createMapForKeys(String... keys) {
 	 */
 	public static final class DestinationConfigurer {
 
-		protected final String name;
-		protected final DestinationType type;
+		protected final String name; // NOSONAR
+
+		protected final DestinationType type; // NOSONAR
 
 		DestinationConfigurer(String name, DestinationType type) {
 			this.name = name;
@@ -92,9 +93,9 @@ public GenericExchangeRoutingKeyConfigurer to(Exchange exchange) {
 	 */
 	public static final class HeadersExchangeMapConfigurer {
 
-		protected final DestinationConfigurer destination;
+		protected final DestinationConfigurer destination; // NOSONAR
 
-		protected final HeadersExchange exchange;
+		protected final HeadersExchange exchange; // NOSONAR
 
 		HeadersExchangeMapConfigurer(DestinationConfigurer destination, HeadersExchange exchange) {
 			this.destination = destination;
@@ -191,9 +192,9 @@ public Binding match() {
 
 	private abstract static class AbstractRoutingKeyConfigurer<E extends Exchange> {
 
-		protected final DestinationConfigurer destination;
+		protected final DestinationConfigurer destination; // NOSONAR
 
-		protected final String exchange;
+		protected final String exchange; // NOSONAR
 
 		AbstractRoutingKeyConfigurer(DestinationConfigurer destination, String exchange) {
 			this.destination = destination;
@@ -246,6 +247,7 @@ public GenericArgumentsConfigurer with(Enum<?> routingKeyEnum) {
 	public static class GenericArgumentsConfigurer {
 
 		private final GenericExchangeRoutingKeyConfigurer configurer;
+
 		private final String routingKey;
 
 		public GenericArgumentsConfigurer(GenericExchangeRoutingKeyConfigurer configurer, String routingKey) {

spring-amqp/src/main/java/org/springframework/amqp/core/MessageBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-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.
@@ -30,6 +30,10 @@
  */
 public final class MessageBuilder extends MessageBuilderSupport<Message> {
 
+	private static final String MESSAGE_CANNOT_BE_NULL = "'message' cannot be null";
+
+	private static final String BODY_CANNOT_BE_NULL = "'body' cannot be null";
+
 	private final byte[] body;
 
 	/**
@@ -38,7 +42,7 @@ public final class MessageBuilder extends MessageBuilderSupport<Message> {
 	 * @return The builder.
 	 */
 	public static MessageBuilder withBody(byte[] body) {
-		Assert.notNull(body, "'body' cannot be null");
+		Assert.notNull(body, BODY_CANNOT_BE_NULL);
 		return new MessageBuilder(body);
 	}
 
@@ -48,7 +52,7 @@ public static MessageBuilder withBody(byte[] body) {
 	 * @return The builder.
 	 */
 	public static MessageBuilder withClonedBody(byte[] body) {
-		Assert.notNull(body, "'body' cannot be null");
+		Assert.notNull(body, BODY_CANNOT_BE_NULL);
 		return new MessageBuilder(Arrays.copyOf(body, body.length));
 	}
 
@@ -63,7 +67,7 @@ public static MessageBuilder withClonedBody(byte[] body) {
 	 * @see Arrays#copyOfRange(byte[], int, int)
 	 */
 	public static MessageBuilder withBody(byte[] body, int from, int to) {
-		Assert.notNull(body, "'body' cannot be null");
+		Assert.notNull(body, BODY_CANNOT_BE_NULL);
 		return new MessageBuilder(Arrays.copyOfRange(body, from, to));
 	}
 
@@ -74,7 +78,7 @@ public static MessageBuilder withBody(byte[] body, int from, int to) {
 	 * @return The builder.
 	 */
 	public static MessageBuilder fromMessage(Message message) {
-		Assert.notNull(message, "'message' cannot be null");
+		Assert.notNull(message, MESSAGE_CANNOT_BE_NULL);
 		return new MessageBuilder(message);
 	}
 
@@ -85,9 +89,9 @@ public static MessageBuilder fromMessage(Message message) {
 	 * @return The builder.
 	 */
 	public static MessageBuilder fromClonedMessage(Message message) {
-		Assert.notNull(message, "'message' cannot be null");
+		Assert.notNull(message, MESSAGE_CANNOT_BE_NULL);
 		byte[] body = message.getBody();
-		Assert.notNull(body, "'body' cannot be null");
+		Assert.notNull(body, BODY_CANNOT_BE_NULL);
 		return new MessageBuilder(Arrays.copyOf(body, body.length), message.getMessageProperties());
 	}
 

spring-amqp/src/main/java/org/springframework/amqp/core/MessageProperties.java

@@ -532,7 +532,7 @@ public void setTargetBean(Object targetBean) {
 	}
 
 	@Override
-	public int hashCode() {
+	public int hashCode() { // NOSONAR complexity
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((this.appId == null) ? 0 : this.appId.hashCode());
@@ -559,7 +559,7 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(Object obj) { // NOSONAR complexity
 		if (this == obj) {
 			return true;
 		}
@@ -716,7 +716,7 @@ else if (!this.userId.equals(other.userId)) {
 	}
 
 	@Override
-	public String toString() {
+	public String toString() { // NOSONAR complexity
 		return "MessageProperties [headers=" + this.headers
 				+ (this.timestamp == null ? "" : ", timestamp=" + this.timestamp)
 				+ (this.messageId == null ? "" : ", messageId=" + this.messageId)

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/Exchange.java

@@ -35,6 +35,10 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Exchange {
 
+	String TRUE = "true";
+
+	String FALSE = "false";
+
 	/**
 	 * @return the exchange name.
 	 */
@@ -60,32 +64,32 @@
 	/**
 	 * @return false if the exchange is to be declared as non-durable.
 	 */
-	String durable() default "true";
+	String durable() default TRUE;
 
 	/**
 	 * @return true if the exchange is to be declared as auto-delete.
 	 */
-	String autoDelete() default "false";
+	String autoDelete() default FALSE;
 
 	/**
 	 * @return true if the exchange is to be declared as internal.
 	 * @since 1.6
 	 */
-	String internal() default "false";
+	String internal() default FALSE;
 
 	/**
 	 * @return true if the declaration exceptions should be ignored.
 	 * @since 1.6
 	 */
-	String ignoreDeclarationExceptions() default "false";
+	String ignoreDeclarationExceptions() default FALSE;
 
 	/**
 	 * @return true if the exchange is to be declared as an
 	 * 'x-delayed-message' exchange. Requires the delayed message exchange
 	 * plugin on the broker.
 	 * @since 1.6.4
 	 */
-	String delayed() default "false";
+	String delayed() default FALSE;
 
 	/**
 	 * @return the arguments to apply when declaring this exchange.
@@ -97,7 +101,7 @@
 	 * @return true if the admin(s), if present, should declare this component.
 	 * @since 2.1
 	 */
-	String declare() default "true";
+	String declare() default TRUE;
 
 	/**
 	 * Return a list of admin bean names that should declare this component.

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/RabbitListenerAnnotationBeanPostProcessor.java

@@ -69,6 +69,7 @@
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.Environment;
+import org.springframework.lang.Nullable;
 import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
 import org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory;
 import org.springframework.messaging.handler.invocation.InvocableHandlerMethod;
@@ -130,7 +131,7 @@ public class RabbitListenerAnnotationBeanPostProcessor
 
 	private RabbitListenerEndpointRegistry endpointRegistry;
 
-	private String containerFactoryBeanName = DEFAULT_RABBIT_LISTENER_CONTAINER_FACTORY_BEAN_NAME;
+	private String defaultContainerFactoryBeanName = DEFAULT_RABBIT_LISTENER_CONTAINER_FACTORY_BEAN_NAME;
 
 	private BeanFactory beanFactory;
 
@@ -175,7 +176,7 @@ public void setEndpointRegistry(RabbitListenerEndpointRegistry endpointRegistry)
 	 * @param containerFactoryBeanName the {@link RabbitListenerContainerFactory} bean name.
 	 */
 	public void setContainerFactoryBeanName(String containerFactoryBeanName) {
-		this.containerFactoryBeanName = containerFactoryBeanName;
+		this.defaultContainerFactoryBeanName = containerFactoryBeanName;
 	}
 
 	/**
@@ -242,8 +243,8 @@ public void afterSingletonsInstantiated() {
 			this.registrar.setEndpointRegistry(this.endpointRegistry);
 		}
 
-		if (this.containerFactoryBeanName != null) {
-			this.registrar.setContainerFactoryBeanName(this.containerFactoryBeanName);
+		if (this.defaultContainerFactoryBeanName != null) {
+			this.registrar.setContainerFactoryBeanName(this.defaultContainerFactoryBeanName);
 		}
 
 		// Set the custom handler method factory once resolved by the configurer
@@ -367,7 +368,8 @@ protected void processAmqpListener(RabbitListener rabbitListener, Method method,
 		processListener(endpoint, rabbitListener, bean, methodToUse, beanName);
 	}
 
-	private Method checkProxy(Method method, Object bean) {
+	private Method checkProxy(Method methodArg, Object bean) {
+		Method method = methodArg;
 		if (AopUtils.isJdkDynamicProxy(bean)) {
 			try {
 				// Found a @RabbitListener method on the target class for this JDK proxy ->
@@ -389,10 +391,10 @@ private Method checkProxy(Method method, Object bean) {
 			catch (NoSuchMethodException ex) {
 				throw new IllegalStateException(String.format(
 						"@RabbitListener method '%s' found on bean target class '%s', " +
-								"but not found in any interface(s) for bean JDK proxy. Either " +
-								"pull the method up to an interface or switch to subclass (CGLIB) " +
-								"proxies by setting proxy-target-class/proxyTargetClass " +
-								"attribute to 'true'", method.getName(), method.getDeclaringClass().getSimpleName()));
+						"but not found in any interface(s) for a bean JDK proxy. Either " +
+						"pull the method up to an interface or switch to subclass (CGLIB) " +
+						"proxies by setting proxy-target-class/proxyTargetClass " +
+						"attribute to 'true'", method.getName(), method.getDeclaringClass().getSimpleName()), ex);
 			}
 		}
 		return method;
@@ -445,6 +447,13 @@ else if (errorHandler instanceof String) {
 			}
 		}
 
+		resolveAdmin(endpoint, rabbitListener, adminTarget);
+		RabbitListenerContainerFactory<?> factory = resolveContainerFactory(rabbitListener, adminTarget, beanName);
+
+		this.registrar.registerEndpoint(endpoint, factory);
+	}
+
+	private void resolveAdmin(MethodRabbitListenerEndpoint endpoint, RabbitListener rabbitListener, Object adminTarget) {
 		String rabbitAdmin = resolve(rabbitListener.admin());
 		if (StringUtils.hasText(rabbitAdmin)) {
 			Assert.state(this.beanFactory != null, "BeanFactory must be set to resolve RabbitAdmin by bean name");
@@ -457,8 +466,11 @@ else if (errorHandler instanceof String) {
 						rabbitAdmin + "' was found in the application context", ex);
 			}
 		}
+	}
 
-
+	@Nullable
+	private RabbitListenerContainerFactory<?> resolveContainerFactory(RabbitListener rabbitListener, Object adminTarget,
+			String beanName) {
 		RabbitListenerContainerFactory<?> factory = null;
 		String containerFactoryBeanName = resolve(rabbitListener.containerFactory());
 		if (StringUtils.hasText(containerFactoryBeanName)) {
@@ -472,8 +484,7 @@ else if (errorHandler instanceof String) {
 						containerFactoryBeanName + "' was found in the application context", ex);
 			}
 		}
-
-		this.registrar.registerEndpoint(endpoint, factory);
+		return factory;
 	}
 
 	private String getEndpointId(RabbitListener rabbitListener) {
@@ -617,6 +628,10 @@ private void declareExchangeAndBinding(QueueBinding binding, String queueName) {
 
 		((ConfigurableBeanFactory) this.beanFactory)
 				.registerSingleton(exchangeName + ++this.increment, exchange);
+		registerBindings(binding, queueName, exchangeName, exchangeType);
+	}
+
+	private void registerBindings(QueueBinding binding, String queueName, String exchangeName, String exchangeType) {
 		final String[] routingKeys;
 		if (exchangeType.equals(ExchangeTypes.FANOUT) || binding.key().length == 0) {
 			routingKeys = new String[] { "" };
@@ -826,17 +841,17 @@ private static class TypeMetadata {
 		/**
 		 * Methods annotated with {@link RabbitListener}.
 		 */
-		final ListenerMethod[] listenerMethods;
+		final ListenerMethod[] listenerMethods; // NOSONAR
 
 		/**
 		 * Methods annotated with {@link RabbitHandler}.
 		 */
-		final Method[] handlerMethods;
+		final Method[] handlerMethods; // NOSONAR
 
 		/**
 		 * Class level {@link RabbitListener} annotations.
 		 */
-		final RabbitListener[] classAnnotations;
+		final RabbitListener[] classAnnotations; // NOSONAR
 
 		static final TypeMetadata EMPTY = new TypeMetadata();
 
@@ -859,9 +874,9 @@ private TypeMetadata() {
 	 */
 	private static class ListenerMethod {
 
-		final Method method;
+		final Method method; // NOSONAR
 
-		final RabbitListener[] annotations;
+		final RabbitListener[] annotations; // NOSONAR
 
 		ListenerMethod(Method method, RabbitListener[] annotations) { // NOSONAR
 			this.method = method;