Fix some Sonar smells

Author: artembilan

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

@@ -385,21 +385,25 @@ else if (delayValue != null) {
 			}
 		}
 		if (delayValueException != null) {
-			if (this.ignoreExpressionFailures) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Failed to get delay value from 'delayExpression': " +
-							delayValueException.getMessage() +
-							". Will fall back to default delay: " + this.defaultDelay);
-				}
-			}
-			else {
-				throw new IllegalStateException("Error occurred during 'delay' value determination",
-						delayValueException);
-			}
+			handleDelayValueException(delayValueException);
 		}
 		return delay;
 	}
 
+	private void handleDelayValueException(Exception delayValueException) {
+		if (this.ignoreExpressionFailures) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Failed to get delay value from 'delayExpression': " +
+						delayValueException.getMessage() +
+						". Will fall back to default delay: " + this.defaultDelay);
+			}
+		}
+		else {
+			throw new IllegalStateException("Error occurred during 'delay' value determination",
+					delayValueException);
+		}
+	}
+
 	private void releaseMessageAfterDelay(final Message<?> message, long delay) {
 		Message<?> delayedMessage = message;
 

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

@@ -27,6 +27,7 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.springframework.core.convert.ConversionService;
 import org.springframework.integration.support.management.MappingMessageRouterManagement;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -292,37 +293,41 @@ private void addToCollection(Collection<MessageChannel> channels, Collection<?>
 			return;
 		}
 		for (Object channelKey : channelKeys) {
-			if (channelKey instanceof MessageChannel) {
-				channels.add((MessageChannel) channelKey);
-			}
-			else if (channelKey instanceof MessageChannel[]) {
-				channels.addAll(Arrays.asList((MessageChannel[]) channelKey));
-			}
-			else if (channelKey instanceof String) {
-				addChannelFromString(channels, (String) channelKey, message);
-			}
-			else if (channelKey instanceof Class) {
-				addChannelFromString(channels, ((Class<?>) channelKey).getName(), message);
-			}
-			else if (channelKey instanceof String[]) {
-				for (String indicatorName : (String[]) channelKey) {
-					addChannelFromString(channels, indicatorName, message);
-				}
-			}
-			else if (channelKey instanceof Collection) {
-				addToCollection(channels, (Collection<?>) channelKey, message);
-			}
-			else if (channelKey != null &&
-					getRequiredConversionService().canConvert(channelKey.getClass(), String.class)) {
-				String converted = getConversionService().convert(channelKey, String.class);
-				if (converted != null) {
-					addChannelFromString(channels, converted, message);
-				}
+			addChannelKeyToCollection(channels, message, channelKey);
+		}
+	}
+
+	private void addChannelKeyToCollection(Collection<MessageChannel> channels, Message<?> message, Object channelKey) {
+		ConversionService conversionService = getRequiredConversionService();
+		if (channelKey instanceof MessageChannel) {
+			channels.add((MessageChannel) channelKey);
+		}
+		else if (channelKey instanceof MessageChannel[]) {
+			channels.addAll(Arrays.asList((MessageChannel[]) channelKey));
+		}
+		else if (channelKey instanceof String) {
+			addChannelFromString(channels, (String) channelKey, message);
+		}
+		else if (channelKey instanceof Class) {
+			addChannelFromString(channels, ((Class<?>) channelKey).getName(), message);
+		}
+		else if (channelKey instanceof String[]) {
+			for (String indicatorName : (String[]) channelKey) {
+				addChannelFromString(channels, indicatorName, message);
 			}
-			else if (channelKey != null) {
-				throw new MessagingException("unsupported return type for router [" + channelKey.getClass() + "]");
+		}
+		else if (channelKey instanceof Collection) {
+			addToCollection(channels, (Collection<?>) channelKey, message);
+		}
+		else if (channelKey != null && conversionService.canConvert(channelKey.getClass(), String.class)) {
+			String converted = conversionService.convert(channelKey, String.class);
+			if (converted != null) {
+				addChannelFromString(channels, converted, message);
 			}
 		}
+		else if (channelKey != null) {
+			throw new MessagingException("unsupported return type for router [" + channelKey.getClass() + "]");
+		}
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-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.
@@ -391,50 +391,9 @@ else if (acquired) {
 						}
 					}
 					catch (Exception e) {
-						if (this.locked) {
-							this.locked = false;
-							try {
-								this.lock.unlock();
-							}
-							catch (Exception e1) {
-								logger.debug("Could not unlock - treat as broken " + this.context +
-										". Revoking " + (isRunning() ? " and retrying..." : "..."), e1);
-
-							}
-							// The lock was broken and we are no longer leader
-							handleRevoked();
-						}
-
-						if (e instanceof InterruptedException || Thread.currentThread().isInterrupted()) {
-							Thread.currentThread().interrupt();
-							if (isRunning()) {
-								logger.warn("Restarting LeaderSelector for " + this.context + " because of error.", e);
-								LockRegistryLeaderInitiator.this.future =
-										LockRegistryLeaderInitiator.this.executorService.submit(
-												() -> {
-													// Give it a chance to elect some other leader.
-													Thread.sleep(LockRegistryLeaderInitiator.this.busyWaitMillis);
-													return call();
-												});
-							}
+						if (handleLockException(e)) {
 							return null;
 						}
-						else {
-							if (isRunning()) {
-								// Give it a chance to elect some other leader.
-								try {
-									Thread.sleep(LockRegistryLeaderInitiator.this.busyWaitMillis);
-								}
-								catch (InterruptedException e1) {
-									// Ignore interruption and let it to be caught on the next cycle.
-									Thread.currentThread().interrupt();
-								}
-							}
-							if (logger.isDebugEnabled()) {
-								logger.debug("Error acquiring the lock for " + this.context +
-										". " + (isRunning() ? "Retrying..." : ""), e);
-							}
-						}
 					}
 				}
 			}
@@ -455,6 +414,54 @@ else if (acquired) {
 			return null;
 		}
 
+		private boolean handleLockException(Exception e) {
+			if (this.locked) {
+				this.locked = false;
+				try {
+					this.lock.unlock();
+				}
+				catch (Exception e1) {
+					logger.debug("Could not unlock - treat as broken " + this.context +
+							". Revoking " + (isRunning() ? " and retrying..." : "..."), e1);
+
+				}
+				// The lock was broken and we are no longer leader
+				handleRevoked();
+			}
+
+			if (e instanceof InterruptedException || Thread.currentThread().isInterrupted()) {
+				Thread.currentThread().interrupt();
+				if (isRunning()) {
+					logger.warn("Restarting LeaderSelector for " + this.context + " because of error.", e);
+					LockRegistryLeaderInitiator.this.future =
+							LockRegistryLeaderInitiator.this.executorService.submit(
+									() -> {
+										// Give it a chance to elect some other leader.
+										Thread.sleep(LockRegistryLeaderInitiator.this.busyWaitMillis);
+										return call();
+									});
+				}
+				return true;
+			}
+			else {
+				if (isRunning()) {
+					// Give it a chance to elect some other leader.
+					try {
+						Thread.sleep(LockRegistryLeaderInitiator.this.busyWaitMillis);
+					}
+					catch (InterruptedException e1) {
+						// Ignore interruption and let it to be caught on the next cycle.
+						Thread.currentThread().interrupt();
+					}
+				}
+				if (logger.isDebugEnabled()) {
+					logger.debug("Error acquiring the lock for " + this.context +
+							". " + (isRunning() ? "Retrying..." : ""), e);
+				}
+			}
+			return false;
+		}
+
 		public boolean isLeader() {
 			return this.locked;
 		}