Centralize logic to check for invalid URLs

Author: jschroeder-avi

src/main/java/com/codedx/bambooplugin/CodeDxScanTask.java

@@ -16,8 +16,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -148,9 +146,7 @@ private static Boolean loadUserPreferences(ScanTaskState state) {
                 logError(state, "Missing Code Dx URL.  Please configure it on the task configuration page.");
                 return false;
             } else {
-                try {
-                    new URL(state.apiUrl);
-                } catch (MalformedURLException e) {
+                if (!ServerConfigManager.isURLValid(state.apiUrl)) {
                     logError(state, "Malformed Code Dx URL.  Please correct it on the task configuration page.");
                     return false;
                 }

src/main/java/com/codedx/bambooplugin/CodeDxScanTaskConfigurator.java

@@ -11,8 +11,6 @@
 import org.apache.commons.lang.StringUtils;
 
 import javax.ws.rs.ProcessingException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -114,9 +112,7 @@ public void validate(final ActionParametersMap params, final ErrorCollection err
             final String url = params.getString("url");
             if (url != null && !url.isEmpty()) {
                 // Make sure the URL is valid
-                try {
-                    new URL(url);
-                } catch (MalformedURLException e) {
+                if (!ServerConfigManager.isURLValid(url)) {
                     errorCollection.addError("url", "Malformed URL");
                 }
             } else {

src/main/java/com/codedx/bambooplugin/ProjectRefresherServlet.java

@@ -14,8 +14,6 @@
 import javax.ws.rs.ProcessingException;
 import java.io.IOException;
 import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.UnknownHostException;
 
 public class ProjectRefresherServlet extends HttpServlet {
@@ -61,9 +59,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         CodeDxCredentials credentials = mapper.readValue(req.getInputStream(), CodeDxCredentials.class);
 
         // Make sure the URL is valid
-        try {
-            new URL(credentials.getUrl());
-        } catch (MalformedURLException e) {
+        if (!ServerConfigManager.isURLValid(credentials.getUrl())) {
             resp.setStatus(404);
             resp.getOutputStream().print("Malformed Code Dx URL");
             return;

src/main/java/com/codedx/bambooplugin/ServerConfigManager.java

@@ -10,6 +10,8 @@
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 public class ServerConfigManager implements Serializable {
 
@@ -98,6 +100,16 @@ public static boolean getDefaultsSet() {
         return false;
     }
 
+    // Helper method to tell if a url is formatted correctly
+    public static boolean isURLValid(String url) {
+        try {
+            new URL(url);
+        } catch (MalformedURLException e) {
+            return false;
+        }
+        return true;
+    }
+
     // Fields we want to save
     private static class GlobalData implements Serializable {
         public String url;