Sonar Fixes

Critical smells, packages `o.s.i.a*` to `f*`.

Plus new smells caused by these changes.

Author: garyrussell

build.gradle

@@ -131,7 +131,7 @@ subprojects { subproject ->
 		romeToolsVersion = '1.9.0'
 		servletApiVersion = '4.0.0'
 		smackVersion = '4.3.1'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.2.RELEASE'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.3.BUILD-SNAPSHOT'
 		springDataJpaVersion = '2.1.3.RELEASE'
 		springDataMongoVersion = '2.1.3.RELEASE'
 		springDataRedisVersion = '2.1.3.RELEASE'

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractSubscribableAmqpChannel.java

@@ -288,14 +288,9 @@ public void onMessage(org.springframework.amqp.core.Message message) {
 			Message<?> messageToSend = null;
 			try {
 				Object converted = this.converter.fromMessage(message);
-				if (converted != null) {
-					messageToSend = (converted instanceof Message<?>) ? (Message<?>) converted
-							: buildMessage(message, converted);
-					this.dispatcher.dispatch(messageToSend);
-				}
-				else if (this.logger.isWarnEnabled()) {
-					this.logger.warn("MessageConverter returned null, no Message to dispatch");
-				}
+				messageToSend = (converted instanceof Message<?>) ? (Message<?>) converted
+						: buildMessage(message, converted);
+				this.dispatcher.dispatch(messageToSend);
 			}
 			catch (MessageDispatchingException e) {
 				String exceptionMessage = e.getMessage() + " for amqp-channel '"

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AmqpChannelFactoryBean.java

@@ -46,6 +46,7 @@
 import org.springframework.integration.amqp.channel.PublishSubscribeAmqpChannel;
 import org.springframework.integration.amqp.support.AmqpHeaderMapper;
 import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper;
+import org.springframework.lang.Nullable;
 import org.springframework.messaging.support.ChannelInterceptor;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.interceptor.TransactionAttribute;
@@ -152,7 +153,7 @@ public AmqpChannelFactoryBean(boolean messageDriven) {
 
 
 	@Override
-	public void setBeanName(String name) {
+	public void setBeanName(@Nullable String name) {
 		this.beanName = name;
 	}
 
@@ -399,8 +400,8 @@ protected AbstractAmqpChannel createInstance() throws Exception {
 			this.channel.setInterceptors(this.interceptors);
 		}
 		this.channel.setBeanName(this.beanName);
-		if (this.getBeanFactory() != null) {
-			this.channel.setBeanFactory(this.getBeanFactory());
+		if (getBeanFactory() != null) {
+			this.channel.setBeanFactory(getBeanFactory()); // NOSONAR never null
 		}
 		if (this.defaultDeliveryMode != null) {
 			this.channel.setDefaultDeliveryMode(this.defaultDeliveryMode);

spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.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.
@@ -126,7 +126,7 @@ private MessageChannel resolveErrorChannel(Throwable t) {
 		Message<?> failedMessage = (actualThrowable instanceof MessagingException) ?
 				((MessagingException) actualThrowable).getFailedMessage() : null;
 		if (getDefaultErrorChannel() == null && getChannelResolver() != null) {
-			setChannel(getChannelResolver().resolveDestination(
+			setChannel(getChannelResolver().resolveDestination(// NOSONAR not null
 					IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME));
 		}
 
@@ -137,11 +137,11 @@ private MessageChannel resolveErrorChannel(Throwable t) {
 		if (errorChannelHeader instanceof MessageChannel) {
 			return (MessageChannel) errorChannelHeader;
 		}
-		Assert.isInstanceOf(String.class, errorChannelHeader,
+		Assert.isInstanceOf(String.class, errorChannelHeader, () ->
 				"Unsupported error channel header type. Expected MessageChannel or String, but actual type is [" +
-						errorChannelHeader.getClass() + "]");
+						errorChannelHeader.getClass() + "]"); // NOSONAR never null here
 		if (getChannelResolver() != null) {
-			return getChannelResolver().resolveDestination((String) errorChannelHeader);
+			return getChannelResolver().resolveDestination((String) errorChannelHeader); // NOSONAR not null
 		}
 		else {
 			return null;

spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java

@@ -26,6 +26,7 @@
 
 import org.springframework.integration.core.MessageSelector;
 import org.springframework.integration.support.management.QueueChannelManagement;
+import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
@@ -116,19 +117,7 @@ protected Message<?> doReceive(long timeout) {
 					return ((BlockingQueue<Message<?>>) this.queue).poll(timeout, TimeUnit.MILLISECONDS);
 				}
 				else {
-					Message<?> message = this.queue.poll();
-					if (message == null) {
-						long nanos = TimeUnit.MILLISECONDS.toNanos(timeout);
-						long deadline = System.nanoTime() + nanos;
-						while (message == null && nanos > 0) {
-							this.queueSemaphore.tryAcquire(nanos, TimeUnit.NANOSECONDS); // NOSONAR ok to ignore result
-							message = this.queue.poll();
-							if (message == null) {
-								nanos = deadline - System.nanoTime();
-							}
-						}
-					}
-					return message;
+					return pollNonBlockingQueue(timeout);
 				}
 			}
 			if (timeout == 0) {
@@ -141,7 +130,7 @@ protected Message<?> doReceive(long timeout) {
 			else {
 				Message<?> message = this.queue.poll();
 				while (message == null) {
-					this.queueSemaphore.tryAcquire(50, TimeUnit.MILLISECONDS);
+					this.queueSemaphore.tryAcquire(50, TimeUnit.MILLISECONDS); // NOSONAR ok to ignore result
 					message = this.queue.poll();
 				}
 				return message;
@@ -153,6 +142,23 @@ protected Message<?> doReceive(long timeout) {
 		}
 	}
 
+	@Nullable
+	private Message<?> pollNonBlockingQueue(long timeout) throws InterruptedException {
+		Message<?> message = this.queue.poll();
+		if (message == null) {
+			long nanos = TimeUnit.MILLISECONDS.toNanos(timeout);
+			long deadline = System.nanoTime() + nanos;
+			while (message == null && nanos > 0) {
+				this.queueSemaphore.tryAcquire(nanos, TimeUnit.NANOSECONDS); // NOSONAR ok to ignore result
+				message = this.queue.poll();
+				if (message == null) {
+					nanos = deadline - System.nanoTime();
+				}
+			}
+		}
+		return message;
+	}
+
 	@Override
 	public List<Message<?>> clear() {
 		List<Message<?>> clearedMessages = new ArrayList<>();

spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java

@@ -160,7 +160,7 @@ private void registerNullChannel() {
 			else {
 				nullChannelDefinition =
 						((BeanDefinitionRegistry) this.beanFactory.getParentBeanFactory())
-								.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME);
+								.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME); // NOSONAR not null
 			}
 			if (!NullChannel.class.getName().equals(nullChannelDefinition.getBeanClassName())) {
 				throw new IllegalStateException("The bean name '" + IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME

spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.
@@ -38,6 +38,7 @@
  * {@link org.springframework.context.annotation.Bean} methods are also processed.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 4.0
  */
 public class GlobalChannelInterceptorInitializer implements IntegrationConfigurationInitializer {
@@ -50,14 +51,18 @@ public void initialize(ConfigurableListableBeanFactory beanFactory) throws Beans
 			BeanDefinition beanDefinition = registry.getBeanDefinition(beanName);
 			if (beanDefinition instanceof AnnotatedBeanDefinition) {
 				AnnotationMetadata metadata = ((AnnotatedBeanDefinition) beanDefinition).getMetadata();
-				Map<String, Object> annotationAttributes = metadata.getAnnotationAttributes(GlobalChannelInterceptor.class.getName());
-				if (CollectionUtils.isEmpty(annotationAttributes) && beanDefinition.getSource() instanceof MethodMetadata) {
+				Map<String, Object> annotationAttributes = metadata
+						.getAnnotationAttributes(GlobalChannelInterceptor.class.getName());
+				if (CollectionUtils.isEmpty(annotationAttributes)
+						&& beanDefinition.getSource() instanceof MethodMetadata) {
 					MethodMetadata beanMethod = (MethodMetadata) beanDefinition.getSource();
-					annotationAttributes = beanMethod.getAnnotationAttributes(GlobalChannelInterceptor.class.getName());
+					annotationAttributes =
+						beanMethod.getAnnotationAttributes(GlobalChannelInterceptor.class.getName()); // NOSONAR not null
 				}
 
 				if (!CollectionUtils.isEmpty(annotationAttributes)) {
-					BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(GlobalChannelInterceptorWrapper.class)
+					BeanDefinitionBuilder builder = BeanDefinitionBuilder
+							.genericBeanDefinition(GlobalChannelInterceptorWrapper.class)
 							.addConstructorArgReference(beanName)
 							.addPropertyValue("patterns", annotationAttributes.get("patterns"))
 							.addPropertyValue("order", annotationAttributes.get("order"));

spring-integration-core/src/main/java/org/springframework/integration/config/IdGeneratorConfigurer.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.
@@ -48,6 +48,7 @@ public final class IdGeneratorConfigurer implements ApplicationListener<Applicat
 
 	private final Log logger = LogFactory.getLog(getClass());
 
+	@Override
 	public synchronized void onApplicationEvent(ApplicationContextEvent event) {
 		ApplicationContext context = event.getApplicationContext();
 		if (event instanceof ContextRefreshedEvent) {
@@ -75,7 +76,7 @@ private boolean setIdGenerator(ApplicationContext context) {
 				this.logger.debug("using custom MessageHeaders.IdGenerator [" + idGeneratorBean.getClass() + "]");
 			}
 			Field idGeneratorField = ReflectionUtils.findField(MessageHeaders.class, "idGenerator");
-			ReflectionUtils.makeAccessible(idGeneratorField);
+			ReflectionUtils.makeAccessible(idGeneratorField); // NOSONAR never null
 			IdGenerator currentIdGenerator = (IdGenerator) ReflectionUtils.getField(idGeneratorField, null);
 			if (currentIdGenerator != null) {
 				if (currentIdGenerator.equals(idGeneratorBean)) {
@@ -128,7 +129,7 @@ else if (this.logger.isDebugEnabled()) {
 	private void unsetIdGenerator() {
 		try {
 			Field idGeneratorField = ReflectionUtils.findField(MessageHeaders.class, "idGenerator");
-			ReflectionUtils.makeAccessible(idGeneratorField);
+			ReflectionUtils.makeAccessible(idGeneratorField); // NOSONAR never null
 			idGeneratorField.set(null, null);
 			IdGeneratorConfigurer.theIdGenerator = null;
 		}

spring-integration-core/src/main/java/org/springframework/integration/config/IdempotentReceiverAutoProxyCreatorInitializer.java

@@ -79,8 +79,8 @@ else if (beanDefinition instanceof AnnotatedBeanDefinition) {
 				if (beanDefinition.getSource() instanceof MethodMetadata) {
 					MethodMetadata beanMethod = (MethodMetadata) beanDefinition.getSource();
 					String annotationType = IdempotentReceiver.class.getName();
-					if (beanMethod.isAnnotated(annotationType)) {
-						Object value = beanMethod.getAnnotationAttributes(annotationType).get("value");
+					if (beanMethod.isAnnotated(annotationType)) { // NOSONAR never null
+						Object value = beanMethod.getAnnotationAttributes(annotationType).get("value"); // NOSONAR
 						if (value != null) {
 
 							Class<?> returnType;

spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java

@@ -54,7 +54,7 @@ public void initialize(ConfigurableListableBeanFactory beanFactory) throws Beans
 
 				if (!hasIntegrationConverter && beanDefinition.getSource() instanceof MethodMetadata) {
 					MethodMetadata beanMethod = (MethodMetadata) beanDefinition.getSource();
-					hasIntegrationConverter = beanMethod.isAnnotated(IntegrationConverter.class.getName());
+					hasIntegrationConverter = beanMethod.isAnnotated(IntegrationConverter.class.getName()); // NOSONAR never null
 				}
 
 				if (hasIntegrationConverter) {