Cleanup - Use try-with-resources for automatic resource cleanup

This reduces boilerplate code.
jenkinsci · Feb 14, 2019 · a9aae82 · a9aae82
1 parent a5d1027
commit a9aae82
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/src/main/java/org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java b/src/main/java/org/jvnet/hudson/test/ExtractResourceWithChangesSCM.java
@@ -87,19 +87,15 @@ public boolean checkout(AbstractBuild<?,?> build, Launcher launcher, FilePath wo
         workspace.unzipFrom(secondZip.openStream());
 
         // Get list of files changed in secondZip.
-        ZipInputStream zip = new ZipInputStream(secondZip.openStream());
-        ZipEntry e;
         ExtractChangeLogParser.ExtractChangeLogEntry changeLog = new ExtractChangeLogParser.ExtractChangeLogEntry(secondZip.toString());
 
-        try {
+        try (ZipInputStream zip = new ZipInputStream(secondZip.openStream())) {
+            ZipEntry e;
             while ((e = zip.getNextEntry()) != null) {
                 if (!e.isDirectory())
                     changeLog.addFile(new ExtractChangeLogParser.FileInZip(e.getName()));
             }
         }
-        finally {
-            zip.close();
-        }
         saveToChangeLog(changeLogFile, changeLog);
 
         return true;

diff --git a/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -1068,12 +1068,9 @@ public JSONWebResponse postJSON(@Nonnull String path, @Nonnull Object json) thro
 
             byte[] content = json.toString().getBytes(UTF8);
             conn.setRequestProperty("Content-Length", String.valueOf(content.length));
-            final OutputStream os = conn.getOutputStream();
-            try {
+            try (OutputStream os = conn.getOutputStream()) {
                 os.write(content);
                 os.flush();
-            } finally {
-                os.close();
             }
 
             WebResponseData webResponseData;

diff --git a/src/main/java/org/jvnet/hudson/test/PropertiesTestSuite.java b/src/main/java/org/jvnet/hudson/test/PropertiesTestSuite.java
@@ -66,11 +66,8 @@ public synchronized Object put(Object key, Object value) {
                     return null;
                 }
             };
-            InputStream is = resource.openStream();
-            try {
+            try (InputStream is = resource.openStream()) {
                 props.load(is);
-            } finally {
-                is.close();
             }
         }
 

diff --git a/src/main/java/org/jvnet/hudson/test/TestPluginManager.java b/src/main/java/org/jvnet/hudson/test/TestPluginManager.java
@@ -114,8 +114,7 @@ private Set<String> loadBundledPlugins(File fromDir) throws IOException, URISynt
         // and copy them into $JENKINS_HOME/plugins.
         URL index = getClass().getResource("/test-dependencies/index");
         if (index!=null) {// if built with maven-hpi-plugin < 1.52 this file won't exist.
-            BufferedReader r = new BufferedReader(new InputStreamReader(index.openStream(), StandardCharsets.UTF_8));
-            try {
+            try (BufferedReader r = new BufferedReader(new InputStreamReader(index.openStream(), StandardCharsets.UTF_8))) {
                 String line;
                 while ((line=r.readLine())!=null) {
                 	final URL url = new URL(index, line + ".jpi");
@@ -140,8 +139,6 @@ private Set<String> loadBundledPlugins(File fromDir) throws IOException, URISynt
                 		copyBundledPlugin(new URL(index, line + ".hpi"), line + ".jpi"); // fallback to hpi
                 	}
                 }
-            } finally {
-                r.close();
             }
         }