Changeset 19662 in josm

Timestamp:

2026-10-24T13:43:40+02:00 (less than one hour ago)

Author:

stoecker

Message:

fix #24970 - patch by DanProgs (modified) - fix sonar issues

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.server;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -8 +9 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 
@@ -38 +40 @@
     private final Component parent;
     private HttpClient connection;
+
+    private static final String CONNECTION_FAILED_MSG = marktr("Connection to API failed");
 
     /**
@@ -94 +98 @@
                         url
                 ),
-                tr("Connection to API failed"),
+                tr(CONNECTION_FAILED_MSG),
                 JOptionPane.ERROR_MESSAGE,
                 HelpUtil.ht("/Preferences/Connection#ConnectionToAPIFailed")
@@ -111 +115 @@
                         url
                 ),
-                tr("Connection to API failed"),
+                tr(CONNECTION_FAILED_MSG),
                 JOptionPane.ERROR_MESSAGE,
                 HelpUtil.ht("/Preferences/Connection#InvalidServerResult")
@@ -127 +131 @@
                         url
                 ),
-                tr("Connection to API failed"),
+                tr(CONNECTION_FAILED_MSG),
                 JOptionPane.ERROR_MESSAGE,
                 HelpUtil.ht("/Preferences/Connection#InvalidSettings")
@@ -152 +156 @@
         try {
             try {
-                new URL(url);
-            } catch (MalformedURLException e) {
+                URI.create(url).toURL();
+            } catch (IllegalArgumentException | MalformedURLException e) {
                 alertInvalidUrl(url);
                 return;
             }
-            URL capabilitiesUrl;
-            String getCapabilitiesUrl = url + "/0.6/capabilities";
+            final URL capabilitiesUrl;
+            final String getCapabilitiesUrl = url + "/0.6/capabilities";
             try {
-                capabilitiesUrl = new URL(getCapabilitiesUrl);
-            } catch (MalformedURLException e) {
+                capabilitiesUrl = URI.create(getCapabilitiesUrl).toURL();
+            } catch (IllegalArgumentException | MalformedURLException e) {
                 alertInvalidCapabilitiesUrl(getCapabilitiesUrl);
                 return;
@@ -171 +175 @@
             }
 
-            if (connection.getResponse().getResponseCode() != HttpURLConnection.HTTP_OK) {
-                alertInvalidServerResult(connection.getResponse().getResponseCode());
+            final int responseCode = connection.getResponse().getResponseCode();
+            if (responseCode  != HttpURLConnection.HTTP_OK) {
+                alertInvalidServerResult(responseCode );
                 return;
             }
@@ -185 +190 @@
             success = true;
         } catch (IOException e) {
-            if (canceled)
+            if (canceled) {
                 // ignore exceptions
                 return;
+            }
             Logging.error(e);
             alertConnectionFailed();