Repository: karaf Updated Branches: refs/heads/master 4888b6a17 -> 1850106fb
[KARAF-5170] Use try-with-resources Signed-off-by: Stephen Kitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c7eb8acf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c7eb8acf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c7eb8acf Branch: refs/heads/master Commit: c7eb8acf1dc688432e5ab0ac79037c4915f345a7 Parents: 4888b6a Author: Stephen Kitt <[email protected]> Authored: Wed May 31 15:33:56 2017 -0700 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jun 1 08:05:15 2017 +0200 ---------------------------------------------------------------------- .../bundle/core/internal/BundleWatcherImpl.java | 5 +---- .../features/FeatureDeploymentListener.java | 10 ++-------- .../deployer/wrap/WrapDeploymentListener.java | 5 +---- .../core/internal/InstanceServiceImplTest.java | 10 ++-------- .../karaf/obr/command/ObrCommandSupport.java | 10 ++-------- .../karaf/shell/impl/console/standalone/Main.java | 5 +---- .../tooling/features/GenerateDescriptorMojo.java | 17 ++++------------- 7 files changed, 13 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java ---------------------------------------------------------------------- diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java index f2a11de..f53db23 100644 --- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java +++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundleWatcherImpl.java @@ -155,8 +155,7 @@ public class BundleWatcherImpl implements Runnable, BundleListener, BundleWatche throws BundleException, IOException { File location = getBundleExternalLocation(localRepository, bundle); if (location != null && location.exists() && location.lastModified() > bundle.getLastModified()) { - InputStream is = new FileInputStream(location); - try { + try (InputStream is = new FileInputStream(location)) { logger.info("[Watch] Updating watched bundle: {} ({})", bundle.getSymbolicName(), bundle.getVersion()); if (bundle.getHeaders().get(Constants.FRAGMENT_HOST) != null) { logger.info("[Watch] Bundle {} is a fragment, so it's not stopped", bundle.getSymbolicName()); @@ -175,8 +174,6 @@ public class BundleWatcherImpl implements Runnable, BundleListener, BundleWatche bundle.update(is); } updated.add(bundle); - } finally { - is.close(); } } } http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java ---------------------------------------------------------------------- diff --git a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java index 2c5bd3d..733d585 100644 --- a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java +++ b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java @@ -129,11 +129,8 @@ public class FeatureDeploymentListener implements ArtifactUrlTransformer, Bundle File file = getPropertiesFile(); if (file != null) { if (file.exists()) { - InputStream input = new FileInputStream(file); - try { + try (InputStream input = new FileInputStream(file)) { properties.load(input); - } finally { - input.close(); } } } @@ -142,11 +139,8 @@ public class FeatureDeploymentListener implements ArtifactUrlTransformer, Bundle private void saveProperties() throws IOException { File file = getPropertiesFile(); if (file != null) { - OutputStream output = new FileOutputStream(file); - try { + try (OutputStream output = new FileOutputStream(file)) { properties.store(output, null); - } finally { - output.close(); } } } http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java ---------------------------------------------------------------------- diff --git a/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java b/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java index 7e0840f..c02a8dc 100644 --- a/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java +++ b/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java @@ -37,8 +37,7 @@ public class WrapDeploymentListener implements ArtifactUrlTransformer { if (!artifact.getPath().endsWith(".jar")) { return false; } - JarFile jar = new JarFile(artifact); - try { + try (JarFile jar = new JarFile(artifact)) { // only handle non OSGi jar Manifest manifest = jar.getManifest(); if (manifest != null && @@ -47,8 +46,6 @@ public class WrapDeploymentListener implements ArtifactUrlTransformer { return false; } return true; - } finally { - jar.close(); } } catch (Exception e) { return false; http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java ---------------------------------------------------------------------- diff --git a/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java b/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java index 24f6ac5..fd56656 100644 --- a/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java +++ b/instance/src/test/java/org/apache/karaf/instance/core/internal/InstanceServiceImplTest.java @@ -63,22 +63,16 @@ public class InstanceServiceImplTest { Properties p = new Properties(); p.put("featuresBoot", "abc,def "); p.put("featuresRepositories", "somescheme://xyz"); - OutputStream os = new FileOutputStream(f); - try { + try (OutputStream os = new FileOutputStream(f)) { p.store(os, "Test comment"); - } finally { - os.close(); } InstanceSettings s = new InstanceSettings(8122, 1122, 44444, null, null, null, Arrays.asList("test")); as.addFeaturesFromSettings(f, s); Properties p2 = new Properties(); - InputStream is = new FileInputStream(f); - try { + try (InputStream is = new FileInputStream(f)) { p2.load(is); - } finally { - is.close(); } assertEquals(2, p2.size()); assertEquals("abc,def,test", p2.get("featuresBoot")); http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java b/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java index 004a52b..5cd6262 100644 --- a/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java +++ b/obr/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java @@ -239,12 +239,10 @@ public abstract class ObrCommandSupport implements Action { File sys = new File(etc, "config.properties"); File sysTmp = new File(etc, "config.properties.tmp"); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(sysTmp))); boolean modified = false; - try { + try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(sysTmp)))) { if (sys.exists()) { - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(sys))); - try { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(sys)))) { String line = reader.readLine(); while (line != null) { if (line.matches("obr\\.repository\\.url[:= ].*")) { @@ -255,8 +253,6 @@ public abstract class ObrCommandSupport implements Action { writer.newLine(); line = reader.readLine(); } - } finally { - reader.close(); } } if (!modified) { @@ -271,8 +267,6 @@ public abstract class ObrCommandSupport implements Action { writer.newLine(); writer.newLine(); } - } finally { - writer.close(); } sys.delete(); http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java index e3be511..b37178a 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java @@ -108,14 +108,11 @@ public class Main { } if (file != null) { - Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file))); - try { + try (Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) { sb.setLength(0); for (int c = reader.read(); c >= 0; c = reader.read()) { sb.append((char) c); } - } finally { - reader.close(); } } else if (batch) { Reader reader = new BufferedReader(new InputStreamReader(System.in)); http://git-wip-us.apache.org/repos/asf/karaf/blob/c7eb8acf/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java index c9349ff..74768c7 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java @@ -339,11 +339,8 @@ public class GenerateDescriptorMojo extends MojoSupport { this.treeListing = dependencyHelper.getTreeListing(); File dir = outputFile.getParentFile(); if (dir.isDirectory() || dir.mkdirs()) { - PrintStream out = new PrintStream(new FileOutputStream(outputFile)); - try { + try (PrintStream out = new PrintStream(new FileOutputStream(outputFile))) { writeFeatures(out); - } finally { - out.close(); } // now lets attach it projectHelper.attachArtifact(project, attachmentArtifactType, attachmentArtifactClassifier, outputFile); @@ -894,11 +891,8 @@ public class GenerateDescriptorMojo extends MojoSupport { if (!file.getParentFile().exists() || !file.getParentFile().isDirectory()) { throw new IOException("Cannot create directory at " + file.getParent()); } - FileOutputStream out = new FileOutputStream(file); - try { + try (OutputStream out = new FileOutputStream(file)) { JaxbUtil.marshal(features, out); - } finally { - out.close(); } } @@ -932,12 +926,9 @@ public class GenerateDescriptorMojo extends MojoSupport { protected String saveTreeListing() throws IOException { File treeListFile = new File(filteredDependencyCache.getParentFile(), "treeListing.txt"); - OutputStream os = new FileOutputStream(treeListFile); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os)); - try { + try (OutputStream os = new FileOutputStream(treeListFile); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os))) { writer.write(treeListing); - } finally { - writer.close(); } return "\tTree listing is saved here: " + treeListFile.getAbsolutePath() + "\n"; }
