Use try with resources

Author: Gintas Grigelionis

src/java/org/apache/ivy/ant/IvyReport.java

@@ -308,10 +308,8 @@ private void genStyled(String[] confs, File style, String ext) throws IOExceptio
             out = getProject().getBaseDir();
         }
 
-        InputStream xsltStream = null;
-        try {
+        try (InputStream xsltStream = new BufferedInputStream(new FileInputStream(style))) {
             // create stream to stylesheet
-            xsltStream = new BufferedInputStream(new FileInputStream(style));
             Source xsltSource = new StreamSource(xsltStream, JAXPUtils.getSystemId(style));
 
             // create transformer
@@ -372,14 +370,6 @@ private void genStyled(String[] confs, File style, String ext) throws IOExceptio
             }
         } catch (TransformerConfigurationException e) {
             throw new BuildException(e);
-        } finally {
-            if (xsltStream != null) {
-                try {
-                    xsltStream.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
         }
     }
 

src/java/org/apache/ivy/core/pack/ZipPacking.java

@@ -73,15 +73,8 @@ public void unpack(InputStream packed, File dest) throws IOException {
     }
 
     protected void writeFile(InputStream zip, File f) throws IOException {
-        FileOutputStream out = new FileOutputStream(f);
-        try {
+        try (FileOutputStream out = new FileOutputStream(f)) {
             FileUtil.copy(zip, out, null, false);
-        } finally {
-            try {
-                out.close();
-            } catch (IOException e) {
-                // ignore
-            }
         }
     }
 

src/java/org/apache/ivy/core/settings/XmlSettingsParser.java

@@ -151,9 +151,7 @@ public File resolveFile(String path, String filename) {
     @SuppressWarnings("deprecation")
     private void doParse(URL settingsUrl) throws IOException, ParseException {
         this.settings = settingsUrl;
-        InputStream stream = null;
-        try {
-            stream = URLHandlerRegistry.getDefault().openStream(settingsUrl);
+        try (InputStream stream = URLHandlerRegistry.getDefault().openStream(settingsUrl)) {
             InputSource inSrc = new InputSource(stream);
             inSrc.setSystemId(settingsUrl.toExternalForm());
             SAXParserFactory.newInstance().newSAXParser().parse(settingsUrl.toExternalForm(), this);
@@ -165,14 +163,6 @@ private void doParse(URL settingsUrl) throws IOException, ParseException {
                     + ": " + e.getMessage(), 0);
             pe.initCause(e);
             throw pe;
-        } finally {
-            if (stream != null) {
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                    // ignored
-                }
-            }
         }
     }
 

src/java/org/apache/ivy/osgi/core/ManifestParser.java

@@ -87,15 +87,8 @@ public static BundleInfo parseJarManifest(InputStream jarStream) throws IOExcept
     }
 
     public static BundleInfo parseManifest(File manifestFile) throws IOException, ParseException {
-        FileInputStream fis = new FileInputStream(manifestFile);
-        try {
+        try (FileInputStream fis = new FileInputStream(manifestFile)) {
             return parseManifest(fis);
-        } finally {
-            try {
-                fis.close();
-            } catch (IOException e) {
-                // ignore
-            }
         }
     }
 

src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java

@@ -61,16 +61,9 @@ public boolean accept(Resource res) {
 
     public ModuleDescriptor parseDescriptor(ParserSettings ivySettings, URL descriptorURL,
             Resource res, boolean validate) throws ParseException, IOException {
-        final InputStream resourceStream = res.openStream();
         final Manifest manifest;
-        try {
+        try (InputStream resourceStream = res.openStream()) {
             manifest = new Manifest(resourceStream);
-        } finally {
-            try {
-                resourceStream.close();
-            } catch (Exception e) {
-                // ignore
-            }
         }
         BundleInfo bundleInfo = ManifestParser.parseManifest(manifest);
         try {

src/java/org/apache/ivy/osgi/repo/AbstractFSManifestIterable.java

@@ -101,9 +101,7 @@ public boolean hasNext() {
                     }
                 } else if (bundleCandidates.hasNext()) {
                     T bundleCandidate = bundleCandidates.next();
-                    JarInputStream in = null;
-                    try {
-                        in = new JarInputStream(getInputStream(bundleCandidate));
+                    try (JarInputStream in = new JarInputStream(getInputStream(bundleCandidate))) {
                         Manifest manifest = in.getManifest();
                         if (manifest != null) {
                             next = new ManifestAndLocation(manifest,
@@ -115,14 +113,6 @@ public boolean hasNext() {
                         Message.debug("Jar file just removed: " + bundleCandidate, e);
                     } catch (IOException e) {
                         Message.warn("Unreadable jar: " + bundleCandidate, e);
-                    } finally {
-                        if (in != null) {
-                            try {
-                                in.close();
-                            } catch (IOException e) {
-                                // Don't care
-                            }
-                        }
                     }
                 } else {
                     // no more candidate on the current directory

src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java

@@ -94,27 +94,17 @@ public boolean hasNext() {
                     }
                 }
                 if (jar.getUnpackedLocalFile() != null && jar.getUnpackedLocalFile().isDirectory()) {
-                    FileInputStream in = null;
-                    try {
-                        in = new FileInputStream(new File(jar.getUnpackedLocalFile(),
-                                "META-INF/MANIFEST.MF"));
+                    try (FileInputStream in = new FileInputStream(new File(jar.getUnpackedLocalFile(),
+                            "META-INF/MANIFEST.MF"))) {
                         next = new ManifestAndLocation(new Manifest(in), jar.getUnpackedLocalFile()
                                 .toURI(), sourceURI);
                         return true;
                     } catch (FileNotFoundException e) {
                         Message.debug(
-                            "Bundle directory file just removed: " + jar.getUnpackedLocalFile(), e);
+                                "Bundle directory file just removed: " + jar.getUnpackedLocalFile(), e);
                     } catch (IOException e) {
                         Message.debug("The Manifest in the bundle directory could not be read: "
                                 + jar.getUnpackedLocalFile(), e);
-                    } finally {
-                        if (in != null) {
-                            try {
-                                in.close();
-                            } catch (IOException e) {
-                                // ignore
-                            }
-                        }
                     }
                 } else {
                     File artifact;

src/java/org/apache/ivy/util/CredentialsUtil.java

@@ -111,20 +111,10 @@ public static Credentials promptCredentials(Credentials c, File passfile) {
                 Properties props = new EncryptedProperties();
                 props.setProperty("username", username);
                 props.setProperty("passwd", passwd);
-                FileOutputStream fos = null;
-                try {
-                    fos = new FileOutputStream(passfile);
+                try (FileOutputStream fos = new FileOutputStream(passfile)) {
                     props.store(fos, "");
                 } catch (Exception e) {
                     Message.warn("error occurred while saving password file " + passfile, e);
-                } finally {
-                    if (fos != null) {
-                        try {
-                            fos.close();
-                        } catch (Exception e) {
-                            // ignored
-                        }
-                    }
                 }
             }
             c = new Credentials(c.getRealm(), c.getHost(), username, passwd);
@@ -135,9 +125,7 @@ public static Credentials promptCredentials(Credentials c, File passfile) {
     public static Credentials loadPassfile(Credentials c, File passfile) {
         if (passfile != null && passfile.exists()) {
             Properties props = new EncryptedProperties();
-            FileInputStream fis = null;
-            try {
-                fis = new FileInputStream(passfile);
+            try (FileInputStream fis = new FileInputStream(passfile)) {
                 props.load(fis);
                 String username = c.getUserName();
                 String passwd = c.getPasswd();
@@ -150,14 +138,6 @@ public static Credentials loadPassfile(Credentials c, File passfile) {
                 return new Credentials(c.getRealm(), c.getHost(), username, passwd);
             } catch (IOException e) {
                 Message.warn("error occurred while loading password file " + passfile, e);
-            } finally {
-                if (fis != null) {
-                    try {
-                        fis.close();
-                    } catch (IOException e) {
-                        // ignored
-                    }
-                }
             }
         }
         return c;

src/java/org/apache/ivy/util/XMLHelper.java

@@ -119,17 +119,10 @@ public static void parse(URL xmlURL, URL schema, DefaultHandler handler) throws
     @SuppressWarnings("deprecation")
     public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
             throws SAXException, IOException, ParserConfigurationException {
-        InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL);
-        try {
+        try (InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL)) {
             InputSource inSrc = new InputSource(xmlStream);
             inSrc.setSystemId(toSystemId(xmlURL));
             parse(inSrc, schema, handler, lHandler);
-        } finally {
-            try {
-                xmlStream.close();
-            } catch (IOException e) {
-                // ignored
-            }
         }
     }
 

src/java/org/apache/ivy/util/url/BasicURLHandler.java

@@ -347,22 +347,12 @@ private void disconnect(URLConnection con) {
     private void readResponseBody(HttpURLConnection conn) {
         byte[] buffer = new byte[BUFFER_SIZE];
 
-        InputStream inStream = null;
-        try {
-            inStream = conn.getInputStream();
+        try (InputStream inStream = conn.getInputStream()) {
             while (inStream.read(buffer) > 0) {
                 // Skip content
             }
         } catch (IOException e) {
             // ignore
-        } finally {
-            if (inStream != null) {
-                try {
-                    inStream.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
         }
 
         InputStream errStream = conn.getErrorStream();