Changeset 31847 in osm for applications/editors/josm/plugins/wikipedia

Timestamp:

2015-12-22T18:51:31+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: use try-with-resource and utility URL methods

Location:

applications/editors/josm/plugins/wikipedia

Files:

• src/org/wikipedia/WikipediaApp.java (modified) (6 diffs)
• test/unit/org/wikipedia/WikipediaAppTest.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java

@@ -3 +3 @@
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -52 +53 @@
             final XPathExpression xpathCoord = XPathFactory.newInstance().newXPath().compile("Point/coordinates/text()");
             final XPathExpression xpathDescr = XPathFactory.newInstance().newXPath().compile("description");
-            Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new URL(url).openStream());
-            NodeList nodes = (NodeList) xpathPlacemark.evaluate(doc, XPathConstants.NODESET);
-            // construct WikipediaEntry for each XML element
-            List<WikipediaEntry> entries = new ArrayList<>(nodes.getLength());
-            for (int i = 0; i < nodes.getLength(); i++) {
-                final String[] coord = xpathCoord.evaluate(nodes.item(i)).split(",");
-                if (coord.length <= 2) {
-                    continue;
-                }
-                final String name = xpathName.evaluate(nodes.item(i));
-                final String descr = xpathDescr.evaluate(nodes.item(i));
-                entries.add(new WikipediaEntry(name, descr,
-                        new LatLon(Double.parseDouble(coord[1]), Double.parseDouble(coord[0]))));
-            }
-            return entries;
+            try (final InputStream in = Utils.openURL(new URL(url))) {
+                Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(in);
+                NodeList nodes = (NodeList) xpathPlacemark.evaluate(doc, XPathConstants.NODESET);
+                // construct WikipediaEntry for each XML element
+                List<WikipediaEntry> entries = new ArrayList<>(nodes.getLength());
+                for (int i = 0; i < nodes.getLength(); i++) {
+                    final String[] coord = xpathCoord.evaluate(nodes.item(i)).split(",");
+                    if (coord.length <= 2) {
+                        continue;
+                    }
+                    final String name = xpathName.evaluate(nodes.item(i));
+                    final String descr = xpathDescr.evaluate(nodes.item(i));
+                    entries.add(new WikipediaEntry(name, descr,
+                            new LatLon(Double.parseDouble(coord[1]), Double.parseDouble(coord[0]))));
+                }
+                return entries;
+            }
         } catch (Exception ex) {
             throw new RuntimeException(ex);
@@ -79 +82 @@
                     + "&cat=" + encodeURL(category);
             System.out.println("Wikipedia: GET " + url);
-            final Scanner scanner = new Scanner(new URL(url).openStream(), "UTF-8").useDelimiter("\n");
-            final List<WikipediaEntry> entries = new ArrayList<>();
-            while (scanner.hasNext()) {
-                final String article = scanner.next().trim().replace("_", " ");
-                entries.add(new WikipediaEntry(article, wikipediaLang, article));
-            }
-            return entries;
+            try (final InputStream in = Utils.openURL(new URL(url));
+                 final Scanner scanner = new Scanner(in, "UTF-8").useDelimiter("\n")) {
+                final List<WikipediaEntry> entries = new ArrayList<>();
+                while (scanner.hasNext()) {
+                    final String article = scanner.next().trim().replace("_", " ");
+                    entries.add(new WikipediaEntry(article, wikipediaLang, article));
+                }
+                return entries;
+            }
         } catch (IOException ex) {
             throw new RuntimeException(ex);
@@ -114 +119 @@
 
             try {
-                URLConnection connection = new URL(url).openConnection();
+                final HttpURLConnection connection = Utils.openHttpConnection(new URL(url));
                 connection.setDoOutput(true);
 
-                try (OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), "UTF-8")) {
+                try (final OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), "UTF-8")) {
                         out.write("articles=" + encodeURL(Utils.join(",", articleNames)));
                 }
 
-                final Scanner scanner = new Scanner(connection.getInputStream(), "UTF-8").useDelimiter("\n");
-                while (scanner.hasNext()) {
-                    //[article]\t[0|1]
-                    final String line = scanner.next();
-                    final String[] x = line.split("\t");
-                    if (x.length == 2) {
-                        status.put(x[0], "1".equals(x[1]));
-                    } else {
-                        Main.error("Unknown element " + line);
+                try (final Scanner scanner = new Scanner(connection.getInputStream(), "UTF-8").useDelimiter("\n")) {
+                    while (scanner.hasNext()) {
+                        //[article]\t[0|1]
+                        final String line = scanner.next();
+                        final String[] x = line.split("\t");
+                        if (x.length == 2) {
+                            status.put(x[0], "1".equals(x[1]));
+                        } else {
+                            Main.error("Unknown element " + line);
+                        }
                     }
                 }
@@ -170 +176 @@
                     "&format=xml";
             System.out.println("Wikipedia: GET " + url);
-            final Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new URL(url).openStream());
-            final NodeList nodes = (NodeList) XPathFactory.newInstance().newXPath().compile("//ll").evaluate(xml, XPathConstants.NODESET);
-            for (int i = 0; i < nodes.getLength(); i++) {
-                final String lang = nodes.item(i).getAttributes().getNamedItem("lang").getTextContent();
-                final String name = nodes.item(i).getTextContent();
-                r.add(new WikipediaLangArticle(lang, name));
+            try (final InputStream in = Utils.openURL(new URL(url))) {
+                final Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(in);
+                final NodeList nodes = (NodeList) XPathFactory.newInstance().newXPath().compile("//ll").evaluate(xml, XPathConstants.NODESET);
+                for (int i = 0; i < nodes.getLength(); i++) {
+                    final String lang = nodes.item(i).getAttributes().getNamedItem("lang").getTextContent();
+                    final String name = nodes.item(i).getTextContent();
+                    r.add(new WikipediaLangArticle(lang, name));
+                }
             }
             return r;
@@ -298 +306 @@
                         + "&article=" + encodeURL(wikipediaArticle);
                 System.out.println("Wikipedia: GET " + url);
-                final Scanner scanner = new Scanner(new URL(url).openStream(), "UTF-8");
-                wiwosmStatus = scanner.hasNextInt() && scanner.nextInt() == 1;
+                try (final InputStream in = Utils.openURL(new URL(url));
+                     final Scanner scanner = new Scanner(in, "UTF-8")) {
+                    wiwosmStatus = scanner.hasNextInt() && scanner.nextInt() == 1;
+                }
             } catch (IOException ex) {
                 throw new RuntimeException(ex);

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -1 +1 @@
 package org.wikipedia;
 
+import org.junit.Before;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.Predicate;
@@ -19 +21 @@
 
 public class WikipediaAppTest {
+    @Before
+    public void setUp() throws Exception {
+        Main.initApplicationPreferences();
+    }
 
     @Test