From 304b1028aab271ee41137e449cf0b7277a83f32b Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Thu, 30 Jul 2020 18:03:48 +0000 Subject: [PATCH 1/2] Java 7: Files.newOutputStream instead of new FilesOutputStream Provides potentially better performance. Signed-off-by: Markus KARG --- src/main/java/org/codehaus/plexus/util/Expand.java | 5 +++-- .../java/org/codehaus/plexus/util/FileUtils.java | 12 +++++++----- .../java/org/codehaus/plexus/util/WriterFactory.java | 9 ++++----- .../codehaus/plexus/util/xml/XmlStreamWriter.java | 7 +++---- .../org/codehaus/plexus/util/FileBasedTestCase.java | 4 ++-- .../java/org/codehaus/plexus/util/FileUtilsTest.java | 12 ++++++------ .../java/org/codehaus/plexus/util/IOUtilTest.java | 12 ++++++------ .../plexus/util/xml/PrettyPrintXMLWriterTest.java | 4 ++-- .../org/codehaus/plexus/util/xml/XmlUtilTest.java | 4 ++-- 9 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/util/Expand.java b/src/main/java/org/codehaus/plexus/util/Expand.java index db81df4a..bd44b793 100644 --- a/src/main/java/org/codehaus/plexus/util/Expand.java +++ b/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; @@ -149,7 +150,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; diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java index 7cd1ddcf..97556fb6 100644 --- a/src/main/java/org/codehaus/plexus/util/FileUtils.java +++ b/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 ); @@ -1123,7 +1125,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 ); } @@ -2228,7 +2230,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 ) ); diff --git a/src/main/java/org/codehaus/plexus/util/WriterFactory.java b/src/main/java/org/codehaus/plexus/util/WriterFactory.java index 229f1082..6a7af8da 100644 --- a/src/main/java/org/codehaus/plexus/util/WriterFactory.java +++ b/src/main/java/org/codehaus/plexus/util/WriterFactory.java @@ -18,7 +18,6 @@ import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.io.OutputStream; @@ -26,6 +25,7 @@ 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 Supported encodings */ 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 ); } } diff --git a/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java b/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java index 2dfcc5f0..99bcf495 100644 --- a/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java +++ b/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() diff --git a/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java b/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java index 1be701d8..7f3f88ec 100644 --- a/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java +++ b/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 { diff --git a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java index f29dd418..176b63a7 100644 --- a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java +++ b/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; @@ -34,6 +33,7 @@ import java.io.Reader; import java.io.Writer; import java.net.URL; +import java.nio.file.Files; import java.util.Properties; import org.junit.Before; @@ -1089,7 +1089,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(); } @@ -1114,7 +1114,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(); } @@ -1137,7 +1137,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(); } @@ -1163,7 +1163,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(); } @@ -1236,7 +1236,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 ); diff --git a/src/test/java/org/codehaus/plexus/util/IOUtilTest.java b/src/test/java/org/codehaus/plexus/util/IOUtilTest.java index c99384c1..f9075f02 100644 --- a/src/test/java/org/codehaus/plexus/util/IOUtilTest.java +++ b/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. diff --git a/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java b/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java index 128d004f..5abe744a 100644 --- a/src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java +++ b/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; diff --git a/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java b/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java index 25ee91ae..9941644a 100644 --- a/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java +++ b/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 ); From eff41782f46630a097684235ff383f8cd1a9497c Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Sun, 16 Aug 2020 14:24:42 +0000 Subject: [PATCH 2/2] Java 7: Files.newInputStream instead of new FilesInputStream Provides potentially better performance. Signed-off-by: Markus KARG --- .../java/org/codehaus/plexus/util/Expand.java | 3 +-- .../org/codehaus/plexus/util/FileUtils.java | 11 +++++----- .../codehaus/plexus/util/PropertyUtils.java | 4 ++-- .../codehaus/plexus/util/ReaderFactory.java | 9 ++++---- .../codehaus/plexus/util/xml/XmlReader.java | 4 ++-- .../plexus/util/FileBasedTestCase.java | 7 +++---- .../codehaus/plexus/util/FileUtilsTest.java | 3 +-- .../org/codehaus/plexus/util/IOUtilTest.java | 21 +++++++++---------- .../codehaus/plexus/util/xml/XmlUtilTest.java | 3 +-- 9 files changed, 29 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/util/Expand.java b/src/main/java/org/codehaus/plexus/util/Expand.java index bd44b793..430c1e5d 100644 --- a/src/main/java/org/codehaus/plexus/util/Expand.java +++ b/src/main/java/org/codehaus/plexus/util/Expand.java @@ -55,7 +55,6 @@ */ import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -104,7 +103,7 @@ protected void expandFile( final File srcF, final File dir ) throws Exception { // code from WarExpand - try ( ZipInputStream zis = new ZipInputStream( new FileInputStream( srcF ) ) ) + try ( ZipInputStream zis = new ZipInputStream( Files.newInputStream( srcF.toPath() ) ) ) { for ( ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry() ) { diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java index 97556fb6..7447157f 100644 --- a/src/main/java/org/codehaus/plexus/util/FileUtils.java +++ b/src/main/java/org/codehaus/plexus/util/FileUtils.java @@ -60,7 +60,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -376,11 +375,11 @@ private static InputStreamReader getInputStreamReader( File file, String encodin { if ( encoding != null ) { - return new InputStreamReader( new FileInputStream( file ), encoding ); + return new InputStreamReader( Files.newInputStream( file.toPath() ), encoding ); } else { - return new InputStreamReader( new FileInputStream( file ) ); + return new InputStreamReader( Files.newInputStream( file.toPath() ) ); } } @@ -726,8 +725,8 @@ public static boolean contentEquals( final File file1, final File file2 ) return false; } - 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 IOUtil.contentEquals( input1, input2 ); } @@ -2228,7 +2227,7 @@ public static void copyFile( File from, File to, String encoding, FilterWrapper[ } else { - FileInputStream instream = new FileInputStream( from ); + InputStream instream = Files.newInputStream( from.toPath() ); OutputStream outstream = Files.newOutputStream( to.toPath() ); diff --git a/src/main/java/org/codehaus/plexus/util/PropertyUtils.java b/src/main/java/org/codehaus/plexus/util/PropertyUtils.java index 419fc125..cee5cd25 100644 --- a/src/main/java/org/codehaus/plexus/util/PropertyUtils.java +++ b/src/main/java/org/codehaus/plexus/util/PropertyUtils.java @@ -20,10 +20,10 @@ import java.util.Properties; import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.io.IOException; import java.net.URL; +import java.nio.file.Files; /** * Static methods to create Properties loaded from various sources. @@ -43,7 +43,7 @@ public static Properties loadProperties( final URL url ) public static Properties loadProperties( final File file ) throws IOException { - return loadProperties( new FileInputStream( Objects.requireNonNull( file, "file" ) ) ); + return loadProperties( Files.newInputStream( Objects.requireNonNull( file, "file" ).toPath() ) ); } public static Properties loadProperties( final InputStream is ) diff --git a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java index 70389d68..c0ae93f2 100644 --- a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java +++ b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java @@ -17,7 +17,6 @@ */ import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; @@ -27,6 +26,7 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.nio.charset.Charset; +import java.nio.file.Files; import org.codehaus.plexus.util.xml.XmlStreamReader; @@ -199,14 +199,13 @@ public static Reader newReader( InputStream in, String encoding ) * @param file not null file. * @param encoding not null supported encoding. * @return a reader instance for the input file using the given encoding. - * @throws FileNotFoundException if any. - * @throws UnsupportedEncodingException if any. + * @throws IOException if any. * @see Supported encodings */ public static Reader newReader( File file, String encoding ) - throws FileNotFoundException, UnsupportedEncodingException + throws IOException { - return new InputStreamReader( new FileInputStream( file ), encoding ); + return new InputStreamReader( Files.newInputStream( file.toPath() ), encoding ); } /** diff --git a/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java b/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java index 9864d3df..9af7f26b 100644 --- a/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java +++ b/src/main/java/org/codehaus/plexus/util/xml/XmlReader.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; @@ -27,6 +26,7 @@ import java.io.StringReader; import java.net.URL; import java.net.URLConnection; +import java.nio.file.Files; import java.net.HttpURLConnection; import java.util.Locale; import java.util.regex.Pattern; @@ -126,7 +126,7 @@ public static String getDefaultEncoding() public XmlReader( File file ) throws IOException { - this( new FileInputStream( file ) ); + this( Files.newInputStream( file.toPath() ) ); } /** diff --git a/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java b/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java index 7f3f88ec..33b1654d 100644 --- a/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java +++ b/src/test/java/org/codehaus/plexus/util/FileBasedTestCase.java @@ -21,7 +21,6 @@ import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -192,10 +191,10 @@ private void assertEqualContent( final File f0, final File f1 ) * + " and " + f1 + " have differing file sizes (" + f0.length() + " vs " + f1.length() + ")", ( f0.length() == * f1.length() ) ); */ - final InputStream is0 = new FileInputStream( f0 ); + final InputStream is0 = Files.newInputStream( f0.toPath() ); try { - final InputStream is1 = new FileInputStream( f1 ); + final InputStream is1 = Files.newInputStream( f1.toPath() ); try { final byte[] buf0 = new byte[1024]; @@ -229,7 +228,7 @@ private void assertEqualContent( final File f0, final File f1 ) protected void assertEqualContent( final byte[] b0, final File file ) throws IOException { - final InputStream is = new FileInputStream( file ); + final InputStream is = Files.newInputStream( file.toPath() ); try { byte[] b1 = new byte[b0.length]; diff --git a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java index 176b63a7..b24e1a5b 100644 --- a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java @@ -25,7 +25,6 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -268,7 +267,7 @@ public void testCopyURLToFile() FileUtils.copyURLToFile( getClass().getResource( resourceName ), file ); // Tests that resource was copied correctly - final FileInputStream fis = new FileInputStream( file ); + final InputStream fis = Files.newInputStream( file.toPath() ); try { assertTrue( "Content is not equal.", diff --git a/src/test/java/org/codehaus/plexus/util/IOUtilTest.java b/src/test/java/org/codehaus/plexus/util/IOUtilTest.java index f9075f02..0bbd7b0e 100644 --- a/src/test/java/org/codehaus/plexus/util/IOUtilTest.java +++ b/src/test/java/org/codehaus/plexus/util/IOUtilTest.java @@ -22,7 +22,6 @@ import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -115,8 +114,8 @@ private void assertEqualContent( byte[] b0, byte[] b1 ) private void assertEqualContent( File f0, File f1 ) throws IOException { - FileInputStream is0 = new FileInputStream( f0 ); - FileInputStream is1 = new FileInputStream( f1 ); + InputStream is0 = Files.newInputStream( f0.toPath() ); + InputStream is1 = Files.newInputStream( f1.toPath() ); byte[] buf0 = new byte[FILE_SIZE]; byte[] buf1 = new byte[FILE_SIZE]; int n0 = 0; @@ -145,7 +144,7 @@ private void assertEqualContent( File f0, File f1 ) private void assertEqualContent( byte[] b0, File file ) throws IOException { - FileInputStream is = new FileInputStream( file ); + InputStream is = Files.newInputStream( file.toPath() ); byte[] b1 = new byte[b0.length]; int numRead = is.read( b1 ); assertTrue( "Different number of bytes", numRead == b0.length && is.available() == 0 ); @@ -160,7 +159,7 @@ public void testInputStreamToOutputStream() throws Exception { File destination = newFile( "copy1.txt" ); - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); OutputStream fout = Files.newOutputStream( destination.toPath() ); IOUtil.copy( fin, fout ); @@ -179,7 +178,7 @@ public void testInputStreamToWriter() throws Exception { File destination = newFile( "copy2.txt" ); - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); FileWriter fout = new FileWriter( destination ); IOUtil.copy( fin, fout ); @@ -198,7 +197,7 @@ public void testInputStreamToWriter() public void testInputStreamToString() throws Exception { - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); String out = IOUtil.toString( fin ); assertNotNull( out ); assertTrue( "Not all bytes were read", fin.available() == 0 ); @@ -304,7 +303,7 @@ public void testStringToWriter() public void testInputStreamToByteArray() throws Exception { - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); byte[] out = IOUtil.toByteArray( fin ); assertNotNull( out ); assertTrue( "Not all bytes were read", fin.available() == 0 ); @@ -333,7 +332,7 @@ public void testByteArrayToWriter() { File destination = newFile( "copy7.txt" ); FileWriter fout = new FileWriter( destination ); - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); // Create our byte[]. Rely on testInputStreamToByteArray() to make sure this is valid. byte[] in = IOUtil.toByteArray( fin ); @@ -350,7 +349,7 @@ public void testByteArrayToWriter() public void testByteArrayToString() throws Exception { - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); byte[] in = IOUtil.toByteArray( fin ); // Create our byte[]. Rely on testInputStreamToByteArray() to make sure this is valid. String str = IOUtil.toString( in ); @@ -364,7 +363,7 @@ public void testByteArrayToOutputStream() { File destination = newFile( "copy8.txt" ); OutputStream fout = Files.newOutputStream( destination.toPath() ); - FileInputStream fin = new FileInputStream( testFile ); + InputStream fin = Files.newInputStream( testFile.toPath() ); // Create our byte[]. Rely on testInputStreamToByteArray() to make sure this is valid. byte[] in = IOUtil.toByteArray( fin ); diff --git a/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java b/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java index 9941644a..acb6a302 100644 --- a/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java +++ b/src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -77,7 +76,7 @@ public void testPrettyFormatInputStreamOutputStream() OutputStream os = null; try { - is = new FileInputStream( testDocument ); + is = Files.newInputStream( testDocument.toPath() ); os = Files.newOutputStream( getTestOutputFile( "target/test/prettyFormatTestDocumentOutputStream.xml" ).toPath() ); assertNotNull( is );