From 412d9f5400155de3b1cd19c4423f8126cf0cb31c Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Thu, 2 Jul 2020 10:30:03 -0400
Subject: [PATCH] Fix new Sonar smells

---
 .../gateway/MessagingGatewaySupport.java      |  6 +--
 ...tractRemoteFileStreamingMessageSource.java | 52 ++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
index 3177cf24c1..ffeb0d076e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
@@ -613,13 +613,14 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
 
 	private Mono<Message<?>> doSendAndReceiveMessageReactive(MessageChannel requestChannel, Object object,
 			boolean error) {
-		final Message<?> requestMessage;
+
+		Message<?> requestMessage;
 		try {
 			Message<?> message =
 					object instanceof Message<?>
 							? (Message<?>) object
 							: this.requestMapper.toMessage(object);
-
+			Assert.state(message != null, () -> "request mapper resulted in no message for " + object);
 			message = this.historyWritingPostProcessor.postProcessMessage(message);
 			requestMessage = message;
 		}
@@ -628,7 +629,6 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint
 		}
 
 		return Mono.defer(() -> {
-
 			Object originalReplyChannelHeader = requestMessage.getHeaders().getReplyChannel();
 			Object originalErrorChannelHeader = requestMessage.getHeaders().getErrorChannel();
 
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java
index fd9fc2b2b5..637118be47 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java
@@ -204,35 +204,39 @@ public abstract class AbstractRemoteFileStreamingMessageSource<F>
 					break;
 				}
 			}
-			try {
-				String remotePath = remotePath(file);
-				Session<?> session = this.remoteFileTemplate.getSession();
-				if (maxFetchSize > 0) {
-					this.fetched.incrementAndGet();
-				}
-				try {
-					return getMessageBuilderFactory()
-							.withPayload(session.readRaw(remotePath))
-							.setHeader(IntegrationMessageHeaderAccessor.CLOSEABLE_RESOURCE, session)
-							.setHeader(FileHeaders.REMOTE_DIRECTORY, file.getRemoteDirectory())
-							.setHeader(FileHeaders.REMOTE_FILE, file.getFilename())
-							.setHeader(FileHeaders.REMOTE_HOST_PORT, session.getHostPort())
-							.setHeader(FileHeaders.REMOTE_FILE_INFO,
-									this.fileInfoJson ? file.toJson() : file);
-				}
-				catch (IOException e) {
-					session.close();
-					throw new UncheckedIOException("IOException when retrieving " + remotePath, e);
-				}
-			}
-			catch (RuntimeException e) {
-				resetFilterIfNecessary(file);
-				throw e;
+			if (maxFetchSize > 0) {
+				this.fetched.incrementAndGet();
 			}
+			return remoteFileToMessage(file);
 		}
 		return null;
 	}
 
+	private Object remoteFileToMessage(AbstractFileInfo<F> file) {
+		try {
+			String remotePath = remotePath(file);
+			Session<?> session = this.remoteFileTemplate.getSession();
+			try {
+				return getMessageBuilderFactory()
+						.withPayload(session.readRaw(remotePath))
+						.setHeader(IntegrationMessageHeaderAccessor.CLOSEABLE_RESOURCE, session)
+						.setHeader(FileHeaders.REMOTE_DIRECTORY, file.getRemoteDirectory())
+						.setHeader(FileHeaders.REMOTE_FILE, file.getFilename())
+						.setHeader(FileHeaders.REMOTE_HOST_PORT, session.getHostPort())
+						.setHeader(FileHeaders.REMOTE_FILE_INFO,
+								this.fileInfoJson ? file.toJson() : file);
+			}
+			catch (IOException e) {
+				session.close();
+				throw new UncheckedIOException("IOException when retrieving " + remotePath, e);
+			}
+		}
+		catch (RuntimeException e) {
+			resetFilterIfNecessary(file);
+			throw e;
+		}
+	}
+
 	protected AbstractFileInfo<F> poll() {
 		if (this.toBeReceived.size() == 0) {
 			listFiles();