close input and output stream

Author: mcxiaoke

core/src/main/java/com/mcxiaoke/next/utils/IOUtils.java

@@ -562,12 +562,17 @@ public static void writeList(Collection<?> lines, OutputStream output, Charset e
             lineSeparator = LINE_SEPARATOR;
         }
         Charset cs = Charsets.toCharset(encoding);
-        for (Object line : lines) {
-            if (line != null) {
-                output.write(line.toString().getBytes(cs));
+        try {
+            for (Object line : lines) {
+                if (line != null) {
+                    output.write(line.toString().getBytes(cs));
+                }
+                output.write(lineSeparator.getBytes(cs));
             }
-            output.write(lineSeparator.getBytes(cs));
+        } finally {
+            IOUtils.closeQuietly(output);
         }
+
     }
 
     public static void writeList(Collection<?> lines,
@@ -583,12 +588,17 @@ public static void writeList(Collection<?> lines, String lineSeparator,
         if (lineSeparator == null) {
             lineSeparator = LINE_SEPARATOR;
         }
-        for (Object line : lines) {
-            if (line != null) {
-                writer.write(line.toString());
+        try {
+            for (Object line : lines) {
+                if (line != null) {
+                    writer.write(line.toString());
+                }
+                writer.write(lineSeparator);
             }
-            writer.write(lineSeparator);
+        } finally {
+            IOUtils.closeQuietly(writer);
         }
+
     }
 
     public static void copyLegacy(File source, File dest)
@@ -604,8 +614,8 @@ public static void copyLegacy(File source, File dest)
                 output.write(buf, 0, bytesRead);
             }
         } finally {
-            input.close();
-            output.close();
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
         }
     }
 
@@ -650,9 +660,14 @@ public static long copyLarge(InputStream input, OutputStream output, byte[] buff
             throws IOException {
         long count = 0;
         int n = 0;
-        while (EOF != (n = input.read(buffer))) {
-            output.write(buffer, 0, n);
-            count += n;
+        try {
+            while (EOF != (n = input.read(buffer))) {
+                output.write(buffer, 0, n);
+                count += n;
+            }
+        } finally {
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
         }
         return count;
     }
@@ -677,13 +692,18 @@ public static long copyLarge(InputStream input, OutputStream output,
         }
         int read;
         long totalRead = 0;
-        while (bytesToRead > 0 && EOF != (read = input.read(buffer, 0, bytesToRead))) {
-            output.write(buffer, 0, read);
-            totalRead += read;
-            if (length > 0) { // only adjust length if not reading to the end
-                // Note the cast must work because buffer.length is an integer
-                bytesToRead = (int) Math.min(length - totalRead, bufferLength);
+        try {
+            while (bytesToRead > 0 && EOF != (read = input.read(buffer, 0, bytesToRead))) {
+                output.write(buffer, 0, read);
+                totalRead += read;
+                if (length > 0) { // only adjust length if not reading to the end
+                    // Note the cast must work because buffer.length is an integer
+                    bytesToRead = (int) Math.min(length - totalRead, bufferLength);
+                }
             }
+        } finally {
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
         }
         return totalRead;
     }
@@ -743,13 +763,18 @@ public static long copyLarge(Reader input, Writer output, final long inputOffset
         }
         int read;
         long totalRead = 0;
-        while (bytesToRead > 0 && EOF != (read = input.read(buffer, 0, bytesToRead))) {
-            output.write(buffer, 0, read);
-            totalRead += read;
-            if (length > 0) { // only adjust length if not reading to the end
-                // Note the cast must work because buffer.length is an integer
-                bytesToRead = (int) Math.min(length - totalRead, buffer.length);
+        try {
+            while (bytesToRead > 0 && EOF != (read = input.read(buffer, 0, bytesToRead))) {
+                output.write(buffer, 0, read);
+                totalRead += read;
+                if (length > 0) { // only adjust length if not reading to the end
+                    // Note the cast must work because buffer.length is an integer
+                    bytesToRead = (int) Math.min(length - totalRead, buffer.length);
+                }
             }
+        } finally {
+            IOUtils.closeQuietly(input);
+            IOUtils.closeQuietly(output);
         }
         return totalRead;
     }
@@ -835,9 +860,9 @@ public static void skipFully(InputStream input, long toSkip) throws IOException
      *
      * @param input  stream to skip
      * @param toSkip the number of characters to skip
-     * @throws IOException      if there is a problem reading the file
+     * @throws IOException              if there is a problem reading the file
      * @throws IllegalArgumentException if toSkip is negative
-     * @throws EOFException     if the number of characters skipped was incorrect
+     * @throws EOFException             if the number of characters skipped was incorrect
      * @see Reader#skip(long)
      * @since 2.0
      */
@@ -867,13 +892,17 @@ public static int read(Reader input, char[] buffer, int offset, int length) thro
             throw new IllegalArgumentException("Length must not be negative: " + length);
         }
         int remaining = length;
-        while (remaining > 0) {
-            int location = length - remaining;
-            int count = input.read(buffer, offset + location, remaining);
-            if (EOF == count) { // EOF
-                break;
+        try {
+            while (remaining > 0) {
+                int location = length - remaining;
+                int count = input.read(buffer, offset + location, remaining);
+                if (EOF == count) { // EOF
+                    break;
+                }
+                remaining -= count;
             }
-            remaining -= count;
+        } finally {
+            IOUtils.closeQuietly(input);
         }
         return length - remaining;
     }
@@ -913,13 +942,17 @@ public static int read(InputStream input, byte[] buffer, int offset, int length)
             throw new IllegalArgumentException("Length must not be negative: " + length);
         }
         int remaining = length;
-        while (remaining > 0) {
-            int location = length - remaining;
-            int count = input.read(buffer, offset + location, remaining);
-            if (EOF == count) { // EOF
-                break;
+        try {
+            while (remaining > 0) {
+                int location = length - remaining;
+                int count = input.read(buffer, offset + location, remaining);
+                if (EOF == count) { // EOF
+                    break;
+                }
+                remaining -= count;
             }
-            remaining -= count;
+        } finally {
+            IOUtils.closeQuietly(input);
         }
         return length - remaining;
     }
@@ -950,9 +983,9 @@ public static int read(InputStream input, byte[] buffer) throws IOException {
      * @param buffer destination
      * @param offset inital offset into buffer
      * @param length length to read, must be >= 0
-     * @throws IOException      if there is a problem reading the file
+     * @throws IOException              if there is a problem reading the file
      * @throws IllegalArgumentException if length is negative
-     * @throws EOFException     if the number of characters read was incorrect
+     * @throws EOFException             if the number of characters read was incorrect
      * @since 2.2
      */
     public static void readFully(Reader input, char[] buffer, int offset, int length) throws IOException {
@@ -970,9 +1003,9 @@ public static void readFully(Reader input, char[] buffer, int offset, int length
      *
      * @param input  where to read input from
      * @param buffer destination
-     * @throws IOException      if there is a problem reading the file
+     * @throws IOException              if there is a problem reading the file
      * @throws IllegalArgumentException if length is negative
-     * @throws EOFException     if the number of characters read was incorrect
+     * @throws EOFException             if the number of characters read was incorrect
      * @since 2.2
      */
     public static void readFully(Reader input, char[] buffer) throws IOException {
@@ -989,9 +1022,9 @@ public static void readFully(Reader input, char[] buffer) throws IOException {
      * @param buffer destination
      * @param offset inital offset into buffer
      * @param length length to read, must be >= 0
-     * @throws IOException      if there is a problem reading the file
+     * @throws IOException              if there is a problem reading the file
      * @throws IllegalArgumentException if length is negative
-     * @throws EOFException     if the number of bytes read was incorrect
+     * @throws EOFException             if the number of bytes read was incorrect
      * @since 2.2
      */
     public static void readFully(InputStream input, byte[] buffer, int offset, int length) throws IOException {
@@ -1009,9 +1042,9 @@ public static void readFully(InputStream input, byte[] buffer, int offset, int l
      *
      * @param input  where to read input from
      * @param buffer destination
-     * @throws IOException      if there is a problem reading the file
+     * @throws IOException              if there is a problem reading the file
      * @throws IllegalArgumentException if length is negative
-     * @throws EOFException     if the number of bytes read was incorrect
+     * @throws EOFException             if the number of bytes read was incorrect
      * @since 2.2
      */
     public static void readFully(InputStream input, byte[] buffer) throws IOException {

core/src/main/java/com/mcxiaoke/next/utils/TrafficUtils.java

@@ -21,8 +21,8 @@ public abstract class TrafficUtils {
 
     public static final String TAG_SESSION = "session_traffic_info";
 
-    private static Map<String, Long> sReceivedBytes = new HashMap<String, Long>();
-    private static Map<String, Long> sSendBytes = new HashMap<String, Long>();
+    private static Map<String, Long> sReceivedBytes = new HashMap<>();
+    private static Map<String, Long> sSendBytes = new HashMap<>();
 
     private TrafficUtils() {
     }
@@ -59,7 +59,7 @@ public static long start(Context context, String tag) {
     public static long current(Context context, String tag) {
         Long appRxValue = sReceivedBytes.get(tag);
         Long appTxValue = sSendBytes.get(tag);
-        if (appRxValue == null || appRxValue == null) {
+        if (appRxValue == null || appTxValue == null) {
             if (DEBUG) {
                 LogUtils.w(TAG, "current() appRxValue or appTxValue is null.");
             }
@@ -87,7 +87,7 @@ public static long current(Context context, String tag) {
     public static long stop(Context context, String tag) {
         Long appRxValue = sReceivedBytes.remove(tag);
         Long appTxValue = sSendBytes.remove(tag);
-        if (appRxValue == null || appRxValue == null) {
+        if (appRxValue == null || appTxValue == null) {
             if (DEBUG) {
                 LogUtils.w(TAG, "stop() appRxValue or appTxValue is null.");
             }

core/src/main/java/com/mcxiaoke/next/utils/ZipUtils.java

@@ -35,15 +35,15 @@ public static class ZipDeCompressor {
         public void unzip(File file) throws ZipException, IOException {
 
             String fileName = file.getName();
-            int exindex = fileName.lastIndexOf(".");
-            String dirName = fileName.substring(0, exindex);
+            int extIndex = fileName.lastIndexOf(".");
+            String dirName = fileName.substring(0, extIndex);
 
             File toDir = new File(file.getParent(), dirName + "/");
 
             unzip(file, toDir);
         }
 
-        public void unzip(File file, File toDir) throws ZipException,
+        public void unzip(File file, File toDir) throws
                 IOException {
 
             toDir.mkdirs();
@@ -77,20 +77,16 @@ public void unzip(File file, File toDir) throws ZipException,
                         while ((len = bis.read(read)) != -1) {
                             bos.write(read, 0, len);
                         }
-                    } catch (FileNotFoundException e) {
-                        throw e;
-                    } catch (IOException e) {
-                        throw e;
                     } finally {
                         try {
                             if (bis != null)
                                 bis.close();
-                        } catch (IOException e) {
+                        } catch (IOException ignored) {
                         }
                         try {
                             if (bos != null)
                                 bos.close();
-                        } catch (IOException e) {
+                        } catch (IOException ignored) {
                         }
                     }
                 }