Merge remote-tracking branch 'upstream/master'

Author: garydgregory

src/changes/changes.xml

@@ -63,6 +63,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="ggregory" due-to="Martin Wiesner">Fix typos in Javadoc of FileUtils and related test classes #833.</action>
       <action type="fix" dev="ggregory" due-to="Daniel Vega, Gary Gregory" issue="IO-887">WriterOutputStream from a builder fails on malformed or unmappable input bytes.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">BoundedReader now extends ProxyReader.</action>
+      <action type="fix" dev="ggregory" due-to="Peter De Maeyer, Gary Gregory" issue="IO-885">Path visits follow links #832.</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory, Piotr P. Karwasz">Add and use IOUtils.closeQuietlySuppress(Closeable, Throwable) #818.</action>
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add ProxyWriter.setReference(Writer).</action>

src/main/java/org/apache/commons/io/LineIterator.java

@@ -82,12 +82,7 @@ public static void closeQuietly(final LineIterator iterator) {
      */
     @SuppressWarnings("resource") // Caller closes Reader
     public LineIterator(final Reader reader) {
-        Objects.requireNonNull(reader, "reader");
-        if (reader instanceof BufferedReader) {
-            bufferedReader = (BufferedReader) reader;
-        } else {
-            bufferedReader = new BufferedReader(reader);
-        }
+        bufferedReader = IOUtils.buffer(Objects.requireNonNull(reader, "reader"));
     }
 
     /**

src/main/java/org/apache/commons/io/file/CountingPathVisitor.java

@@ -28,7 +28,6 @@
 
 import org.apache.commons.io.file.Counters.PathCounters;
 import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.commons.io.filefilter.SymbolicLinkFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.commons.io.function.IOBiFunction;
 
@@ -152,7 +151,7 @@ static UnaryOperator<Path> defaultDirectoryTransformer() {
     }
 
     static IOFileFilter defaultFileFilter() {
-        return new SymbolicLinkFileFilter(FileVisitResult.TERMINATE, FileVisitResult.CONTINUE);
+        return TrueFileFilter.INSTANCE;
     }
 
     static PathCounters defaultPathCounters() {

src/test/java/org/apache/commons/io/FileUtilsTest.java

@@ -2986,10 +2986,10 @@ void testSizeOfDirectory() throws Exception {
         // Create a cyclic symlink
         final Path linkPath = createCircularSymbolicLink(file);
         try {
-            assertEquals(TEST_DIRECTORY_SIZE, FileUtils.sizeOfDirectory(file), "Unexpected directory size");
+            // Different result value depending on the Java version and operating system, but should not throw an exception or loop infinitely.
+            FileUtils.sizeOfDirectory(file);
         } finally {
             Files.deleteIfExists(linkPath);
-            assertDelete(true, file);
         }
     }
 
@@ -3014,7 +3014,8 @@ void testSizeOfDirectoryAsBigInteger() throws Exception {
         assertMkdir(true, file);
         final Path linkPath = createCircularSymbolicLink(file);
         try {
-            assertEquals(TEST_DIRECTORY_SIZE_BI, FileUtils.sizeOfDirectoryAsBigInteger(file), "Unexpected directory size");
+            // Different result value depending on the Java version and operating system, but should not throw an exception or loop infinitely.
+            FileUtils.sizeOfDirectoryAsBigInteger(file);
             assertDelete(false, file);
             assertMkdir(false, file);
             final File nonEmptyFile = new File(file, "non-emptyFile" + System.nanoTime());
@@ -3025,12 +3026,12 @@ void testSizeOfDirectoryAsBigInteger() throws Exception {
             } finally {
                 IOUtils.closeQuietly(output);
             }
-            assertEquals(TEST_DIRECTORY_SIZE_GT_ZERO_BI, FileUtils.sizeOfDirectoryAsBigInteger(file), "Unexpected directory size");
+            // Different result value depending on the Java version and operating system, but should not throw an exception or loop infinitely.
+            FileUtils.sizeOfDirectoryAsBigInteger(file);
             assertDelete(true, nonEmptyFile);
             assertDelete(false, file);
         } finally {
             Files.deleteIfExists(linkPath);
-            assertDelete(true, file);
         }
     }