Changeset 10294 in josm

Timestamp:

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

Author:

Don-vip

Message:

sonar - squid:S1848 - refactor URL checks

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/oauth/OAuthParameters.java (modified) (2 diffs)
• gui/dialogs/changeset/query/UrlBasedQueryPanel.java (modified) (1 diff)
• gui/preferences/server/OsmApiUrlInputPanel.java (modified) (2 diffs)
• plugins/PluginInformation.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

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;
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java

@@ -134 +134 @@
         }
         String path = url.getPath();
-        String query = url.getQuery();
         if (path == null || !path.endsWith("/changesets"))
             return null;
 
         try {
-            return ChangesetQuery.buildFromUrlQuery(query);
+            return ChangesetQuery.buildFromUrlQuery(url.getQuery());
         } catch (ChangesetQueryUrlException e) {
             Main.warn(e.getMessage());

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

@@ -14 +14 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Arrays;
 
@@ -258 +256 @@
             if (getComponent().getText().trim().isEmpty())
                 return false;
-
-            try {
-                new URL(getComponent().getText().trim());
-                return true;
-            } catch (MalformedURLException e) {
-                return false;
-            }
+            return Utils.isValidUrl(getComponent().getText().trim());
         }
 

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -12 +12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
@@ -206 +205 @@
             s = attr.getValue("Plugin-Link");
         }
-        if (s != null) {
-            try {
-                new URL(s);
-            } catch (MalformedURLException e) {
-                Main.info(tr("Invalid URL ''{0}'' in plugin {1}", s, name));
-                s = null;
-            }
+        if (s != null && !Utils.isValidUrl(s)) {
+            Main.info(tr("Invalid URL ''{0}'' in plugin {1}", s, name));
+            s = null;
         }
         link = s;

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

@@ -1324 +1324 @@
 
     /**
+     * Determines if the given URL is valid.
+     * @param url The URL to test
+     * @return {@code true} if the url is valid
+     * @since 10294
+     */
+    public static boolean isValidUrl(String url) {
+        try {
+            new URL(url);
+            return true;
+        } catch (MalformedURLException | NullPointerException e) {
+            return false;
+        }
+    }
+
+    /**
      * Creates a new {@link ThreadFactory} which creates threads with names according to {@code nameFormat}.
      * @param nameFormat a {@link String#format(String, Object...)} compatible name format; its first argument is a unique thread index