Move cleanse to MailUtil

pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/service/MailUtil.java

@@ -21,6 +21,7 @@
 import jakarta.mail.MessagingException;
 import jakarta.mail.Multipart;
 import jakarta.mail.Part;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Russ Poetker ([email protected])
@@ -31,7 +32,7 @@ private MailUtil() {}
 
     static String getHtmlText(Part part) throws MessagingException, IOException {
         if (part.isMimeType("text/html")) {
-            return part.getContent().toString();
+            return cleanseContent(part.getContent().toString());
         }
 
         if (part.isMimeType("multipart/alternative")) {
@@ -40,7 +41,7 @@ static String getHtmlText(Part part) throws MessagingException, IOException {
             for (int i = 0; i < count; i++) {
                 Part bodyPart = multipart.getBodyPart(i);
                 if (bodyPart.isMimeType("text/html")) {
-                    return bodyPart.getContent().toString();
+                    return cleanseContent(bodyPart.getContent().toString());
                 } else if (bodyPart.isMimeType("multipart/*")) {
                     return getHtmlText(bodyPart);
                 }
@@ -52,11 +53,15 @@ static String getHtmlText(Part part) throws MessagingException, IOException {
                 Part bodyPart = multipart.getBodyPart(i);
                 String content = getHtmlText(bodyPart);
                 if (Objects.nonNull(content)) {
-                    return content;
+                    return cleanseContent(content);
                 }
             }
         }
 
         return null;
     }
+
+    private static String cleanseContent(String content) {
+        return StringUtils.normalizeSpace(content);
+    }
 }

pass-deposit-services/deposit-core/src/main/java/org/eclipse/pass/deposit/service/NihmsReceiveMailService.java

@@ -31,7 +31,6 @@
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeMessage;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.pass.deposit.provider.nihms.NihmsAssembler;
 import org.eclipse.pass.support.client.PassClient;
 import org.eclipse.pass.support.client.PassClientSelector;
@@ -100,15 +99,14 @@ public void handleReceivedMail(MimeMessage receivedMessage) {
             }
             LOG.warn("Email is from Nihms");
             String content = getHtmlText(receivedMessage);
-            String cleansedContent = StringUtils.normalizeSpace(content);
-            LOG.warn("Nihms Email content:" + cleansedContent);
+            LOG.warn("Nihms Email content: {}", content);
             if (Objects.isNull(content)) {
                 LOG.error("No HTML content found in nihms email: " + receivedMessage.getSubject());
                 return;
             }
-            Elements messageElements = getMessageElements(cleansedContent);
+            Elements messageElements = getMessageElements(content);
             if (messageElements.isEmpty()) {
-                LOG.error("No messages found in nihms email: " + cleansedContent);
+                LOG.error("No messages found in nihms email: {}", content);
                 return;
             }
             processMessages(messageElements);