Trim Software Title value on notification emails.

sowerstl · sowerstl · commit 3413b96498af · 2018-10-03T14:04:30.000-04:00
diff --git a/src/main/java/gov/osti/services/Metadata.java b/src/main/java/gov/osti/services/Metadata.java
@@ -2332,14 +2332,16 @@ private static void sendStatusNotification(DOECodeMetadata md) {
             email.setSubject("DOE CODE Record " + md.getWorkflowStatus().toString());
             email.addTo(EMAIL_SUBMISSION);
 
+            String softwareTitle = md.getSoftwareTitle().replaceAll("^\\h+|\\h+$","");
+
             StringBuilder msg = new StringBuilder();
             msg.append("<html>");
             msg.append("A new DOE CODE record has been ")
                .append(md.getWorkflowStatus())
                .append(" and is awaiting approval:");
 
             msg.append("<P>Code ID: ").append(md.getCodeId());
-            msg.append("<BR>Software Title: ").append(md.getSoftwareTitle());
+            msg.append("<BR>Software Title: ").append(softwareTitle);
             msg.append("</html>");
 
             email.setHtmlMsg(msg.toString());
@@ -2379,8 +2381,10 @@ private static void sendApprovalNotification(DOECodeMetadata md) {
                 return;
             }
 
+            String softwareTitle = md.getSoftwareTitle().replaceAll("^\\h+|\\h+$","");
+
             email.setFrom(EMAIL_FROM);
-            email.setSubject("Approved -- DOE CODE ID: " + md.getCodeId() + ", " + md.getSoftwareTitle());
+            email.setSubject("Approved -- DOE CODE ID: " + md.getCodeId() + ", " + softwareTitle);
             email.addTo(md.getOwner());
 
             // if email is provided, BCC the Project Manager
@@ -2488,8 +2492,10 @@ private static void sendPOCNotification(DOECodeMetadata md) {
                 String lab = site.getLab();
                 lab = lab.isEmpty() ? siteCode : lab;
 
+                String softwareTitle = md.getSoftwareTitle().replaceAll("^\\h+|\\h+$","");
+
                 email.setFrom(EMAIL_FROM);
-                email.setSubject("POC Notification -- " + workflowStatus + " -- DOE CODE ID: " + codeId + ", " + md.getSoftwareTitle());
+                email.setSubject("POC Notification -- " + workflowStatus + " -- DOE CODE ID: " + codeId + ", " + softwareTitle);
 
                 for (String pocEmail : emails)
                     email.addTo(pocEmail);
@@ -2506,7 +2512,7 @@ private static void sendPOCNotification(DOECodeMetadata md) {
                 String biblioLink = SITE_URL + "/biblio/" + codeId;
 
                 msg.append("<p>As a point of contact for ").append(lab).append(", we wanted to inform you that a software project, titled ")
-                   .append(md.getSoftwareTitle())
+                   .append(softwareTitle)
                    .append(", associated with your organization was ").append(lastApprovalFor).append(" to DOE CODE and assigned DOE CODE ID: ")
                    .append(codeId)
                    .append(".  This project record is discoverable in <a href=\"")
