Changeset 15261 in josm for trunk/src/org

Timestamp:

2019-07-23T14:39:03+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17935 - fix bad HTTP request construction when contacting OSM wiki

File:

• trunk/src/org/openstreetmap/josm/tools/Mediawiki.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Mediawiki.java

@@ -46 +46 @@
     public Optional<String> findExistingPage(List<String> pages)
             throws IOException, ParserConfigurationException, SAXException, XPathExpressionException {
+        List<String> distinctPages = pages.stream().distinct().collect(Collectors.toList());
         // find a page that actually exists in the wiki
         // API documentation: https://wiki.openstreetmap.org/w/api.php?action=help&modules=query
-        final URL url = new URL(baseUrl + "/w/api.php?action=query&format=xml&titles=" + pages.stream()
+        final URL url = new URL(baseUrl + "/w/api.php?action=query&format=xml&titles=" + distinctPages.stream()
                 .map(Utils::encodeUrl)
-                .collect(Collectors.joining("|"))
+                .collect(Collectors.joining(Utils.encodeUrl("|")))
         );
         final HttpClient.Response conn = HttpClient.create(url).connect();
@@ -59 +60 @@
         conn.disconnect();
         final XPath xPath = XPathFactory.newInstance().newXPath();
-        for (String page : pages) {
+        for (String page : distinctPages) {
             String normalized = xPath.evaluate("/api/query/normalized/n[@from='" + page + "']/@to", document);
             if (normalized == null || normalized.isEmpty()) {