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 eb40d8e inline some-single use variables. eb40d8e is described below commit eb40d8ee6a342429918dfe6dc8ae0591c392aae5 Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Wed Sep 22 08:18:06 2021 -0400 inline some-single use variables. Formatting nits. --- src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java | 7 ++----- .../org/apache/commons/io/filefilter/MagicNumberFileFilter.java | 3 +-- src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java | 3 +-- .../org/apache/commons/io/filefilter/PathVisitorFileFilter.java | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java index 78cd230..f94e336 100644 --- a/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/AgeFileFilter.java @@ -181,8 +181,7 @@ public class AgeFileFilter extends AbstractFileFilter implements Serializable { */ @Override public boolean accept(final File file) { - final boolean newer = FileUtils.isFileNewer(file, cutoffInstant); - return acceptOlder != newer; + return acceptOlder != FileUtils.isFileNewer(file, cutoffInstant); } /** @@ -198,13 +197,11 @@ public class AgeFileFilter extends AbstractFileFilter implements Serializable { */ @Override public FileVisitResult accept(final Path file, final BasicFileAttributes attributes) { - final boolean newer; try { - newer = PathUtils.isNewer(file, cutoffInstant); + return toFileVisitResult(acceptOlder != PathUtils.isNewer(file, cutoffInstant)); } catch (final IOException e) { return handle(e); } - return toFileVisitResult(acceptOlder != newer); } /** diff --git a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java index d096598..9e395e5 100644 --- a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java @@ -235,8 +235,7 @@ public class MagicNumberFileFilter extends AbstractFileFilter implements throw new IllegalArgumentException("The offset cannot be negative"); } - this.magicNumbers = magicNumber.getBytes(Charset.defaultCharset()); // explicitly uses the platform default - // charset + this.magicNumbers = magicNumber.getBytes(Charset.defaultCharset()); // explicitly uses the platform default charset this.byteOffset = offset; } diff --git a/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java index 0523fff..ba47319 100644 --- a/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java @@ -84,8 +84,7 @@ public class NotFileFilter extends AbstractFileFilter implements Serializable { } private FileVisitResult not(final FileVisitResult accept) { - return accept == FileVisitResult.CONTINUE ? FileVisitResult.TERMINATE - : FileVisitResult.CONTINUE; + return accept == FileVisitResult.CONTINUE ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE; } /** diff --git a/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java index 543a707..410c969 100644 --- a/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/PathVisitorFileFilter.java @@ -50,8 +50,7 @@ public class PathVisitorFileFilter extends AbstractFileFilter { public boolean accept(final File file) { try { final Path path = file.toPath(); - return visitFile(path, - file.exists() ? PathUtils.readBasicFileAttributes(path) : null) == FileVisitResult.CONTINUE; + return visitFile(path, file.exists() ? PathUtils.readBasicFileAttributes(path) : null) == FileVisitResult.CONTINUE; } catch (final IOException e) { return handle(e) == FileVisitResult.CONTINUE; }