Fix some Sonar smells

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.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.
@@ -68,12 +68,12 @@
  */
 public class ReloadableResourceBundleExpressionSource implements ExpressionSource, ResourceLoaderAware {
 
+	private static final Log LOGGER = LogFactory.getLog(ReloadableResourceBundleExpressionSource.class);
+
 	private static final String PROPERTIES_SUFFIX = ".properties";
 
 	private static final String XML_SUFFIX = ".xml";
 
-	private static final Log LOGGER = LogFactory.getLog(ReloadableResourceBundleExpressionSource.class);
-
 
 	/**
 	 * Cache to hold filename lists per Locale
@@ -211,7 +211,7 @@ public void setFallbackToSystemLocale(boolean fallbackToSystemLocale) {
 	 * @param cacheSeconds The cache seconds.
 	 */
 	public void setCacheSeconds(int cacheSeconds) {
-		this.cacheMillis = (cacheSeconds * 1000);
+		this.cacheMillis = (cacheSeconds * 1000); // NOSONAR
 	}
 
 	/**
@@ -324,8 +324,7 @@ private List<String> calculateAllFilenames(String basename, Locale locale) {
 					return filenames;
 				}
 			}
-			List<String> filenames = new ArrayList<>(7);
-			filenames.addAll(calculateFilenamesForLocale(basename, locale));
+			List<String> filenames = new ArrayList<>(calculateFilenamesForLocale(basename, locale));
 			if (this.fallbackToSystemLocale && !locale.equals(Locale.getDefault())) {
 				List<String> fallbackFilenames = calculateFilenamesForLocale(basename, Locale.getDefault());
 				for (String fallbackFilename : fallbackFilenames) {
@@ -359,7 +358,7 @@ private List<String> calculateAllFilenames(String basename, Locale locale) {
 	 * @return the List of filenames to check
 	 */
 	private List<String> calculateFilenamesForLocale(String basename, Locale locale) {
-		List<String> result = new ArrayList<>(3);
+		List<String> result = new ArrayList<>();
 		String language = locale.getLanguage();
 		String country = locale.getCountry();
 		String variant = locale.getVariant();

spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-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.
@@ -170,11 +170,8 @@ protected Object doInvoke(MethodInvocation invocation, Message<?> message) throw
 	}
 
 	private MessageChannel obtainDiscardChannel() {
-		if (this.discardChannel == null) {
-			if (this.discardChannelName != null) {
-				this.discardChannel = getChannelResolver()
-						.resolveDestination(this.discardChannelName);
-			}
+		if (this.discardChannel == null && this.discardChannelName != null) {
+			this.discardChannel = getChannelResolver().resolveDestination(this.discardChannelName);
 		}
 		return this.discardChannel;
 	}

spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerCircuitBreakerAdvice.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.
@@ -36,9 +36,19 @@
  */
 public class RequestHandlerCircuitBreakerAdvice extends AbstractRequestHandlerAdvice {
 
-	private volatile int threshold = 5;
+	/**
+	 * A default failures threshold as {@value DEFAULT_THRESHOLD}.
+	 */
+	public static final int DEFAULT_THRESHOLD = 5;
 
-	private volatile long halfOpenAfter = 1000;
+	/**
+	 * A half-open duration as {@value DEFAULT_HALF_OPEN_AFTER} .
+	 */
+	public static final int DEFAULT_HALF_OPEN_AFTER = 1000;
+
+	private int threshold = DEFAULT_THRESHOLD;
+
+	private long halfOpenAfter = DEFAULT_HALF_OPEN_AFTER;
 
 	private final ConcurrentMap<Object, AdvisedMetadata> metadataMap = new ConcurrentHashMap<>();
 
@@ -101,6 +111,7 @@ private void setLastFailure(long lastFailure) {
 		private AtomicInteger getFailures() {
 			return this.failures;
 		}
+
 	}
 
 	/**

spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerRetryAdvice.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.
@@ -37,17 +37,18 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ *
  * @since 2.2
  */
 public class RequestHandlerRetryAdvice extends AbstractRequestHandlerAdvice
 		implements RetryListener {
 
+	private static final ThreadLocal<Message<?>> MESSAGE_HOLDER = new ThreadLocal<>();
+
 	private RetryTemplate retryTemplate = new RetryTemplate();
 
 	private RecoveryCallback<Object> recoveryCallback;
 
-	private static final ThreadLocal<Message<?>> messageHolder = new ThreadLocal<Message<?>>();
-
 	// Stateless unless a state generator is provided
 	private volatile RetryStateGenerator retryStateGenerator = message -> null;
 
@@ -78,9 +79,8 @@ protected void onInit() {
 
 	@Override
 	protected Object doInvoke(final ExecutionCallback callback, Object target, final Message<?> message) {
-		RetryState retryState = null;
-		retryState = this.retryStateGenerator.determineRetryState(message);
-		messageHolder.set(message);
+		RetryState retryState = this.retryStateGenerator.determineRetryState(message);
+		MESSAGE_HOLDER.set(message);
 
 		try {
 			return this.retryTemplate.execute(context -> callback.cloneAndExecute(), this.recoveryCallback, retryState);
@@ -98,13 +98,13 @@ protected Object doInvoke(final ExecutionCallback callback, Object target, final
 			throw new ThrowableHolderException(e);
 		}
 		finally {
-			messageHolder.remove();
+			MESSAGE_HOLDER.remove();
 		}
 	}
 
 	@Override
 	public <T, E extends Throwable> boolean open(RetryContext context, RetryCallback<T, E> callback) {
-		context.setAttribute(ErrorMessageUtils.FAILED_MESSAGE_CONTEXT_KEY, messageHolder.get());
+		context.setAttribute(ErrorMessageUtils.FAILED_MESSAGE_CONTEXT_KEY, MESSAGE_HOLDER.get());
 		return true;
 	}
 

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

@@ -128,7 +128,6 @@ public void setRequestHeaderNames(String... requestHeaderNames) {
 	 * Provide the header names that should be mapped to a response
 	 * from a {@link MessageHeaders}.
 	 * <p>The values can also contain simple wildcard patterns (e.g. "foo*" or "*foo") to be matched.
-	 *
 	 * @param replyHeaderNames The reply header names.
 	 */
 	public void setReplyHeaderNames(String... replyHeaderNames) {
@@ -141,7 +140,7 @@ public void setReplyHeaderNames(String... replyHeaderNames) {
 	 * standard header prefix.
 	 * @param standardHeaderPrefix the prefix for standard headers.
 	 * @param headerNames the collection of header names to map.
-	 * @return the deafault {@link HeaderMatcher} instance.
+	 * @return the default {@link HeaderMatcher} instance.
 	 */
 	protected HeaderMatcher createDefaultHeaderMatcher(String standardHeaderPrefix, Collection<String> headerNames) {
 		return new ContentBasedHeaderMatcher(true, headerNames);
@@ -401,6 +400,7 @@ protected void populateStandardHeaders(@Nullable Map<String, Object> allHeaders,
 
 	/**
 	 * Strategy interface to determine if a given header name matches.
+	 *
 	 * @since 4.1
 	 */
 	@FunctionalInterface
@@ -427,11 +427,12 @@ default boolean isNegated() {
 	 * A content-based {@link HeaderMatcher} that matches if the specified
 	 * header is contained within a list of candidates. The case of the
 	 * header does not matter.
+	 *
 	 * @since 4.1
 	 */
 	protected static class ContentBasedHeaderMatcher implements HeaderMatcher {
 
-		private static final Log logger = LogFactory.getLog(HeaderMatcher.class);
+		private static final Log LOGGER = LogFactory.getLog(HeaderMatcher.class);
 
 		private final boolean match;
 
@@ -446,13 +447,13 @@ public ContentBasedHeaderMatcher(boolean match, Collection<String> content) {
 		@Override
 		public boolean matchHeader(String headerName) {
 			boolean result = (this.match == containsIgnoreCase(headerName));
-			if (result && logger.isDebugEnabled()) {
+			if (result && LOGGER.isDebugEnabled()) {
 				StringBuilder message = new StringBuilder("headerName=[{0}] WILL be mapped, ");
 				if (!this.match) {
 					message.append("not ");
 				}
 				message.append("found in {1}");
-				logger.debug(MessageFormat.format(message.toString(), headerName, this.content));
+				LOGGER.debug(MessageFormat.format(message.toString(), headerName, this.content));
 			}
 			return result;
 		}
@@ -471,12 +472,14 @@ private boolean containsIgnoreCase(String name) {
 	/**
 	 * A pattern-based {@link HeaderMatcher} that matches if the specified
 	 * header matches one of the specified simple patterns.
-	 * @see org.springframework.util.PatternMatchUtils#simpleMatch(String, String)
+	 *
 	 * @since 4.1
+	 *
+	 * @see org.springframework.util.PatternMatchUtils#simpleMatch(String, String)
 	 */
 	protected static class PatternBasedHeaderMatcher implements HeaderMatcher {
 
-		private static final Log logger = LogFactory.getLog(HeaderMatcher.class);
+		private static final Log LOGGER = LogFactory.getLog(HeaderMatcher.class);
 
 		private final Collection<String> patterns = new ArrayList<>();
 
@@ -493,8 +496,8 @@ public boolean matchHeader(String headerName) {
 			String header = headerName.toLowerCase();
 			for (String pattern : this.patterns) {
 				if (PatternMatchUtils.simpleMatch(pattern, header)) {
-					if (logger.isDebugEnabled()) {
-						logger.debug(MessageFormat.format(
+					if (LOGGER.isDebugEnabled()) {
+						LOGGER.debug(MessageFormat.format(
 								"headerName=[{0}] WILL be mapped, matched pattern={1}", headerName, pattern));
 					}
 					return true;
@@ -509,12 +512,14 @@ public boolean matchHeader(String headerName) {
 	 * A pattern-based {@link HeaderMatcher} that matches if the specified
 	 * header matches the specified simple pattern.
 	 * <p> The {@code negate == true} state indicates if the matching should be treated as "not matched".
-	 * @see org.springframework.util.PatternMatchUtils#simpleMatch(String, String)
+	 *
 	 * @since 4.3
+	 *
+	 * @see org.springframework.util.PatternMatchUtils#simpleMatch(String, String)
 	 */
 	protected static class SinglePatternBasedHeaderMatcher implements HeaderMatcher {
 
-		private static final Log logger = LogFactory.getLog(HeaderMatcher.class);
+		private static final Log LOGGER = LogFactory.getLog(HeaderMatcher.class);
 
 		private final String pattern;
 
@@ -534,8 +539,8 @@ public SinglePatternBasedHeaderMatcher(String pattern, boolean negate) {
 		public boolean matchHeader(String headerName) {
 			String header = headerName.toLowerCase();
 			if (PatternMatchUtils.simpleMatch(this.pattern, header)) {
-				if (logger.isDebugEnabled()) {
-					logger.debug(MessageFormat.format(
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug(MessageFormat.format(
 							"headerName=[{0}] WILL be mapped, matched pattern={1}", headerName, this.pattern));
 				}
 				return true;
@@ -553,11 +558,12 @@ public boolean isNegated() {
 	/**
 	 * A prefix-based {@link HeaderMatcher} that matches if the specified
 	 * header starts with a configurable prefix.
+	 *
 	 * @since 4.1
 	 */
 	protected static class PrefixBasedMatcher implements HeaderMatcher {
 
-		private static final Log logger = LogFactory.getLog(HeaderMatcher.class);
+		private static final Log LOGGER = LogFactory.getLog(HeaderMatcher.class);
 
 		private final boolean match;
 
@@ -571,13 +577,13 @@ public PrefixBasedMatcher(boolean match, String prefix) {
 		@Override
 		public boolean matchHeader(String headerName) {
 			boolean result = (this.match == headerName.startsWith(this.prefix));
-			if (result && logger.isDebugEnabled()) {
+			if (result && LOGGER.isDebugEnabled()) {
 				StringBuilder message = new StringBuilder("headerName=[{0}] WILL be mapped, ");
 				if (!this.match) {
 					message.append("does not ");
 				}
 				message.append("start with [{1}]");
-				logger.debug(MessageFormat.format(message.toString(), headerName, this.prefix));
+				LOGGER.debug(MessageFormat.format(message.toString(), headerName, this.prefix));
 			}
 			return result;
 		}
@@ -587,11 +593,12 @@ public boolean matchHeader(String headerName) {
 	/**
 	 * A composite {@link HeaderMatcher} that matches if one of provided
 	 * {@link HeaderMatcher}s matches to the {@code headerName}.
+	 *
 	 * @since 4.1
 	 */
 	protected static class CompositeHeaderMatcher implements HeaderMatcher {
 
-		private static final Log logger = LogFactory.getLog(HeaderMatcher.class);
+		private static final Log LOGGER = LogFactory.getLog(HeaderMatcher.class);
 
 		private final Collection<HeaderMatcher> matchers;
 
@@ -613,8 +620,8 @@ public boolean matchHeader(String headerName) {
 					return true;
 				}
 			}
-			if (logger.isDebugEnabled()) {
-				logger.debug(MessageFormat.format("headerName=[{0}] WILL NOT be mapped", headerName));
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug(MessageFormat.format("headerName=[{0}] WILL NOT be mapped", headerName));
 			}
 			return false;
 		}

spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java

@@ -114,7 +114,8 @@ public boolean accept(Message<?> message) {
 				? this.valueStrategy.processMessage(message)
 				: (timestamp == null ? "0" : Long.toString(timestamp));
 
-		if (this.compareValues == null) {
+		BiPredicate<String, String> predicate = this.compareValues;
+		if (predicate == null) {
 			return this.metadataStore.putIfAbsent(key, value) == null;
 		}
 		else {
@@ -123,7 +124,7 @@ public boolean accept(Message<?> message) {
 				if (oldValue == null) {
 					return this.metadataStore.putIfAbsent(key, value) == null;
 				}
-				if (this.compareValues.test(oldValue, value)) { // NOSONAR (null dereference)
+				if (predicate.test(oldValue, value)) {
 					return this.metadataStore.replace(key, oldValue, value);
 				}
 				return false;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-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.
@@ -46,7 +46,7 @@ public AbstractIntegrationMessageBuilder<T> setExpirationDate(Long expirationDat
 		return setHeader(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, expirationDate);
 	}
 
-	public AbstractIntegrationMessageBuilder<T> setExpirationDate(Date expirationDate) {
+	public AbstractIntegrationMessageBuilder<T> setExpirationDate(@Nullable Date expirationDate) {
 		if (expirationDate != null) {
 			return setHeader(IntegrationMessageHeaderAccessor.EXPIRATION_DATE, expirationDate.getTime());
 		}
@@ -62,7 +62,7 @@ public AbstractIntegrationMessageBuilder<T> setCorrelationId(Object correlationI
 	public AbstractIntegrationMessageBuilder<T> pushSequenceDetails(Object correlationId, int sequenceNumber,
 			int sequenceSize) {
 
-		Object incomingCorrelationId = this.getCorrelationId();
+		Object incomingCorrelationId = getCorrelationId();
 		List<List<Object>> incomingSequenceDetails = getSequenceDetails();
 		if (incomingCorrelationId != null) {
 			if (incomingSequenceDetails == null) {
@@ -92,8 +92,8 @@ public AbstractIntegrationMessageBuilder<T> popSequenceDetails() {
 			incomingSequenceDetails = new ArrayList<>(incomingSequenceDetails);
 		}
 		List<Object> sequenceDetails = incomingSequenceDetails.remove(incomingSequenceDetails.size() - 1);
-		Assert.state(sequenceDetails.size() == 3, "Wrong sequence details (not created by MessageBuilder?): "
-				+ sequenceDetails);
+		Assert.state(sequenceDetails.size() == 3, // NOSONAR
+				() -> "Wrong sequence details (not created by MessageBuilder?): " + sequenceDetails);
 		setCorrelationId(sequenceDetails.get(0));
 		Integer sequenceNumber = (Integer) sequenceDetails.get(1);
 		Integer sequenceSize = (Integer) sequenceDetails.get(2);
@@ -166,10 +166,13 @@ public AbstractIntegrationMessageBuilder<T> filterAndCopyHeadersIfAbsent(Map<Str
 	@Nullable
 	protected abstract List<List<Object>> getSequenceDetails();
 
+	@Nullable
 	protected abstract Object getCorrelationId();
 
+	@Nullable
 	protected abstract Object getSequenceNumber();
 
+	@Nullable
 	protected abstract Object getSequenceSize();
 
 	public abstract T getPayload();