* Add FileReadingMessageSource.setWatchEvents to allow to listen to the specific events,

not only `CREATE` or all of them.
* Modify tests and docs to reflect the new API

Author: artembilan

spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java

@@ -110,6 +110,8 @@ public class FileReadingMessageSource extends IntegrationObjectSupport implement
 
 	private boolean useWatchService;
 
+	private WatchEventType[] watchEvents = new WatchEventType[] { WatchEventType.CREATE };
+
 	/**
 	 * Creates a FileReadingMessageSource with a naturally ordered queue of unbounded capacity.
 	 */
@@ -255,10 +257,30 @@ public void setScanEachPoll(boolean scanEachPoll) {
 		this.scanEachPoll = scanEachPoll;
 	}
 
+	/**
+	 * Switch this {@link FileReadingMessageSource} to use its internal
+	 * {@link FileReadingMessageSource.WatchServiceDirectoryScanner}.
+	 * @param useWatchService the {@code boolean} flag to switch to
+	 * {@link FileReadingMessageSource.WatchServiceDirectoryScanner} on {@code true}.
+	 * @since 4.3
+	 * @see #setWatchEvents
+	 */
 	public void setUseWatchService(boolean useWatchService) {
 		this.useWatchService = useWatchService;
 	}
 
+	/**
+	 * The {@link WatchService} event types.
+	 * If {@link #setUseWatchService} isn't {@code true}, this option is ignored.
+	 * @param watchEvents the set of {@link WatchEventType}.
+	 * @since 4.3
+	 * @see #setUseWatchService
+	 */
+	public void setWatchEvents(WatchEventType... watchEvents) {
+		Assert.notEmpty(watchEvents, "'watchEvents' must not be empty.");
+		this.watchEvents = watchEvents;
+	}
+
 	@Override
 	public String getComponentType() {
 		return "file:inbound-channel-adapter";
@@ -377,35 +399,61 @@ public void onSend(Message<File> sentMessage) {
 		}
 	}
 
+	@UsesJava7
+	public enum WatchEventType {
+
+		CREATE(StandardWatchEventKinds.ENTRY_CREATE),
+
+		MODIFY(StandardWatchEventKinds.ENTRY_MODIFY),
+
+		DELETE(StandardWatchEventKinds.ENTRY_DELETE);
+
+		private final WatchEvent.Kind<Path> kind;
+
+		WatchEventType(WatchEvent.Kind<Path> kind) {
+			this.kind = kind;
+		}
+
+	}
+
 	@UsesJava7
 	private class WatchServiceDirectoryScanner extends DefaultDirectoryScanner implements Lifecycle {
 
-		private volatile WatchService watcher;
+		private WatchService watcher;
 
-		private volatile Collection<File> initialFiles;
+		private Collection<File> initialFiles;
+
+		private WatchEvent.Kind<?>[] kinds;
 
 		@Override
 		public void start() {
-				try {
-					this.watcher = FileSystems.getDefault().newWatchService();
-				}
-				catch (IOException e) {
-					logger.error("Failed to create watcher for " + FileReadingMessageSource.this.directory, e);
-				}
-				final Set<File> initialFiles = walkDirectory(FileReadingMessageSource.this.directory.toPath());
-				initialFiles.addAll(filesFromEvents());
-				this.initialFiles = initialFiles;
+			try {
+				this.watcher = FileSystems.getDefault().newWatchService();
+			}
+			catch (IOException e) {
+				logger.error("Failed to create watcher for " + FileReadingMessageSource.this.directory, e);
+			}
+
+			this.kinds = new WatchEvent.Kind<?>[FileReadingMessageSource.this.watchEvents.length];
+
+			for (int i = 0; i < FileReadingMessageSource.this.watchEvents.length; i++) {
+				this.kinds[i] = FileReadingMessageSource.this.watchEvents[i].kind;
+			}
+
+			final Set<File> initialFiles = walkDirectory(FileReadingMessageSource.this.directory.toPath());
+			initialFiles.addAll(filesFromEvents());
+			this.initialFiles = initialFiles;
 		}
 
 		@Override
 		public void stop() {
-				try {
-					this.watcher.close();
-					this.watcher = null;
-				}
-				catch (IOException e) {
-					logger.error("Failed to close watcher for " + FileReadingMessageSource.this.directory, e);
-				}
+			try {
+				this.watcher.close();
+				this.watcher = null;
+			}
+			catch (IOException e) {
+				logger.error("Failed to close watcher for " + FileReadingMessageSource.this.directory, e);
+			}
 		}
 
 		@Override
@@ -506,10 +554,7 @@ private void registerWatch(Path dir) throws IOException {
 			if (logger.isDebugEnabled()) {
 				logger.debug("registering: " + dir + " for file events");
 			}
-			dir.register(this.watcher,
-					StandardWatchEventKinds.ENTRY_CREATE,
-					StandardWatchEventKinds.ENTRY_MODIFY,
-					StandardWatchEventKinds.ENTRY_DELETE);
+			dir.register(this.watcher, this.kinds);
 		}
 
 	}

