dorkbox/Utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix close/etc to use Closeable instead of explicit types

Browse Source
This commit is contained in:
nathan 2016-09-26 02:24:52 +02:00
parent 88fb29ba2c
commit e28d00882a
1 changed files with 20 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Dorkbox-Util/src/dorkbox/util/IO.java
View File

@ -15,130 +15,54 @@
*/ */
package dorkbox.util; package dorkbox.util;
import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public public
class IO { class IO {
/** /**
* Convenient close for a stream. * Convenient close for a Closeable.
*/ */
@SuppressWarnings("Duplicates") @SuppressWarnings("Duplicates")
public static public static
void close(InputStream inputStream) { void close(final Closeable closeable) {
if (inputStream != null) { if (closeable != null) {
try { try {
inputStream.close(); closeable.close();
} catch (IOException ioe) { } catch (IOException e) {
System.err.println("Error closing the input stream:" + inputStream); System.err.println("Error closing : " + closeable);
ioe.printStackTrace(); e.printStackTrace();
} }
} }
} }
/** /**
* Convenient close for a stream. * Convenient close for a Closeable.
*/ */
@SuppressWarnings("Duplicates") @SuppressWarnings("Duplicates")
public static public static
void closeQuietly(InputStream inputStream) { void close(final Closeable closeable, final org.slf4j.Logger logger) {
if (inputStream != null) { if (closeable != null) {
try { try {
inputStream.close(); closeable.close();
} catch (IOException ignored) { } catch (IOException e) {
logger.error("Error closing: {}", closeable, e);
} }
} }
} }
/** /**
* Convenient close for a stream. * Convenient close for a Closeable.
*/ */
@SuppressWarnings("Duplicates") @SuppressWarnings("Duplicates")
public static public static
void close(OutputStream outputStream) { void closeQuietly(final Closeable closeable) {
if (outputStream != null) { if (closeable != null) {
try { try {
outputStream.close(); closeable.close();
} catch (IOException ioe) {
System.err.println("Error closing the output stream:" + outputStream);
ioe.printStackTrace();
}
}
}
/**
* Convenient close for a stream.
*/
@SuppressWarnings("Duplicates")
public static
void closeQuietly(OutputStream outputStream) {
if (outputStream != null) {
try {
outputStream.close();
} catch (IOException ignored) {
}
}
}
/**
* Convenient close for a Reader.
*/
@SuppressWarnings("Duplicates")
public static
void close(Reader inputReader) {
if (inputReader != null) {
try {
inputReader.close();
} catch (IOException ioe) {
System.err.println("Error closing input reader: " + inputReader);
ioe.printStackTrace();
}
}
}
/**
* Convenient close for a Reader.
*/
@SuppressWarnings("Duplicates")
public static
void closeQuietly(Reader inputReader) {
if (inputReader != null) {
try {
inputReader.close();
} catch (IOException ignored) {
}
}
}
/**
* Convenient close for a Writer.
*/
@SuppressWarnings("Duplicates")
public static
void close(Writer outputWriter) {
if (outputWriter != null) {
try {
outputWriter.close();
} catch (IOException ioe) {
System.err.println("Error closing output writer: " + outputWriter);
ioe.printStackTrace();
}
}
}
/**
* Convenient close for a Writer.
*/
@SuppressWarnings("Duplicates")
public static
void closeQuietly(Writer outputWriter) {
if (outputWriter != null) {
try {
outputWriter.close();
} catch (IOException ignored) { } catch (IOException ignored) {
} }
} }
@ -150,9 +74,10 @@ class IO {
* DOES NOT CLOSE THE STEAMS! * DOES NOT CLOSE THE STEAMS!
*/ */
public static public static
<T extends OutputStream> T copyStream(InputStream inputStream, T outputStream) throws IOException { <T extends OutputStream> T copyStream(final InputStream inputStream, final T outputStream) throws IOException {
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];
int read; int read;
while ((read = inputStream.read(buffer)) > 0) { while ((read = inputStream.read(buffer)) > 0) {
outputStream.write(buffer, 0, read); outputStream.write(buffer, 0, read);
} }
@ -160,5 +85,4 @@ class IO {
return outputStream; return outputStream;
} }
} }