PMD: Remove unnecessary final

Author: Gary Gregory

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

@@ -1068,7 +1068,7 @@ public static void copyToFile(final InputStream inputStream, final File file) th
      * @throws IOException if an IO error occurs during copying
      */
     public static void copyURLToFile(final URL source, final File destination) throws IOException {
-        try (final InputStream stream = source.openStream()) {
+        try (InputStream stream = source.openStream()) {
             final Path path = destination.toPath();
             PathUtils.createParentDirectories(path);
             Files.copy(stream, path, StandardCopyOption.REPLACE_EXISTING);
@@ -1096,10 +1096,10 @@ public static void copyURLToFile(final URL source, final File destination) throw
      */
     public static void copyURLToFile(final URL source, final File destination, final int connectionTimeoutMillis, final int readTimeoutMillis)
         throws IOException {
-        try (final CloseableURLConnection urlConnection = CloseableURLConnection.open(source)) {
+        try (CloseableURLConnection urlConnection = CloseableURLConnection.open(source)) {
             urlConnection.setConnectTimeout(connectionTimeoutMillis);
             urlConnection.setReadTimeout(readTimeoutMillis);
-            try (final InputStream stream = urlConnection.getInputStream()) {
+            try (InputStream stream = urlConnection.getInputStream()) {
                 copyInputStreamToFile(stream, destination);
             }
         }

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

@@ -2485,10 +2485,9 @@ public static BufferedReader toBufferedReader(final Reader reader, final int siz
      */
     public static byte[] toByteArray(final InputStream inputStream) throws IOException {
         // We use a ThresholdingOutputStream to avoid reading AND writing more than Integer.MAX_VALUE.
-        try (final UnsynchronizedByteArrayOutputStream ubaOutput = new UnsynchronizedByteArrayOutputStream();
-            final ThresholdingOutputStream thresholdOuput = new ThresholdingOutputStream(Integer.MAX_VALUE, os -> {
-                throw new IllegalArgumentException(
-                    String.format("Cannot read more than %,d into a byte array", Integer.MAX_VALUE));
+        try (UnsynchronizedByteArrayOutputStream ubaOutput = new UnsynchronizedByteArrayOutputStream();
+            ThresholdingOutputStream thresholdOuput = new ThresholdingOutputStream(Integer.MAX_VALUE, os -> {
+                throw new IllegalArgumentException(String.format("Cannot read more than %,d into a byte array", Integer.MAX_VALUE));
             }, os -> ubaOutput)) {
             copy(inputStream, thresholdOuput);
             return ubaOutput.toByteArray();
@@ -2589,7 +2588,7 @@ public static byte[] toByteArray(final Reader reader) throws IOException {
      * @since 2.3
      */
     public static byte[] toByteArray(final Reader reader, final Charset charset) throws IOException {
-        try (final ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+        try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
             copy(reader, output, charset);
             return output.toByteArray();
         }
@@ -2662,7 +2661,7 @@ public static byte[] toByteArray(final URI uri) throws IOException {
      * @since 2.4
      */
     public static byte[] toByteArray(final URL url) throws IOException {
-        try (final CloseableURLConnection urlConnection = CloseableURLConnection.open(url)) {
+        try (CloseableURLConnection urlConnection = CloseableURLConnection.open(url)) {
             return IOUtils.toByteArray(urlConnection);
         }
     }
@@ -2930,7 +2929,7 @@ public static String toString(final InputStream input) throws IOException {
      * @since 2.3
      */
     public static String toString(final InputStream input, final Charset charset) throws IOException {
-        try (final StringBuilderWriter sw = new StringBuilderWriter()) {
+        try (StringBuilderWriter sw = new StringBuilderWriter()) {
             copy(input, sw, charset);
             return sw.toString();
         }
@@ -2975,7 +2974,7 @@ public static String toString(final InputStream input, final String charsetName)
      * @throws IOException          if an I/O error occurs
      */
     public static String toString(final Reader reader) throws IOException {
-        try (final StringBuilderWriter sw = new StringBuilderWriter()) {
+        try (StringBuilderWriter sw = new StringBuilderWriter()) {
             copy(reader, sw);
             return sw.toString();
         }

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

@@ -277,7 +277,7 @@ public static PathCounters copyDirectory(final Path sourceDirectory, final Path
      * @see Files#copy(InputStream, Path, CopyOption...)
      */
     public static Path copyFile(final URL sourceFile, final Path targetFile, final CopyOption... copyOptions) throws IOException {
-        try (final InputStream inputStream = sourceFile.openStream()) {
+        try (InputStream inputStream = sourceFile.openStream()) {
             Files.copy(inputStream, targetFile, copyOptions);
             return targetFile;
         }
@@ -308,7 +308,7 @@ public static Path copyFileToDirectory(final Path sourceFile, final Path targetD
      * @see Files#copy(InputStream, Path, CopyOption...)
      */
     public static Path copyFileToDirectory(final URL sourceFile, final Path targetDirectory, final CopyOption... copyOptions) throws IOException {
-        try (final InputStream inputStream = sourceFile.openStream()) {
+        try (InputStream inputStream = sourceFile.openStream()) {
             Files.copy(inputStream, targetDirectory.resolve(sourceFile.getFile()), copyOptions);
             return targetDirectory;
         }
@@ -721,8 +721,8 @@ public static boolean fileContentEquals(final Path path1, final Path path2, fina
             // same file
             return true;
         }
-        try (final InputStream inputStream1 = Files.newInputStream(nPath1, openOptions);
-            final InputStream inputStream2 = Files.newInputStream(nPath2, openOptions)) {
+        try (InputStream inputStream1 = Files.newInputStream(nPath1, openOptions); 
+            InputStream inputStream2 = Files.newInputStream(nPath2, openOptions)) {
             return IOUtils.contentEquals(inputStream1, inputStream2);
         }
     }

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

@@ -292,7 +292,7 @@ public boolean accept(final File file) {
     public FileVisitResult accept(final Path file, final BasicFileAttributes attributes) {
         if (file != null && Files.isRegularFile(file) && Files.isReadable(file)) {
             try {
-                try (final FileChannel fileChannel = FileChannel.open(file)) {
+                try (FileChannel fileChannel = FileChannel.open(file)) {
                     final ByteBuffer byteBuffer = ByteBuffer.allocate(this.magicNumbers.length);
                     final int read = fileChannel.read(byteBuffer);
                     if (read != magicNumbers.length) {

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

@@ -31,7 +31,7 @@
  *
  * <pre>
  * final TimestampedObserver timetampedObserver = new TimestampedObserver();
- * try (final ObservableInputStream inputStream = new ObservableInputStream(...),
+ * try (ObservableInputStream inputStream = new ObservableInputStream(...),
  *     timetampedObserver)) {
  *     ...
  * }

src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java

@@ -78,7 +78,7 @@ public static InputStream toBufferedInputStream(final InputStream input)
      */
     public static InputStream toBufferedInputStream(final InputStream input, final int size)
         throws IOException {
-        try (final ByteArrayOutputStream output = new ByteArrayOutputStream(size)) {
+        try (ByteArrayOutputStream output = new ByteArrayOutputStream(size)) {
             output.write(input);
             return output.toInputStream();
         }

src/main/java/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.java

@@ -71,7 +71,7 @@ public static InputStream toBufferedInputStream(final InputStream input) throws
      */
     public static InputStream toBufferedInputStream(final InputStream input, final int size) throws IOException {
         // It does not matter if a ByteArrayOutputStream is not closed as close() is a no-op
-        try (final UnsynchronizedByteArrayOutputStream output = new UnsynchronizedByteArrayOutputStream(size)) {
+        try (UnsynchronizedByteArrayOutputStream output = new UnsynchronizedByteArrayOutputStream(size)) {
             output.write(input);
             return output.toInputStream();
         }

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

@@ -127,7 +127,7 @@ public void testFileCleanerDirectory_ForceStrategy() throws Exception {
             throw new IOException("Cannot create file " + testFile
                     + " as the parent directory does not exist");
         }
-        try (final BufferedOutputStream output =
+        try (BufferedOutputStream output =
                 new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
             TestUtils.generateTestData(output, 100);
         }

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

@@ -49,7 +49,7 @@ public void testDeleteForce() throws Exception {
             throw new IOException("Cannot create file " + subFile
                     + " as the parent directory does not exist");
         }
-        try (final BufferedOutputStream output =
+        try (BufferedOutputStream output =
                 new BufferedOutputStream(Files.newOutputStream(subFile.toPath()))) {
             TestUtils.generateTestData(output, 16);
         }
@@ -75,7 +75,7 @@ public void testDeleteNormal() throws Exception {
             throw new IOException("Cannot create file " + subFile
                     + " as the parent directory does not exist");
         }
-        try (final BufferedOutputStream output =
+        try (BufferedOutputStream output =
                 new BufferedOutputStream(Files.newOutputStream(subFile.toPath()))) {
             TestUtils.generateTestData(output, 16);
         }
@@ -114,7 +114,7 @@ public void testDeleteQuietlyNormal() throws Exception {
             throw new IOException("Cannot create file " + subFile
                     + " as the parent directory does not exist");
         }
-        try (final BufferedOutputStream output =
+        try (BufferedOutputStream output =
                 new BufferedOutputStream(Files.newOutputStream(subFile.toPath()))) {
             TestUtils.generateTestData(output, 16);
         }

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

@@ -74,7 +74,7 @@ public void copyDirectoryToDirectoryThrowsIllegalArgumentExceptionWithCorrectMes
     @Test
     public void copyDirectoryToDirectoryThrowsIllegalExceptionWithCorrectMessageWhenSrcDirIsNotDirectory()
         throws IOException {
-        try (final TempFile srcDir = TempFile.create("notadireotry", null)) {
+        try (TempFile srcDir = TempFile.create("notadireotry", null)) {
             final File destDir = new File(temporaryFolder, "destinationDirectory");
             destDir.mkdirs();
             final String expectedMessage = String.format("Parameter 'sourceDir' is not a directory: '%s'", srcDir);
@@ -100,7 +100,7 @@ public void copyDirectoryToDirectoryThrowsNullPointerExceptionWithCorrectMessage
 
     @Test
     public void copyFileAndCheckAcl() throws IOException {
-        try (final TempFile sourcePath = TempFile.create("TempOutput", ".bin")) {
+        try (TempFile sourcePath = TempFile.create("TempOutput", ".bin")) {
             final Path destPath = Paths.get(temporaryFolder.getAbsolutePath(), "SomeFile.bin");
             // Test copy attributes without replace FIRST.
             FileUtils.copyFile(sourcePath.toFile(), destPath.toFile(), true, StandardCopyOption.COPY_ATTRIBUTES);