Use more try-with-resources

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/RenderReportsCmd.java

@@ -32,7 +32,6 @@
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
 import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
-import net.sourceforge.pmd.eclipse.util.IOUtil;
 import net.sourceforge.pmd.renderers.Renderer;
 
 /**
@@ -87,18 +86,16 @@ public void registerRenderer(Renderer renderer, String reportFile) {
     private void render(Report report, IFolder folder, String reportName, Renderer renderer)
             throws IOException, CoreException {
 
-        StringWriter writer = new StringWriter();
         String reportString = null;
 
-        try {
+        try (StringWriter writer = new StringWriter()) {
             renderer.setWriter(writer);
             renderer.start();
             renderer.renderFileReport(report);
             renderer.end();
+            renderer.flush();
 
             reportString = writer.toString();
-        } finally {
-            IOUtil.closeQuietly(writer);
         }
 
         if (StringUtils.isBlank(reportString)) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesImpl.java

@@ -31,7 +31,6 @@
 
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.eclipse.core.internal.FileModificationUtil;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.cmd.JavaProjectClassLoader;
@@ -42,7 +41,6 @@
 import net.sourceforge.pmd.eclipse.runtime.writer.WriterException;
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
 import net.sourceforge.pmd.eclipse.ui.actions.internal.InternalRuleSetUtil;
-import net.sourceforge.pmd.eclipse.util.IOUtil;
 
 /**
  * Implementation of a project properties information structure
@@ -146,7 +144,7 @@ public void setPmdEnabled(final boolean pmdEnabled) {
      */
     @Deprecated
     @Override
-    public RuleSets getProjectRuleSets() throws PropertiesException {
+    public net.sourceforge.pmd.RuleSets getProjectRuleSets() throws PropertiesException {
         return InternalRuleSetUtil.toRuleSets(projectRuleSets);
     }
 
@@ -170,7 +168,7 @@ public void setProjectRuleSet(RuleSet projectRuleSet) throws PropertiesException
      */
     @Override
     @Deprecated
-    public void setProjectRuleSets(final RuleSets newProjectRuleSets) throws PropertiesException {
+    public void setProjectRuleSets(final net.sourceforge.pmd.RuleSets newProjectRuleSets) throws PropertiesException {
         setProjectRuleSetList(Arrays.asList(newProjectRuleSets.getAllRuleSets()));
     }
 
@@ -357,11 +355,8 @@ private File getExistingFileOrNull(IFile file) {
     @Override
     public void createDefaultRuleSetFile() throws PropertiesException {
         LOG.info("Create a default rule set file for project " + this.project.getName());
-        ByteArrayOutputStream baos = null;
-        ByteArrayInputStream bais = null;
-        try {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
             IRuleSetWriter writer = PMDPlugin.getDefault().getRuleSetWriter();
-            baos = new ByteArrayOutputStream();
 
             // create a single ruleset from all the rulesets
             // the ruleset writer is only capable of writing one ruleset
@@ -378,14 +373,12 @@ public void createDefaultRuleSetFile() throws PropertiesException {
             if (file.exists() && file.isAccessible()) {
                 throw new PropertiesException("Project ruleset file already exists");
             } else {
-                bais = new ByteArrayInputStream(baos.toByteArray());
-                file.create(bais, true, null);
+                try (ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray())) {
+                    file.create(bais, true, null);
+                }
             }
-        } catch (WriterException | CoreException e) {
+        } catch (IOException | WriterException | CoreException e) {
             throw new PropertiesException("Error while creating default ruleset file for project " + this.project.getName(), e);
-        } finally {
-            IOUtil.closeQuietly(baos);
-            IOUtil.closeQuietly(bais);
         }
     }
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/actions/PMDGenerateASTAction.java

@@ -33,7 +33,6 @@
 import net.sourceforge.pmd.eclipse.runtime.writer.IAstWriter;
 import net.sourceforge.pmd.eclipse.runtime.writer.WriterException;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-import net.sourceforge.pmd.eclipse.util.IOUtil;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersionHandler;
@@ -78,14 +77,12 @@ public void run(IAction action) {
      */
     private void generateAST(IFile file) {
         LOG.info("Generating AST for file " + file.getName());
-        ByteArrayOutputStream byteArrayOutputStream = null;
-        ByteArrayInputStream astInputStream = null;
-        try (Reader reader = new InputStreamReader(file.getContents(), file.getCharset())) {
+        try (Reader reader = new InputStreamReader(file.getContents(), file.getCharset());
+                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();) {
             Language javaLanguage = LanguageRegistry.getLanguage(JavaLanguageModule.NAME);
             LanguageVersionHandler languageVersionHandler = javaLanguage.getDefaultVersion().getLanguageVersionHandler();
             Parser parser = languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions());
             ASTCompilationUnit compilationUnit = (ASTCompilationUnit) parser.parse(file.getName(), reader);
-            byteArrayOutputStream = new ByteArrayOutputStream();
             IAstWriter astWriter = PMDPlugin.getDefault().getAstWriter();
             astWriter.write(byteArrayOutputStream, compilationUnit);
             byteArrayOutputStream.flush();
@@ -96,8 +93,9 @@ private void generateAST(IFile file) {
                 if (astFile.exists()) {
                     astFile.delete(false, null);
                 }
-                astInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-                astFile.create(astInputStream, false, null);
+                try (ByteArrayInputStream astInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray())) {
+                    astFile.create(astInputStream, false, null);
+                }
             }
 
         } catch (CoreException e) {
@@ -106,9 +104,6 @@ private void generateAST(IFile file) {
             showErrorById(StringKeys.ERROR_PMD_EXCEPTION, e);
         } catch (IOException e) {
             showErrorById(StringKeys.ERROR_IO_EXCEPTION, e);
-        } finally {
-            IOUtil.closeQuietly(byteArrayOutputStream);
-            IOUtil.closeQuietly(astInputStream);
         }
     }