Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MSHARED-881] use try with resources #27

Merged
merged 2 commits into from
Apr 13, 2020
Merged

[MSHARED-881] use try with resources #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63da8d3
use try with resources
elharo Apr 13, 2020
bd43055
format
elharo Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 64 additions & 171 deletions src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Expand All @@ -41,6 +40,7 @@
import java.io.Writer;
import java.net.URL;
import java.nio.channels.FileChannel;
import java.nio.charset.Charset;
import java.security.SecureRandom;
import java.text.DecimalFormat;
import java.util.ArrayList;
Expand Down Expand Up @@ -270,32 +270,20 @@ public static boolean fileExists( @Nonnull String fileName )
@Nonnull public static String fileRead( @Nonnull File file, @Nullable String encoding )
throws IOException
{
StringBuilder buf = new StringBuilder();

Reader reader = null;
StringBuilder buf = new StringBuilder();
if ( encoding == null )
{
encoding = Charset.defaultCharset().name();
}

try
try ( Reader reader = new InputStreamReader( new FileInputStream( file ), encoding ) )
{
if ( encoding != null )
{
reader = new InputStreamReader( new FileInputStream( file ), encoding );
}
else
{
reader = new InputStreamReader( new FileInputStream( file ) );
}
int count;
char[] b = new char[512];
while ( ( count = reader.read( b ) ) >= 0 ) // blocking read
{
buf.append( b, 0, count );
}
reader.close();
reader = null;
}
finally
{
IOUtil.close( reader );
}

return buf.toString();
Expand Down Expand Up @@ -340,24 +328,15 @@ public static void fileAppend( @Nonnull String fileName, @Nonnull String data )
public static void fileAppend( @Nonnull String fileName, @Nullable String encoding, @Nonnull String data )
throws IOException
{
FileOutputStream out = null;
try

if ( encoding == null )
{
out = new FileOutputStream( fileName, true );
if ( encoding != null )
{
out.write( data.getBytes( encoding ) );
}
else
{
out.write( data.getBytes() );
}
out.close();
out = null;
encoding = Charset.defaultCharset().name();
}
finally

try ( OutputStream out = new FileOutputStream( fileName, true ) )
{
IOUtil.close( out );
out.write( data.getBytes( encoding ) );
}
}

Expand Down Expand Up @@ -401,24 +380,15 @@ public static void fileWrite( @Nonnull String fileName, @Nullable String encodin
public static void fileWrite( @Nonnull File file, @Nullable String encoding, @Nonnull String data )
throws IOException
{
Writer writer = null;
try

if ( encoding == null )
{
if ( encoding != null )
{
writer = new OutputStreamWriter( new FileOutputStream( file ), encoding );
}
else
{
writer = new OutputStreamWriter( new FileOutputStream( file ) );
}
writer.write( data );
writer.close();
writer = null;
encoding = Charset.defaultCharset().name();
}
finally

try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), encoding ) )
{
IOUtil.close( writer );
writer.write( data );
}
}

Expand Down Expand Up @@ -447,18 +417,14 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String... data
public static void fileWriteArray( @Nonnull File file, @Nullable String encoding, @Nullable String... data )
throws IOException
{
Writer writer = null;
try

if ( encoding == null )
{
if ( encoding != null )
{
writer = new OutputStreamWriter( new FileOutputStream( file ), encoding );
}
else
{
writer = new OutputStreamWriter( new FileOutputStream( file ) );
}
encoding = Charset.defaultCharset().name();
}

try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), encoding ) )
{
for ( int i = 0; data != null && i < data.length; i++ )
{
writer.write( data[i] );
Expand All @@ -467,13 +433,6 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String encoding
writer.write( "\n" );
}
}

writer.close();
writer = null;
}
finally
{
IOUtil.close( writer );
}
}

Expand Down Expand Up @@ -637,25 +596,11 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
return false;
}

InputStream input1 = null;
InputStream input2 = null;
boolean equals = false;
try
{
input1 = new FileInputStream( file1 );
input2 = new FileInputStream( file2 );
equals = IOUtil.contentEquals( input1, input2 );
input1.close();
input1 = null;
input2.close();
input2 = null;
try ( InputStream input1 = new FileInputStream( file1 );
InputStream input2 = new FileInputStream( file2 ) )
{
return IOUtil.contentEquals( input1, input2 );
}
finally
{
IOUtil.close( input1 );
IOUtil.close( input2 );
}
return equals;
}

