Sonar Fixes

- all minors

* Remaining issues - mostly imports for Javadocs only.

* Final final

* Polising - bogus chars in comment

* Polishing idle time.

Author: garyrussell

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

@@ -48,7 +48,7 @@ public class Address {
 	 */
 	public static final String AMQ_RABBITMQ_REPLY_TO = "amq.rabbitmq.reply-to";
 
-	private static final Pattern pattern = Pattern.compile("^(?:.*://)?([^/]*)/?(.*)$");
+	private static final Pattern ADDRESS_PATTERN = Pattern.compile("^(?:.*://)?([^/]*)/?(.*)$");
 
 	private final String exchangeName;
 
@@ -77,7 +77,7 @@ else if (address.lastIndexOf('/') <= 0) {
 			this.exchangeName = "";
 		}
 		else {
-			Matcher matcher = pattern.matcher(address);
+			Matcher matcher = ADDRESS_PATTERN.matcher(address);
 			boolean matchFound = matcher.find();
 			if (matchFound) {
 				this.exchangeName = matcher.group(1);
@@ -131,7 +131,8 @@ public boolean equals(Object o) {
 	@Override
 	public int hashCode() {
 		int result = this.exchangeName != null ? this.exchangeName.hashCode() : 0;
-		result = 31 * result + (this.routingKey != null ? this.routingKey.hashCode() : 0);
+		int prime = 31; // NOSONAR magic #
+		result = prime * result + (this.routingKey != null ? this.routingKey.hashCode() : 0);
 		return result;
 	}
 

spring-amqp/src/main/java/org/springframework/amqp/core/AmqpTemplate.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.
@@ -17,7 +17,6 @@
 package org.springframework.amqp.core;
 
 import org.springframework.amqp.AmqpException;
-import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.lang.Nullable;
 
@@ -26,8 +25,9 @@
  *
  * Provides synchronous send and receive methods. The {@link #convertAndSend(Object)} and
  * {@link #receiveAndConvert()} methods allow let you send and receive POJO objects.
- * Implementations are expected to delegate to an instance of {@link MessageConverter} to
- * perform conversion to and from AMQP byte[] payload type.
+ * Implementations are expected to delegate to an instance of
+ * {@link org.springframework.amqp.support.converter.MessageConverter} to perform
+ * conversion to and from AMQP byte[] payload type.
  *
  * @author Mark Pollack
  * @author Mark Fisher

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

@@ -150,7 +150,7 @@ public Base64UrlNamingStrategy(String prefix) {
 		@Override
 		public String generateName() {
 			UUID uuid = UUID.randomUUID();
-			ByteBuffer bb = ByteBuffer.wrap(new byte[16]);
+			ByteBuffer bb = ByteBuffer.wrap(new byte[16]); // NOSONAR - Magic # deprecated anyway
 			bb.putLong(uuid.getMostSignificantBits())
 			  .putLong(uuid.getLeastSignificantBits());
 			// Convert to base64 and remove trailing =

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

@@ -34,6 +34,8 @@
  */
 public class Base64UrlNamingStrategy implements NamingStrategy {
 
+	private static final int SIXTEEN = 16;
+
 	/**
 	 * The default instance - using {@code spring.gen-} as the prefix.
 	 */
@@ -60,7 +62,7 @@ public Base64UrlNamingStrategy(String prefix) {
 	@Override
 	public String generateName() {
 		UUID uuid = UUID.randomUUID();
-		ByteBuffer bb = ByteBuffer.wrap(new byte[16]);
+		ByteBuffer bb = ByteBuffer.wrap(new byte[SIXTEEN]);
 		bb.putLong(uuid.getMostSignificantBits())
 		  .putLong(uuid.getLeastSignificantBits());
 		// Convert to base64 and remove trailing =

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

@@ -35,6 +35,8 @@
  */
 public class MessageProperties implements Serializable {
 
+	private static final int INT_MASK = 32;
+
 	private static final long serialVersionUID = 1619000546531112290L;
 
 	public static final String CONTENT_TYPE_BYTES = "application/octet-stream";
@@ -123,11 +125,11 @@ public class MessageProperties implements Serializable {
 
 	private volatile long publishSequenceNumber;
 
-	private volatile transient Type inferredArgumentType;
+	private transient volatile Type inferredArgumentType;
 
-	private volatile transient Method targetMethod;
+	private transient volatile Method targetMethod;
 
-	private volatile transient Object targetBean;
+	private transient volatile Object targetBean;
 
 	public void setHeader(String key, Object value) {
 		this.headers.put(key, value);
@@ -538,11 +540,11 @@ public int hashCode() {
 		result = prime * result + ((this.appId == null) ? 0 : this.appId.hashCode());
 		result = prime * result + ((this.clusterId == null) ? 0 : this.clusterId.hashCode());
 		result = prime * result + ((this.contentEncoding == null) ? 0 : this.contentEncoding.hashCode());
-		result = prime * result + (int) (this.contentLength ^ (this.contentLength >>> 32));
+		result = prime * result + (int) (this.contentLength ^ (this.contentLength >>> INT_MASK));
 		result = prime * result + ((this.contentType == null) ? 0 : this.contentType.hashCode());
 		result = prime * result + this.correlationId.hashCode();
 		result = prime * result + ((this.deliveryMode == null) ? 0 : this.deliveryMode.hashCode());
-		result = prime * result + (int) (this.deliveryTag ^ (this.deliveryTag >>> 32));
+		result = prime * result + (int) (this.deliveryTag ^ (this.deliveryTag >>> INT_MASK));
 		result = prime * result + ((this.expiration == null) ? 0 : this.expiration.hashCode());
 		result = prime * result + this.headers.hashCode();
 		result = prime * result + ((this.messageCount == null) ? 0 : this.messageCount.hashCode());

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

@@ -27,7 +27,7 @@
  */
 public final class QueueBuilder extends AbstractBuilder {
 
-	private static final NamingStrategy namingStrategy = Base64UrlNamingStrategy.DEFAULT;
+	private static final NamingStrategy namingStrategy = Base64UrlNamingStrategy.DEFAULT; // NOSONAR lower case
 
 	private final String name;
 

spring-amqp/src/main/java/org/springframework/amqp/remoting/client/AmqpClientInterceptor.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.
@@ -22,7 +22,6 @@
 import org.aopalliance.intercept.MethodInvocation;
 
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.remoting.service.AmqpInvokerServiceExporter;
 import org.springframework.remoting.RemoteProxyFailureException;
 import org.springframework.remoting.support.DefaultRemoteInvocationFactory;
 import org.springframework.remoting.support.RemoteAccessor;
@@ -36,7 +35,7 @@
  * @author David Bilge
  * @author Gary Russell
  * @since 1.2
- * @see AmqpInvokerServiceExporter
+ * @see org.springframework.amqp.remoting.service.AmqpInvokerServiceExporter
  * @see AmqpProxyFactoryBean
  * @see org.springframework.remoting.RemoteAccessException
  */

spring-amqp/src/main/java/org/springframework/amqp/remoting/client/AmqpProxyFactoryBean.java

@@ -16,13 +16,10 @@
 
 package org.springframework.amqp.remoting.client;
 
-import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.remoting.service.AmqpInvokerServiceExporter;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.remoting.rmi.RmiServiceExporter;
 
 /**
  * {@link FactoryBean} for AMQP proxies. Exposes the proxied service for use as a bean reference, using the specified
@@ -32,16 +29,17 @@
  * This is intended for an "RMI-style" (i.e. synchroneous) usage of the AMQP protocol. Obviously, AMQP allows for a much
  * broader scope of execution styles, which are not the scope of the mechanism at hand.
  * <p>
- * Calling a method on the proxy will cause an AMQP message being sent according to the configured {@link AmqpTemplate}.
- * This can be received and answered by an {@link AmqpInvokerServiceExporter}.
+ * Calling a method on the proxy will cause an AMQP message being sent according to the configured
+ * {@link org.springframework.amqp.core.AmqpTemplate}.
+ * This can be received and answered by an {@link org.springframework.amqp.remoting.service.AmqpInvokerServiceExporter}.
  *
  * @author David Bilge
  * @author Gary Russell
  *
  * @since 1.2
  * @see #setServiceInterface
  * @see AmqpClientInterceptor
- * @see RmiServiceExporter
+ * @see org.springframework.remoting.rmi.RmiServiceExporter
  * @see org.springframework.remoting.RemoteAccessException
  */
 public class AmqpProxyFactoryBean extends AmqpClientInterceptor implements FactoryBean<Object>, BeanClassLoaderAware,

spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java

@@ -22,7 +22,6 @@
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.remoting.client.AmqpProxyFactoryBean;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.amqp.support.converter.SimpleMessageConverter;
 import org.springframework.remoting.support.RemoteInvocation;
@@ -31,7 +30,7 @@
 
 /**
  * This message listener exposes a plain java service via AMQP. Such services can be accessed via plain AMQP or via
- * {@link AmqpProxyFactoryBean}.
+ * {@link org.springframework.amqp.remoting.client.AmqpProxyFactoryBean}.
  *
  * To configure this message listener so that it actually receives method calls via AMQP, it needs to be put into a
  * listener container. See {@link MessageListener}.

spring-amqp/src/main/java/org/springframework/amqp/support/AmqpHeaders.java

@@ -65,7 +65,7 @@ public abstract class AmqpHeaders {
 
 	public static final String RECEIVED_DELAY = PREFIX + "receivedDelay";
 
-	public final static String RECEIVED_DELIVERY_MODE = PREFIX + "receivedDeliveryMode";
+	public static final String RECEIVED_DELIVERY_MODE = PREFIX + "receivedDeliveryMode";
 
 	public static final String RECEIVED_EXCHANGE = PREFIX + "receivedExchange";