Improve and standardize user facing strings

Author: jschroeder-avi

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

@@ -96,17 +96,17 @@ public void validate(final ActionParametersMap params, final ErrorCollection err
 
         final String analysisName = params.getString("analysisName");
         if (StringUtils.isEmpty(analysisName)) {
-            errorCollection.addError("analysisName", "Missing Code Dx Analysis Name.");
+            errorCollection.addError("analysisName", "Missing analysis name");
         }
 
         final String selectedProjectId = params.getString("selectedProjectId");
         if (StringUtils.isEmpty(selectedProjectId)) {
-            errorCollection.addError("selectedProjectId", "Missing Selected Project.");
+            errorCollection.addError("selectedProjectId", "Missing selected project");
         }
 
         final String includePaths = params.getString("includePaths");
         if (StringUtils.isEmpty(includePaths)) {
-            errorCollection.addError("includePaths", "Missing source and binary files.");
+            errorCollection.addError("includePaths", "Missing source and binary files");
         }
 
         final String useDefaults = params.getString("useDefaults");
@@ -118,15 +118,15 @@ public void validate(final ActionParametersMap params, final ErrorCollection err
                 try {
                     new URL(url);
                 } catch (MalformedURLException e) {
-                    errorCollection.addError("url", "Invalid URL");
+                    errorCollection.addError("url", "Malformed URL");
                 }
             } else {
-                errorCollection.addError("url", "Missing Code Dx URL.");
+                errorCollection.addError("url", "Missing Code Dx URL");
             }
 
             final String apiKey = params.getString("apiKey");
             if (StringUtils.isEmpty(apiKey)) {
-                errorCollection.addError("apiKey", "Missing Code Dx Api Key.");
+                errorCollection.addError("apiKey", "Missing Code Dx API key");
             }
         }
     }
@@ -149,7 +149,7 @@ private static List<Project> getProjectList(Map<String, Object> context) {
         }
 
         if (url == null || apiKey == null || url.isEmpty() || apiKey.isEmpty()) {
-            context.put("reachabilityMessage", "CodeDx URL and API key are not configured");
+            context.put("reachabilityMessage", "Code Dx URL and API key are not configured");
             return new ArrayList<Project>();
         }
 
@@ -166,7 +166,7 @@ private static List<Project> getProjectList(Map<String, Object> context) {
         } catch (ApiException e) {
             e.printStackTrace();
         } catch (ProcessingException e) {
-            context.put("reachabilityMessage", "CodeDx is unreachable");
+            context.put("reachabilityMessage", "Connection refused. Please confirm that the URL is correct and that the Code Dx server is running.");
         }
 
         return new ArrayList<Project>();
@@ -306,7 +306,7 @@ public void populateContextForEdit(Map<String, Object> context, TaskDefinition t
         failedSave = null;
     }
 
-    // Helper
+    // Private helpers
     private static String emptyIfNull(String value) {
         if (value == null) {
             return "";

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

@@ -65,7 +65,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             new URL(credentials.getUrl());
         } catch (MalformedURLException e) {
             resp.setStatus(404);
-            resp.getOutputStream().print("Invalid URL");
+            resp.getOutputStream().print("Malformed Code Dx URL");
             return;
         }
 
@@ -104,7 +104,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             return;
         } catch (ProcessingException e) {
             resp.setStatus(404);
-            resp.getOutputStream().print("Connection refused.  Please confirm the URL is correct and the Code Dx server is running.");
+            resp.getOutputStream().print("Connection refused. Please confirm that the URL is correct and that the Code Dx server is running.");
             return;
         }
 
@@ -116,7 +116,7 @@ private static String getBetterErrorMessage(Throwable cause) {
         String betterMessage = cause.getMessage();
 
         if (cause instanceof ConnectException)
-            betterMessage = "Connection failed, is the URL/port correct?";
+            betterMessage = "Connection refused. Please confirm that the URL is correct and that the Code Dx server is running.";
         else if (cause instanceof SSLHandshakeException)
             betterMessage = "The SSL Certificate presented by the server is invalid. If this is expected, please input the SHA1 fingerprint in the advanced options";
         else if (cause instanceof UnknownHostException)

src/main/resources/configureCodeDxTask.ftl

@@ -96,7 +96,7 @@
 </div>
 <div id="url-warning" style="color:#C4A000;">
 	<i class="fas fa-exclamation-triangle"></i>
-	<span>HTTP is considered insecure, it is recommended that you use HTTPS.</span>
+	<span>HTTP is considered insecure.  It is recommended that you use HTTPS.</span>
 </div>
 
 <!--Code Dx API Key-->
@@ -449,10 +449,10 @@
 				}
 
 				if (projects.length > 0) {
-					updateReachabilityMessage("Projects refreshed successfully.", false);
+					updateReachabilityMessage("Projects refreshed successfully", false);
 					projectSelect.disabled = false;
 				} else {
-					updateReachabilityMessage("No projects available for this API token.", true);
+					updateReachabilityMessage("No projects available for this API token", true);
 					projectSelect.disabled = true;
 				}
             },