diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java index 2e22ac35b8..516ab8a4a1 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java @@ -180,6 +180,11 @@ public abstract class AbstractPersistentAcceptOnceFileListFilter extends Abst } } + @Override + protected boolean isDirectory(F file) { + return false; + } + protected abstract long modified(F file); protected abstract String fileName(F file); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java index e8782ac4d5..64123128d1 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java @@ -111,11 +111,6 @@ public class PersistentAcceptOnceFileListFilterTests extends AcceptOnceFileListF return file; } - @Override - protected boolean isDirectory(String file) { - return false; - } - }; doTestRollback(filter); } diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java index ea03e417cc..1650071029 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java @@ -345,19 +345,19 @@ public class StreamingInboundTests { } try { Session session = mock(Session.class); - willReturn(new String[] { "/foo/foo", "/foo/bar" }).given(session).list("/foo"); + willReturn(new String[]{ "/foo/foo", "/foo/bar" }).given(session).list("/foo"); ByteArrayInputStream foo = new ByteArrayInputStream("foo\nbar".getBytes()); ByteArrayInputStream bar = new ByteArrayInputStream("baz\nqux".getBytes()); willReturn(foo).given(session).readRaw("/foo/foo"); willReturn(bar).given(session).readRaw("/foo/bar"); - willReturn(new String[] { "/bar/foo", "/bar/bar" }).given(session).list("/bar"); + willReturn(new String[]{ "/bar/foo", "/bar/bar" }).given(session).list("/bar"); ByteArrayInputStream foo2 = new ByteArrayInputStream("foo\r\nbar".getBytes()); ByteArrayInputStream bar2 = new ByteArrayInputStream("baz\r\nqux".getBytes()); willReturn(foo2).given(session).readRaw("/bar/foo"); willReturn(bar2).given(session).readRaw("/bar/bar"); - willReturn(new String[] { "/bad/file1", "/bad/file2" }).given(session).list("/bad"); + willReturn(new String[]{ "/bad/file1", "/bad/file2" }).given(session).list("/bad"); willThrow(new IOException("No file")).given(session).readRaw("/bad/file1"); willThrow(new IOException("No file")).given(session).readRaw("/bad/file2"); @@ -390,11 +390,6 @@ public class StreamingInboundTests { return file; } - @Override - protected boolean isDirectory(String file) { - return false; - } - } }