Fix some Sonar smells

Author: artembilan

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

@@ -58,9 +58,9 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
 		else {
 			BeanDefinitionBuilder executorBuilder =
 					BeanDefinitionBuilder.genericBeanDefinition(ThreadPoolTaskExecutor.class);
-			executorBuilder.addPropertyValue("corePoolSize", 1);
-			executorBuilder.addPropertyValue("maxPoolSize", 10);
-			executorBuilder.addPropertyValue("queueCapacity", 0);
+			executorBuilder.addPropertyValue("corePoolSize", 1); // NOSONAR
+			executorBuilder.addPropertyValue("maxPoolSize", 10); // NOSONAR
+			executorBuilder.addPropertyValue("queueCapacity", 0); // NOSONAR
 			executorBuilder.addPropertyValue("threadNamePrefix", "event-multicaster-");
 			builder.addPropertyValue("taskExecutor", executorBuilder.getBeanDefinition());
 		}

spring-integration-core/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -65,13 +65,13 @@ public class BroadcastingDispatcher extends AbstractDispatcher implements BeanFa
 
 	private volatile int minSubscribers;
 
-	private volatile MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory();
+	private MessageHandlingTaskDecorator messageHandlingTaskDecorator = task -> task;
 
-	private volatile boolean messageBuilderFactorySet;
+	private BeanFactory beanFactory;
 
-	private volatile MessageHandlingTaskDecorator messageHandlingTaskDecorator = task -> task;
+	private volatile MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory();
 
