Java 8: Files.newBufferedReader instead of new FileReader

Provides potentially better performance.

Signed-off-by: Markus KARG <[email protected]>

Author: mkarg

src/main/java/org/codehaus/plexus/util/FileUtils.java

@@ -60,7 +60,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -70,6 +69,7 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -2252,16 +2252,14 @@ public static void copyFile( File from, File to, String encoding, FilterWrapper[
             {
                 if ( encoding == null || encoding.length() < 1 )
                 {
-                    fileReader = new BufferedReader( new FileReader( from ) );
+                    fileReader = Files.newBufferedReader( from.toPath() );
                     fileWriter = new FileWriter( to );
                 }
                 else
                 {
-                    InputStream instream = Files.newInputStream( from.toPath() );
-
                     OutputStream outstream = Files.newOutputStream( to.toPath() );
 
-                    fileReader = new BufferedReader( new InputStreamReader( instream, encoding ) );
+                    fileReader = Files.newBufferedReader( from.toPath(), Charset.forName( encoding ) );
 
                     fileWriter = new OutputStreamWriter( outstream, encoding );
                 }
@@ -2311,7 +2309,7 @@ public static List<String> loadFile( File file )
 
         if ( file.exists() )
         {
-            try ( BufferedReader reader = new BufferedReader( new FileReader( file ) ) )
+            try ( BufferedReader reader = Files.newBufferedReader( file.toPath() ) )
             {
                 for ( String line = reader.readLine(); line != null; line = reader.readLine() )
                 {

src/main/java/org/codehaus/plexus/util/ReaderFactory.java

@@ -18,7 +18,6 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -154,13 +153,13 @@ public static Reader newPlatformReader( InputStream in )
      *
      * @param file not null file.
      * @return a reader instance for the input file using the default platform charset.
-     * @throws FileNotFoundException if any.
+     * @throws IOException if any.
      * @see Charset#defaultCharset()
      */
     public static Reader newPlatformReader( File file )
-        throws FileNotFoundException
+        throws IOException
     {
-        return new FileReader( file );
+        return Files.newBufferedReader( file.toPath() );
     }
 
     /**

src/test/java/org/codehaus/plexus/util/IOUtilTest.java

@@ -22,7 +22,6 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -210,7 +209,7 @@ public void testReaderToOutputStream()
         throws Exception
     {
         File destination = newFile( "copy3.txt" );
-        FileReader fin = new FileReader( testFile );
+        Reader fin = Files.newBufferedReader( testFile.toPath() );
         OutputStream fout = Files.newOutputStream( destination.toPath() );
         IOUtil.copy( fin, fout );
         // Note: this method *does* flush. It is equivalent to:
@@ -232,7 +231,7 @@ public void testReaderToWriter()
         throws Exception
     {
         File destination = newFile( "copy4.txt" );
-        FileReader fin = new FileReader( testFile );
+        Reader fin = Files.newBufferedReader( testFile.toPath() );
         FileWriter fout = new FileWriter( destination );
         IOUtil.copy( fin, fout );
 
@@ -248,7 +247,7 @@ public void testReaderToWriter()
     public void testReaderToString()
         throws Exception
     {
-        FileReader fin = new FileReader( testFile );
+        Reader fin = Files.newBufferedReader( testFile.toPath() );
         String out = IOUtil.toString( fin );
         assertNotNull( out );
         assertTrue( "Wrong output size: out.length()=" + out.length() + "!=" + FILE_SIZE, out.length() == FILE_SIZE );
@@ -260,7 +259,7 @@ public void testStringToOutputStream()
         throws Exception
     {
         File destination = newFile( "copy5.txt" );
-        FileReader fin = new FileReader( testFile );
+        Reader fin = Files.newBufferedReader( testFile.toPath() );
         // Create our String. Rely on testReaderToString() to make sure this is valid.
         String str = IOUtil.toString( fin );
         OutputStream fout = Files.newOutputStream( destination.toPath() );
@@ -284,7 +283,7 @@ public void testStringToWriter()
         throws Exception
     {
         File destination = newFile( "copy6.txt" );
-        FileReader fin = new FileReader( testFile );
+        Reader fin = Files.newBufferedReader( testFile.toPath() );
         // Create our String. Rely on testReaderToString() to make sure this is valid.
         String str = IOUtil.toString( fin );
         FileWriter fout = new FileWriter( destination );
@@ -316,7 +315,7 @@ public void testInputStreamToByteArray()
     public void testStringToByteArray()
         throws Exception
     {
-        FileReader fin = new FileReader( testFile );
+        Reader fin = Files.newBufferedReader( testFile.toPath() );
 
         // Create our String. Rely on testReaderToString() to make sure this is valid.
         String str = IOUtil.toString( fin );