Switch to AutoClose instead of StreamUtils.

Change-Id: I07ed6c365c52470233ce2e56b262f6eb8456e874
Reviewed-on: http://gerrit.dmdirc.com/3791
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/plugins/PluginMetaData.java

@@ -25,7 +25,6 @@ package com.dmdirc.plugins;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
-import com.dmdirc.util.io.StreamUtils;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.File;
@@ -134,7 +133,7 @@ public class PluginMetaData {
         errors.clear();
         InputStream stream = null;
 
-        try {
+        try (InputStream steam = getStream()) {
             stream = getStream();
             final ConfigFile configFile = new ConfigFile(stream);
             configFile.read();
@@ -151,7 +150,6 @@ public class PluginMetaData {
             readExports(configFile.getFlatDomain("exports"));
         } catch (IOException | InvalidConfigFileException ex) {
             errors.add("Unable to read config file: " + ex.getMessage());
-            StreamUtils.close(stream);
         }
     }
 

src/com/dmdirc/tls/CertificateManager.java

@@ -27,7 +27,6 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.collections.ListenerList;
-import com.dmdirc.util.io.StreamUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -119,12 +118,9 @@ public class CertificateManager implements X509TrustManager {
      * Loads the trusted CA certificates from the Java cacerts store.
      */
     protected void loadTrustedCAs() {
-        FileInputStream is = null;
-
-        try {
-            final String filename = System.getProperty("java.home")
-                    + "/lib/security/cacerts".replace('/', File.separatorChar);
-            is = new FileInputStream(filename);
+        final String filename = System.getProperty("java.home")
+                + "/lib/security/cacerts".replace('/', File.separatorChar);
+        try (FileInputStream is = new FileInputStream(filename)) {
             final KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
             keystore.load(is, null);
 
@@ -135,8 +131,6 @@ public class CertificateManager implements X509TrustManager {
         } catch (CertificateException | IOException | InvalidAlgorithmParameterException |
                 KeyStoreException | NoSuchAlgorithmException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
-        } finally {
-            StreamUtils.close(is);
         }
     }
 
@@ -148,8 +142,8 @@ public class CertificateManager implements X509TrustManager {
      */
     public KeyManager[] getKeyManager() {
         if (config.hasOptionString("ssl", "clientcert.file")) {
-            FileInputStream fis = null;
-            try {
+            try (FileInputStream fis = new FileInputStream(config.getOption("ssl",
+                    "clientcert.file"))) {
                 final char[] pass;
 
                 if (config.hasOptionString("ssl", "clientcert.pass")) {
@@ -158,7 +152,6 @@ public class CertificateManager implements X509TrustManager {
                     pass = null;
                 }
 
-                fis = new FileInputStream(config.getOption("ssl", "clientcert.file"));
                 final KeyStore ks = KeyStore.getInstance("pkcs12");
                 ks.load(fis, pass);
 
@@ -171,8 +164,6 @@ public class CertificateManager implements X509TrustManager {
                 Logger.userError(ErrorLevel.MEDIUM, "Certificate file not found", ex);
             } catch (GeneralSecurityException | IOException ex) {
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
-            } finally {
-                StreamUtils.close(fis);
             }
         }
 

src/com/dmdirc/util/resourcemanager/FileResourceManager.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.util.resourcemanager;
 
-import com.dmdirc.util.io.StreamUtils;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -73,7 +71,6 @@ public final class FileResourceManager extends ResourceManager {
     /** {@inheritDoc} */
     @Override
     public byte[] getResourceBytes(final String resource) {
-        FileInputStream inputStream = null;
         final File file;
 
         if (resource.startsWith(basePath)) {
@@ -92,13 +89,10 @@ public final class FileResourceManager extends ResourceManager {
 
         final byte[] bytes = new byte[(int) file.length()];
 
-        try {
-            inputStream = new FileInputStream(file);
+        try (FileInputStream inputStream = new FileInputStream(file)) {
             inputStream.read(bytes);
         } catch (IOException ex) {
             return new byte[0];
-        } finally {
-            StreamUtils.close(inputStream);
         }
 
         return bytes;

src/com/dmdirc/util/resourcemanager/ResourceManager.java

@@ -24,7 +24,6 @@ package com.dmdirc.util.resourcemanager;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.io.StreamUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -107,14 +106,9 @@ public abstract class ResourceManager {
      */
     public final void resourceToFile(final byte[] resource, final File file)
             throws IOException {
-        FileOutputStream out = null;
-
-        try {
-            out = new FileOutputStream(file, false);
+        try (FileOutputStream out = new FileOutputStream(file, false)) {
             out.write(resource);
             out.flush();
-        } finally {
-            StreamUtils.close(out);
         }
     }
 

src/com/dmdirc/util/resourcemanager/ZipResourceManager.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.util.resourcemanager;
 
-import com.dmdirc.util.io.StreamUtils;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -110,8 +108,6 @@ public final class ZipResourceManager extends ResourceManager {
     @Override
     public byte[] getResourceBytes(final String resource) {
         final ZipEntry zipEntry = zipFile.getEntry(resource);
-        BufferedInputStream inputStream = null;
-
         if (zipEntry == null) {
             return new byte[0];
         }
@@ -122,17 +118,14 @@ public final class ZipResourceManager extends ResourceManager {
 
         final byte[] bytes = new byte[(int) zipEntry.getSize()];
 
-        try {
-            inputStream = new BufferedInputStream(zipFile.getInputStream(zipEntry));
-
+        try (BufferedInputStream inputStream = new BufferedInputStream(zipFile.getInputStream
+                (zipEntry))) {
             if (inputStream.read(bytes) != bytes.length) {
                 inputStream.close();
                 return new byte[0];
             }
         } catch (IOException ex) {
             return new byte[0];
-        } finally {
-            StreamUtils.close(inputStream);
         }
 
         return bytes;

test/com/dmdirc/logger/NullOutputStreamTest.java

@@ -21,13 +21,11 @@
  */
 package com.dmdirc.logger;
 
-import com.dmdirc.util.io.StreamUtils;
-
 import java.io.IOException;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
 
 public class NullOutputStreamTest {
 
@@ -35,14 +33,10 @@ public class NullOutputStreamTest {
     public void testWrite() {
         boolean exception = false;
 
-        final NullOutputStream os = new NullOutputStream();
-
-        try {
+        try (NullOutputStream os = new NullOutputStream()) {
             os.write(46);
         } catch (IOException ex) {
             exception = true;
-        } finally {
-            StreamUtils.close(os);
         }
 
         assertFalse(exception);