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 e5d2ecd Revert "AccumulatorPathVisitor does not track directories
properly."
e5d2ecd is described below
commit e5d2ecdaff58c875c60f84d54292c297d4fcf70d
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Oct 8 23:35:29 2020 -0400
Revert "AccumulatorPathVisitor does not track directories properly."
This reverts commit b97055390b0f4735d82d6cdc8b47fd039ac50cfa.
---
src/changes/changes.xml | 3 -
.../commons/io/file/AccumulatorPathVisitor.java | 19 +----
.../io/file/AccumulatorPathVisitorTest.java | 99 ----------------------
3 files changed, 4 insertions(+), 117 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5facc49..4623008 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,9 +63,6 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" due-to="Michiel Kalkman">
FileUtils#copyDirectory(File, File, FileFilter, preserveFileDate)
clean up #163.
</action>
- <action dev="ggregory" type="fix" due-to="Michiel Kalkman">
- AccumulatorPathVisitor does not track directories properly.
- </action>
<!-- ADD -->
<action dev="ggregory" type="add" due-to="Gary Gregory">
Add FileSystemProviders class.
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 d59e6c3..2215b2a 100644
--- a/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java
@@ -19,6 +19,7 @@ package org.apache.commons.io.file;
import java.io.IOException;
import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
@@ -69,10 +70,6 @@ public class AccumulatorPathVisitor extends
CountingPathVisitor {
super(pathCounter);
}
- private void add(final List<Path> list, final Path dir) {
- list.add(dir.normalize());
- }
-
@Override
public boolean equals(final Object obj) {
if (this == obj) {
@@ -114,12 +111,6 @@ public class AccumulatorPathVisitor extends
CountingPathVisitor {
return result;
}
- @Override
- public FileVisitResult postVisitDirectory(final Path dir, final
IOException exc) throws IOException {
- add(dirList, dir);
- return super.postVisitDirectory(dir, exc);
- }
-
/**
* Relativizes each directory path with {@link Path#relativize(Path)}
against the given {@code parent}, optionally
* sorting the result.
@@ -129,8 +120,7 @@ public class AccumulatorPathVisitor extends
CountingPathVisitor {
* @param comparator How to sort, null uses default sorting.
* @return A new list
*/
- public List<Path> relativizeDirectories(final Path parent, final boolean
sort,
- final Comparator<? super Path> comparator) {
+ public List<Path> relativizeDirectories(final Path parent, final boolean
sort, final Comparator<? super Path> comparator) {
return PathUtils.relativize(getDirList(), parent, sort, comparator);
}
@@ -143,14 +133,13 @@ public class AccumulatorPathVisitor extends
CountingPathVisitor {
* @param comparator How to sort, null uses default sorting.
* @return A new list
*/
- public List<Path> relativizeFiles(final Path parent, final boolean sort,
- final Comparator<? super Path> comparator) {
+ public List<Path> relativizeFiles(final Path parent, final boolean sort,
final Comparator<? super Path> comparator) {
return PathUtils.relativize(getFileList(), parent, sort, comparator);
}
@Override
public FileVisitResult visitFile(final Path file, final
BasicFileAttributes attributes) throws IOException {
- add(fileList, file);
+ ((Files.isDirectory(file)) ? dirList : fileList).add(file.normalize());
return super.visitFile(file, attributes);
}
diff --git
a/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java
b/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java
deleted file mode 100644
index ae6bc07..0000000
--- a/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.io.file;
-
-import static org.apache.commons.io.file.CounterAssertions.assertCounts;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.apache.commons.io.filefilter.AndFileFilter;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.commons.io.filefilter.EmptyFileFilter;
-import org.apache.commons.io.filefilter.PathVisitorFileFilter;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-public class AccumulatorPathVisitorTest {
-
- @TempDir
- File tempDirFile;
-
- /**
- * Tests an empty folder.
- */
- @Test
- public void testEmptyFolder() throws IOException {
- final Path tempDir = tempDirFile.toPath();
- final AccumulatorPathVisitor accPathVisitor =
AccumulatorPathVisitor.withLongCounters();
- final PathVisitorFileFilter countingFileFilter = new
PathVisitorFileFilter(accPathVisitor);
- Files.walkFileTree(tempDir,
- new AndFileFilter(countingFileFilter,
DirectoryFileFilter.INSTANCE, EmptyFileFilter.EMPTY));
- assertCounts(1, 0, 0, accPathVisitor.getPathCounters());
- assertEquals(1, accPathVisitor.getDirList().size());
- assertTrue(accPathVisitor.getFileList().isEmpty());
- }
-
- /**
- * Tests a directory with one file of size 0.
- */
- @Test
- public void testFolders1FileSize0() throws IOException {
- final AccumulatorPathVisitor accPathVisitor =
AccumulatorPathVisitor.withLongCounters();
- final PathVisitorFileFilter countingFileFilter = new
PathVisitorFileFilter(accPathVisitor);
-
Files.walkFileTree(Paths.get("src/test/resources/org/apache/commons/io/dirs-1-file-size-0"),
- countingFileFilter);
- assertCounts(1, 1, 0, accPathVisitor.getPathCounters());
- assertEquals(1, accPathVisitor.getDirList().size());
- assertEquals(1, accPathVisitor.getFileList().size());
- }
-
- /**
- * Tests a directory with one file of size 1.
- */
- @Test
- public void testFolders1FileSize1() throws IOException {
- final AccumulatorPathVisitor accPathVisitor =
AccumulatorPathVisitor.withLongCounters();
- final PathVisitorFileFilter countingFileFilter = new
PathVisitorFileFilter(accPathVisitor);
-
Files.walkFileTree(Paths.get("src/test/resources/org/apache/commons/io/dirs-1-file-size-1"),
- countingFileFilter);
- assertCounts(1, 1, 1, accPathVisitor.getPathCounters());
- assertEquals(1, accPathVisitor.getDirList().size());
- assertEquals(1, accPathVisitor.getFileList().size());
- }
-
- /**
- * Tests a directory with two subdirectories, each containing one file of
size 1.
- */
- @Test
- public void testFolders2FileSize2() throws IOException {
- final AccumulatorPathVisitor accPathVisitor =
AccumulatorPathVisitor.withLongCounters();
- final PathVisitorFileFilter countingFileFilter = new
PathVisitorFileFilter(accPathVisitor);
-
Files.walkFileTree(Paths.get("src/test/resources/org/apache/commons/io/dirs-2-file-size-2"),
- countingFileFilter);
- assertCounts(3, 2, 2, accPathVisitor.getPathCounters());
- assertEquals(3, accPathVisitor.getDirList().size());
- assertEquals(2, accPathVisitor.getFileList().size());
-
- }
-}
