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 37ba41f Use final.
37ba41f is described below
commit 37ba41f6f0311ff7b060c095a5f1fe5843a1acf9
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sun Oct 18 12:16:19 2020 -0400
Use final.
---
src/main/java/org/apache/commons/io/FileUtils.java | 2 +-
src/main/java/org/apache/commons/io/file/CountingPathVisitor.java | 4 ++--
src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +-
.../org/apache/commons/io/filefilter/PathEqualsFileFilter.java | 4 ++--
src/test/java/org/apache/commons/io/FileUtilsTestCase.java | 8 ++++----
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index bcfd389..6ee4dba 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2820,7 +2820,7 @@ public class FileUtils {
return files;
}
- private static List<File> toList(Stream<File> stream) {
+ private static List<File> toList(final Stream<File> stream) {
return stream.collect(Collectors.toList());
}
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 53b41c8..a93a5fd 100644
--- a/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java
+++ b/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java
@@ -75,7 +75,7 @@ public class CountingPathVisitor extends SimplePathVisitor {
* @param dirFilter Filters which directories to count.
* @since 2.9.0
*/
- public CountingPathVisitor(final PathCounters pathCounter, final
PathFilter fileFilter, PathFilter dirFilter) {
+ public CountingPathVisitor(final PathCounters pathCounter, final
PathFilter fileFilter, final PathFilter dirFilter) {
super();
this.pathCounters = Objects.requireNonNull(pathCounter, "pathCounter");
this.fileFilter = Objects.requireNonNull(fileFilter, "fileFilter");
@@ -115,7 +115,7 @@ public class CountingPathVisitor extends SimplePathVisitor {
}
@Override
- public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes
attributes) throws IOException {
+ public FileVisitResult preVisitDirectory(final Path dir, final
BasicFileAttributes attributes) throws IOException {
final FileVisitResult accept = dirFilter.accept(dir, attributes);
return accept != FileVisitResult.CONTINUE ?
FileVisitResult.SKIP_SUBTREE : FileVisitResult.CONTINUE;
}
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 23f389d..bb8593b 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -899,7 +899,7 @@ public final class PathUtils {
* @since 2.9.0
*/
public static Stream<Path> walk(final Path start, final PathFilter
pathFilter, final int maxDepth,
- boolean readAttributes, final FileVisitOption... options) throws
IOException {
+ final boolean readAttributes, final FileVisitOption... options) throws
IOException {
return Files.walk(start, maxDepth, options).filter(path ->
pathFilter.accept(path,
readAttributes ? readBasicFileAttributesQuietly(path) : null) ==
FileVisitResult.CONTINUE);
}
diff --git
a/src/main/java/org/apache/commons/io/filefilter/PathEqualsFileFilter.java
b/src/main/java/org/apache/commons/io/filefilter/PathEqualsFileFilter.java
index f24bf4c..99f9d69 100644
--- a/src/main/java/org/apache/commons/io/filefilter/PathEqualsFileFilter.java
+++ b/src/main/java/org/apache/commons/io/filefilter/PathEqualsFileFilter.java
@@ -45,12 +45,12 @@ public class PathEqualsFileFilter extends
AbstractFileFilter {
}
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return Objects.equals(this.path, file.toPath());
}
@Override
- public FileVisitResult accept(Path path, BasicFileAttributes attributes) {
+ public FileVisitResult accept(final Path path, final BasicFileAttributes
attributes) {
return toFileVisitResult(Objects.equals(this.path, path), path);
}
}
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
index af318ae..47e82b3 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -169,7 +169,7 @@ public class FileUtilsTestCase {
assertNotEquals(getLastModifiedMillis(testFile), lastModified1,
"Should have changed source date");
}
- private void consumeRemaining(Iterator<File> iterator) {
+ private void consumeRemaining(final Iterator<File> iterator) {
if (iterator != null) {
iterator.forEachRemaining(e -> {});
}
@@ -221,12 +221,12 @@ public class FileUtilsTestCase {
}
private void iterateFilesAndDirs(final File dir, final IOFileFilter
fileFilter,
- final IOFileFilter dirFilter, Collection<File> expectedFilesAndDirs) {
+ final IOFileFilter dirFilter, final Collection<File>
expectedFilesAndDirs) {
Iterator<File> iterator;
int filesCount = 0;
iterator = FileUtils.iterateFilesAndDirs(dir, fileFilter, dirFilter);
try {
- List<File> actualFiles = new ArrayList<>();
+ final List<File> actualFiles = new ArrayList<>();
while (iterator.hasNext()) {
filesCount++;
final File file = iterator.next();
@@ -1919,7 +1919,7 @@ public class FileUtilsTestCase {
iterateFilesAndDirs(subDir1, fileFilterAllFiles,
fileFilterAllDirs, expectedFilesAndDirs);
//
// "*.txt" and "*"
- int filesCount;
+ final int filesCount;
expectedFilesAndDirs = Arrays.asList(subDir1, subDir2, someFile,
subDir3, subDir4);
iterateFilesAndDirs(subDir1, fileFilterExtTxt, fileFilterAllDirs,
expectedFilesAndDirs);
//
