Fix Sonar issues

Author: garyrussell

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

@@ -264,18 +264,25 @@ private void addChannelFromString(Collection<MessageChannel> channels, String ch
 			mapped = true;
 		}
 		if (channelName != null) {
-			if (this.prefix != null) {
-				channelName = this.prefix + channelName;
-			}
-			if (this.suffix != null) {
-				channelName = channelName + this.suffix;
-			}
-			MessageChannel channel = resolveChannelForName(channelName, message);
-			if (channel != null) {
-				channels.add(channel);
-				if (!mapped && this.dynamicChannels.get(channelName) == null) {
-					this.dynamicChannels.put(channelName, channel);
-				}
+			addChannel(channels, message, channelName, mapped);
+		}
+	}
+
+	private void addChannel(Collection<MessageChannel> channels, Message<?> message, String channelNameArg,
+			boolean mapped) {
+
+		String channelName = channelNameArg;
+		if (this.prefix != null) {
+			channelName = this.prefix + channelName;
+		}
+		if (this.suffix != null) {
+			channelName = channelName + this.suffix;
+		}
+		MessageChannel channel = resolveChannelForName(channelName, message);
+		if (channel != null) {
+			channels.add(channel);
+			if (!mapped && this.dynamicChannels.get(channelName) == null) {
+				this.dynamicChannels.put(channelName, channel);
 			}
 		}
 	}

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/DirectoryCreatedEvent.java

@@ -19,6 +19,8 @@
 import java.nio.file.Path;
 import java.util.Map;
 
+import org.springframework.lang.Nullable;
+
 /**
  * An event emitted when a directory is created.
  *
@@ -30,7 +32,7 @@ public class DirectoryCreatedEvent extends ApacheMinaSftpEvent {
 
 	private static final long serialVersionUID = 1L;
 
-	private final Path path;
+	private transient Path path;
 
 	private final Map<String, ?> attrs;
 
@@ -40,6 +42,7 @@ public DirectoryCreatedEvent(Object source, Path path, Map<String, ?> attrs) {
 		this.attrs = attrs;
 	}
 
+	@Nullable
 	public Path getPath() {
 		return this.path;
 	}

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/FileWrittenEvent.java

@@ -33,7 +33,7 @@ public class FileWrittenEvent extends ApacheMinaSftpEvent {
 
 	private final String remoteHandle;
 
-	private final Path file;
+	private transient Path file;
 
 	private final int dataLen;
 
@@ -48,6 +48,7 @@ public String getRemoteHandle() {
 		return this.remoteHandle;
 	}
 
+	@Nullable
 	public Path getFile() {
 		return this.file;
 	}

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/PathMovedEvent.java

@@ -31,20 +31,22 @@ public class PathMovedEvent extends ApacheMinaSftpEvent {
 
 	private static final long serialVersionUID = 1L;
 
-	private final Path srcPath;
+	private transient Path srcPath;
 
-	private final Path dstPath;
+	private transient Path dstPath;
 
 	public PathMovedEvent(Object source, Path srcPath, Path dstPath, @Nullable Throwable thrown) {
 		super(source, thrown);
 		this.srcPath = srcPath;
 		this.dstPath = dstPath;
 	}
 
+	@Nullable
 	public Path getSrcPath() {
 		return this.srcPath;
 	}
 
+	@Nullable
 	public Path getDstPath() {
 		return this.dstPath;
 	}

spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/PathRemovedEvent.java

@@ -31,7 +31,7 @@ public class PathRemovedEvent extends ApacheMinaSftpEvent {
 
 	private static final long serialVersionUID = 1L;
 
-	private final Path path;
+	private transient Path path;
 
 	private final boolean isDirectory;
 
@@ -41,6 +41,7 @@ public PathRemovedEvent(Object source, Path path, boolean isDirectory, @Nullable
 		this.isDirectory = isDirectory;
 	}
 
+	@Nullable
 	public Path getPath() {
 		return this.path;
 	}