-	private BeanFactory beanFactory;
+	private volatile boolean messageBuilderFactorySet;
 
 
 	public BroadcastingDispatcher() {
@@ -226,7 +226,9 @@ private boolean invokeHandler(MessageHandler handler, Message<?> message) {
 		}
 		catch (RuntimeException e) {
 			if (!this.ignoreFailures) {
-				if (e instanceof MessagingException && ((MessagingException) e).getFailedMessage() == null) {
+				if (e instanceof MessagingException
+						&& ((MessagingException) e).getFailedMessage() == null) { // NOSONAR
+
 					throw new MessagingException(message, "Failed to handle Message", e);
 				}
 				throw e;

spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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,6 +16,7 @@
 
 package org.springframework.integration.dispatcher;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -52,7 +53,7 @@ public final Iterator<MessageHandler> getHandlerIterator(Message<?> message, Col
 			return handlers.iterator();
 		}
 
-		return this.buildHandlerIterator(size, handlers.toArray(new MessageHandler[size]));
+		return buildHandlerIterator(size, handlers.toArray(new MessageHandler[size]));
 	}
 
 	private Iterator<MessageHandler> buildHandlerIterator(int size, final MessageHandler[] handlers) {
@@ -63,23 +64,7 @@ private Iterator<MessageHandler> buildHandlerIterator(int size, final MessageHan
 		System.arraycopy(handlers, nextHandlerStartIndex, reorderedHandlers, 0, size - nextHandlerStartIndex);
 		System.arraycopy(handlers, 0, reorderedHandlers, size - nextHandlerStartIndex, nextHandlerStartIndex);
 
-		return new Iterator<MessageHandler>() {
-
-			private int currentIndex = 0;
-
-			public boolean hasNext() {
-				return this.currentIndex < reorderedHandlers.length;
-			}
-
-			public MessageHandler next() {
-				return reorderedHandlers[this.currentIndex++];
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException("Remove is not supported by this Iterator");
-			}
-
-		};
+		return Arrays.stream(reorderedHandlers).iterator();
 	}
 
 	/**

spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java

@@ -205,8 +205,7 @@ protected void sendMessage(Message<?> messageArg) {
 		}
 		message = trackMessageIfAny(message);
 		try {
-			MessageChannel outputChannel = getRequiredOutputChannel();
-			this.messagingTemplate.send(outputChannel, message);
+			this.messagingTemplate.send(getRequiredOutputChannel(), message);
 		}
 		catch (RuntimeException ex) {
 			if (!sendErrorMessageIfNecessary(message, ex)) {
@@ -216,7 +215,7 @@ protected void sendMessage(Message<?> messageArg) {
 	}
 
 	protected void subscribeToPublisher(Publisher<? extends Message<?>> publisher) {
-		MessageChannel outputChannel = getRequiredOutputChannel();
+		MessageChannel channelForSubscription = getRequiredOutputChannel();
 
 		Flux<? extends Message<?>> messageFlux =
 				Flux.from(publisher)
@@ -225,8 +224,8 @@ protected void subscribeToPublisher(Publisher<? extends Message<?>> publisher) {
 						.doOnCancel(this::stop)
 						.takeWhile((message) -> isRunning());
 
-		if (outputChannel instanceof ReactiveStreamsSubscribableChannel) {
-			((ReactiveStreamsSubscribableChannel) outputChannel).subscribeTo(messageFlux);
+		if (channelForSubscription instanceof ReactiveStreamsSubscribableChannel) {
+			((ReactiveStreamsSubscribableChannel) channelForSubscription).subscribeTo(messageFlux);
 		}
 		else {
 			messageFlux

spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -52,13 +52,18 @@
  */
 public class PollingConsumer extends AbstractPollingEndpoint implements IntegrationConsumer {
 
+	/**
+	 * A default receive timeout as {@value DEFAULT_RECEIVE_TIMEOUT} milliseconds.
+	 */
+	public static final long DEFAULT_RECEIVE_TIMEOUT = 1000;
+
 	private final PollableChannel inputChannel;
 
 	private final MessageHandler handler;
 
 	private final List<ChannelInterceptor> channelInterceptors;
 
-	private volatile long receiveTimeout = 1000;
+	private volatile long receiveTimeout = DEFAULT_RECEIVE_TIMEOUT;
 
 	public PollingConsumer(PollableChannel inputChannel, MessageHandler handler) {
 		Assert.notNull(inputChannel, "inputChannel must not be null");

spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java

@@ -236,7 +236,7 @@ protected void handleMessage(Message<?> messageArg) {
 		}
 		catch (Exception e) {
 			AckUtils.autoNack(ackCallback);
-			if (e instanceof MessagingException) {
+			if (e instanceof MessagingException) { // NOSONAR
 				throw (MessagingException) e;
 			}
 			else {

spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducer.java

@@ -17,9 +17,7 @@
 package org.springframework.integration.mongodb.inbound;
 
 import org.bson.Document;
-import org.reactivestreams.Publisher;
 
-import org.springframework.data.mongodb.core.ChangeStreamEvent;
 import org.springframework.data.mongodb.core.ChangeStreamOptions;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.integration.endpoint.MessageProducerSupport;
@@ -35,7 +33,7 @@
  * A {@link MessageProducerSupport} for MongoDB Change Stream implementation.
  * The functionality is based on the
  * {@link ReactiveMongoOperations#changeStream(String, ChangeStreamOptions, Class)}
- * and {@link MessageProducerSupport#subscribeToPublisher(Publisher)} consumption.
+ * and {@link MessageProducerSupport#subscribeToPublisher(org.reactivestreams.Publisher)} consumption.
  *
  * @author Artem Bilan
  *
@@ -97,9 +95,9 @@ public void setOptions(ChangeStreamOptions options) {
 
 	/**
 	 * Configure this channel adapter to build a {@link Message} to produce
-	 * with a payload based on a {@link ChangeStreamEvent#getBody()} (by default)
-	 * or use a whole {@link ChangeStreamEvent} as a payload.
-	 * @param extractBody to extract {@link ChangeStreamEvent#getBody()} or not.
+	 * with a payload based on a {@link org.springframework.data.mongodb.core.ChangeStreamEvent#getBody()} (by default)
+	 * or use a whole {@link org.springframework.data.mongodb.core.ChangeStreamEvent} as a payload.
+	 * @param extractBody to extract {@link org.springframework.data.mongodb.core.ChangeStreamEvent#getBody()} or not.
 	 */
 	public void setExtractBody(boolean extractBody) {
 		this.extractBody = extractBody;