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 498cd03 Minor changes: (#243)
498cd03 is described below
commit 498cd03984bd0cd191a38ecfc03c46520df83f6b
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Fri Jun 11 22:20:19 2021 +0200
Minor changes: (#243)
* Remove Unnecessary interface modifier
* Make final var
* Simplify conditions
* Simplify assertions
---
src/main/java/org/apache/commons/io/CopyUtils.java | 4 ++--
src/main/java/org/apache/commons/io/FileSystemUtils.java | 2 --
src/main/java/org/apache/commons/io/FileUtils.java | 4 ++--
src/main/java/org/apache/commons/io/FilenameUtils.java | 2 +-
src/main/java/org/apache/commons/io/file/PathUtils.java | 4 ++--
src/main/java/org/apache/commons/io/function/IOConsumer.java | 4 ++--
.../org/apache/commons/io/input/BufferedFileChannelInputStream.java | 2 +-
.../java/org/apache/commons/io/output/ThresholdingOutputStream.java | 2 +-
src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java | 2 --
src/test/java/org/apache/commons/io/FileUtilsTestCase.java | 2 +-
10 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/CopyUtils.java
b/src/main/java/org/apache/commons/io/CopyUtils.java
index 7ec03e3..0e1ab2f 100644
--- a/src/main/java/org/apache/commons/io/CopyUtils.java
+++ b/src/main/java/org/apache/commons/io/CopyUtils.java
@@ -169,7 +169,7 @@ public class CopyUtils {
public static int copy(final InputStream input, final OutputStream output)
throws IOException {
final byte[] buffer = IOUtils.byteArray();
int count = 0;
- int n = 0;
+ int n;
while (EOF != (n = input.read(buffer))) {
output.write(buffer, 0, n);
count += n;
@@ -194,7 +194,7 @@ public class CopyUtils {
throws IOException {
final char[] buffer = IOUtils.getCharArray();
int count = 0;
- int n = 0;
+ int n;
while (EOF != (n = input.read(buffer))) {
output.write(buffer, 0, n);
count += n;
diff --git a/src/main/java/org/apache/commons/io/FileSystemUtils.java
b/src/main/java/org/apache/commons/io/FileSystemUtils.java
index 9036e32..3035260 100644
--- a/src/main/java/org/apache/commons/io/FileSystemUtils.java
+++ b/src/main/java/org/apache/commons/io/FileSystemUtils.java
@@ -99,8 +99,6 @@ public class FileSystemUtils {
} else if (osName.contains("hp-ux") ||
osName.contains("aix")) {
os = POSIX_UNIX;
- } else {
- os = OTHER;
}
} catch (final Exception ex) {
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index db86169..774d64b 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -687,7 +687,7 @@ public class FileUtils {
final String destDirCanonicalPath = destDir.getCanonicalPath();
if (destDirCanonicalPath.startsWith(srcDirCanonicalPath)) {
final File[] srcFiles = listFiles(srcDir, fileFilter);
- if (srcFiles != null && srcFiles.length > 0) {
+ if (srcFiles.length > 0) {
exclusionList = new ArrayList<>(srcFiles.length);
for (final File srcFile : srcFiles) {
final File copiedFile = new File(destDir,
srcFile.getName());
@@ -2254,7 +2254,7 @@ public class FileUtils {
}
if (!createDestDir) {
throw new FileNotFoundException("Destination directory '" +
destDir +
- "' does not exist [createDestDir=" + createDestDir +
"]");
+ "' does not exist [createDestDir=" + false + "]");
}
mkdirs(destDir);
}
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java
b/src/main/java/org/apache/commons/io/FilenameUtils.java
index d9b9785..90f79ed 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -1604,7 +1604,7 @@ public class FilenameUtils {
if (octet.length() > IPV6_MAX_HEX_DIGITS_PER_GROUP) {
return false;
}
- int octetInt = 0;
+ final int octetInt;
try {
octetInt = Integer.parseInt(octet, BASE_16);
} catch (final NumberFormatException e) {
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 0ba3644..29a19a5 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -92,8 +92,8 @@ public final class PathUtils {
*/
private RelativeSortedPaths(final Path dir1, final Path dir2, final
int maxDepth,
final LinkOption[] linkOptions, final FileVisitOption[]
fileVisitOptions) throws IOException {
- List<Path> tmpRelativeDirList1 = null;
- List<Path> tmpRelativeDirList2 = null;
+ final List<Path> tmpRelativeDirList1;
+ final List<Path> tmpRelativeDirList2;
List<Path> tmpRelativeFileList1 = null;
List<Path> tmpRelativeFileList2 = null;
if (dir1 == null && dir2 == null) {
diff --git a/src/main/java/org/apache/commons/io/function/IOConsumer.java
b/src/main/java/org/apache/commons/io/function/IOConsumer.java
index 26da31c..37031da 100644
--- a/src/main/java/org/apache/commons/io/function/IOConsumer.java
+++ b/src/main/java/org/apache/commons/io/function/IOConsumer.java
@@ -33,7 +33,7 @@ public interface IOConsumer<T> {
/**
* Package private constant; consider private.
*/
- static final IOConsumer<?> NOOP_IO_CONSUMER = t -> {/* noop */};
+ IOConsumer<?> NOOP_IO_CONSUMER = t -> {/* noop */};
/**
* Returns a constant NOOP consumer.
@@ -43,7 +43,7 @@ public interface IOConsumer<T> {
* @since 2.9.0
*/
@SuppressWarnings("unchecked")
- public static <T> IOConsumer<T> noop() {
+ static <T> IOConsumer<T> noop() {
return (IOConsumer<T>) NOOP_IO_CONSUMER;
}
diff --git
a/src/main/java/org/apache/commons/io/input/BufferedFileChannelInputStream.java
b/src/main/java/org/apache/commons/io/input/BufferedFileChannelInputStream.java
index 6edb3f4..95792c8 100644
---
a/src/main/java/org/apache/commons/io/input/BufferedFileChannelInputStream.java
+++
b/src/main/java/org/apache/commons/io/input/BufferedFileChannelInputStream.java
@@ -53,7 +53,7 @@ public final class BufferedFileChannelInputStream extends
InputStream {
Class<?> res = null;
try {
res = Class.forName("sun.nio.ch.DirectBuffer");
- } catch (IllegalAccessError | ClassNotFoundException ignored) {
+ } catch (final IllegalAccessError | ClassNotFoundException ignored) {
// ignored
}
return res;
diff --git
a/src/main/java/org/apache/commons/io/output/ThresholdingOutputStream.java
b/src/main/java/org/apache/commons/io/output/ThresholdingOutputStream.java
index 876b8fd..4791f8e 100644
--- a/src/main/java/org/apache/commons/io/output/ThresholdingOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/ThresholdingOutputStream.java
@@ -40,7 +40,7 @@ public class ThresholdingOutputStream extends OutputStream {
/**
* Noop output stream getter function.
*/
- private static IOFunction<ThresholdingOutputStream, OutputStream>
NOOP_OS_GETTER = os -> NullOutputStream.NULL_OUTPUT_STREAM;
+ private static final IOFunction<ThresholdingOutputStream, OutputStream>
NOOP_OS_GETTER = os -> NullOutputStream.NULL_OUTPUT_STREAM;
/**
* The threshold at which the event will be triggered.
diff --git a/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java
b/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java
index 6232c4b..90e7ab4 100644
--- a/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java
+++ b/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java
@@ -21,11 +21,9 @@ import static
org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.nio.charset.Charset;
-import java.util.Arrays;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
index 93418c9..4a9f014 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -2785,7 +2785,7 @@ public class FileUtilsTestCase {
final long nowMillis = System.currentTimeMillis();
FileUtils.touch(file);
assertEquals(1, file.length(), "FileUtils.touch() didn't empty the
file.");
- assertFalse(y2k == getLastModifiedMillis(file), "FileUtils.touch()
changed lastModified");
+ assertNotEquals(y2k, getLastModifiedMillis(file), "FileUtils.touch()
changed lastModified");
final int delta = 3000;
assertTrue(getLastModifiedMillis(file) >= nowMillis - delta,
"FileUtils.touch() changed lastModified to more than now-3s");
assertTrue(getLastModifiedMillis(file) <= nowMillis + delta,
"FileUtils.touch() changed lastModified to less than now+3s");
