You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/10/16 17:29:36 UTC

[commons-io] branch master updated: Better boolean file filters.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


The following commit(s) were added to refs/heads/master by this push:
     new 0bc88dd  Better boolean file filters.
0bc88dd is described below

commit 0bc88ddc0d830fa8209b7a2b1db993afe0e43064
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Oct 16 13:29:30 2020 -0400

    Better boolean file filters.
---
 src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java  | 5 +++++
 src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java     | 2 +-
 src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java   | 5 +++++
 .../java/org/apache/commons/io/filefilter/FileFilterTestCase.java    | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
index 071bb51..a70973c 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
@@ -86,4 +86,9 @@ public class FalseFileFilter implements IOFileFilter, Serializable {
         return FileVisitResult.TERMINATE;
     }
 
+    @Override
+    public IOFileFilter not() {
+        return TrueFileFilter.INSTANCE;
+    }
+
 }
diff --git a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
index ccb2cec..7176b4e 100644
--- a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
@@ -93,7 +93,7 @@ public interface IOFileFilter extends FileFilter, FilenameFilter, PathFilter {
      * @return a new filter
      * @since 2.9.0
      */
-    default NotFileFilter not() {
+    default IOFileFilter not() {
         return new NotFileFilter(this);
     }
 
diff --git a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
index 8716c72..62bf9a7 100644
--- a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
@@ -86,4 +86,9 @@ public class TrueFileFilter implements IOFileFilter, Serializable {
         return FileVisitResult.CONTINUE;
     }
 
+    @Override
+    public IOFileFilter not() {
+        return FalseFileFilter.INSTANCE;
+    }
+
 }
diff --git a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
index 27f5227..c2561a4 100644
--- a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
+++ b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
@@ -524,6 +524,8 @@ public class FileFilterTestCase {
         assertFiltering(filter, (Path) null, true);
         //
         assertSame(TrueFileFilter.TRUE, TrueFileFilter.INSTANCE);
+        assertSame(FalseFileFilter.FALSE, TrueFileFilter.INSTANCE.not());
+        assertSame(FalseFileFilter.INSTANCE, TrueFileFilter.INSTANCE.not());
     }
 
     @Test
@@ -536,6 +538,8 @@ public class FileFilterTestCase {
         assertFiltering(filter, (File) null, false);
         assertFiltering(filter, (Path) null, false);
         assertSame(FalseFileFilter.FALSE, FalseFileFilter.INSTANCE);
+        assertSame(TrueFileFilter.TRUE, FalseFileFilter.INSTANCE.not());
+        assertSame(TrueFileFilter.INSTANCE, FalseFileFilter.INSTANCE.not());
     }
 
     @Test