Merge branch 'master' of https://ggregory@gitbox.apache.org/repos/asf/commons-io.git

garydgregory · garydgregory · commit 021879c4e8a8 · 2021-06-13T12:48:02.000-04:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -45,6 +45,12 @@ The <action> type attribute can be add,update,fix,remove.
   </properties>
 
   <body>
+    <release version="2.10.1" date="2021-MM-DD" description="Java 8 required.">
+      <!-- FIX -->
+      <action dev="ggregory" type="fix" due-to="Arturo Bernal">
+        Minor changes #243.
+      </action>
+    </release>
     <!-- The release date is the date RC is cut -->
     <release version="2.10.0" date="2021-06-10" description="Java 8 required.">
       <!-- FIX -->
diff --git 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 static void copy(final byte[] input, final Writer output, final String en
     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 static int copy(
                 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
@@ -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
@@ -687,7 +687,7 @@ public static void copyDirectory(final File srcDir, final File destDir, final Fi
         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 static void moveDirectoryToDirectory(final File src, final File destDir,
             }
             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
@@ -1604,7 +1604,7 @@ private static boolean isIPv6Address(final String inet6Address) {
                 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
@@ -92,8 +92,8 @@ private static class RelativeSortedPaths {
          */
         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
@@ -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
@@ -53,7 +53,7 @@ private static Class<?> getDirectBufferClass() {
         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
@@ -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
@@ -21,11 +21,9 @@
 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
@@ -2785,7 +2785,7 @@ public void testTouch() throws IOException {
         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");

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,6 @@ public class FileSystemUtils {`
`99`	`99`	`} else if (osName.contains("hp-ux") \|\|`
`100`	`100`	`osName.contains("aix")) {`
`101`	`101`	`os = POSIX_UNIX;`
`102`		`- } else {`
`103`		`- os = OTHER;`
`104`	`102`	`}`
`105`	`103`
`106`	`104`	`} catch (final Exception ex) {`
Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ public static void copyDirectory(final File srcDir, final File destDir, final Fi`
`687`	`687`	`final String destDirCanonicalPath = destDir.getCanonicalPath();`
`688`	`688`	`if (destDirCanonicalPath.startsWith(srcDirCanonicalPath)) {`
`689`	`689`	`final File[] srcFiles = listFiles(srcDir, fileFilter);`
`690`		`- if (srcFiles != null && srcFiles.length > 0) {`
	`690`	`+ if (srcFiles.length > 0) {`
`691`	`691`	`exclusionList = new ArrayList<>(srcFiles.length);`
`692`	`692`	`for (final File srcFile : srcFiles) {`
`693`	`693`	`final File copiedFile = new File(destDir, srcFile.getName());`
`@@ -2254,7 +2254,7 @@ public static void moveDirectoryToDirectory(final File src, final File destDir,`
`2254`	`2254`	`}`
`2255`	`2255`	`if (!createDestDir) {`
`2256`	`2256`	`throw new FileNotFoundException("Destination directory '" + destDir +`
`2257`		`- "' does not exist [createDestDir=" + createDestDir + "]");`
	`2257`	`+ "' does not exist [createDestDir=" + false + "]");`
`2258`	`2258`	`}`
`2259`	`2259`	`mkdirs(destDir);`
`2260`	`2260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1604,7 +1604,7 @@ private static boolean isIPv6Address(final String inet6Address) {`
`1604`	`1604`	`if (octet.length() > IPV6_MAX_HEX_DIGITS_PER_GROUP) {`
`1605`	`1605`	`return false;`
`1606`	`1606`	`}`
`1607`		`- int octetInt = 0;`
	`1607`	`+ final int octetInt;`
`1608`	`1608`	`try {`
`1609`	`1609`	`octetInt = Integer.parseInt(octet, BASE_16);`
`1610`	`1610`	`} catch (final NumberFormatException e) {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private static Class<?> getDirectBufferClass() {`
`53`	`53`	`Class<?> res = null;`
`54`	`54`	`try {`
`55`	`55`	`res = Class.forName("sun.nio.ch.DirectBuffer");`
`56`		`- } catch (IllegalAccessError \| ClassNotFoundException ignored) {`
	`56`	`+ } catch (final IllegalAccessError \| ClassNotFoundException ignored) {`
`57`	`57`	`// ignored`
`58`	`58`	`}`
`59`	`59`	`return res;`