Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4215: Add ChainFileListFilter

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4215
Fixes GH-1998 (https://github.com/spring-projects/spring-integration/issues/1998)

Just make an `CompositeFileListFilter` extension which chains result of the previous filter to the next

**Cherry-pick 4.3.x**
This commit is contained in:
Artem Bilan
2017-01-25 13:00:19 -05:00
committed by Gary Russell
parent eaaa21ef5d
commit d47bca48cc
5 changed files with 95 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-file/src/test/java/org/springframework/integration/file/CompositeFileListFilterTests.java
View File

@@ -16,26 +16,31 @@
package org.springframework.integration.file;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.springframework.integration.file.filters.ChainFileListFilter;
import org.springframework.integration.file.filters.CompositeFileListFilter;
import org.springframework.integration.file.filters.FileListFilter;
/**
* @author Iwein Fuld
* @author Gary Russell
* @author Aaron Grant
* @author Artem Bilan
*/
public class CompositeFileListFilterTests {
@@ -52,7 +57,7 @@ public class CompositeFileListFilterTests {
CompositeFileListFilter<File> compositeFileFilter = new CompositeFileListFilter<File>();
compositeFileFilter.addFilter(fileFilterMock1);
compositeFileFilter.addFilter(fileFilterMock2);
List<File> returnedFiles = Arrays.asList(fileMock);
List<File> returnedFiles = Collections.singletonList(fileMock);
when(fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(returnedFiles);
when(fileFilterMock2.filterFiles(isA(File[].class))).thenReturn(returnedFiles);
assertEquals(returnedFiles, compositeFileFilter.filterFiles(new File[] { fileMock }));
@@ -66,7 +71,7 @@ public class CompositeFileListFilterTests {
CompositeFileListFilter<File> compositeFileFilter = new CompositeFileListFilter<File>();
compositeFileFilter.addFilter(fileFilterMock1);
compositeFileFilter.addFilter(fileFilterMock2);
List<File> returnedFiles = Arrays.asList(fileMock);
List<File> returnedFiles = Collections.singletonList(fileMock);
when(fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(returnedFiles);
when(fileFilterMock2.filterFiles(isA(File[].class))).thenReturn(returnedFiles);
assertEquals(returnedFiles, compositeFileFilter.filterFiles(new File[] { fileMock }));
@@ -86,4 +91,20 @@ public class CompositeFileListFilterTests {
assertTrue(compositeFileFilter.filterFiles(new File[] { fileMock }).isEmpty());
compositeFileFilter.close();
}
@Test
public void excludeFromLaterFilters() throws Exception {
CompositeFileListFilter<File> compositeFileFilter = new ChainFileListFilter<>();
compositeFileFilter.addFilter(this.fileFilterMock1);
compositeFileFilter.addFilter(this.fileFilterMock2);
List<File> noFiles = new ArrayList<>();
when(this.fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(noFiles);
assertEquals(noFiles, compositeFileFilter.filterFiles(new File[] { this.fileMock }));
verify(fileFilterMock1).filterFiles(argThat(arrayWithSize(1)));
verify(fileFilterMock2).filterFiles(argThat(arrayWithSize(0)));
compositeFileFilter.close();
}
}