[IO-875] CopyDirectoryVisitor ignores fileFilter #743

garydgregory · garydgregory · commit 4fa9d428b4cc · 2025-05-05T08:25:58.000-04:00
- Document adding and using org.apache.commons.io.file.CountingPathVisitor.accept(Path, BasicFileAttributes) #743 - Added missing Javadoc since tag - Fix Javadoc comment - Remove extra blank lines - Sort members
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -45,10 +45,12 @@ The <action> type attribute can be add,update,fix,remove.
     <title>Apache Commons IO Release Notes</title>
   </properties>
   <body>
-    <release version="2.19.1" date="YYYY-MM-DD" description="Version 2.19.1: Java 8 or later is required.">
+    <release version="2.20.0" date="YYYY-MM-DD" description="Version 2.19.1: Java 8 or later is required.">
       <!-- FIX -->
       <action dev="ggregory" type="fix"                due-to="Jesse Glick">[javadoc] Rename parameter of ProxyOutputStream.write(int) #740.</action> 
+      <action dev="ggregory" type="fix" issue="IO-875" due-to="Pierre Baumard, Gary Gregory">CopyDirectoryVisitor ignores fileFilter #743.</action> 
       <!-- ADD -->
+      <action dev="ggregory" type="add" issue="IO-875" due-to="Pierre Baumard, Gary Gregory">Add and use org.apache.commons.io.file.CountingPathVisitor.accept(Path, BasicFileAttributes) #743.</action> 
       <!-- UPDATE -->
     </release>
     <release version="2.19.0" date="2025-04-08" description="Version 2.19.0: Java 8 or later is required.">
diff --git a/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java b/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java
@@ -236,6 +236,19 @@ public CountingPathVisitor(final PathCounters pathCounters, final PathFilter fil
         this.directoryPostTransformer = UnaryOperator.identity();
     }
 
+    /**
+     * Tests whether the given file is accepted by the file filter.
+     *
+     * @param file       the visited file.
+     * @param attributes the visited file attributes.
+     * @return true to copy the given file, false if not.
+     * @since 2.20.0
+     */
+    protected boolean accept(final Path file, final BasicFileAttributes attributes) {
+        // Note: A file can be a symbolic link to a directory.
+        return Files.exists(file) && fileFilter.accept(file, attributes) == FileVisitResult.CONTINUE;
+    }
+
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -290,18 +303,6 @@ protected void updateDirCounter(final Path dir, final IOException exc) {
         pathCounters.getDirectoryCounter().increment();
     }
 
-    /**
-     * Returns true to copy the given file, false if not.
-     *
-     * @param file       the visited file.
-     * @param attributes the visited file attributes.
-     * @return true to copy the given file, false if not.
-     */
-    protected boolean accept(final Path file, final BasicFileAttributes attributes) {
-        // Note: A file can be a symbolic link to a directory.
-        return Files.exists(file) && fileFilter.accept(file, attributes) == FileVisitResult.CONTINUE;
-    }
-
     /**
      * Updates the counters for visiting the given file.
      *
diff --git a/src/test/java/org/apache/commons/io/file/CopyDirectoryVisitorTest.java b/src/test/java/org/apache/commons/io/file/CopyDirectoryVisitorTest.java
@@ -118,7 +118,6 @@ public void testCopyDirectoryFilters(final PathCounters pathCounters) throws IOE
         assertFalse(Files.exists(targetDir.resolve("dirs-a-file-size-2")));
     }
 
-
     /**
      * Tests a directory with one file of size 0.
      */

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ public void testCopyDirectoryFilters(final PathCounters pathCounters) throws IOE`
`118`	`118`	`assertFalse(Files.exists(targetDir.resolve("dirs-a-file-size-2")));`
`119`	`119`	`}`
`120`	`120`
`121`		`-`
`122`	`121`	`/**`
`123`	`122`	`* Tests a directory with one file of size 0.`
`124`	`123`	`*/`