You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/12/26 00:10:55 UTC
[commons-io] branch master updated: [IO-648] Implement directory
content equality.
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 11f0abe [IO-648] Implement directory content equality.
11f0abe is described below
commit 11f0abe7a3fb6954b2985ca4ab0697b2fb489e84
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Dec 25 19:10:51 2019 -0500
[IO-648] Implement directory content equality.
Integrate feedback from Michael Osipov.
---
src/main/java/org/apache/commons/io/file/PathUtils.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 317fd99..03ee2ca 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -62,7 +62,7 @@ public final class PathUtils {
* @return file tree information.
*/
private static AccumulatorPathVisitor accumulate(final Path directory, final int maxDepth,
- final LinkOption[] linkOptions, final FileVisitOption... fileVisitOptions) throws IOException {
+ final LinkOption[] linkOptions, final FileVisitOption[] fileVisitOptions) throws IOException {
return visitFileTree(AccumulatorPathVisitor.withLongCounters(), directory,
toFileVisitOptionSet(fileVisitOptions), maxDepth);
}
@@ -90,7 +90,7 @@ public final class PathUtils {
* @throws IOException if an I/O error is thrown by a visitor method.
*/
private RelativeSortedPaths(final Path dir1, final Path dir2, final int maxDepth,
- final LinkOption[] linkOptions, final FileVisitOption... fileVisitOptions) throws IOException {
+ final LinkOption[] linkOptions, final FileVisitOption[] fileVisitOptions) throws IOException {
List<Path> tmpRelativeDirList1 = null;
List<Path> tmpRelativeDirList2 = null;
List<Path> tmpRelativeFileList1 = null;
@@ -313,7 +313,7 @@ public final class PathUtils {
* @throws IOException if an I/O error is thrown by a visitor method
*/
public static boolean directoryAndFileContentEquals(final Path path1, final Path path2,
- final LinkOption[] linkOptions, final OpenOption[] openOptions, final FileVisitOption... fileVisitOption)
+ final LinkOption[] linkOptions, final OpenOption[] openOptions, final FileVisitOption[] fileVisitOption)
throws IOException {
// First walk both file trees and gather normalized paths.
if (path1 == null && path2 == null) {
@@ -374,7 +374,7 @@ public final class PathUtils {
* @throws IOException if an I/O error is thrown by a visitor method
*/
public static boolean directoryContentEquals(final Path path1, final Path path2, final int maxDepth,
- LinkOption[] linkOptions, FileVisitOption... fileVisitOptions) throws IOException {
+ LinkOption[] linkOptions, FileVisitOption[] fileVisitOptions) throws IOException {
return new RelativeSortedPaths(path1, path2, maxDepth, linkOptions, fileVisitOptions).equals;
}
@@ -411,7 +411,7 @@ public final class PathUtils {
* @see org.apache.commons.io.FileUtils#contentEquals(java.io.File, java.io.File)
*/
public static boolean fileContentEquals(final Path path1, final Path path2, final LinkOption[] linkOptions,
- final OpenOption... openOptions) throws IOException {
+ final OpenOption[] openOptions) throws IOException {
if (path1 == null && path2 == null) {
return true;
}