Use String.replaceAll

eclipse-pass · Dec 19, 2024 · 63d80d1 · 63d80d1
1 parent aacdd12
commit 63d80d1
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/.../deposit-core/src/main/java/org/eclipse/pass/deposit/service/NihmsReceiveMailService.java b/.../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;
@@ -94,21 +93,21 @@ public NihmsReceiveMailService(PassClient passClient,
 
     public void handleReceivedMail(MimeMessage receivedMessage) {
         try {
-            LOG.warn("Email received: " + receivedMessage.getSubject());
+            LOG.warn("Email received: {}", receivedMessage.getSubject());
             if (isEmailNotNihms(receivedMessage)) {
                 return;
             }
             LOG.warn("Email is from Nihms");
             String content = getHtmlText(receivedMessage);
-            String cleansedContent = StringUtils.normalizeSpace(content);
-            LOG.warn("Nihms Email content:" + cleansedContent);
             if (Objects.isNull(content)) {
-                LOG.error("No HTML content found in nihms email: " + receivedMessage.getSubject());
+                LOG.error("No HTML content found in nihms email: {}", receivedMessage.getSubject());
                 return;
             }
-            Elements messageElements = getMessageElements(cleansedContent);
+            String loggingContent = content.replaceAll("[\n\r]", " ");
+            LOG.warn("Nihms Email content: {}", loggingContent);
+            Elements messageElements = getMessageElements(content);
             if (messageElements.isEmpty()) {
-                LOG.error("No messages found in nihms email: " + cleansedContent);
+                LOG.error("No messages found in nihms email: {}", loggingContent);
                 return;
             }
             processMessages(messageElements);