Sonar Fixes

- remaining majors

Author: garyrussell

spring-amqp/src/main/java/org/springframework/amqp/remoting/client/AmqpProxyFactoryBean.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.
@@ -36,6 +36,8 @@
  * This can be received and answered by an {@link AmqpInvokerServiceExporter}.
  *
  * @author David Bilge
+ * @author Gary Russell
+ *
  * @since 1.2
  * @see #setServiceInterface
  * @see AmqpClientInterceptor
@@ -56,7 +58,7 @@ public void afterPropertiesSet() {
 	}
 
 	@Override
-	public Object getObject() throws Exception {
+	public Object getObject() {
 		return this.serviceProxy;
 	}
 

spring-amqp/src/main/java/org/springframework/amqp/support/SimpleAmqpHeaderMapper.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.
@@ -50,8 +50,8 @@
  */
 public class SimpleAmqpHeaderMapper extends AbstractHeaderMapper<MessageProperties> implements AmqpHeaderMapper {
 
-	@Override
-	public void fromHeaders(MessageHeaders headers, MessageProperties amqpMessageProperties) {
+	@Override // NOSONAR complexity - mostly null/empty tests
+	public void fromHeaders(MessageHeaders headers, MessageProperties amqpMessageProperties) { // NOSONAR NCSS lines
 		String appId = getHeaderIfAvailable(headers, AmqpHeaders.APP_ID, String.class);
 		if (StringUtils.hasText(appId)) {
 			amqpMessageProperties.setAppId(appId);
@@ -158,8 +158,8 @@ public void fromHeaders(MessageHeaders headers, MessageProperties amqpMessagePro
 		}
 	}
 
-	@Override
-	public MessageHeaders toHeaders(MessageProperties amqpMessageProperties) {
+	@Override  // NOSONAR complexity - mostly null/empty tests
+	public MessageHeaders toHeaders(MessageProperties amqpMessageProperties) { // NOSONAR NCSS lines
 		Map<String, Object> headers = new HashMap<String, Object>();
 		try {
 			String appId = amqpMessageProperties.getAppId();

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java

@@ -51,20 +51,24 @@
 public abstract class AbstractJackson2MessageConverter extends AbstractMessageConverter
 		implements BeanClassLoaderAware, SmartMessageConverter {
 
-	protected final Log log = LogFactory.getLog(getClass());
+	protected final Log log = LogFactory.getLog(getClass()); // NOSONAR protected
 
 	public static final String DEFAULT_CHARSET = "UTF-8";
 
 	private volatile String defaultCharset = DEFAULT_CHARSET;
 
-	@Nullable
-	private ClassMapper classMapper = null;
+	/**
+	 * The supported content type; only the subtype is checked, e.g. */json,
+	 * */xml.
+	 */
+	private final MimeType supportedContentType;
 
-	protected boolean typeMapperSet;
+	protected final ObjectMapper objectMapper; // NOSONAR protected
 
-	private final MimeType contentType;
+	@Nullable
+	private ClassMapper classMapper = null;
 
-	protected final ObjectMapper objectMapper;
+	protected boolean typeMapperSet; // NOSONAR - TODO private in 2.2
 
 	private ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
 
@@ -73,7 +77,8 @@ public abstract class AbstractJackson2MessageConverter extends AbstractMessageCo
 	/**
 	 * Construct with the provided {@link ObjectMapper} instance.
 	 * @param objectMapper the {@link ObjectMapper} to use.
-	 * @param contentType content type of the message
+	 * @param contentType supported content type when decoding messages, only the subtype
+	 * is checked, e.g. */json, */xml.
 	 * @param trustedPackages the trusted Java packages for deserialization
 	 * @see DefaultJackson2JavaTypeMapper#setTrustedPackages(String...)
 	 */
@@ -83,14 +88,13 @@ protected AbstractJackson2MessageConverter(ObjectMapper objectMapper, MimeType c
 		Assert.notNull(objectMapper, "'objectMapper' must not be null");
 		Assert.notNull(contentType, "'contentType' must not be null");
 		this.objectMapper = objectMapper;
-		this.contentType = contentType;
+		this.supportedContentType = contentType;
 		((DefaultJackson2JavaTypeMapper) this.javaTypeMapper).setTrustedPackages(trustedPackages);
 	}
 
 	@Nullable
 	public ClassMapper getClassMapper() {
 		return this.classMapper;
-
 	}
 
 	public void setClassMapper(ClassMapper classMapper) {
@@ -185,7 +189,7 @@ public Object fromMessage(Message message, @Nullable Object conversionHint) thro
 		MessageProperties properties = message.getMessageProperties();
 		if (properties != null) {
 			String contentType = properties.getContentType();
-			if (contentType != null && contentType.contains(this.contentType.getSubtype())) {
+			if (contentType != null && contentType.contains(this.supportedContentType.getSubtype())) {
 				String encoding = properties.getContentEncoding();
 				if (encoding == null) {
 					encoding = getDefaultCharset();
@@ -217,7 +221,7 @@ else if (getClassMapper() == null) {
 			else {
 				if (this.log.isWarnEnabled()) {
 					this.log.warn("Could not convert incoming message with content-type ["
-							+ contentType + "], '" + this.contentType.getSubtype() + "' keyword missing.");
+							+ contentType + "], '" + this.supportedContentType.getSubtype() + "' keyword missing.");
 				}
 			}
 		}
@@ -258,7 +262,7 @@ protected Message createMessage(Object objectToConvert, MessageProperties messag
 		catch (IOException e) {
 			throw new MessageConversionException("Failed to convert Message content", e);
 		}
-		messageProperties.setContentType(this.contentType.toString());
+		messageProperties.setContentType(this.supportedContentType.toString());
 		messageProperties.setContentEncoding(getDefaultCharset());
 		messageProperties.setContentLength(bytes.length);
 

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractMessageConverter.java

@@ -59,9 +59,11 @@ public final Message toMessage(Object object, MessageProperties messagePropertie
 	}
 
 	@Override
-	public final Message toMessage(Object object, @Nullable MessageProperties messageProperties, @Nullable Type genericType)
+	public final Message toMessage(Object object, @Nullable MessageProperties messagePropertiesArg,
+			@Nullable Type genericType)
 			throws MessageConversionException {
 
+		MessageProperties messageProperties = messagePropertiesArg;
 		if (messageProperties == null) {
 			messageProperties = new MessageProperties();
 		}

spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultClassMapper.java

@@ -64,9 +64,9 @@ public class DefaultClassMapper implements ClassMapper, InitializingBean {
 
 	private volatile Map<Class<?>, String> classIdMapping = new HashMap<>();
 
-	private volatile Class<?> defaultMapClass = LinkedHashMap.class;
+	private volatile Class<?> defaultMapClass = LinkedHashMap.class; // NOSONAR concrete type
 
-	private volatile Class<?> defaultType = LinkedHashMap.class;
+	private volatile Class<?> defaultType = LinkedHashMap.class; // NOSONAR concrete type
 
 	/**
 	 * The type returned by {@link #toClass(MessageProperties)} if no type information

spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultJackson2JavaTypeMapper.java

@@ -125,21 +125,7 @@ public JavaType toJavaType(MessageProperties properties) {
 		String typeIdHeader = retrieveHeaderAsString(properties, getClassIdFieldName());
 
 		if (typeIdHeader != null) {
-
-			JavaType classType = getClassIdType(typeIdHeader);
-			if (!classType.isContainerType() || classType.isArrayType()) {
-				return classType;
-			}
-
-			JavaType contentClassType = getClassIdType(retrieveHeader(properties, getContentClassIdFieldName()));
-			if (classType.getKeyType() == null) {
-				return TypeFactory.defaultInstance()
-						.constructCollectionLikeType(classType.getRawClass(), contentClassType);
-			}
-
-			JavaType keyClassType = getClassIdType(retrieveHeader(properties, getKeyClassIdFieldName()));
-			return TypeFactory.defaultInstance()
-					.constructMapLikeType(classType.getRawClass(), keyClassType, contentClassType);
+			return fromTypeHeader(properties, typeIdHeader);
 		}
 
 		if (hasInferredTypeHeader) {
@@ -149,6 +135,23 @@ public JavaType toJavaType(MessageProperties properties) {
 		return TypeFactory.defaultInstance().constructType(Object.class);
 	}
 
+	private JavaType fromTypeHeader(MessageProperties properties, String typeIdHeader) {
+		JavaType classType = getClassIdType(typeIdHeader);
+		if (!classType.isContainerType() || classType.isArrayType()) {
+			return classType;
+		}
+
+		JavaType contentClassType = getClassIdType(retrieveHeader(properties, getContentClassIdFieldName()));
+		if (classType.getKeyType() == null) {
+			return TypeFactory.defaultInstance()
+					.constructCollectionLikeType(classType.getRawClass(), contentClassType);
+		}
+
+		JavaType keyClassType = getClassIdType(retrieveHeader(properties, getKeyClassIdFieldName()));
+		return TypeFactory.defaultInstance()
+				.constructMapLikeType(classType.getRawClass(), keyClassType, contentClassType);
+	}
+
 	private JavaType getClassIdType(String classId) {
 		if (getIdClassMapping().containsKey(classId)) {
 			return TypeFactory.defaultInstance().constructType(getIdClassMapping().get(classId));

spring-amqp/src/main/java/org/springframework/amqp/support/converter/SerializerMessageConverter.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.
@@ -125,31 +125,11 @@ public Object fromMessage(Message message) throws MessageConversionException {
 		if (properties != null) {
 			String contentType = properties.getContentType();
 			if (contentType != null && contentType.startsWith("text") && !this.ignoreContentType) {
-				String encoding = properties.getContentEncoding();
-				if (encoding == null) {
-					encoding = this.defaultCharset;
-				}
-				try {
-					content = new String(message.getBody(), encoding);
-				}
-				catch (UnsupportedEncodingException e) {
-					throw new MessageConversionException("failed to convert text-based Message content", e);
-				}
+				content = asString(message, properties);
 			}
 			else if (contentType != null && contentType.equals(MessageProperties.CONTENT_TYPE_SERIALIZED_OBJECT)
 					|| this.ignoreContentType) {
-				try {
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(message.getBody());
-					if (this.usingDefaultDeserializer) {
-						content = deserialize(inputStream);
-					}
-					else {
-						content = this.deserializer.deserialize(inputStream);
-					}
-				}
-				catch (IOException e) {
-					throw new MessageConversionException("Could not convert message body", e);
-				}
+				content = deserialize(message);
 			}
 		}
 		if (content == null) {
@@ -158,6 +138,34 @@ else if (contentType != null && contentType.equals(MessageProperties.CONTENT_TYP
 		return content;
 	}
 
+	private Object deserialize(Message message) {
+		try {
+			ByteArrayInputStream inputStream = new ByteArrayInputStream(message.getBody());
+			if (this.usingDefaultDeserializer) {
+				return deserialize(inputStream);
+			}
+			else {
+				return this.deserializer.deserialize(inputStream);
+			}
+		}
+		catch (IOException e) {
+			throw new MessageConversionException("Could not convert message body", e);
+		}
+	}
+
+	private Object asString(Message message, MessageProperties properties) {
+		String encoding = properties.getContentEncoding();
+		if (encoding == null) {
+			encoding = this.defaultCharset;
+		}
+		try {
+			return new String(message.getBody(), encoding);
+		}
+		catch (UnsupportedEncodingException e) {
+			throw new MessageConversionException("failed to convert text-based Message content", e);
+		}
+	}
+
 	private Object deserialize(ByteArrayInputStream inputStream) throws IOException {
 		try {
 			ObjectInputStream objectInputStream = new ConfigurableObjectInputStream(inputStream,

spring-amqp/src/main/java/org/springframework/amqp/support/postprocessor/AbstractDeflaterPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 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.
@@ -27,7 +27,7 @@
  */
 public abstract class AbstractDeflaterPostProcessor extends AbstractCompressingPostProcessor {
 
-	protected int level = Deflater.BEST_SPEED;
+	protected int level = Deflater.BEST_SPEED; // NOSONAR - TODO: add getter in 2.2
 
 	public AbstractDeflaterPostProcessor() {
 		super();

spring-amqp/src/main/java/org/springframework/amqp/utils/MapBuilder.java

@@ -42,7 +42,7 @@ public Map<K, V> get() {
 	}
 
 	@SuppressWarnings("unchecked")
-	protected final B _this() {
+	protected final B _this() { // NOSONAR underscore
 		return (B) this;
 	}
 

spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/RabbitListenerTestHarness.java

@@ -28,6 +28,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.mockito.Mockito;
 
+import org.springframework.amqp.AmqpException;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.rabbit.annotation.RabbitListenerAnnotationBeanPostProcessor;
@@ -87,7 +88,7 @@ protected void processListener(MethodRabbitListenerEndpoint endpoint, RabbitList
 					this.listenerCapture.put(id, advice);
 				}
 				catch (Exception e) {
-					logger.error("Failed to proxy @RabbitListener with id: " + id);
+					throw new AmqpException("Failed to proxy @RabbitListener with id: " + id, e);
 				}
 			}
 		}