Use final

- Use 'L' for long literal
- Use compact array declaration

Author: garydgregory

src/main/java/org/apache/commons/io/FileUtils.java

@@ -2820,7 +2820,7 @@ private static boolean setTimes(final File sourceFile, final File targetFile) {
             // null guards are not needed; BasicFileAttributes.setTimes(...) is null safe
             destAttrView.setTimes(srcAttr.lastModifiedTime(), srcAttr.lastAccessTime(), srcAttr.creationTime());
             return true;
-        } catch (IOException ignored) {
+        } catch (final IOException ignored) {
             // Fallback: Only set modified time to match source file
             return targetFile.setLastModified(sourceFile.lastModified());
         }
@@ -2895,7 +2895,7 @@ public static BigInteger sizeOfAsBigInteger(final File file) {
     public static long sizeOfDirectory(final File directory) {
         try {
             requireDirectoryExists(directory, "directory");
-        } catch (FileNotFoundException e) {
+        } catch (final FileNotFoundException e) {
             throw new UncheckedIOException(e);
         }
         return Uncheck.get(() -> PathUtils.sizeOfDirectory(directory.toPath()));
@@ -2913,7 +2913,7 @@ public static long sizeOfDirectory(final File directory) {
     public static BigInteger sizeOfDirectoryAsBigInteger(final File directory) {
         try {
             requireDirectoryExists(directory, "directory");
-        } catch (FileNotFoundException e) {
+        } catch (final FileNotFoundException e) {
             throw new UncheckedIOException(e);
         }
         return Uncheck.get(() -> PathUtils.sizeOfDirectoryAsBigInteger(directory.toPath()));

src/main/java/org/apache/commons/io/file/PathUtils.java

@@ -770,7 +770,7 @@ public static boolean fileContentEquals(final Path path1, final Path path2, fina
         try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(path1.toRealPath(linkOptions));
                 RandomAccessFile raf2 = RandomAccessFileMode.READ_ONLY.create(path2.toRealPath(linkOptions))) {
             return RandomAccessFiles.contentEquals(raf1, raf2);
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
             // Slower:
             // Handle
             // java.lang.UnsupportedOperationException
@@ -877,7 +877,7 @@ public static DosFileAttributeView getDosFileAttributeView(final Path path, fina
      * @see Path#getFileName()
      * @since 2.16.0
      */
-    public static <R> R getFileName(final Path path, Function<Path, R> function) {
+    public static <R> R getFileName(final Path path, final Function<Path, R> function) {
         final Path fileName = path != null ? path.getFileName() : null;
         return fileName != null ? function.apply(fileName) : null;
     }

src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java

@@ -120,7 +120,7 @@ void append(final Object[] array, final StringBuilder buffer) {
     FileVisitResult get(final IOSupplier<FileVisitResult> supplier) {
         try {
             return supplier.get();
-        } catch (IOException e) {
+        } catch (final IOException e) {
             return handle(e);
         }
     }

src/main/java/org/apache/commons/io/function/IOStream.java

@@ -97,7 +97,7 @@ public boolean hasNext() {
             public T next() throws NoSuchElementException {
                 try {
                     return t = t == IOStreams.NONE ? seed : f.apply(t);
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     final NoSuchElementException nsee = new NoSuchElementException();
                     nsee.initCause(e);
                     throw nsee;

src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java

@@ -182,7 +182,7 @@ private CharSequenceInputStream(final CharSequence cs, final int bufferSize, fin
         this.bBufMark = NO_MARK;
         try {
             fillBuffer();
-        } catch (CharacterCodingException ex) {
+        } catch (final CharacterCodingException ex) {
             // Reset everything without filling the buffer
             // so the same exception can be thrown again later.
             this.bBuf.clear();

src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java

@@ -219,7 +219,7 @@ public UnsynchronizedByteArrayInputStream(final byte[] data, final int offset, f
         this.markedOffset = minPosLen(data, offset);
     }
 
-    private UnsynchronizedByteArrayInputStream(byte[] data, int eod, int offset, int markedOffset) {
+    private UnsynchronizedByteArrayInputStream(final byte[] data, final int eod, final int offset, final int markedOffset) {
         this.data = Objects.requireNonNull(data, "data");
         this.eod = eod;
         this.offset = offset;

src/test/java/org/apache/commons/io/EndianUtilsTest.java

@@ -45,15 +45,15 @@ public void testEOFException() {
 
     @Test
     public void testInvalidOffset() throws IOException {
-        final byte[] bytes = new byte[0];
+        final byte[] bytes = {};
 
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.readSwappedInteger(bytes, 0));
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.readSwappedLong(bytes, 0));
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.readSwappedShort(bytes, 0));
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.readSwappedUnsignedInteger(bytes, 0));
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.readSwappedUnsignedShort(bytes, 0));
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.writeSwappedInteger(bytes, 0, 0));
-        assertThrows(IllegalArgumentException.class, () -> EndianUtils.writeSwappedLong(bytes, 0, 0l));
+        assertThrows(IllegalArgumentException.class, () -> EndianUtils.writeSwappedLong(bytes, 0, 0L));
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.writeSwappedShort(bytes, 0, (short) 0));
     }
 

src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java

@@ -352,7 +352,7 @@ private void testMarkResetMultiByteChars(final String csName) throws IOException
         final String sequenceEnglish = "Test Sequence";
         final String sequenceCJK = "\u4e01\u4f23\u5045\u5167\u5289\u53ab"; // Kanji text
         final String[] sequences = {sequenceEnglish, sequenceCJK};
-        for (String testSequence : sequences) {
+        for (final String testSequence : sequences) {
             final CharsetEncoder charsetEncoder = Charset.forName(csName).newEncoder();
             final ByteBuffer byteBuffer = ByteBuffer.allocate(testSequence.length() * 3);
             final CharBuffer charBuffer = CharBuffer.wrap(testSequence);

src/test/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStreamTest.java

@@ -36,7 +36,7 @@ public class UnsynchronizedByteArrayInputStreamTest {
     private UnsynchronizedByteArrayInputStream newStream(final byte[] buffer) {
         try {
             return UnsynchronizedByteArrayInputStream.builder().setByteArray(buffer).get();
-        } catch (IOException e) {
+        } catch (final IOException e) {
             fail("Should never happen because no conversion is needed.", e);
             return null;
         }
@@ -45,7 +45,7 @@ private UnsynchronizedByteArrayInputStream newStream(final byte[] buffer) {
     private UnsynchronizedByteArrayInputStream newStream(final byte[] buffer, final int offset) {
         try {
             return UnsynchronizedByteArrayInputStream.builder().setByteArray(buffer).setOffset(offset).get();
-        } catch (IOException e) {
+        } catch (final IOException e) {
             fail("Should never happen because no conversion is needed.", e);
             return null;
         }
@@ -54,7 +54,7 @@ private UnsynchronizedByteArrayInputStream newStream(final byte[] buffer, final
     private UnsynchronizedByteArrayInputStream newStream(final byte[] buffer, final int offset, final int length) {
         try {
             return UnsynchronizedByteArrayInputStream.builder().setByteArray(buffer).setOffset(offset).setLength(length).get();
-        } catch (IOException e) {
+        } catch (final IOException e) {
             fail("Should never happen because no conversion is needed.", e);
             return null;
         }

src/test/java/org/apache/commons/io/jmh/PathUtilsContentEqualsBenchmark.java

@@ -72,7 +72,7 @@ public class PathUtilsContentEqualsBenchmark {
             Arrays.fill(bytes1, (byte) 1);
             Files.write(bigFile1, bytes1);
             Files.copy(bigFile1, bigFile2, StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new UncheckedIOException(e);
         }
     }