Changeset 10294 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-05-29T00:14:28+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1848 - refactor URL checks

File:

• trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.oauth;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Objects;
 
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.OAuthProvider;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
+
+import oauth.signpost.OAuthConsumer;
+import oauth.signpost.OAuthProvider;
 
 /**
@@ -52 +52 @@
         final String serverUrl;
 
-        if (apiUrl != null) {
-            // validate URL syntax
-            try {
-                new URL(apiUrl);
-            } catch (MalformedURLException e) {
-                apiUrl = null;
-            }
+        if (!Utils.isValidUrl(apiUrl)) {
+            apiUrl = null;
         }