Use negate() instead of not() to match predicate terminology.

Gary Gregory · Gary Gregory · commit e21df7d5b95b · 2020-10-16T18:34:30.000-04:00
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2616,7 +2616,7 @@ private static IOFileFilter setUpEffectiveDirFilter(final IOFileFilter dirFilter
      * @return a filter that accepts files
      */
     private static IOFileFilter setUpEffectiveFileFilter(final IOFileFilter fileFilter) {
-        return fileFilter.and(DirectoryFileFilter.INSTANCE.not());
+        return fileFilter.and(DirectoryFileFilter.INSTANCE.negate());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/CanExecuteFileFilter.java
@@ -59,7 +59,7 @@ public class CanExecuteFileFilter extends AbstractFileFilter implements Serializ
     public static final IOFileFilter CAN_EXECUTE = new CanExecuteFileFilter();
 
     /** Singleton instance of not <i>executable</i> filter */
-    public static final IOFileFilter CANNOT_EXECUTE = CAN_EXECUTE.not();
+    public static final IOFileFilter CANNOT_EXECUTE = CAN_EXECUTE.negate();
 
     private static final long serialVersionUID = 3179904805251622989L;
 
diff --git a/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/CanReadFileFilter.java
@@ -67,7 +67,7 @@ public class CanReadFileFilter extends AbstractFileFilter implements Serializabl
     public static final IOFileFilter CAN_READ = new CanReadFileFilter();
 
     /** Singleton instance of not <i>readable</i> filter */
-    public static final IOFileFilter CANNOT_READ = CAN_READ.not();
+    public static final IOFileFilter CANNOT_READ = CAN_READ.negate();
 
     /** Singleton instance of <i>read-only</i> filter */
     public static final IOFileFilter READ_ONLY = CAN_READ.and(CanWriteFileFilter.CANNOT_WRITE);
diff --git a/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/CanWriteFileFilter.java
@@ -59,7 +59,7 @@ public class CanWriteFileFilter extends AbstractFileFilter implements Serializab
     public static final IOFileFilter CAN_WRITE = new CanWriteFileFilter();
 
     /** Singleton instance of not <i>writable</i> filter */
-    public static final IOFileFilter CANNOT_WRITE = CAN_WRITE.not();
+    public static final IOFileFilter CANNOT_WRITE = CAN_WRITE.negate();
 
     private static final long serialVersionUID = 5132005214688990379L;
 
diff --git a/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java
@@ -81,7 +81,7 @@ public class EmptyFileFilter extends AbstractFileFilter implements Serializable
     public static final IOFileFilter EMPTY = new EmptyFileFilter();
 
     /** Singleton instance of <i>not-empty</i> filter */
-    public static final IOFileFilter NOT_EMPTY = EMPTY.not();
+    public static final IOFileFilter NOT_EMPTY = EMPTY.negate();
 
     private static final long serialVersionUID = 3631422087512832211L;
 
diff --git a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
@@ -87,7 +87,7 @@ public FileVisitResult accept(final Path file, final BasicFileAttributes attribu
     }
 
     @Override
-    public IOFileFilter not() {
+    public IOFileFilter negate() {
         return TrueFileFilter.INSTANCE;
     }
 
diff --git a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
@@ -600,7 +600,7 @@ public static IOFileFilter nameFileFilter(final String name, final IOCase caseSe
      * @see NotFileFilter
      */
     public static IOFileFilter notFileFilter(final IOFileFilter filter) {
-        return filter.not();
+        return filter.negate();
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java
@@ -81,7 +81,7 @@ public class HiddenFileFilter extends AbstractFileFilter implements Serializable
     private static final long serialVersionUID = 8930842316112759062L;
 
     /** Singleton instance of <i>visible</i> filter */
-    public static final IOFileFilter VISIBLE = HIDDEN.not();
+    public static final IOFileFilter VISIBLE = HIDDEN.negate();
 
     /**
      * Restrictive constructor.
diff --git 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 @@ default AndFileFilter and(final IOFileFilter... fileFilter) {
      * @return a new filter
      * @since 2.9.0
      */
-    default IOFileFilter not() {
+    default IOFileFilter negate() {
         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
@@ -87,7 +87,7 @@ public FileVisitResult accept(final Path file, final BasicFileAttributes attribu
     }
 
     @Override
-    public IOFileFilter not() {
+    public IOFileFilter negate() {
         return FalseFileFilter.INSTANCE;
     }
 
diff --git a/src/test/java/org/apache/commons/io/file/DirectoryStreamFilterTest.java b/src/test/java/org/apache/commons/io/file/DirectoryStreamFilterTest.java
@@ -55,7 +55,7 @@ public void testFilterByName() throws Exception {
 
     @Test
     public void testFilterByNameNot() throws Exception {
-        final PathFilter pathFilter = new NameFileFilter(PATH_FIXTURE).not();
+        final PathFilter pathFilter = new NameFileFilter(PATH_FIXTURE).negate();
         final DirectoryStreamFilter streamFilter = new DirectoryStreamFilter(pathFilter);
         assertEquals(pathFilter, streamFilter.getPathFilter());
         try (final DirectoryStream<Path> stream = Files.newDirectoryStream(Paths.get("."), streamFilter)) {
diff --git a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
@@ -524,8 +524,8 @@ public void testTrue() throws Exception {
         assertFiltering(filter, (Path) null, true);
         //
         assertSame(TrueFileFilter.TRUE, TrueFileFilter.INSTANCE);
-        assertSame(FalseFileFilter.FALSE, TrueFileFilter.INSTANCE.not());
-        assertSame(FalseFileFilter.INSTANCE, TrueFileFilter.INSTANCE.not());
+        assertSame(FalseFileFilter.FALSE, TrueFileFilter.INSTANCE.negate());
+        assertSame(FalseFileFilter.INSTANCE, TrueFileFilter.INSTANCE.negate());
     }
 
     @Test
@@ -538,16 +538,16 @@ public void testFalse() throws Exception {
         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());
+        assertSame(TrueFileFilter.TRUE, FalseFileFilter.INSTANCE.negate());
+        assertSame(TrueFileFilter.INSTANCE, FalseFileFilter.INSTANCE.negate());
     }
 
     @Test
-    public void testNot() throws Exception {
+    public void testNegate() throws Exception {
         final IOFileFilter filter = FileFilterUtils.notFileFilter(FileFilterUtils.trueFileFilter());
         assertFiltering(filter, new File("foo.test"), false);
         assertFiltering(filter, new File("foo"), false);
-        assertFiltering(filter.not(), new File("foo"), true);
+        assertFiltering(filter.negate(), new File("foo"), true);
         assertFiltering(filter, (File) null, false);
         assertThrows(IllegalArgumentException.class, () -> new NotFileFilter(null));
     }

Original file line number	Diff line number	Diff line change
`@@ -2616,7 +2616,7 @@ private static IOFileFilter setUpEffectiveDirFilter(final IOFileFilter dirFilter`
`2616`	`2616`	`* @return a filter that accepts files`
`2617`	`2617`	`*/`
`2618`	`2618`	`private static IOFileFilter setUpEffectiveFileFilter(final IOFileFilter fileFilter) {`
`2619`		`- return fileFilter.and(DirectoryFileFilter.INSTANCE.not());`
	`2619`	`+ return fileFilter.and(DirectoryFileFilter.INSTANCE.negate());`
`2620`	`2620`	`}`
`2621`	`2621`
`2622`	`2622`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public FileVisitResult accept(final Path file, final BasicFileAttributes attribu`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- public IOFileFilter not() {`
	`90`	`+ public IOFileFilter negate() {`
`91`	`91`	`return TrueFileFilter.INSTANCE;`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ public static IOFileFilter nameFileFilter(final String name, final IOCase caseSe`
`600`	`600`	`* @see NotFileFilter`
`601`	`601`	`*/`
`602`	`602`	`public static IOFileFilter notFileFilter(final IOFileFilter filter) {`
`603`		`- return filter.not();`
	`603`	`+ return filter.negate();`
`604`	`604`	`}`
`605`	`605`
`606`	`606`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ default AndFileFilter and(final IOFileFilter... fileFilter) {`
`93`	`93`	`* @return a new filter`
`94`	`94`	`* @since 2.9.0`
`95`	`95`	`*/`
`96`		`- default IOFileFilter not() {`
	`96`	`+ default IOFileFilter negate() {`
`97`	`97`	`return new NotFileFilter(this);`
`98`	`98`	`}`
`99`	`99`