Fix new Sonar smells

Author: artembilan

build.gradle

@@ -610,6 +610,7 @@ project('spring-integration-jpa') {
 		}
 		testImplementation "com.h2database:h2:$h2Version"
 		testImplementation "org.hibernate:hibernate-entitymanager:$hibernateVersion"
+		testImplementation "org.hamcrest:hamcrest-core:$hamcrestVersion"
 	}
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -89,7 +89,7 @@ public boolean send(Message<?> message, long timeout) {
 
 	@Override
 	public boolean subscribe(MessageHandler handler) {
-		if (handler != this.handler && LOGGER.isDebugEnabled()) {
+		if (!this.handler.equals(handler) && LOGGER.isDebugEnabled()) {
 			LOGGER.debug(getComponentName() + ": cannot be subscribed to (it has a fixed single subscriber).");
 		}
 		return false;

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

@@ -103,7 +103,9 @@ private PublisherAnnotationBeanPostProcessor createPublisherAnnotationBeanPostPr
 			if (beanFactory != null) {
 				order = beanFactory.resolveEmbeddedValue(order);
 			}
-			postProcessor.setOrder(Integer.parseInt(order));
+			if (StringUtils.hasText(order)) {
+				postProcessor.setOrder(Integer.parseInt(order));
+			}
 		}
 		return postProcessor;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -46,9 +46,9 @@ public class PointToPointChannelParser extends AbstractChannelParser {
 	@Override
 	protected BeanDefinitionBuilder buildBeanDefinition(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = null;
-		Element queueElement = null;
+		Element queueElement;
 		String fixedSubscriberChannel = element.getAttribute("fixed-subscriber");
-		boolean isFixedSubscriber = "true".equals(fixedSubscriberChannel.trim().toLowerCase());
+		boolean isFixedSubscriber = "true".equalsIgnoreCase(fixedSubscriberChannel.trim());
 
 		// configure a queue-based channel if any queue sub-element is defined
 		String channel = element.getAttribute(ID_ATTRIBUTE);

spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -277,7 +277,7 @@ private void copyHeaders(Map<String, Object> source, Map<String, Object> target,
 					if (shouldMapHeader(headerName, headerMatcher)) {
 						Object value = entry.getValue();
 						target.put(headerName, value);
-						if (this.replyHeaderMatcher == headerMatcher &&
+						if (this.replyHeaderMatcher.equals(headerMatcher) &&
 								JsonHeaders.TYPE_ID.equals(headerName) && value != null) {
 
 							ResolvableType resolvableType =

spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -107,7 +107,7 @@ private int determineTypeDifferenceWeight(String candidate, Class<?> type, int l
 			}
 			// no match at this level, continue up the hierarchy
 			for (Class<?> superInterface : iface.getInterfaces()) {
-				int weight = this.determineTypeDifferenceWeight(candidate, superInterface, level + 3);
+				int weight = this.determineTypeDifferenceWeight(candidate, superInterface, level + 3); // NOSONAR
 				if (weight < Integer.MAX_VALUE) {
 					return weight;
 				}

spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.router;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -98,13 +99,8 @@ public void setChannels(List<MessageChannel> channels) {
 	public void setRecipients(List<Recipient> recipients) {
 		Assert.notEmpty(recipients, "'recipients' must not be empty");
 		Queue<Recipient> newRecipients = new ConcurrentLinkedQueue<>(recipients);
-
 		newRecipients.forEach(this::setupRecipient);
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Channel Recipients: " + this.recipients + " replaced with: " + newRecipients);
-		}
-
+		logger.debug(() -> "Channel Recipients: " + this.recipients + " replaced with: " + newRecipients);
 		this.recipients = newRecipients;
 	}
 
@@ -126,10 +122,7 @@ public void setRecipientMappings(Map<String, String> recipientMappings) {
 				addRecipient(next.getKey(), (MessageSelector) null, newRecipients);
 			}
 		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("Channel Recipients: " + this.recipients + " replaced with: " + newRecipients);
-		}
-
+		logger.debug(() -> "Channel Recipients: " + this.recipients + " replaced with: " + newRecipients);
 		this.recipients = newRecipients;
 	}
 
@@ -193,7 +186,7 @@ public int removeRecipient(String channelName) {
 		int counter = 0;
 		MessageChannel channel = getChannelResolver().resolveDestination(channelName);
 		for (Iterator<Recipient> it = this.recipients.iterator(); it.hasNext(); ) {
-			if (it.next().getChannel() == channel) {
+			if (channel.equals(it.next().getChannel())) {
 				it.remove();
 				counter++;
 			}
@@ -236,9 +229,7 @@ public void replaceRecipients(Properties recipientMappings) {
 				addRecipient(key);
 			}
 		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("Channel Recipients:" + originalRecipients + " replaced with:" + this.recipients);
-		}
+		logger.debug(() -> "Channel Recipients: " + originalRecipients + " replaced with: " + this.recipients);
 	}
 
 	@Override
@@ -259,10 +250,13 @@ public IntegrationPatternType getIntegrationPatternType() {
 
 	@Override
 	protected Collection<MessageChannel> determineTargetChannels(Message<?> message) {
-		return this.recipients.stream()
-				.filter(recipient -> recipient.accept(message))
-				.map(Recipient::getChannel)
-				.collect(Collectors.toList());
+		List<MessageChannel> result = new ArrayList<>();
+		for (Recipient recipient : this.recipients) {
+			if (recipient.accept(message)) {
+				result.add(recipient.getChannel());
+			}
+		}
+		return result;
 	}
 
 

spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -31,11 +31,23 @@
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @author Gary Russell
+ * @author Artem Bilan
  */
 public class PollerMetadata {
 
+	/**
+	 * The constant for unlimited number of message to poll in one cycle.
+	 */
 	public static final int MAX_MESSAGES_UNBOUNDED = Integer.MIN_VALUE;
 
+	/**
+	 * The default receive timeout as one second.
+	 */
+	public static final long DEFAULT_RECEIVE_TIMEOUT = 1000;
+
+	/**
+	 * The bean name for global default poller.
+	 */
 	public static final String DEFAULT_POLLER_METADATA_BEAN_NAME =
 			"org.springframework.integration.context.defaultPollerMetadata";
 
@@ -44,21 +56,21 @@ public class PollerMetadata {
 	 */
 	public static final String DEFAULT_POLLER = DEFAULT_POLLER_METADATA_BEAN_NAME;
 
-	private volatile Trigger trigger;
+	private Trigger trigger;
 
-	private volatile long maxMessagesPerPoll = MAX_MESSAGES_UNBOUNDED;
+	private long maxMessagesPerPoll = MAX_MESSAGES_UNBOUNDED;
 
-	private volatile long receiveTimeout = 1000;
+	private long receiveTimeout = DEFAULT_RECEIVE_TIMEOUT;
 
-	private volatile ErrorHandler errorHandler;
+	private ErrorHandler errorHandler;
 
-	private volatile List<Advice> adviceChain;
+	private List<Advice> adviceChain;
 
-	private volatile Executor taskExecutor;
+	private Executor taskExecutor;
 
-	private volatile long sendTimeout;
+	private long sendTimeout;
 
-	private volatile TransactionSynchronizationFactory transactionSynchronizationFactory;
+	private TransactionSynchronizationFactory transactionSynchronizationFactory;
 
 
 	public void setTransactionSynchronizationFactory(
@@ -91,11 +103,8 @@ public void setErrorHandler(ErrorHandler errorHandler) {
 	 * Set the maximum number of messages to receive for each poll.
 	 * A non-positive value indicates that polling should repeat as long
 	 * as non-null messages are being received and successfully sent.
-	 *
 	 * <p>The default is unbounded.
-	 *
 	 * @param maxMessagesPerPoll The maxMessagesPerPoll to set.
-	 *
 	 * @see #MAX_MESSAGES_UNBOUNDED
 	 */
 	public void setMaxMessagesPerPoll(long maxMessagesPerPoll) {

spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java

@@ -198,44 +198,46 @@ protected JavaType constructType(Type type) {
 
 	private void registerWellKnownModulesIfAvailable() {
 		if (JDK8_MODULE_PRESENT) {
-			this.objectMapper.registerModule(Jdk8ModuleProvider.module);
+			this.objectMapper.registerModule(Jdk8ModuleProvider.MODULE);
 		}
 
 		if (JAVA_TIME_MODULE_PRESENT) {
-			this.objectMapper.registerModule(JavaTimeModuleProvider.module);
+			this.objectMapper.registerModule(JavaTimeModuleProvider.MODULE);
 		}
 
 		if (JODA_MODULE_PRESENT) {
-			this.objectMapper.registerModule(JodaModuleProvider.module);
+			this.objectMapper.registerModule(JodaModuleProvider.MODULE);
 		}
 
 		if (KOTLIN_MODULE_PRESENT) {
-			this.objectMapper.registerModule(KotlinModuleProvider.module);
+			this.objectMapper.registerModule(KotlinModuleProvider.MODULE);
 		}
 	}
 
 	private static final class Jdk8ModuleProvider {
 
-		static final com.fasterxml.jackson.databind.Module module = new com.fasterxml.jackson.datatype.jdk8.Jdk8Module();
+		static final com.fasterxml.jackson.databind.Module MODULE =
+				new com.fasterxml.jackson.datatype.jdk8.Jdk8Module();
 
 	}
 
 	private static final class JavaTimeModuleProvider {
 
-		static final com.fasterxml.jackson.databind.Module module =
+		static final com.fasterxml.jackson.databind.Module MODULE =
 				new com.fasterxml.jackson.datatype.jsr310.JavaTimeModule();
 
 	}
 
 	private static final class JodaModuleProvider {
 
-		static final com.fasterxml.jackson.databind.Module module = new com.fasterxml.jackson.datatype.joda.JodaModule();
+		static final com.fasterxml.jackson.databind.Module MODULE =
+				new com.fasterxml.jackson.datatype.joda.JodaModule();
 
 	}
 
 	private static final class KotlinModuleProvider {
 
-		static final com.fasterxml.jackson.databind.Module module =
+		static final com.fasterxml.jackson.databind.Module MODULE =
 				new com.fasterxml.jackson.module.kotlin.KotlinModule();
 
 	}