Changeset 7473 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

Timestamp:

2014-08-31T01:30:58+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10441 - send capabilities request instead of changesets request when testing API url

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

@@ -11 +11 @@
 
 import javax.swing.JOptionPane;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.openstreetmap.josm.Main;
@@ -16 +17 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.OsmChangesetParser;
+import org.openstreetmap.josm.io.Capabilities;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
  * This is an asynchronous task for testing whether an URL points to an OSM API server.
- * It tries to retrieve a list of changesets from the given URL. If it succeeds, the method
+ * It tries to retrieve capabilities from the given URL. If it succeeds, the method
  * {@link #isSuccess()} replies true, otherwise false.
- *
- * Note: it fetches a list of changesets instead of the much smaller capabilities because - strangely enough -
- * an OSM server "https://x.y.y/api/0.6" not only responds to  "https://x.y.y/api/0.6/capabilities" but also
- * to "https://x.y.y/api/0/capabilities" or "https://x.y.y/a/capabilities" with valid capabilities. If we get
- * valid capabilities with an URL we therefore can't be sure that the base URL is valid API URL.
  * @since 2745
  */
@@ -71 +67 @@
     }
 
-    protected void alertInvalidChangesetUrl(String url) {
+    protected void alertInvalidCapabilitiesUrl(String url) {
         HelpAwareOptionPane.showMessageDialogInEDT(
                 parent,
@@ -120 +116 @@
     }
 
-    protected void alertInvalidChangesetList() {
+    protected void alertInvalidCapabilities() {
         HelpAwareOptionPane.showMessageDialogInEDT(
                 parent,
@@ -150 +146 @@
 
     /**
-     * Removes leading and trailing whitespace from the API URL and removes trailing
-     * '/'.
+     * Removes leading and trailing whitespace from the API URL and removes trailing '/'.
      *
      * @return the normalized API URL
@@ -173 +168 @@
             }
             URL capabilitiesUrl;
-            String getChangesetsUrl = getNormalizedApiUrl() + "/0.6/changesets";
+            String getCapabilitiesUrl = getNormalizedApiUrl() + "/0.6/capabilities";
             try {
-                capabilitiesUrl = new URL(getChangesetsUrl);
+                capabilitiesUrl = new URL(getCapabilitiesUrl);
             } catch(MalformedURLException e) {
-                alertInvalidChangesetUrl(getChangesetsUrl);
+                alertInvalidCapabilitiesUrl(getCapabilitiesUrl);
                 return;
             }
@@ -195 +190 @@
 
             try {
-                OsmChangesetParser.parse(connection.getInputStream(), progressMonitor.createSubTaskMonitor(1, true));
-            } catch (IllegalDataException e) {
-                if (e.getCause() instanceof IOException) {
-                    throw (IOException) e.getCause();
-                } else {
-                    Main.warn(e.getMessage());
-                    alertInvalidChangesetList();
-                    return;
-                }
+                Capabilities.CapabilitiesParser.parse(new InputSource(connection.getInputStream()));
+            } catch (SAXException | ParserConfigurationException e) {
+                Main.warn(e.getMessage());
+                alertInvalidCapabilities();
+                return;
             }
             success = true;