Changeset 13204 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2017-12-17T00:17:20+01:00 (3 years ago)

Author:

Don-vip

Message:

enable new PMD rule AvoidFileStream - see ​https://pmd.github.io/pmd-6.0.0/pmd_rules_java_performance.html#avoidfilestream / ​https://bugs.openjdk.java.net/browse/JDK-8080225 for details

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginInformation.java (modified) (3 diffs)
• ReadLocalPluginInformationTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -114 +115 @@
         this.file = file;
         try (
-            FileInputStream fis = new FileInputStream(file);
+            InputStream fis = Files.newInputStream(file.toPath());
             JarInputStream jar = new JarInputStream(fis)
         ) {
@@ -122 +123 @@
             scanManifest(manifest, false);
             libraries.add(0, Utils.fileToURL(file));
-        } catch (IOException e) {
+        } catch (IOException | InvalidPathException e) {
             throw new PluginException(name, e);
         }

trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -145 +147 @@
 
     protected void processLocalPluginInformationFile(File file) throws PluginListParseException {
-        try (FileInputStream fin = new FileInputStream(file)) {
+        try (InputStream fin = Files.newInputStream(file.toPath())) {
             List<PluginInformation> pis = new PluginListParser().parse(fin);
             for (PluginInformation pi : pis) {
@@ -154 +156 @@
                 availablePlugins.put(pi.name, pi);
             }
-        } catch (IOException e) {
+        } catch (IOException | InvalidPathException e) {
             throw new PluginListParseException(e);
         }