/**
Expand Down Expand Up @@ -857,16 +802,13 @@ private static void mkdirsFor( @Nonnull File destination )
private static void doCopyFile( @Nonnull File source, @Nonnull File destination )
throws IOException
{
FileInputStream fis = null;
FileOutputStream fos = null;
FileChannel input = null;
FileChannel output = null;
try

try ( FileInputStream fis = new FileInputStream( source );
FileOutputStream fos = new FileOutputStream( destination );
FileChannel input = fis.getChannel();
FileChannel output = fos.getChannel() )
{
fis = new FileInputStream( source );
fos = new FileOutputStream( destination );
input = fis.getChannel();
output = fos.getChannel();

long size = input.size();
long pos = 0;
long count;
Expand All @@ -875,21 +817,6 @@ private static void doCopyFile( @Nonnull File source, @Nonnull File destination
count = size - pos > FILE_COPY_BUFFER_SIZE ? FILE_COPY_BUFFER_SIZE : size - pos;
pos += output.transferFrom( input, pos, count );
}
output.close();
output = null;
fos.close();
fos = null;
input.close();
input = null;
fis.close();
fis = null;
}
finally
{
IOUtil.close( output );
IOUtil.close( fos );
IOUtil.close( input );
IOUtil.close( fis );
}
}

Expand Down Expand Up @@ -959,35 +886,23 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour
@Nonnull final File destination )
throws IOException
{
InputStream in = source;
OutputStream out = null;
try
// does destination directory exist ?
if ( destination.getParentFile() != null && !destination.getParentFile().exists() )
{
//does destination directory exist ?
if ( destination.getParentFile() != null && !destination.getParentFile().exists() )
{
//noinspection ResultOfMethodCallIgnored
destination.getParentFile().mkdirs();
}

//make sure we can write to destination
if ( destination.exists() && !destination.canWrite() )
{
final String message = "Unable to open file " + destination + " for writing.";
throw new IOException( message );
}
// noinspection ResultOfMethodCallIgnored
destination.getParentFile().mkdirs();
}

out = new FileOutputStream( destination );
IOUtil.copy( in, out );
out.close();
out = null;
in.close();
in = null;
// make sure we can write to destination
if ( destination.exists() && !destination.canWrite() )
{
final String message = "Unable to open file " + destination + " for writing.";
throw new IOException( message );
}
finally

try ( OutputStream out = new FileOutputStream( destination ); InputStream in = source )
{
IOUtil.close( out );
IOUtil.close( in );
IOUtil.copy( in, out );
}
}

Expand Down Expand Up @@ -1179,7 +1094,7 @@ public static void forceDelete( @Nonnull final File file )
* deletes a file.
*
* @param file The file to delete
* @throws IOException If the file cannot be delted.
* @throws IOException if the file cannot be deleted
*/


Expand Down Expand Up @@ -1913,37 +1828,25 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
{
if ( wrappers != null && wrappers.length > 0 )
{

if ( encoding == null || encoding.isEmpty() )
{
encoding = Charset.defaultCharset().name();
}

// buffer so it isn't reading a byte at a time!
Reader fileReader = null;
Writer fileWriter = null;
try
try ( Reader fileReader =
new BufferedReader( new InputStreamReader( new FileInputStream( from ), encoding ) );
Writer fileWriter = new OutputStreamWriter( new FileOutputStream( to ), encoding ) )
{
if ( encoding == null || encoding.length() < 1 )
{
fileReader = new BufferedReader( new FileReader( from ) );
fileWriter = new FileWriter( to );
}
else
{
fileReader = new BufferedReader( new InputStreamReader( new FileInputStream( from ), encoding ) );
fileWriter = new OutputStreamWriter( new FileOutputStream( to ), encoding );
}

Reader wrapped = fileReader;
for ( FilterWrapper wrapper : wrappers )
{
fileReader = wrapper.getReader( fileReader );
wrapped = wrapper.getReader( wrapped );
}

IOUtil.copy( fileReader, fileWriter );
fileWriter.close();
fileWriter = null;
fileReader.close();
fileReader = null;
}
finally
{
IOUtil.close( fileReader );
IOUtil.close( fileWriter );
IOUtil.copy( wrapped, fileWriter );
}
}
else
Expand All @@ -1956,7 +1859,7 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
}

/**
* Note: the file content is read with platform encoding
* Note: the file content is read with platform encoding.
*
* @param file the file
* @return a List containing every every line not starting with # and not empty
Expand All @@ -1969,31 +1872,21 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str

if ( file.exists() )
{
BufferedReader reader = null;
try
try ( BufferedReader reader = new BufferedReader( new FileReader( file ) ) )
{
reader = new BufferedReader( new FileReader( file ) );

for ( String line = reader.readLine(); line != null; line = reader.readLine() )
{
line = line.trim();

if ( !line.startsWith( "#" ) && line.length() != 0 )
{
lines.add( line );
}
}

reader.close();
reader = null;
}
finally
{
IOUtil.close( reader );
}
}

return lines;

}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding

/**
* @param reader {@link Reader}
* @param trim true/false.
* @return the built dom.
* @throws XmlPullParserException in case of an error.
* @param trim true/false
* @return the built dom
* @throws XmlPullParserException in case of an error
*/
public static Xpp3Dom build( @WillClose Reader reader, boolean trim )
throws XmlPullParserException
Expand Down
Loading