From ebbcb9df4812a54931536cde361949679106865e Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 1 May 2019 14:13:43 -0400
Subject: [PATCH] Sonar fixes

* exposing internal objects
* boolean complexity
* names, methods with _
* missing `default` in switch
* lost stack trace
* unnecessary null check before instanceof
* unused parameter

* Fix method name
---
 .../aggregator/MessageGroupExpiredEvent.java  |  2 +-
 .../GlobalChannelInterceptorWrapper.java      |  2 +-
 .../integration/config/FilterFactoryBean.java | 10 +++--
 .../integration/config/RouterFactoryBean.java |  2 +-
 ...AbstractMethodAnnotationPostProcessor.java |  9 ++--
 .../RouterAnnotationPostProcessor.java        |  2 +-
 .../xml/AbstractInboundGatewayParser.java     |  2 +-
 .../DefaultInboundChannelAdapterParser.java   | 33 ++++++++------
 .../IdempotentReceiverInterceptorParser.java  |  9 ++--
 .../AggregateMessageDeliveryException.java    |  3 +-
 .../dsl/IntegrationFlowDefinition.java        |  2 +-
 .../IntegrationFlowLifecycleAdvice.java       |  4 ++
 .../gateway/GatewayProxyFactoryBean.java      |  4 +-
 .../integration/handler/LoggingHandler.java   |  4 +-
 .../advice/AbstractHandleMessageAdvice.java   |  4 +-
 .../json/JsonPropertyAccessor.java            |  2 +-
 .../integration/support/MapBuilder.java       |  2 +-
 .../integration/support/MutableMessage.java   |  2 +-
 .../EmbeddedJsonHeadersMessageMapper.java     |  3 +-
 ...TransactionSynchronizationFactoryBean.java |  2 +-
 .../util/BeanFactoryTypeConverter.java        |  2 +-
 .../util/MessagingAnnotationUtils.java        |  4 +-
 ...EmbeddedJsonHeadersMessageMapperTests.java |  8 ++--
 .../integration/http/inbound/CrossOrigin.java |  8 ++--
 .../http/inbound/RequestMapping.java          | 12 ++---
 .../CachingClientConnectionFactory.java       |  4 +-
 .../integration/jms/JmsOutboundGateway.java   |  6 +--
 .../jms/config/JmsOutboundGatewayParser.java  | 27 +++++++-----
 .../BeanPropertyParameterSource.java          |  2 +-
 .../mongodb/store/MessageDocument.java        |  2 +-
 .../mongodb/store/MongoDbMessageStore.java    | 44 +++++++++----------
 .../RedisQueueInboundGatewayParser.java       |  2 +-
 .../integration/sftp/session/SftpSession.java |  2 +-
 .../test/util/OnlyOnceTrigger.java            |  2 +-
 .../dsl/WebFluxMessageHandlerSpec.java        |  2 +-
 35 files changed, 128 insertions(+), 102 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java
index 8d6d6353aa..45a0a9b195 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java
@@ -65,7 +65,7 @@ public class MessageGroupExpiredEvent extends IntegrationEvent {
 	}
 
 	public Date getExpired() {
-		return this.expired;
+		return (Date) this.expired.clone();
 	}
 
 	public boolean isDiscarded() {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java
index 7f8f5cb1f8..e5699617e5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java
@@ -66,7 +66,7 @@ public class GlobalChannelInterceptorWrapper implements Ordered {
 	}
 
 	public String[] getPatterns() {
-		return this.patterns;
+		return this.patterns; // NOSONAR - expose internals
 	}
 
 	@Override
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java
index 10af4a8df6..c517610e9b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/FilterFactoryBean.java
@@ -132,9 +132,13 @@ public class FilterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
 	@Override
 	protected boolean canBeUsedDirect(AbstractMessageProducingHandler handler) {
 		return handler instanceof MessageFilter
-				|| (!(handler instanceof MessageSelector)
-				&& this.discardChannel == null && this.throwExceptionOnRejection == null
-				&& this.discardWithinAdvice == null);
+				|| (!(handler instanceof MessageSelector) && noFilterAttributesProvided());
+	}
+
+	private boolean noFilterAttributesProvided() {
+		return this.discardChannel == null
+				&& this.throwExceptionOnRejection == null
+				&& this.discardWithinAdvice == null;
 	}
 
 	@Override
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
index 011a09c75e..3ae23dede5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/RouterFactoryBean.java
@@ -152,7 +152,7 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean
 	}
 
 	protected boolean noRouterAttributesProvided() {
-		return this.channelMappings == null && this.defaultOutputChannel == null
+		return this.channelMappings == null && this.defaultOutputChannel == null // NOSONAR boolean complexity
 				&& getSendTimeout() == null && this.resolutionRequired == null && this.applySequence == null
 				&& this.ignoreSendFailures == null;
 	}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