spring-integration-file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java

@@ -47,6 +47,7 @@ protected BeanMetadataElement parseSource(Element element, ParserContext parserC
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "comparator");
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "scanner");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "use-watch-service");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "watch-events");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "directory");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-create-directory");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "queue-size");

spring-integration-file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java

@@ -35,6 +35,8 @@
  * @author Mark Fisher
  * @author Iwein Fuld
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 1.0.3
  */
 public class FileReadingMessageSourceFactoryBean implements FactoryBean<FileReadingMessageSource>,
@@ -56,6 +58,8 @@ public class FileReadingMessageSourceFactoryBean implements FactoryBean<FileRead
 
 	private boolean useWatchService;
 
+	private FileReadingMessageSource.WatchEventType[] watchEvents;
+
 	private volatile Boolean scanEachPoll;
 
 	private volatile Boolean autoCreateDirectory;
@@ -83,6 +87,10 @@ public void setUseWatchService(boolean useWatchService) {
 		this.useWatchService = useWatchService;
 	}
 
+	public void setWatchEvents(FileReadingMessageSource.WatchEventType... watchEvents) {
+		this.watchEvents = watchEvents;
+	}
+
 	public void setFilter(FileListFilter<File> filter) {
 		if (filter instanceof AbstractFileLockerFilter && (this.locker == null)) {
 			this.setLocker((AbstractFileLockerFilter) filter);
@@ -154,6 +162,9 @@ else if (queueSizeSet) {
 			}
 			else {
 				this.source.setUseWatchService(this.useWatchService);
+				if (this.watchEvents != null) {
+					this.source.setWatchEvents(this.watchEvents);
+				}
 			}
 			if (this.filter != null) {
 				if (this.locker == null) {

spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.3.xsd

@@ -106,20 +106,29 @@ Only files matching this regular expression will be picked up by this adapter.
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:attribute>
-			<xsd:attribute name="use-watch-service" type="xsd:string">
+			<xsd:attribute name="use-watch-service">
 				<xsd:annotation>
 					<xsd:documentation>
 						Indicates if the 'FileReadingMessageSource' should use an internal 'DirectoryScanner'
 						for the Java 7 'WatchService'.
 						Mutually exclusive with 'scanner' attribute.
 					</xsd:documentation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type
-									type="org.springframework.integration.file.DirectoryScanner"/>
-						</tool:annotation>
-					</xsd:appinfo>
 				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="watch-events" default="CREATE">
+				<xsd:annotation>
+					<xsd:documentation>
+						Comma-separated value for the 'FileReadingMessageSource.WatchEventType's
+						to specify which kinds of files system events the 'WatchService' will listen to.
+						Used only if 'use-watch-service == true'.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="watchEventType xsd:string"/>
+				</xsd:simpleType>
 			</xsd:attribute>
 			<xsd:attribute name="ignore-hidden">
 				<xsd:annotation><xsd:documentation><![CDATA[
@@ -168,7 +177,16 @@ Only files matching this regular expression will be picked up by this adapter.
         </xsd:complexType>
     </xsd:element>
 
-    <xsd:element name="outbound-channel-adapter">
+	<xsd:simpleType name="watchEventType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="CREATE"/>
+			<xsd:enumeration value="MODIFY"/>
+			<xsd:enumeration value="DELETE"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+
+	<xsd:element name="outbound-channel-adapter">
         <xsd:annotation>
             <xsd:documentation>
 				Configures a Consumer Endpoint for the

spring-integration-file/src/test/java/org/springframework/integration/file/WatchServiceDirectoryScannerTests.java

@@ -75,6 +75,9 @@ public void testInitialAndAddMoreThanRemove() throws Exception {
 		FileReadingMessageSource fileReadingMessageSource = new FileReadingMessageSource();
 		fileReadingMessageSource.setDirectory(folder.getRoot());
 		fileReadingMessageSource.setUseWatchService(true);
+		fileReadingMessageSource.setWatchEvents(FileReadingMessageSource.WatchEventType.CREATE,
+				FileReadingMessageSource.WatchEventType.MODIFY,
+				FileReadingMessageSource.WatchEventType.DELETE);
 		fileReadingMessageSource.setBeanFactory(mock(BeanFactory.class));
 
 		final CountDownLatch removeFileLatch = new CountDownLatch(1);
@@ -161,13 +164,17 @@ public boolean remove(File fileToRemove) {
 
 		baz2Copy.setLastModified(baz2.lastModified() + 100000);
 
+		Thread.sleep(100);
+
 		files = scanner.listFiles(folder.getRoot());
 
 		assertEquals(1, files.size());
 		assertTrue(files.contains(baz2));
 
 		baz2.delete();
 
+		Thread.sleep(100);
+
 		scanner.listFiles(folder.getRoot());
 
 		assertTrue(removeFileLatch.await(10, TimeUnit.SECONDS));

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests-context.xml

@@ -15,20 +15,22 @@
 							 filter="filter"
 							 comparator="testComparator"
 							 ignore-hidden="false"
-							 auto-startup="false">
+							 auto-startup="false"
+							 use-watch-service="true"
+							 watch-events="MODIFY, DELETE"> <!-- CREATE by default -->
 		<integration:poller fixed-rate="5000">
-		    <integration:transactional synchronization-factory="syncFactory"/>
+			<integration:transactional synchronization-factory="syncFactory"/>
 		</integration:poller>
 	</inbound-channel-adapter>
 
 	<inbound-channel-adapter id="inboundWithJustFilter"
 							 directory="${java.io.tmpdir}"
 							 filter="filter"
 							 auto-startup="false">
-		<integration:poller fixed-rate="5000" />
+		<integration:poller fixed-rate="5000"/>
 	</inbound-channel-adapter>
 
-	<integration:channel id="successChannel" />
+	<integration:channel id="successChannel"/>
 
 	<beans:bean id="filter" class="org.springframework.integration.file.config.FileListFilterFactoryBean">
 		<beans:property name="ignoreHidden" value="false"/>
@@ -47,12 +49,17 @@
 
 	<beans:bean id="transactionManager" class="org.springframework.integration.transaction.PseudoTransactionManager"/>
 
-	<beans:bean id="syncFactory" class="org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory">
+	<beans:bean id="syncFactory"
+				class="org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory">
 		<beans:constructor-arg>
-			<beans:bean class="org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor">
-				<beans:property name="afterCommitExpression" value="#{new org.springframework.expression.spel.standard.SpelExpressionParser().parseExpression('payload.delete()')}"/>
+			<beans:bean
+					class="org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor">
+				<beans:property name="afterCommitExpression"
+								value="#{new org.springframework.expression.spel.standard.SpelExpressionParser()
+								                .parseExpression('payload.delete()')}"/>
 				<beans:property name="afterCommitChannel" ref="successChannel"/>
-				<beans:property name="afterRollbackExpression" value="#{new org.springframework.expression.common.LiteralExpression('foo')}"/>
+				<beans:property name="afterRollbackExpression"
+								value="#{new org.springframework.expression.common.LiteralExpression('foo')}"/>
 				<beans:property name="afterRollbackChannel" ref="nullChannel"/>
 			</beans:bean>
 		</beans:constructor-arg>

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -16,8 +16,11 @@
 
 package org.springframework.integration.file.config;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.isOneOf;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -52,13 +55,14 @@
  * @author Mark Fisher
  * @author Gary Russell
  * @author Gunnar Hillert
+ * @author Artem Bilan
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 @DirtiesContext
 public class FileInboundChannelAdapterParserTests {
 
-	@Autowired(required = true)
+	@Autowired
 	private ApplicationContext context;
 
 	@Autowired
@@ -107,6 +111,18 @@ public void filter() throws Exception {
 		Object filter = scannerAccessor.getPropertyValue("filter");
 		assertTrue("'filter' should be set and be of instance AcceptOnceFileListFilter but got "
 			+ filter.getClass().getSimpleName(), filter instanceof AcceptOnceFileListFilter);
+
+		assertThat(scanner.getClass().getName(),
+				containsString("FileReadingMessageSource$WatchServiceDirectoryScanner"));
+
+		FileReadingMessageSource.WatchEventType[] watchEvents =
+				(FileReadingMessageSource.WatchEventType[]) this.accessor.getPropertyValue("watchEvents");
+		assertEquals(2, watchEvents.length);
+		for (FileReadingMessageSource.WatchEventType watchEvent : watchEvents) {
+			assertNotEquals(FileReadingMessageSource.WatchEventType.CREATE, watchEvent);
+			assertThat(watchEvent, isOneOf(FileReadingMessageSource.WatchEventType.MODIFY,
+					FileReadingMessageSource.WatchEventType.DELETE));
+		}
 	}
 
 	@Test