From 4679c9bdbed2f4e9a18ca02b7956aae9855f0592 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Fri, 23 Jun 2017 11:51:37 -0400
Subject: [PATCH] INT-4302: Add `fileExistsMode()` to Java DSL

JIRA: https://jira.spring.io/browse/INT-4302

Add `RemoteFileOutboundGatewaySpec#fileExistsMode()`
---
 .../file/dsl/RemoteFileOutboundGatewaySpec.java   | 15 ++++++++++++++-
 .../integration/ftp/dsl/FtpTests.java             |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java
index e80512e78e..77dd829394 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java
@@ -32,6 +32,7 @@ import org.springframework.integration.file.filters.FileListFilter;
 import org.springframework.integration.file.filters.RegexPatternFileListFilter;
 import org.springframework.integration.file.filters.SimplePatternFileListFilter;
 import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway;
+import org.springframework.integration.file.support.FileExistsMode;
 import org.springframework.messaging.Message;
 
 /**
@@ -338,6 +339,19 @@ public abstract class RemoteFileOutboundGatewaySpec<F, S extends RemoteFileOutbo
 		return _this();
 	}
 
+	/**
+	 * Determine the action to take when using GET and MGET operations when the file
+	 * already exists locally, or PUT and MPUT when the file exists on the remote
+	 * system.
+	 * @param fileExistsMode the fileExistsMode to set.
+	 * @return the current Spec
+	 */
+	public S fileExistsMode(FileExistsMode fileExistsMode) {
+		this.target.setFileExistsMode(fileExistsMode);
+		return _this();
+	}
+
+
 	@Override
 	public Map<Object, String> getComponentsToRegister() {
 		Map<Object, String> componentsToRegister = new LinkedHashMap<>();
@@ -351,7 +365,6 @@ public abstract class RemoteFileOutboundGatewaySpec<F, S extends RemoteFileOutbo
 		return componentsToRegister;
 	}
 
-
 	/**
 	 * Specify a simple pattern to match remote files (e.g. '*.txt').
 	 * @param pattern the pattern.
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/dsl/FtpTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/dsl/FtpTests.java
index 6e3755fae1..baa8650070 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/dsl/FtpTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/dsl/FtpTests.java
@@ -62,6 +62,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 /**
  * @author Artem Bilan
  * @author Gary Russell
+ *
  * @since 5.0
  */
 @RunWith(SpringRunner.class)
@@ -170,6 +171,7 @@ public class FtpTests extends FtpTestSupport {
 				.handle(Ftp.outboundGateway(sessionFactory(),
 						AbstractRemoteFileOutboundGateway.Command.MGET, "payload")
 						.options(AbstractRemoteFileOutboundGateway.Option.RECURSIVE)
+						.fileExistsMode(FileExistsMode.IGNORE)
 						.filterExpression("name matches 'subFtpSource|.*1.txt'")
 						.localDirectoryExpression("'" + getTargetLocalDirectoryName() + "' + #remoteDirectory")
 						.localFilenameExpression("#remoteFileName.replaceFirst('ftpSource', 'localTarget')"))