index b3697fe7b5..a5b0de986f 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
@@ -395,9 +395,12 @@ public abstract class AbstractMethodAnnotationPostProcessor<T extends Annotation
 			String receiveTimeout = this.beanFactory.resolveEmbeddedValue(poller.receiveTimeout());
 
 			if (StringUtils.hasText(ref)) {
-				Assert.state(!StringUtils.hasText(triggerRef) && !StringUtils.hasText(executorRef) &&
-								!StringUtils.hasText(cron) && !StringUtils.hasText(fixedDelayValue) &&
-								!StringUtils.hasText(fixedRateValue) && !StringUtils.hasText(maxMessagesPerPollValue),
+				Assert.state(!StringUtils.hasText(triggerRef)
+						&& !StringUtils.hasText(executorRef)
+						&& !StringUtils.hasText(cron)
+						&& !StringUtils.hasText(fixedDelayValue)
+						&& !StringUtils.hasText(fixedRateValue)
+						&& !StringUtils.hasText(maxMessagesPerPollValue), // NOSONAR boolean complexity
 						"The '@Poller' 'ref' attribute is mutually exclusive with other attributes.");
 				pollerMetadata = this.beanFactory.getBean(ref, PollerMetadata.class);
 			}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
index 7050b69311..339a80cc0c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessor.java
@@ -147,7 +147,7 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
 		String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, "applySequence", String.class);
 		String ignoreSendFailures = MessagingAnnotationUtils.resolveAttribute(annotations, "ignoreSendFailures",
 				String.class);
-		return StringUtils.hasText(defaultOutputChannel) || !ObjectUtils.isEmpty(channelMappings)
+		return StringUtils.hasText(defaultOutputChannel) || !ObjectUtils.isEmpty(channelMappings) // NOSONAR complexity
 				|| StringUtils.hasText(prefix) || StringUtils.hasText(suffix) || StringUtils.hasText(resolutionRequired)
 				|| StringUtils.hasText(applySequence) || StringUtils.hasText(ignoreSendFailures);
 	}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractInboundGatewayParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractInboundGatewayParser.java
index 3a3a3058df..346256b701 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractInboundGatewayParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractInboundGatewayParser.java
@@ -51,7 +51,7 @@ public abstract class AbstractInboundGatewayParser extends AbstractSimpleBeanDef
 
 	@Override
 	protected boolean isEligibleAttribute(String attributeName) {
-		return !attributeName.equals("name") && !attributeName.equals("request-channel")
+		return !attributeName.equals("name") && !attributeName.equals("request-channel") // NOSONAR boolean complexity
 				&& !attributeName.equals("error-channel")
 				&& !attributeName.equals("reply-channel") && super.isEligibleAttribute(attributeName);
 	}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultInboundChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultInboundChannelAdapterParser.java
index c6cd97608d..75538282cc 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultInboundChannelAdapterParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultInboundChannelAdapterParser.java
@@ -65,16 +65,16 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
 		boolean hasExpressionElement = expressionElement != null;
 		boolean hasMethod = StringUtils.hasText(methodName);
 
