Java 7: Files.newOutputStream instead of new FilesOutputStream

Provides potentially better performance.

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

Author: mkarg

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

@@ -57,9 +57,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Date;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -140,7 +141,7 @@ protected void extractFile( File srcF, File dir, InputStream compressedInputStre
             {
                 byte[] buffer = new byte[65536];
 
-                try ( FileOutputStream fos = new FileOutputStream( f ) )
+                try ( OutputStream fos = Files.newOutputStream( f.toPath() ) )
                 {
                     for ( int length = compressedInputStream.read( buffer ); 
                           length >= 0; 

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

@@ -61,7 +61,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -72,6 +71,9 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -407,7 +409,7 @@ public static void fileAppend( String fileName, String data )
     public static void fileAppend( String fileName, String encoding, String data )
         throws IOException
     {
-        try ( FileOutputStream out = new FileOutputStream( fileName, true ) )
+        try ( OutputStream out = Files.newOutputStream( Paths.get(fileName), StandardOpenOption.APPEND ) )
         {
             if ( encoding != null )
             {
@@ -484,7 +486,7 @@ public static void fileWrite( File file, String encoding, String data )
 
     private static OutputStreamWriter getOutputStreamWriter( File file, String encoding ) throws IOException
     {
-        OutputStream out = new FileOutputStream( file );
+        OutputStream out = Files.newOutputStream( file.toPath() );
         if ( encoding != null )
         {
             return new OutputStreamWriter( out, encoding );
@@ -1153,7 +1155,7 @@ public static void copyStreamToFile( final InputStreamFacade source, final File
         checkCanWrite( destination );
 
         try (  InputStream input = source.getInputStream();
-               FileOutputStream output = new FileOutputStream( destination ) )
+               OutputStream output = Files.newOutputStream( destination.toPath() ) )
         {
             IOUtil.copy( input, output );
         }
@@ -2258,7 +2260,7 @@ public static void copyFile( File from, File to, String encoding, FilterWrapper[
                 {
                     FileInputStream instream = new FileInputStream( from );
 
-                    FileOutputStream outstream = new FileOutputStream( to );
+                    OutputStream outstream = Files.newOutputStream( to.toPath() );
 
                     fileReader = new BufferedReader( new InputStreamReader( instream, encoding ) );
 

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

@@ -18,14 +18,14 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 
 import org.codehaus.plexus.util.xml.XmlStreamWriter;
 
@@ -169,13 +169,12 @@ public static Writer newWriter( OutputStream out, String encoding )
      * @param file not null file.
      * @param encoding not null supported encoding.
      * @return a writer instance for the output file using the given encoding.
-     * @throws UnsupportedEncodingException if any.
-     * @throws FileNotFoundException if any.
+     * @throws IOException if any.
      * @see <a href="http://java.sun.com/j2se/1.4.2/docs/guide/intl/encoding.doc.html">Supported encodings</a>
      */
     public static Writer newWriter( File file, String encoding )
-        throws UnsupportedEncodingException, FileNotFoundException
+        throws IOException
     {
-        return newWriter( new FileOutputStream( file ), encoding );
+        return newWriter( Files.newOutputStream( file.toPath() ), encoding );
     }
 }

src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java

@@ -17,13 +17,12 @@
  */
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,9 +54,9 @@ public XmlStreamWriter( OutputStream out )
     }
 
     public XmlStreamWriter( File file )
-        throws FileNotFoundException
+        throws IOException
     {
-        this( new FileOutputStream( file ) );
+        this( Files.newOutputStream( file.toPath() ) );
     }
 
     public String getEncoding()

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

@@ -22,13 +22,13 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.Arrays;
 
 import junit.framework.AssertionFailedError;
@@ -61,7 +61,7 @@ protected byte[] createFile( final File file, final long size )
 
         byte[] data = generateTestData( size );
 
-        final BufferedOutputStream output = new BufferedOutputStream( new FileOutputStream( file ) );
+        final BufferedOutputStream output = new BufferedOutputStream( Files.newOutputStream( file.toPath() ) );
 
         try
         {

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

@@ -26,7 +26,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -1134,7 +1133,7 @@ public void testFileRead()
         Writer writer = null;
         try
         {
-            writer = new OutputStreamWriter( new FileOutputStream( testFile ) );
+            writer = new OutputStreamWriter( Files.newOutputStream( testFile.toPath() ) );
             writer.write( testString );
             writer.flush();
         }
@@ -1159,7 +1158,7 @@ public void testFileReadWithEncoding()
         Writer writer = null;
         try
         {
-            writer = new OutputStreamWriter( new FileOutputStream( testFile ), encoding );
+            writer = new OutputStreamWriter( Files.newOutputStream( testFile.toPath() ), encoding );
             writer.write( testString );
             writer.flush();
         }
@@ -1182,7 +1181,7 @@ public void testFileAppend()
         Writer writer = null;
         try
         {
-            writer = new OutputStreamWriter( new FileOutputStream( testFile ) );
+            writer = new OutputStreamWriter( Files.newOutputStream( testFile.toPath() ) );
             writer.write( baseString );
             writer.flush();
         }
@@ -1208,7 +1207,7 @@ public void testFileAppendWithEncoding()
         Writer writer = null;
         try
         {
-            writer = new OutputStreamWriter( new FileOutputStream( testFile ), encoding );
+            writer = new OutputStreamWriter( Files.newOutputStream( testFile.toPath() ), encoding );
             writer.write( baseString );
             writer.flush();
         }
@@ -1281,7 +1280,7 @@ public void testDeleteLongPathOnWindows()
         File f = new File( a1, path.toString() + "test.txt" );
 
         InputStream is = new ByteArrayInputStream( "Blabla".getBytes( "UTF-8" ) );
-        OutputStream os = new FileOutputStream( f.getCanonicalFile() );
+        OutputStream os = Files.newOutputStream( f.getCanonicalFile().toPath() );
         IOUtil.copy( is, os );
         IOUtil.close( is );
         IOUtil.close( os );

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

@@ -23,7 +23,6 @@
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -33,6 +32,7 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.Arrays;
 
 import org.junit.Before;
@@ -95,7 +95,7 @@ public void tearDown()
     private void createFile( File file, long size )
         throws IOException
     {
-        BufferedOutputStream output = new BufferedOutputStream( new FileOutputStream( file ) );
+        BufferedOutputStream output = new BufferedOutputStream( Files.newOutputStream( file.toPath() ) );
 
         for ( int i = 0; i < size; i++ )
         {
@@ -161,7 +161,7 @@ public void testInputStreamToOutputStream()
     {
         File destination = newFile( "copy1.txt" );
         FileInputStream fin = new FileInputStream( testFile );
-        FileOutputStream fout = new FileOutputStream( destination );
+        OutputStream fout = Files.newOutputStream( destination.toPath() );
 
         IOUtil.copy( fin, fout );
         assertTrue( "Not all bytes were read", fin.available() == 0 );
@@ -212,7 +212,7 @@ public void testReaderToOutputStream()
     {
         File destination = newFile( "copy3.txt" );
         FileReader fin = new FileReader( testFile );
-        FileOutputStream fout = new FileOutputStream( destination );
+        OutputStream fout = Files.newOutputStream( destination.toPath() );
         IOUtil.copy( fin, fout );
         // Note: this method *does* flush. It is equivalent to:
         // OutputStreamWriter _out = new OutputStreamWriter(fout);
@@ -264,7 +264,7 @@ public void testStringToOutputStream()
         FileReader fin = new FileReader( testFile );
         // Create our String. Rely on testReaderToString() to make sure this is valid.
         String str = IOUtil.toString( fin );
-        FileOutputStream fout = new FileOutputStream( destination );
+        OutputStream fout = Files.newOutputStream( destination.toPath() );
         IOUtil.copy( str, fout );
         // Note: this method *does* flush. It is equivalent to:
         // OutputStreamWriter _out = new OutputStreamWriter(fout);
@@ -363,7 +363,7 @@ public void testByteArrayToOutputStream()
         throws Exception
     {
         File destination = newFile( "copy8.txt" );
-        FileOutputStream fout = new FileOutputStream( destination );
+        OutputStream fout = Files.newOutputStream( destination.toPath() );
         FileInputStream fin = new FileInputStream( testFile );
 
         // Create our byte[]. Rely on testInputStreamToByteArray() to make sure this is valid.

src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java

@@ -21,10 +21,10 @@
 import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
+import java.nio.file.Files;
 import java.util.NoSuchElementException;
 
 import javax.swing.text.html.HTML.Tag;
@@ -171,7 +171,7 @@ public void testIssue51DetectJava7ConcatenationBug()
             assertTrue( "cannot create directory test-xml", dir.mkdir() );
         }
         File xmlFile = new File( dir, "test-issue-51.xml" );
-        OutputStreamWriter osw = new OutputStreamWriter( new FileOutputStream( xmlFile ), "UTF-8" );
+        OutputStreamWriter osw = new OutputStreamWriter( Files.newOutputStream( xmlFile.toPath() ), "UTF-8" );
         writer = new PrettyPrintXMLWriter( osw );
 
         int iterations = 20000;

src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java

@@ -21,13 +21,13 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.file.Files;
 
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -78,7 +78,7 @@ public void testPrettyFormatInputStreamOutputStream()
         try
         {
             is = new FileInputStream( testDocument );
-            os = new FileOutputStream( getTestOutputFile( "target/test/prettyFormatTestDocumentOutputStream.xml" ) );
+            os = Files.newOutputStream( getTestOutputFile( "target/test/prettyFormatTestDocumentOutputStream.xml" ).toPath() );
 
             assertNotNull( is );
             assertNotNull( os );