Simplify new PathFilter interface to a single method.
diff --git a/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java b/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
index 9673844..a259640 100644
--- a/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
@@ -26,7 +26,6 @@
import java.util.Objects;
import org.apache.commons.io.file.Counters.PathCounters;
-import org.apache.commons.io.filefilter.PathFilter;
/**
* Accumulates normalized paths during visitation.
diff --git a/src/main/java/org/apache/commons/io/file/CopyDirectoryVisitor.java b/src/main/java/org/apache/commons/io/file/CopyDirectoryVisitor.java
index ea4e6d1..72bca11 100644
--- a/src/main/java/org/apache/commons/io/file/CopyDirectoryVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/CopyDirectoryVisitor.java
@@ -27,7 +27,6 @@
import java.util.Objects;
import org.apache.commons.io.file.Counters.PathCounters;
-import org.apache.commons.io.filefilter.PathFilter;
/**
* Copies a source directory to a target directory.
diff --git a/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java b/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java
index c9c4185..4256696 100644
--- a/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java
@@ -25,7 +25,6 @@
import java.util.Objects;
import org.apache.commons.io.file.Counters.PathCounters;
-import org.apache.commons.io.filefilter.PathFilter;
import org.apache.commons.io.filefilter.TrueFileFilter;
/**
diff --git a/src/main/java/org/apache/commons/io/filefilter/PathFilter.java b/src/main/java/org/apache/commons/io/file/PathFilter.java
similarity index 73%
rename from src/main/java/org/apache/commons/io/filefilter/PathFilter.java
rename to src/main/java/org/apache/commons/io/file/PathFilter.java
index 71976aa..0b789cf 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PathFilter.java
+++ b/src/main/java/org/apache/commons/io/file/PathFilter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.io.filefilter;
+package org.apache.commons.io.file;
import java.io.IOException;
import java.nio.file.FileVisitResult;
@@ -26,6 +26,7 @@
*
* @since 2.9.0
*/
+@FunctionalInterface
public interface PathFilter {
/**
@@ -33,17 +34,7 @@ public interface PathFilter {
*
* @param path The Path to test.
* @return a FileVisitResult
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs.
*/
FileVisitResult accept(Path path) throws IOException;
-
- /**
- * Tests whether or not to include the specified Path in a result.
- *
- * @param path The dir path to test.
- * @param name The path base name to test.
- * @return a FileVisitResult
- * @throws IOException if an I/O error occurs
- */
- FileVisitResult accept(Path path, Path name) throws IOException;
}
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
index d8de77f..5b00668 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -54,7 +54,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.file.Counters.PathCounters;
import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.commons.io.filefilter.PathFilter;
/**
* NIO Path utilities.
diff --git a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
index ea4a574..59a7a47 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java
@@ -25,6 +25,7 @@
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Objects;
+import org.apache.commons.io.file.PathFilter;
import org.apache.commons.io.file.PathVisitor;
/**
@@ -68,34 +69,6 @@ public boolean accept(final File dir, final String name) {
}
/**
- * Checks to see if the Path should be accepted by this filter.
- *
- * @param path the Path to check
- * @return true if this path matches the test
- * @throws IOException if an I/O error occurs
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path path) throws IOException {
- Objects.requireNonNull(path, "path");
- return accept(path.getParent(), path.getFileName());
- }
-
- /**
- * Checks to see if the Path should be accepted by this filter.
- *
- * @param dir the directory Path to check
- * @param name the path name within the directory to check
- * @return true if this path matches the test
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path dir, final Path name) throws IOException {
- Objects.requireNonNull(dir, "dir");
- return accept(dir.resolve(name));
- }
-
- /**
* Handles exceptions caught while accepting.
*
* @param t the caught exception.
@@ -113,7 +86,7 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc)
@Override
public FileVisitResult preVisitDirectory(final Path dir, final BasicFileAttributes attrs) throws IOException {
- return accept(dir, dir.getFileName());
+ return accept(dir);
}
/**
diff --git a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
index c863e46..6674445 100644
--- a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java
@@ -152,23 +152,6 @@ public FileVisitResult accept(final Path file) throws IOException {
/**
* {@inheritDoc}
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path file, final Path name) throws IOException {
- if (isEmpty()) {
- return FileVisitResult.TERMINATE;
- }
- for (final IOFileFilter fileFilter : fileFilters) {
- if (fileFilter.accept(file, name) != FileVisitResult.CONTINUE) {
- return FileVisitResult.TERMINATE;
- }
- }
- return FileVisitResult.CONTINUE;
- }
-
- /**
- * {@inheritDoc}
*/
@Override
public void addFileFilter(final IOFileFilter ioFileFilter) {
diff --git a/src/main/java/org/apache/commons/io/filefilter/DirectoryStreamFilter.java b/src/main/java/org/apache/commons/io/filefilter/DirectoryStreamFilter.java
index c55091f..e14471e 100644
--- a/src/main/java/org/apache/commons/io/filefilter/DirectoryStreamFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/DirectoryStreamFilter.java
@@ -23,6 +23,8 @@
import java.nio.file.Path;
import java.util.Objects;
+import org.apache.commons.io.file.PathFilter;
+
/**
* A {@link java.nio.file.DirectoryStream.Filter DirectoryStream.Filter} that delegates to a {@link PathFilter}.
* <p>
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 a9db1c4..5a19c44 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
@@ -85,17 +85,4 @@ public FileVisitResult accept(final Path file) {
return FileVisitResult.TERMINATE;
}
- /**
- * Returns false.
- *
- * @param dir the directory to check (ignored)
- * @param name the file name (ignored)
- * @return false
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path dir, final Path name) {
- return FileVisitResult.TERMINATE;
- }
-
}
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 aa67949..62750cc 100644
--- a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java
@@ -23,6 +23,8 @@
import java.nio.file.FileVisitResult;
import java.nio.file.Path;
+import org.apache.commons.io.file.PathFilter;
+
/**
* An interface which brings the FileFilter, FilenameFilter, and PathFilter interfaces together.
*
@@ -74,20 +76,6 @@ default FileVisitResult accept(final Path path) throws IOException {
}
/**
- * Checks to see if the File should be accepted by this filter.
- *
- * @param path the directory File to check
- * @param name the file name within the directory to check
- * @return true if this file matches the test
- * @throws IOException if an I/O error occurs
- * @since 2.9.0
- */
- @Override
- default FileVisitResult accept(final Path path, final Path name) throws IOException {
- return AbstractFileFilter.toFileVisitResult(accept(path.toFile(), name.toString()));
- }
-
- /**
* Creates a new "and" filter with this filter and the given filters.
*
* @param fileFilter the filters to "and".
diff --git a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
index b3a12a6..f5aca29 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
@@ -179,18 +179,6 @@ public boolean accept(final File dir, final String name) {
/**
* Checks to see if the file name matches.
*
- * @param dir the File directory (ignored)
- * @param name the file name
- * @return true if the file name matches
- */
- @Override
- public FileVisitResult accept(final Path dir, final Path name) {
- return toFileVisitResult(acceptBaseName(dir.getFileName().toString()));
- }
-
- /**
- * Checks to see if the file name matches.
- *
* @param file the File to check
* @return true if the file name matches
* @since 2.9.0
diff --git a/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
index c6dfa5a..788b288 100644
--- a/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
@@ -84,20 +84,6 @@ public FileVisitResult accept(final Path file) throws IOException {
return not(filter.accept(file));
}
- /**
- * Returns the logical NOT of the underlying filter's return value for the same arguments.
- *
- * @param file the File directory
- * @param name the file name
- * @return true if the filter returns false
- * @throws IOException if an I/O error occurs
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path file, final Path name) throws IOException {
- return not(filter.accept(file, name));
- }
-
private FileVisitResult not(final FileVisitResult accept) {
return accept == FileVisitResult.CONTINUE ? FileVisitResult.TERMINATE
: FileVisitResult.CONTINUE;
diff --git a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
index fd4c73e..f3a8db4 100644
--- a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java
@@ -139,19 +139,6 @@ public FileVisitResult accept(final Path file) throws IOException {
* {@inheritDoc}
*/
@Override
- public FileVisitResult accept(final Path file, final Path name) throws IOException {
- for (final IOFileFilter fileFilter : fileFilters) {
- if (fileFilter.accept(file, name) == FileVisitResult.CONTINUE) {
- return FileVisitResult.CONTINUE;
- }
- }
- return FileVisitResult.TERMINATE;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void addFileFilter(final IOFileFilter ioFileFilter) {
this.fileFilters.add(ioFileFilter);
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java
index dd93842..7f5aa30 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java
@@ -22,7 +22,6 @@
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import org.apache.commons.io.file.NoopPathVisitor;
@@ -60,7 +59,7 @@ public boolean accept(final File file) {
@Override
public boolean accept(final File dir, final String name) {
try {
- return accept(dir.toPath(), Paths.get(name)) == FileVisitResult.CONTINUE;
+ return accept(dir.toPath().resolve(name)) == FileVisitResult.CONTINUE;
} catch (final IOException e) {
return handle(e) == FileVisitResult.CONTINUE;
}
@@ -68,13 +67,8 @@ public boolean accept(final File dir, final String name) {
@Override
public FileVisitResult accept(final Path path) throws IOException {
- return visitFile(path, getBasicFileAttributeView(path));
- }
-
- @Override
- public FileVisitResult accept(final Path dir, final Path name) throws IOException {
- return pathVisitor.postVisitDirectory(dir, null);
-
+ return Files.isDirectory(path) ? pathVisitor.postVisitDirectory(path, null)
+ : visitFile(path, getBasicFileAttributeView(path));
}
protected BasicFileAttributes getBasicFileAttributeView(final Path path) throws IOException {
diff --git a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
index cacad30..f28b5fb 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
@@ -194,19 +194,6 @@ public FileVisitResult accept(final Path file) {
return toFileVisitResult(accept(file.getFileName().toFile()));
}
- /**
- * Checks to see if the file name starts with the prefix.
- *
- * @param file the File directory
- * @param name the file name
- * @return true if the file name starts with one of our prefixes
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path file, final Path name) {
- return accept(name);
- }
-
private boolean accept(final String name) {
for (final String prefix : prefixes) {
if (caseSensitivity.checkStartsWith(name, prefix)) {
diff --git a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
index 87879e3..4a22fb5 100644
--- a/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
@@ -148,8 +148,8 @@ public boolean accept(final File dir, final String name) {
* @return true if the file name matches one of the regular expressions
*/
@Override
- public FileVisitResult accept(final Path dir, final Path name) {
- return toFileVisitResult(pattern.matcher(name.toString()).matches());
+ public FileVisitResult accept(final Path path) {
+ return toFileVisitResult(pattern.matcher(path.toString()).matches());
}
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
index 2dff98f..a4211bc 100644
--- a/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
@@ -195,18 +195,6 @@ public FileVisitResult accept(final Path file) {
return toFileVisitResult(accept(file.getFileName().toString()));
}
- /**
- * Checks to see if the file name ends with the suffix.
- *
- * @param file the File directory
- * @param name the file name
- * @return true if the file name ends with one of our suffixes
- */
- @Override
- public FileVisitResult accept(final Path file, final Path name) {
- return accept(name);
- }
-
private boolean accept(final String name) {
for (final String suffix : this.suffixes) {
if (caseSensitivity.checkEndsWith(name, suffix)) {
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 0b54a43..fdf3071 100644
--- a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
@@ -85,17 +85,4 @@ public FileVisitResult accept(final Path file) {
return FileVisitResult.CONTINUE;
}
- /**
- * Returns true.
- *
- * @param dir the directory to check (ignored)
- * @param name the file name (ignored)
- * @return true
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path dir, final Path name) {
- return FileVisitResult.CONTINUE;
- }
-
}
diff --git a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
index 5a6ac11..8663943 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
@@ -197,18 +197,6 @@ public FileVisitResult accept(final Path file) {
return toFileVisitResult(accept(file.getFileName().toString()));
}
- /**
- * Checks to see if the file name matches one of the wildcards.
- *
- * @param dir the file directory (ignored)
- * @param name the file name
- * @return true if the file name matches one of the wildcards
- */
- @Override
- public FileVisitResult accept(final Path dir, final Path name) {
- return accept(name);
- }
-
private boolean accept(final String name) {
for (final String wildcard : wildcards) {
if (FilenameUtils.wildcardMatch(name, wildcard, caseSensitivity)) {
diff --git a/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java b/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
index eacb008..744366b 100644
--- a/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java
@@ -187,27 +187,4 @@ public boolean accept(final File dir, final String name) {
return false;
}
- /**
- * Checks to see if the file name matches one of the wildcards.
- *
- * @param dir the file directory
- * @param name the file name
- * @return true if the file name matches one of the wildcards
- * @since 2.9.0
- */
- @Override
- public FileVisitResult accept(final Path dir, final Path name) {
- if (dir != null && Files.isDirectory(dir.resolve(name))) {
- return FileVisitResult.TERMINATE;
- }
-
- for (final String wildcard : wildcards) {
- if (FilenameUtils.wildcardMatch(name.toString(), wildcard)) {
- return FileVisitResult.CONTINUE;
- }
- }
-
- return FileVisitResult.TERMINATE;
- }
-
}
diff --git a/src/test/java/org/apache/commons/io/filefilter/DirectoryStreamFilterTest.java b/src/test/java/org/apache/commons/io/filefilter/DirectoryStreamFilterTest.java
index 9fad772..ac14a76 100644
--- a/src/test/java/org/apache/commons/io/filefilter/DirectoryStreamFilterTest.java
+++ b/src/test/java/org/apache/commons/io/filefilter/DirectoryStreamFilterTest.java
@@ -27,6 +27,7 @@
import java.nio.file.Paths;
import java.util.Iterator;
+import org.apache.commons.io.file.PathFilter;
import org.junit.jupiter.api.Test;
/**
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 2f3f451..0777004 100644
--- a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
+++ b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
@@ -93,7 +93,7 @@ public void assertFiltering(final IOFileFilter filter, final Path path, final bo
"Filter(Path) " + filter.getClass().getName() + " not " + expectedFileVisitResult + " for " + path);
if (path != null && path.getParent() != null) {
- assertEquals(expectedFileVisitResult, filter.accept(path.getParent(), path.getFileName()),
+ assertEquals(expectedFileVisitResult, filter.accept(path),
"Filter(Path, Path) " + filter.getClass().getName() + " not " + expectedFileVisitResult + " for "
+ path);
} else if (path == null) {
@@ -140,8 +140,8 @@ public void testSuffix() throws Exception {
assertTrue(filter.accept(testFile.getParentFile(), testFile.getName()));
assertTrue(!filter.accept(fredFile.getParentFile(), fredFile.getName()));
//
- assertEquals(FileVisitResult.CONTINUE, filter.accept(testPath.getParent(), testPath.getFileName()));
- assertEquals(FileVisitResult.TERMINATE, filter.accept(fredPath.getParent(), fredPath.getFileName()));
+ assertEquals(FileVisitResult.CONTINUE, filter.accept(testPath));
+ assertEquals(FileVisitResult.TERMINATE, filter.accept(fredPath));
final List<String> prefixes = Arrays.asList("ood", "red");
final IOFileFilter listFilter = new SuffixFileFilter(prefixes);
@@ -149,8 +149,8 @@ public void testSuffix() throws Exception {
assertTrue(!listFilter.accept(testFile.getParentFile(), testFile.getName()));
assertTrue(listFilter.accept(fredFile.getParentFile(), fredFile.getName()));
//
- assertEquals(FileVisitResult.TERMINATE, listFilter.accept(testPath.getParent(), testPath.getFileName()));
- assertEquals(FileVisitResult.CONTINUE, listFilter.accept(fredPath.getParent(), fredPath.getFileName()));
+ assertEquals(FileVisitResult.TERMINATE, listFilter.accept(testPath));
+ assertEquals(FileVisitResult.CONTINUE, listFilter.accept(fredPath));
try {
new SuffixFileFilter((String) null);
@@ -310,8 +310,8 @@ public void testPrefix() throws Exception {
assertTrue(filter.accept(testFile.getParentFile(), testFile.getName()));
assertTrue(!filter.accept(fredFile.getParentFile(), fredFile.getName()));
//
- assertEquals(FileVisitResult.CONTINUE, filter.accept(testPath.getParent(), testPath.getFileName()));
- assertEquals(FileVisitResult.TERMINATE, filter.accept(fredPath.getParent(), fredPath.getFileName()));
+ assertEquals(FileVisitResult.CONTINUE, filter.accept(testPath));
+ assertEquals(FileVisitResult.TERMINATE, filter.accept(fredPath));
final List<String> prefixes = Arrays.asList("foo", "fre");
final IOFileFilter listFilter = new PrefixFileFilter(prefixes);
@@ -319,8 +319,8 @@ public void testPrefix() throws Exception {
assertTrue(!listFilter.accept(testFile.getParentFile(), testFile.getName()));
assertTrue(listFilter.accept(fredFile.getParentFile(), fredFile.getName()));
//
- assertEquals(FileVisitResult.TERMINATE, listFilter.accept(testPath.getParent(), testPath.getFileName()));
- assertEquals(FileVisitResult.CONTINUE, listFilter.accept(fredPath.getParent(), fredPath.getFileName()));
+ assertEquals(FileVisitResult.TERMINATE, listFilter.accept(testPath));
+ assertEquals(FileVisitResult.CONTINUE, listFilter.accept(fredPath));
try {
new PrefixFileFilter((String) null);
@@ -635,10 +635,10 @@ public void testOr() throws Exception {
assertFiltering(orFilter, testPath, true);
assertTrue(orFilter.accept(testFile.getParentFile(), testFile.getName()));
- assertEquals(FileVisitResult.CONTINUE, orFilter.accept(testPath.getParent(), testPath.getFileName()));
+ assertEquals(FileVisitResult.CONTINUE, orFilter.accept(testPath));
orFilter.removeFileFilter(trueFilter);
assertTrue(!orFilter.accept(testFile.getParentFile(), testFile.getName()));
- assertEquals(FileVisitResult.TERMINATE, orFilter.accept(testPath.getParent(), testPath.getFileName()));
+ assertEquals(FileVisitResult.TERMINATE, orFilter.accept(testPath));
try {
new OrFileFilter(falseFilter, (IOFileFilter) null);
@@ -737,9 +737,9 @@ public void testDeprecatedWildcard() throws Exception {
assertTrue(!listFilter.accept(bmpFile.getParentFile(), bmpFile.getName()));
assertTrue(!listFilter.accept(dirFile.getParentFile(), dirFile.getName()));
//
- assertEquals(FileVisitResult.CONTINUE, listFilter.accept(txtPath.getParent(), txtPath.getFileName()));
- assertEquals(FileVisitResult.TERMINATE, listFilter.accept(bmpPath.getParent(), bmpPath.getFileName()));
- assertEquals(FileVisitResult.TERMINATE, listFilter.accept(dirPath.getParent(), dirPath.getFileName()));
+ assertEquals(FileVisitResult.CONTINUE, listFilter.accept(txtPath));
+ assertEquals(FileVisitResult.TERMINATE, listFilter.accept(bmpPath));
+ assertEquals(FileVisitResult.TERMINATE, listFilter.accept(dirPath));
try {
new WildcardFilter((String) null);
@@ -867,9 +867,9 @@ public void testWildcard() throws Exception {
assertTrue(!listFilter.accept(bmpFile.getParentFile(), bmpFile.getName()));
assertTrue(!listFilter.accept(dirFile.getParentFile(), dirFile.getName()));
//
- assertEquals(FileVisitResult.CONTINUE, listFilter.accept(txtPath.getParent(), txtPath.getFileName()));
- assertEquals(FileVisitResult.TERMINATE, listFilter.accept(bmpPath.getParent(), bmpPath.getFileName()));
- assertEquals(FileVisitResult.TERMINATE, listFilter.accept(dirPath.getParent(), dirPath.getFileName()));
+ assertEquals(FileVisitResult.CONTINUE, listFilter.accept(txtPath));
+ assertEquals(FileVisitResult.TERMINATE, listFilter.accept(bmpPath));
+ assertEquals(FileVisitResult.TERMINATE, listFilter.accept(dirPath));
try {
new WildcardFileFilter((String) null);
diff --git a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java
index cc16f84..0e5ab12 100644
--- a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java
+++ b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java
@@ -47,19 +47,19 @@ public void assertFiltering(final IOFileFilter filter, final File file, final bo
}
}
- public void assertFiltering(final IOFileFilter filter, final Path file, final boolean expected) throws Exception {
+ public void assertFiltering(final IOFileFilter filter, final Path path, final boolean expected) throws Exception {
// Note. This only tests the (Path, Path) version if the parent of
// the Path passed in is not null
final FileVisitResult expectedFileVisitResult = AbstractFileFilter.toFileVisitResult(expected);
- assertEquals(expectedFileVisitResult, filter.accept(file),
- "Filter(Path) " + filter.getClass().getName() + " not " + expectedFileVisitResult + " for " + file);
+ assertEquals(expectedFileVisitResult, filter.accept(path),
+ "Filter(Path) " + filter.getClass().getName() + " not " + expectedFileVisitResult + " for " + path);
- if (file != null && file.getParent() != null) {
- assertEquals(expectedFileVisitResult, filter.accept(file.getParent(), file.getFileName()),
+ if (path != null && path.getParent() != null) {
+ assertEquals(expectedFileVisitResult, filter.accept(path),
"Filter(Path, Path) " + filter.getClass().getName() + " not " + expectedFileVisitResult + " for "
- + file);
- } else if (file == null) {
- assertEquals(expectedFileVisitResult, filter.accept(file),
+ + path);
+ } else if (path == null) {
+ assertEquals(expectedFileVisitResult, filter.accept(path),
"Filter(Path, Path) " + filter.getClass().getName() + " not " + expectedFileVisitResult + " for null");
}
}