-		if (!hasInnerDef && !hasRef && !hasExpression && !hasScriptElement && !hasExpressionElement) {
+		if (!hasInnerDef && !hasRef && !hasExpression && !hasScriptElement && !hasExpressionElement) { // NOSONAR
 			parserContext.getReaderContext().error(
-					"Exactly one of the 'ref', 'expression', inner bean, <script> or <expression> is required.", element);
+				"Exactly one of the 'ref', 'expression', inner bean, <script> or <expression> is required.", element);
 		}
 
 		if (hasInnerDef) {
 			if (hasRef || hasExpression) {
 				parserContext.getReaderContext().error(
-						"Neither 'ref' nor 'expression' are permitted when an inner bean (<bean/>) is configured on element " +
-								IntegrationNamespaceUtils.createElementDescription(element) + ".", source);
+						"Neither 'ref' nor 'expression' are permitted when an inner bean (<bean/>) is configured on "
+						+ "element " + IntegrationNamespaceUtils.createElementDescription(element) + ".", source);
 				return null;
 			}
 			if (hasMethod) {
@@ -87,8 +87,9 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
 		else if (hasScriptElement) {
 			if (hasRef || hasMethod || hasExpression) {
 				parserContext.getReaderContext().error(
-						"Neither 'ref' and 'method' nor 'expression' are permitted when an inner script element is configured on element " +
-								IntegrationNamespaceUtils.createElementDescription(element) + ".", source);
+						"Neither 'ref' and 'method' nor 'expression' are permitted when an inner script element is "
+						+ "configured on element "
+						+ IntegrationNamespaceUtils.createElementDescription(element) + ".", source);
 				return null;
 			}
 			BeanDefinition scriptBeanDefinition = parserContext.getDelegate().parseCustomElement(scriptElement);
@@ -101,7 +102,8 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
 		else if (hasExpression || hasExpressionElement) {
 			if (hasRef || hasMethod) {
 				parserContext.getReaderContext().error(
-						"The 'ref' and 'method' attributes can't be used with 'expression' attribute or inner <expression>.", element);
+						"The 'ref' and 'method' attributes can't be used with 'expression' attribute or inner "
+						+ "<expression>.", element);
 				return null;
 			}
 			if (hasExpression & hasExpressionElement) {
@@ -124,9 +126,11 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
 		return result;
 	}
 
-	private BeanMetadataElement parseMethodInvokingSource(BeanMetadataElement targetObject, String methodName, Element element,
-			ParserContext parserContext) {
-		BeanDefinitionBuilder sourceBuilder = BeanDefinitionBuilder.genericBeanDefinition(MethodInvokingMessageSource.class);
+	private BeanMetadataElement parseMethodInvokingSource(BeanMetadataElement targetObject, String methodName,
+			Element element, ParserContext parserContext) {
+
+		BeanDefinitionBuilder sourceBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(MethodInvokingMessageSource.class);
 		sourceBuilder.addPropertyValue("object", targetObject);
 		sourceBuilder.addPropertyValue("methodName", methodName);
 		this.parseHeaderExpressions(sourceBuilder, element, parserContext);
@@ -135,7 +139,9 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
 
 	private BeanMetadataElement parseExpression(String expressionString, Element expressionElement, Element element,
 			ParserContext parserContext) {
-		BeanDefinitionBuilder sourceBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExpressionEvaluatingMessageSource.class);
+
+		BeanDefinitionBuilder sourceBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(ExpressionEvaluatingMessageSource.class);
 
 		BeanDefinition expressionDef = null;
 
@@ -166,8 +172,9 @@ public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundCh
 			ManagedMap<String, Object> headerExpressions = new ManagedMap<String, Object>();
 			for (Element headerElement : headerElements) {
 				String headerName = headerElement.getAttribute("name");
-				BeanDefinition expressionDef = IntegrationNamespaceUtils.createExpressionDefinitionFromValueOrExpression("value",
-						"expression", parserContext, headerElement, true);
+				BeanDefinition expressionDef = IntegrationNamespaceUtils
+						.createExpressionDefinitionFromValueOrExpression("value",
+								"expression", parserContext, headerElement, true);
 				headerExpressions.put(headerName, expressionDef);
 			}
 			builder.addPropertyValue("headerExpressions", headerExpressions);
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IdempotentReceiverInterceptorParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IdempotentReceiverInterceptorParser.java
index e8421c3b84..d36dae5e4b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IdempotentReceiverInterceptorParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IdempotentReceiverInterceptorParser.java
@@ -60,23 +60,24 @@ public class IdempotentReceiverInterceptorParser extends AbstractBeanDefinitionP
 
 		String endpoints = element.getAttribute("endpoint");
 
-		if (!hasSelector & !(hasKeyStrategy | hasKeyExpression)) {
+		if (!hasSelector && !(hasKeyStrategy || hasKeyExpression)) {
 			parserContext.getReaderContext().error("One of the 'selector', 'key-strategy' or 'key-expression' " +
 					"attributes must be provided", source);
 		}
 
-		if (hasSelector & (hasStore | hasKeyStrategy | hasKeyExpression | hasValueStrategy | hasValueExpression)) {
+		if (hasSelector && (hasStore || hasKeyStrategy || hasKeyExpression || hasValueStrategy // NOSONAR complexity
+				|| hasValueExpression)) {
 			parserContext.getReaderContext().error("The 'selector' attribute is mutually exclusive with " +
 					"'metadata-store', 'key-strategy', 'key-expression', 'value-strategy' " +
 					"or 'value-expression'", source);
 		}
 
-		if (hasKeyStrategy & hasKeyExpression) {
+		if (hasKeyStrategy && hasKeyExpression) {
 			parserContext.getReaderContext().error("The 'key-strategy' and 'key-expression' attributes " +
 					"are mutually exclusive", source);
 		}
 
-		if (hasValueStrategy & hasValueExpression) {
+		if (hasValueStrategy && hasValueExpression) {
 			parserContext.getReaderContext().error("The 'value-strategy' and 'value-expression' attributes " +
 					"are mutually exclusive", source);
 		}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java
index 4939b336a0..4af159f6f3 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java
@@ -58,7 +58,8 @@ public class AggregateMessageDeliveryException extends MessageDeliveryException
 	@Override
 	public String getMessage() {
 		String baseMessage = super.getMessage();
-		StringBuilder message = new StringBuilder(appendPeriodIfNecessary(baseMessage) + " Multiple causes:\n");
+		StringBuilder message = new StringBuilder(appendPeriodIfNecessary(baseMessage))
+				.append(" Multiple causes:\n");
 		for (Exception exception : this.aggregatedExceptions) {
 			message.append("    " + exception.getMessage() + "\n");
 		}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
index da99baed1c..4288e6a7b6 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
@@ -3114,7 +3114,7 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	@SuppressWarnings("unchecked")
-	protected final B _this() {
+	protected final B _this() { // NOSONAR name
 		return (B) this;
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java
index 05dc659462..4a1aa6e4df 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/IntegrationFlowLifecycleAdvice.java
@@ -113,6 +113,10 @@ class IntegrationFlowLifecycleAdvice implements MethodInterceptor {
 						result = this.delegate.getPhase();
 					}
 					break;
+
+				default:
+					break;
+
 			}
 		}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
index 4a57fe7867..5f7d1e8c89 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
@@ -547,10 +547,10 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
 					throw t;
 				}
 			}
-			if (t instanceof RuntimeException
+			if (t instanceof RuntimeException // NOSONAR boolean complexity
 					&& !(t instanceof MessagingException)
 					&& !(t instanceof UndeclaredThrowableException)
-					&& !(t instanceof IllegalStateException && ("Unexpected exception thrown").equals(t.getMessage()))) {
+					&& !(t instanceof IllegalStateException && "Unexpected exception thrown".equals(t.getMessage()))) {
 				throw t;
 			}
 			t = t.getCause();
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java
index 80035159f0..3f05c94b92 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java
@@ -85,9 +85,9 @@ public class LoggingHandler extends AbstractMessageHandler {
 			return Level.valueOf(level.toUpperCase());
 		}
 		catch (@SuppressWarnings("unused") IllegalArgumentException e) {
-			throw new IllegalArgumentException("Invalid log level '" + level
+			throw new IllegalArgumentException("Invalid log level '" + level // NOSONAR lost stack trace
 					+ "'. The (case-insensitive) supported values are: "
-					+ StringUtils.arrayToCommaDelimitedString(Level.values())); // NOSONAR lost stack trace
+					+ StringUtils.arrayToCommaDelimitedString(Level.values()));
 		}
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractHandleMessageAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractHandleMessageAdvice.java
index a5d25e8bf0..8169d58e7b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractHandleMessageAdvice.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractHandleMessageAdvice.java
@@ -40,7 +40,7 @@ public abstract class AbstractHandleMessageAdvice extends IntegrationObjectSuppo
 		Method method = invocation.getMethod();
 		Object invocationThis = invocation.getThis();
 		Object[] arguments = invocation.getArguments();
-		boolean isMessageHandler = invocationThis != null && invocationThis instanceof MessageHandler;
+		boolean isMessageHandler = invocationThis instanceof MessageHandler;
 		boolean isMessageMethod = method.getName().equals("handleMessage")
 				&& (arguments.length == 1 && arguments[0] instanceof Message);
 		if (!isMessageHandler || !isMessageMethod) {
@@ -59,6 +59,6 @@ public abstract class AbstractHandleMessageAdvice extends IntegrationObjectSuppo
 		return doInvoke(invocation, message);
 	}
 
-	protected abstract Object doInvoke(MethodInvocation invocation, Message<?> message) throws Throwable;
+	protected abstract Object doInvoke(MethodInvocation invocation, Message<?> message) throws Throwable; // NOSONAR
 
 }
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java
index e0e8865c63..3503e209b2 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java
@@ -68,7 +68,7 @@ public class JsonPropertyAccessor implements PropertyAccessor {
 
 	@Override
 	public Class<?>[] getSpecificTargetClasses() {
-		return SUPPORTED_CLASSES;
+		return SUPPORTED_CLASSES; // NOSONAR - expose internals
 	}
 
 	@Override
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/MapBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/support/MapBuilder.java
index c9e92f9e8f..69ea00c0d8 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/MapBuilder.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/MapBuilder.java
@@ -48,7 +48,7 @@ public class MapBuilder<B extends MapBuilder<B, K, V>, K, V> {
 	}
 
 	@SuppressWarnings("unchecked")
-	protected final B _this() {
+	protected final B _this() { // NOSONAR name
 		return (B) this;
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java
index 86b0a24475..488d91597b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java
@@ -111,7 +111,7 @@ public class MutableMessage<T> implements Message<T>, Serializable {
 		if (this == obj) {
 			return true;
 		}
-		if (obj != null && obj instanceof MutableMessage<?>) {
+		if (obj instanceof MutableMessage<?>) {
 			MutableMessage<?> other = (MutableMessage<?>) obj;
 			UUID thisId = this.headers.getId();
 			UUID otherId = other.headers.getId();
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java
index f5bde20268..59b325cf7c 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java
@@ -21,7 +21,6 @@ import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -260,7 +259,7 @@ public class EmbeddedJsonHeadersMessageMapper implements BytesMessageMapper {
 					buffer.position(4);
 					@SuppressWarnings("unchecked")
 					Map<String, Object> headers = this.objectMapper.readValue(bytes, buffer.position(), headersLen,
-							HashMap.class);
+							Map.class);
 
 					buffer.position(buffer.position() + headersLen);
 					buffer.getInt();
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationFactoryBean.java
index d296e3ab69..a7e8b15641 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationFactoryBean.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
 public class TransactionSynchronizationFactoryBean implements FactoryBean<DefaultTransactionSynchronizationFactory>,
 		BeanFactoryAware {
 
-	private final SpelExpressionParser PARSER = new SpelExpressionParser();
+	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
 	private final AtomicInteger counter = new AtomicInteger();
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
index c6832b6a26..b3136f42f9 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
@@ -108,7 +108,7 @@ public class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware
 		if (sourceType != null) {
 			Class<?> sourceClass = sourceType.getType();
 			Class<?> targetClass = targetType.getType();
-			if ((sourceClass == MessageHeaders.class && targetClass == MessageHeaders.class) ||
+			if ((sourceClass == MessageHeaders.class && targetClass == MessageHeaders.class) || // NOSONAR
 				(sourceClass == MessageHistory.class && targetClass == MessageHistory.class) ||
 				(sourceType.isAssignableTo(targetType) && ClassUtils.isPrimitiveArray(sourceClass))) {
 				return value;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingAnnotationUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingAnnotationUtils.java
index 92bec5d1f7..e9c639a533 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingAnnotationUtils.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingAnnotationUtils.java
@@ -72,7 +72,7 @@ public final class MessagingAnnotationUtils {
 	}
 
 	public static boolean hasValue(Object value) {
-		return value != null && (!(value instanceof String) || (StringUtils.hasText((String) value)))
+		return value != null && (!(value instanceof String) || (StringUtils.hasText((String) value))) // NOSONAR
 				&& (!value.getClass().isArray() || ((Object[]) value).length > 0);
 	}
 
@@ -103,7 +103,7 @@ public final class MessagingAnnotationUtils {
 		Annotation match = null;
 		for (Annotation annotation : annotations) {
 			Class<? extends Annotation> type = annotation.annotationType();
-			if (type.equals(Payload.class)
+			if (type.equals(Payload.class) // NOSONAR boolean complexity
 					|| type.equals(Header.class)
 					|| type.equals(Headers.class)
 					|| (payloads && type.equals(Payloads.class))) {
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java
index ea2625dca2..f657dd415d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class EmbeddedJsonHeadersMessageMapperTests {
 
 	@Test
-	public void testEmbedAll() throws Exception {
+	public void testEmbedAll() {
 		EmbeddedJsonHeadersMessageMapper mapper = new EmbeddedJsonHeadersMessageMapper();
 		GenericMessage<String> message = new GenericMessage<>("foo");
 		assertThat(mapper.toMessage(mapper.fromMessage(message))).isEqualTo(message);
@@ -92,7 +92,7 @@ public class EmbeddedJsonHeadersMessageMapperTests {
 	}
 
 	@Test
-	public void testBytesEmbedSome() throws Exception {
+	public void testBytesEmbedSome() {
 		EmbeddedJsonHeadersMessageMapper mapper = new EmbeddedJsonHeadersMessageMapper("I*");
 		GenericMessage<byte[]> message = new GenericMessage<>("foo".getBytes(), Collections.singletonMap("bar", "baz"));
 		byte[] bytes = mapper.fromMessage(message);
@@ -112,7 +112,7 @@ public class EmbeddedJsonHeadersMessageMapperTests {
 	}
 
 	@Test
-	public void testBytesEmbedAllJson() throws Exception {
+	public void testBytesEmbedAllJson() {
 		EmbeddedJsonHeadersMessageMapper mapper = new EmbeddedJsonHeadersMessageMapper();
 		mapper.setRawBytes(false);
 		GenericMessage<byte[]> message = new GenericMessage<>("foo".getBytes());
@@ -126,7 +126,7 @@ public class EmbeddedJsonHeadersMessageMapperTests {
 	}
 
 	@Test
-	public void testBytesDecodeAll() throws Exception {
+	public void testBytesDecodeAll() {
 		EmbeddedJsonHeadersMessageMapper mapper = new EmbeddedJsonHeadersMessageMapper();
 		GenericMessage<byte[]> message = new GenericMessage<>("foo".getBytes());
 		Message<?> decoded = mapper.toMessage(mapper.fromMessage(message));
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java
index cae5967d21..fd69712b57 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java
@@ -47,7 +47,7 @@ public class CrossOrigin {
 	}
 
 	public String[] getOrigin() {
-		return this.origin;
+		return this.origin; // NOSONAR - expose internals
 	}
 
 	public void setAllowedHeaders(String... allowedHeaders) {
@@ -55,7 +55,7 @@ public class CrossOrigin {
 	}
 
 	public String[] getAllowedHeaders() {
-		return this.allowedHeaders;
+		return this.allowedHeaders; // NOSONAR - expose internals
 	}
 
 	public void setExposedHeaders(String... exposedHeaders) {
@@ -63,7 +63,7 @@ public class CrossOrigin {
 	}
 
 	public String[] getExposedHeaders() {
-		return this.exposedHeaders;
+		return this.exposedHeaders; // NOSONAR - expose internals
 	}
 
 	public void setMethod(RequestMethod... method) {
@@ -71,7 +71,7 @@ public class CrossOrigin {
 	}
 
 	public RequestMethod[] getMethod() {
-		return this.method;
+		return this.method; // NOSONAR - expose internals
 	}
 
 	public void setAllowCredentials(Boolean allowCredentials) {
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java
index 57356e03d4..19f64e0c4d 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java
@@ -61,7 +61,7 @@ public class RequestMapping {
 	}
 
 	public String[] getPathPatterns() {
-		return this.pathPatterns;
+		return this.pathPatterns; // NOSONAR - expose internals
 	}
 
 	public void setMethods(HttpMethod... supportedMethods) {
@@ -70,7 +70,7 @@ public class RequestMapping {
 	}
 
 	public HttpMethod[] getMethods() {
-		return this.methods;
+		return this.methods; // NOSONAR - expose internals
 	}
 
 	public void setParams(String... params) {
@@ -79,7 +79,7 @@ public class RequestMapping {
 	}
 
 	public String[] getParams() {
-		return this.params;
+		return this.params; // NOSONAR - expose internals
 	}
 
 	public void setHeaders(String... headers) {
@@ -88,7 +88,7 @@ public class RequestMapping {
 	}
 
 	public String[] getHeaders() {
-		return this.headers;
+		return this.headers; // NOSONAR - expose internals
 	}
 
 	public void setConsumes(String... consumes) {
@@ -97,7 +97,7 @@ public class RequestMapping {
 	}
 
 	public String[] getConsumes() {
-		return this.consumes;
+		return this.consumes; // NOSONAR - expose internals
 	}
 
 	public void setProduces(String... produces) {
@@ -106,7 +106,7 @@ public class RequestMapping {
 	}
 
 	public String[] getProduces() {
-		return this.produces;
+		return this.produces; // NOSONAR - expose internals
 	}
 
 	public RequestMethod[] getRequestMethods() {
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java
index 71fa96e10d..354ae842de 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java
@@ -393,11 +393,11 @@ public class CachingClientConnectionFactory extends AbstractClientConnectionFact
 
 		private final AtomicBoolean released = new AtomicBoolean();
 
-		private CachedConnection(TcpConnectionSupport connection,
+		CachedConnection(TcpConnectionSupport connection,
 				@Nullable TcpListener tcpListener) {  // NOSONAR false positive, connection not marked @Nullable
 
 			super.setTheConnection(connection);
-			registerListener(tcpListener);
+			super.registerListener(tcpListener);
 		}
 
 		@Override
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
index 30b302e600..528c755b36 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
@@ -572,9 +572,9 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
 			 *  This is needed because there is no way to detect 2 or more gateways using the same reply queue
 			 *  with no correlation key.
 			 */
-			if (this.useReplyContainer && (this.correlationKey == null &&
-					(this.replyDestination != null || this.replyDestinationName != null) ||
-					this.replyDestinationExpressionProcessor != null)) {
+			boolean hasAReplyDest = this.replyDestination != null || this.replyDestinationName != null
+					|| this.replyDestinationExpressionProcessor != null;
+			if (this.useReplyContainer && (this.correlationKey == null && hasAReplyDest)) {
 				if (logger.isWarnEnabled()) {
 					logger.warn("The gateway cannot use a reply listener container with a specified " +
 							"destination(Name/Expression) " +
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
index a74935b5ac..9b11da6843 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java
@@ -79,15 +79,17 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser {
 		Element container = DomUtils.getChildElementByTagName(element, "reply-listener");
 
 		if (container != null) {
-			this.parseReplyContainer(builder, parserContext, container);
+			this.parseReplyContainer(builder, container);
 		}
 		return builder;
 	}
 
 	private void parseDestination(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
-			String destinationAttributeName, String destinationNameAttributeName, String destinationExpressionAttributeName,
+			String destinationAttributeName, String destinationNameAttributeName,
+			String destinationExpressionAttributeName,
 			String destinationProperty, String destinationNameProperty, String destinationExpressionProperty,
 			boolean oneRequired) {
+
 		String destinationAttribute = element.getAttribute(destinationAttributeName);
 		String destinationNameAttribute = element.getAttribute(destinationNameAttributeName);
 		String destinationExpressionAttribute = element.getAttribute(destinationExpressionAttributeName);
@@ -99,14 +101,16 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser {
 						(hasDestinationExpression ? 1 : 0);
 		if (oneRequired) {
 			if (destCount != 1) {
-				parserContext.getReaderContext().error("Exactly one of the '" + destinationAttribute + "', " +
-						"'" + destinationNameAttributeName + "', or '" + destinationExpressionAttributeName + "' attributes is required.", element);
+				parserContext.getReaderContext().error("Exactly one of the '" + destinationAttribute + "', "
+						+ "'" + destinationNameAttributeName + "', or '"
+						+ destinationExpressionAttributeName + "' attributes is required.", element);
 			}
 		}
 		else {
 			if (destCount > 1) {
-				parserContext.getReaderContext().error("Only one of the '" + destinationAttribute + "', " +
-						"'" + destinationNameAttributeName + "', or '" + destinationExpressionAttributeName + "' attributes is allowed.", element);
+				parserContext.getReaderContext().error("Only one of the '" + destinationAttribute + "', "
+						+ "'" + destinationNameAttributeName + "', or '"
+						+ destinationExpressionAttributeName + "' attributes is allowed.", element);
 			}
 		}
 		if (hasDestination) {
@@ -116,15 +120,18 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser {
 			builder.addPropertyValue(destinationNameProperty, destinationNameAttribute);
 		}
 		else if (hasDestinationExpression) {
-			BeanDefinitionBuilder expressionBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class);
+			BeanDefinitionBuilder expressionBuilder = BeanDefinitionBuilder
+					.genericBeanDefinition(ExpressionFactoryBean.class);
 			expressionBuilder.addConstructorArgValue(destinationExpressionAttribute);
 			builder.addPropertyValue(destinationExpressionProperty, expressionBuilder.getBeanDefinition());
 		}
 	}
 
-	private void parseReplyContainer(BeanDefinitionBuilder gatewayBuilder, ParserContext parserContext, Element element) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsOutboundGateway.ReplyContainerProperties.class);
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "acknowledge", "sessionAcknowledgeModeName");
+	private void parseReplyContainer(BeanDefinitionBuilder gatewayBuilder, Element element) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(JmsOutboundGateway.ReplyContainerProperties.class);
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "acknowledge",
+				"sessionAcknowledgeModeName");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "concurrent-consumers");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "max-concurrent-consumers");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "max-messages-per-task");
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
index 6059897f0c..55326615df 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
@@ -80,7 +80,7 @@ public class BeanPropertyParameterSource implements ParameterSource {
 			}
 			this.propertyNames = names.toArray(new String[names.size()]);
 		}
-		return this.propertyNames;
+		return this.propertyNames; // NOSONAR - expose internals
 	}
 
 }
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MessageDocument.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MessageDocument.java
index 6199a9852a..3f6fc9b3da 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MessageDocument.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MessageDocument.java
@@ -41,7 +41,7 @@ public class MessageDocument {
 	 * currently Auditable.
 	 */
 	@Id
-	private String _id;
+	private String _id; // NOSONAR name
 
 	private final Message<?> message;
 
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
index 03ea69e050..bb63733eb2 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
@@ -791,15 +791,15 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
 		 */
 		@SuppressWarnings("unused")
 		@Id
-		private String _id;
+		private String _id; // NOSONAR name
 
-		private volatile Object _groupId;
+		private volatile Object _groupId; // NOSONAR name
 
 		@Transient
-		private final Message<?> message;
+		private final Message<?> message; // NOSONAR name
 
 		@SuppressWarnings("unused")
-		private final String _messageType;
+		private final String _messageType; // NOSONAR name
 
 		@SuppressWarnings("unused")
 		private final Object payload;
@@ -810,15 +810,15 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
 		@SuppressWarnings("unused")
 		private final Message<?> inputMessage;
 
-		private long _message_timestamp;
+		private long _message_timestamp; // NOSONAR name
 
-		private volatile long _group_timestamp;
+		private volatile long _group_timestamp; // NOSONAR name
 
-		private volatile long _group_update_timestamp;
+		private volatile long _group_update_timestamp; // NOSONAR name
 
-		private volatile int _last_released_sequence;
+		private volatile int _last_released_sequence; // NOSONAR name
 
-		private volatile boolean _group_complete;
+		private volatile boolean _group_complete; // NOSONAR name
 
 		@SuppressWarnings("unused")
 		private int sequence;
@@ -837,20 +837,20 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
 			}
 		}
 
-		public int get_LastReleasedSequenceNumber() {
+		public int get_LastReleasedSequenceNumber() { // NOSONAR name
 			return this._last_released_sequence;
 		}
 
-		public long get_Group_timestamp() {
+		public long get_Group_timestamp() { // NOSONAR name
 			return this._group_timestamp;
 		}
 
-		public boolean get_Group_complete() {
+		public boolean get_Group_complete() { // NOSONAR name
 			return this._group_complete;
 		}
 
 		@SuppressWarnings("unused")
-		public Object get_GroupId() {
+		public Object get_GroupId() { // NOSONAR name
 			return this._groupId;
 		}
 
@@ -858,39 +858,39 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
 			return this.message;
 		}
 
-		public void set_GroupId(Object groupId) {
+		public void set_GroupId(Object groupId) { // NOSONAR name
 			this._groupId = groupId;
 		}
 
-		public void set_Group_timestamp(long groupTimestamp) {
+		public void set_Group_timestamp(long groupTimestamp) { // NOSONAR name
 			this._group_timestamp = groupTimestamp;
 		}
 
-		public long get_message_timestamp() {
+		public long get_message_timestamp() { // NOSONAR name
 			return this._message_timestamp;
 		}
 
-		public void set_message_timestamp(long _message_timestamp) {
+		public void set_message_timestamp(long _message_timestamp) { // NOSONAR name
 			this._message_timestamp = _message_timestamp;
 		}
 
-		public long get_Group_update_timestamp() {
+		public long get_Group_update_timestamp() { // NOSONAR name
 			return this._group_update_timestamp;
 		}
 
-		public void set_Group_update_timestamp(long lastModified) {
+		public void set_Group_update_timestamp(long lastModified) { // NOSONAR name
 			this._group_update_timestamp = lastModified;
 		}
 
-		public void set_LastReleasedSequenceNumber(int lastReleasedSequenceNumber) {
+		public void set_LastReleasedSequenceNumber(int lastReleasedSequenceNumber) { // NOSONAR name
 			this._last_released_sequence = lastReleasedSequenceNumber;
 		}
 
-		public void set_Group_complete(boolean completedGroup) {
+		public void set_Group_complete(boolean completedGroup) { // NOSONAR name
 			this._group_complete = completedGroup;
 		}
 
-		public void set_Sequence(int sequence) {
+		public void set_Sequence(int sequence) { // NOSONAR name
 			this.sequence = sequence;
 		}
 
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParser.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParser.java
index 67719e1e21..1e58672440 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParser.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParser.java
@@ -40,7 +40,7 @@ public class RedisQueueInboundGatewayParser extends AbstractInboundGatewayParser
 
 	@Override
 	protected boolean isEligibleAttribute(String attributeName) {
-		return !attributeName.equals("queue")
+		return !attributeName.equals("queue") // NOSONAR boolean complexity
 				&& !attributeName.equals("connection-factory")
 				&& !attributeName.equals("serializer")
 				&& !attributeName.equals("task-executor")
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java
index 9bf286a2ec..a41da3d74a 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java
@@ -88,7 +88,7 @@ public class SftpSession implements Session<LsEntry> {
 	public LsEntry[] list(String path) throws IOException {
 		Assert.state(this.channel != null, "session is not connected");
 		try {
-			Vector<?> lsEntries = this.channel.ls(path);
+			Vector<?> lsEntries = this.channel.ls(path); // NOSONAR (Vector)
 			if (lsEntries != null) {
 				LsEntry[] entries = new LsEntry[lsEntries.size()];
 				for (int i = 0; i < lsEntries.size(); i++) {
diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java
index 3dcd0366be..65db11d1fe 100644
--- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java
+++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/OnlyOnceTrigger.java
@@ -54,7 +54,7 @@ public class OnlyOnceTrigger implements Trigger {
 			return null;
 		}
 
-		return this.executionTime;
+		return this.executionTime; // NOSONAR - expose internals
 	}
 
 	@Override
diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
index 48c1437c37..38725ea378 100644
--- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
+++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
@@ -150,7 +150,7 @@ public class WebFluxMessageHandlerSpec
 	}
 
 	@Override
-	protected WebFluxMessageHandlerSpec expectReply(boolean expectReply) {
+	protected WebFluxMessageHandlerSpec expectReply(boolean expectReply) { // NOSONAR increases visibility
 		return super.expectReply(expectReply);
 	}