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 40a0443 Minor improvements: (#233)
40a0443 is described below
commit 40a0443f57c5622c29a3f308eacac60a4517f556
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Mon May 17 16:00:22 2021 +0200
Minor improvements: (#233)
* Use Method reference
* Use List.sort()
* Change Explicit with <>
* Simplify conditional expression
---
src/main/java/org/apache/commons/io/FileCleaningTracker.java | 4 ++--
src/main/java/org/apache/commons/io/FileUtils.java | 12 ++++++------
src/main/java/org/apache/commons/io/IOUtils.java | 4 ++--
src/main/java/org/apache/commons/io/LineIterator.java | 2 +-
.../apache/commons/io/comparator/AbstractFileComparator.java | 2 +-
src/main/java/org/apache/commons/io/file/PathUtils.java | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
index 62c52e7..623b387 100644
--- a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
+++ b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
@@ -52,11 +52,11 @@ public class FileCleaningTracker {
/**
* Collection of {@code Tracker} instances in existence.
*/
- final Collection<Tracker> trackers = Collections.synchronizedSet(new
HashSet<Tracker>()); // synchronized
+ final Collection<Tracker> trackers = Collections.synchronizedSet(new
HashSet<>()); // synchronized
/**
* Collection of File paths that failed to delete.
*/
- final List<String> deleteFailures = Collections.synchronizedList(new
ArrayList<String>());
+ final List<String> deleteFailures = Collections.synchronizedList(new
ArrayList<>());
/**
* Whether to terminate the thread when the tracking is complete.
*/
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index 385a261..e66dacf 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -1507,7 +1507,7 @@ public class FileUtils {
* @since 2.9.0
*/
public static boolean isDirectory(final File file, final LinkOption...
options) {
- return file != null ? Files.isDirectory(file.toPath(), options) :
false;
+ return file != null && Files.isDirectory(file.toPath(), options);
}
/**
@@ -1681,7 +1681,7 @@ public class FileUtils {
*/
public static boolean isFileNewer(final File file, final long timeMillis) {
Objects.requireNonNull(file, "file");
- return file.exists() ? lastModifiedUnchecked(file) > timeMillis :
false;
+ return file.exists() && lastModifiedUnchecked(file) > timeMillis;
}
/**
@@ -1842,7 +1842,7 @@ public class FileUtils {
*/
public static boolean isFileOlder(final File file, final long timeMillis) {
Objects.requireNonNull(file, "file");
- return file.exists() ? lastModifiedUnchecked(file) < timeMillis :
false;
+ return file.exists() && lastModifiedUnchecked(file) < timeMillis;
}
/**
@@ -1860,7 +1860,7 @@ public class FileUtils {
* @since 2.9.0
*/
public static boolean isRegularFile(final File file, final LinkOption...
options) {
- return file != null ? Files.isRegularFile(file.toPath(), options) :
false;
+ return file != null && Files.isRegularFile(file.toPath(), options);
}
/**
@@ -1875,7 +1875,7 @@ public class FileUtils {
* @see Files#isSymbolicLink(Path)
*/
public static boolean isSymlink(final File file) {
- return file != null ? Files.isSymbolicLink(file.toPath()) : false;
+ return file != null && Files.isSymbolicLink(file.toPath());
}
/**
@@ -2060,7 +2060,7 @@ public class FileUtils {
inputStream = openInputStream(file);
return IOUtils.lineIterator(inputStream, charsetName);
} catch (final IOException | RuntimeException ex) {
- IOUtils.closeQuietly(inputStream, e -> ex.addSuppressed(e));
+ IOUtils.closeQuietly(inputStream, ex::addSuppressed);
throw ex;
}
}
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java
b/src/main/java/org/apache/commons/io/IOUtils.java
index 7fd47e6..0cf8bc9 100644
--- a/src/main/java/org/apache/commons/io/IOUtils.java
+++ b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -180,12 +180,12 @@ public class IOUtils {
/**
* Internal byte array buffer.
*/
- private static final ThreadLocal<byte[]> SKIP_BYTE_BUFFER =
ThreadLocal.withInitial(() -> byteArray());
+ private static final ThreadLocal<byte[]> SKIP_BYTE_BUFFER =
ThreadLocal.withInitial(IOUtils::byteArray);
/**
* Internal byte array buffer.
*/
- private static final ThreadLocal<char[]> SKIP_CHAR_BUFFER =
ThreadLocal.withInitial(() -> charArray());
+ private static final ThreadLocal<char[]> SKIP_CHAR_BUFFER =
ThreadLocal.withInitial(IOUtils::charArray);
/**
* Returns the given InputStream if it is already a {@link
BufferedInputStream}, otherwise creates a
diff --git a/src/main/java/org/apache/commons/io/LineIterator.java
b/src/main/java/org/apache/commons/io/LineIterator.java
index 1cce4f1..f1c7b2c 100644
--- a/src/main/java/org/apache/commons/io/LineIterator.java
+++ b/src/main/java/org/apache/commons/io/LineIterator.java
@@ -105,7 +105,7 @@ public class LineIterator implements Iterator<String>,
Closeable {
}
}
} catch(final IOException ioe) {
- IOUtils.closeQuietly(this, e -> ioe.addSuppressed(e));
+ IOUtils.closeQuietly(this, ioe::addSuppressed);
throw new IllegalStateException(ioe);
}
}
diff --git
a/src/main/java/org/apache/commons/io/comparator/AbstractFileComparator.java
b/src/main/java/org/apache/commons/io/comparator/AbstractFileComparator.java
index 4cedf8d..0f12ab3 100644
--- a/src/main/java/org/apache/commons/io/comparator/AbstractFileComparator.java
+++ b/src/main/java/org/apache/commons/io/comparator/AbstractFileComparator.java
@@ -58,7 +58,7 @@ abstract class AbstractFileComparator implements
Comparator<File> {
*/
public List<File> sort(final List<File> files) {
if (files != null) {
- Collections.sort(files, this);
+ files.sort(this);
}
return files;
}
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 958d06d..08e4fe4 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -733,7 +733,7 @@ public final class PathUtils {
* @since 2.9.0
*/
public static boolean isDirectory(final Path path, final LinkOption...
options) {
- return path != null ? Files.isDirectory(path, options) : false;
+ return path != null && Files.isDirectory(path, options);
}
/**
@@ -815,7 +815,7 @@ public final class PathUtils {
* @since 2.9.0
*/
public static boolean isRegularFile(final Path path, final LinkOption...
options) {
- return path != null ? Files.isRegularFile(path, options) : false;
+ return path != null && Files.isRegularFile(path, options);
}
/**
