Replace construction of FileInputStream and FileOutputStream objects with Files NIO APIs. (#221)

Author: arturobernalg

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

@@ -285,7 +285,7 @@ public static Checksum checksum(final File file, final Checksum checksum) throws
         requireExistsChecked(file, "file");
         requireFile(file, "file");
         Objects.requireNonNull(checksum, "checksum");
-        try (InputStream inputStream = new CheckedInputStream(new FileInputStream(file), checksum)) {
+        try (InputStream inputStream = new CheckedInputStream(Files.newInputStream(file.toPath()), checksum)) {
             IOUtils.consume(inputStream);
         }
         return checksum;
@@ -405,7 +405,7 @@ public static boolean contentEquals(final File file1, final File file2) throws I
             return true;
         }
 
-        try (InputStream input1 = new FileInputStream(file1); InputStream input2 = new FileInputStream(file2)) {
+        try (InputStream input1 = Files.newInputStream(file1.toPath()); InputStream input2 = Files.newInputStream(file2.toPath())) {
             return IOUtils.contentEquals(input1, input2);
         }
     }
@@ -456,8 +456,8 @@ public static boolean contentEqualsIgnoreEOL(final File file1, final File file2,
         }
 
         final Charset charset = Charsets.toCharset(charsetName);
-        try (Reader input1 = new InputStreamReader(new FileInputStream(file1), charset);
-             Reader input2 = new InputStreamReader(new FileInputStream(file2), charset)) {
+        try (Reader input1 = new InputStreamReader(Files.newInputStream(file1.toPath()), charset);
+             Reader input2 = new InputStreamReader(Files.newInputStream(file2.toPath()), charset)) {
             return IOUtils.contentEqualsIgnoreEOL(input1, input2);
         }
     }
@@ -868,7 +868,7 @@ public static void copyFile(final File srcFile, final File destFile, final CopyO
      * @since 2.1
      */
     public static long copyFile(final File input, final OutputStream output) throws IOException {
-        try (FileInputStream fis = new FileInputStream(input)) {
+        try (InputStream fis = Files.newInputStream(input.toPath())) {
             return IOUtils.copyLarge(fis, output);
         }
     }

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

@@ -25,7 +25,6 @@
 import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -44,6 +43,7 @@
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.Selector;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -1230,7 +1230,7 @@ public static int copy(final Reader reader, final Writer writer) throws IOExcept
      * @since 2.9.0
      */
     public static long copy(final URL url, final File file) throws IOException {
-        try (FileOutputStream outputStream = new FileOutputStream(Objects.requireNonNull(file, "file"))) {
+        try (OutputStream outputStream = Files.newOutputStream(Objects.requireNonNull(file, "file").toPath())) {
             return copy(url, outputStream);
         }
     }

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

@@ -19,7 +19,6 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -28,6 +27,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.Objects;
@@ -277,7 +277,7 @@ static boolean isTextXml(final String mime) {
      */
     @SuppressWarnings("resource") // FileInputStream is managed through another reader in this instance.
     public XmlStreamReader(final File file) throws IOException {
-        this(new FileInputStream(Objects.requireNonNull(file, "file")));
+        this(Files.newInputStream(Objects.requireNonNull(file, "file").toPath()));
     }
 
     /**

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

@@ -17,8 +17,6 @@
 package org.apache.commons.io.output;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -240,7 +238,7 @@ protected void thresholdReached() throws IOException {
             outputFile = File.createTempFile(prefix, suffix, directory);
         }
         FileUtils.forceMkdirParent(outputFile);
-        final FileOutputStream fos = new FileOutputStream(outputFile);
+        final OutputStream fos = Files.newOutputStream(outputFile.toPath());
         try {
             memoryOutputStream.writeTo(fos);
         } catch (final IOException e) {
@@ -297,7 +295,7 @@ public void writeTo(final OutputStream outputStream) throws IOException {
         if (isInMemory()) {
             memoryOutputStream.writeTo(outputStream);
         } else {
-            try (FileInputStream fis = new FileInputStream(outputFile)) {
+            try (InputStream fis = Files.newInputStream(outputFile.toPath())) {
                 IOUtils.copy(fis, outputStream);
             }
         }

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

@@ -17,13 +17,14 @@
 package org.apache.commons.io.output;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
 import java.util.Objects;
 
 import org.apache.commons.io.FileUtils;
@@ -227,7 +228,7 @@ private static Writer initWriter(final File file, final Object encoding, final b
         OutputStream stream = null;
         final boolean fileExistedAlready = file.exists();
         try {
-            stream = new FileOutputStream(file, append);
+            stream = Files.newOutputStream(file.toPath(),  append ? StandardOpenOption.APPEND : StandardOpenOption.CREATE);
             if (encoding instanceof Charset) {
                 return new OutputStreamWriter(stream, (Charset)encoding);
             }

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

@@ -24,10 +24,10 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.lang.ref.ReferenceQueue;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -156,7 +156,7 @@ public void testFileCleanerDirectory_ForceStrategy() throws Exception {
                     + " as the parent directory does not exist");
         }
         try (final BufferedOutputStream output =
-                new BufferedOutputStream(new FileOutputStream(testFile))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
             TestUtils.generateTestData(output, 100);
         }
         assertTrue(testFile.exists());

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

@@ -23,8 +23,8 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import org.apache.commons.io.test.TestUtils;
 import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public void testDeleteNormal() throws Exception {
                     + " as the parent directory does not exist");
         }
         try (final BufferedOutputStream output =
-                new BufferedOutputStream(new FileOutputStream(subFile))) {
+                new BufferedOutputStream(Files.newOutputStream(subFile.toPath()))) {
             TestUtils.generateTestData(output, 16);
         }
 
@@ -89,7 +89,7 @@ public void testDeleteQuietlyNormal() throws Exception {
                     + " as the parent directory does not exist");
         }
         try (final BufferedOutputStream output =
-                new BufferedOutputStream(new FileOutputStream(subFile))) {
+                new BufferedOutputStream(Files.newOutputStream(subFile.toPath()))) {
             TestUtils.generateTestData(output, 16);
         }
 
@@ -122,7 +122,7 @@ public void testDeleteForce() throws Exception {
                     + " as the parent directory does not exist");
         }
         try (final BufferedOutputStream output =
-                new BufferedOutputStream(new FileOutputStream(subFile))) {
+                new BufferedOutputStream(Files.newOutputStream(subFile.toPath()))) {
             TestUtils.generateTestData(output, 16);
         }
 

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

@@ -21,8 +21,8 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Date;
 
 import org.apache.commons.io.test.TestUtils;
@@ -54,15 +54,15 @@ public void setUp() throws Exception {
                     + " as the parent directory does not exist");
         }
         try (final BufferedOutputStream output1 =
-                new BufferedOutputStream(new FileOutputStream(testFile1))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
             TestUtils.generateTestData(output1, FILE1_SIZE);
         }
         if (!testFile2.getParentFile().exists()) {
             throw new IOException("Cannot create file " + testFile2
                     + " as the parent directory does not exist");
         }
         try (final BufferedOutputStream output =
-                new BufferedOutputStream(new FileOutputStream(testFile2))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()))) {
             TestUtils.generateTestData(output, FILE2_SIZE);
         }
     }