Only provide sanitized message to exception message. (#1646)

An office with invalid characters that caused the sanitizeOrNul method
to return null would cause the method to put the original exception
message into the details portion.

Modified invalid office and invalid unit builders to only provide the
sanitized, and if null simpler, messages to the generated exception.

(cherry picked from commit 058064c)

Author: MikeNeilson

cwms-data-api/src/main/java/cwms/cda/data/dao/JooqDao.java

@@ -671,19 +671,20 @@ private static InvalidItemException buildInvalidOffice(RuntimeException input) {
 
         Throwable cause = (input instanceof DataAccessException) ? input.getCause() : input;
         String localizedMessage = cause.getLocalizedMessage();
+        String sanitizedMessage = null;
         if (localizedMessage != null) {
             Matcher matcher = INVALID_OFFICE_ID.matcher(localizedMessage);
             if (matcher.find()) {
                 String office = sanitizeOrNull(matcher.group(1));
                 if (office != null) {
-                    localizedMessage = "\"" + office + "\" is not a valid CWMS office id";
+                    sanitizedMessage = "\"" + office + "\" is not a valid CWMS office id";
                 }
             }
         }
-        if (localizedMessage == null || localizedMessage.isEmpty()) {
-            localizedMessage = "Invalid Office.";
+        if (sanitizedMessage == null || sanitizedMessage.isEmpty()) {
+            sanitizedMessage = "Invalid Office.";
         }
-        return new InvalidItemException(localizedMessage, cause);
+        return new InvalidItemException(sanitizedMessage, cause);
     }
 
     public static boolean isUnsupportedOperationException(RuntimeException input) {