IO-229 FileFilterUtils - add varargs methods for AndFileFilter and OrFileFilter - thanks to Michael Wooten

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1002394 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/java/org/apache/commons/io/filefilter/FileFilterUtils.java

@@ -19,7 +19,9 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.commons.io.IOCase;
 
@@ -136,6 +138,7 @@ public static IOFileFilter fileFileFilter() {
      * @param filter1  the first filter
      * @param filter2  the second filter
      * @return a filter that ANDs the two specified filters
+     * @deprecated use {@link #and(IOFileFilter...)}
      */
     public static IOFileFilter andFileFilter(IOFileFilter filter1, IOFileFilter filter2) {
         return new AndFileFilter(filter1, filter2);
@@ -147,11 +150,63 @@ public static IOFileFilter andFileFilter(IOFileFilter filter1, IOFileFilter filt
      * @param filter1  the first filter
      * @param filter2  the second filter
      * @return a filter that ORs the two specified filters
+     * @deprecated use {@link #or(IOFileFilter...)}
      */
     public static IOFileFilter orFileFilter(IOFileFilter filter1, IOFileFilter filter2) {
         return new OrFileFilter(filter1, filter2);
     }
 
+    /**
+     * Returns a filter that ANDs the specified filters.
+     * 
+     * @param filters the IOFileFilters that will be ANDed together.
+     * @return a filter that ANDs the specified filters
+     * 
+     * @throws IllegalArgumentException if the filters are null or contain a 
+     *         null value.
+     * @since Commons IO 2.0
+     */
+    public static IOFileFilter and(IOFileFilter... filters) {
+        return new AndFileFilter(toList(filters));
+    }
+
+    /**
+     * Returns a filter that ORs the specified filters.
+     * 
+     * @param filters the IOFileFilters that will be ORed together.
+     * @return a filter that ORs the specified filters
+     * 
+     * @throws IllegalArgumentException if the filters are null or contain a 
+     *         null value.
+     * @since Commons IO 2.0
+     */
+    public static IOFileFilter or(IOFileFilter... filters) {
+        return new OrFileFilter(toList(filters));
+    }
+
+    /**
+     * Create a List of file filters.
+     *
+     * @param filters The file filters
+     * @return The list of file filters
+     * @throws IllegalArgumentException if the filters are null or contain a 
+     *         null value.
+     * @since Commons IO 2.0
+     */
+    public static List<IOFileFilter> toList(IOFileFilter... filters) {
+        if (filters == null) {
+            throw new IllegalArgumentException("The filters must not be null");
+        }
+        List<IOFileFilter> list = new ArrayList<IOFileFilter>(filters.length);
+        for (int i = 0; i < filters.length; i++) {
+            if (filters[i] == null) {
+                throw new IllegalArgumentException("The filter[" + i + "] is null");
+            }
+            list.add(filters[i]);
+        }
+        return list;
+    }
+
     /**
      * Returns a filter that NOTs the specified filter.
      * 

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

@@ -482,6 +482,24 @@ public void testOr() throws Exception {
         OrFileFilter f = new OrFileFilter((List<IOFileFilter>) null);
         assertEquals(true, f.getFileFilters().isEmpty());
     }
+    public void testFileFilterUtils_and() throws Exception {
+        IOFileFilter trueFilter = TrueFileFilter.INSTANCE;
+        IOFileFilter falseFilter = FalseFileFilter.INSTANCE;
+        assertFiltering(FileFilterUtils.and(trueFilter, trueFilter, trueFilter), new File("foo.test"), true);
+        assertFiltering(FileFilterUtils.and(trueFilter, falseFilter, trueFilter), new File("foo.test"), false);
+        assertFiltering(FileFilterUtils.and(falseFilter, trueFilter), new File("foo.test"), false);
+        assertFiltering(FileFilterUtils.and(falseFilter, falseFilter), new File("foo.test"), false);
+    }
+
+    public void testFileFilterUtils_or() throws Exception {
+        IOFileFilter trueFilter = TrueFileFilter.INSTANCE;
+        IOFileFilter falseFilter = FalseFileFilter.INSTANCE;
+        File testFile = new File( "foo.test" );
+        assertFiltering(FileFilterUtils.or(trueFilter, trueFilter), testFile, true);
+        assertFiltering(FileFilterUtils.or(trueFilter, trueFilter, falseFilter), testFile, true);
+        assertFiltering(FileFilterUtils.or(falseFilter, trueFilter), testFile, true);
+        assertFiltering(FileFilterUtils.or(falseFilter, falseFilter, falseFilter), testFile, false);
+    }
 
     @SuppressWarnings("deprecation")
     public void testDeprecatedWildcard() throws Exception {