chore(core): Move Async Email Actionlet to Core #28360 (#28361)

* #28360 migrating the async email to core * #28360 adding refactor for sonarq feedback * #28360 adding refactor for sonarq feedback * #28360 adding refactor for sonarq feedback
dotCMS · May 9, 2024 · 10b5858 · 10b5858
1 parent c3f6242
commit 10b5858
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 3 deletions.
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/actionlet/AsyncEmailActionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/actionlet/AsyncEmailActionlet.java
@@ -0,0 +1,46 @@
+package com.dotmarketing.portlets.workflows.actionlet;
+
+import com.dotcms.api.system.event.message.MessageSeverity;
+import com.dotcms.api.system.event.message.SystemMessageEventUtil;
+import com.dotcms.api.system.event.message.builder.SystemMessageBuilder;
+import com.dotcms.concurrent.DotConcurrentFactory;
+import com.dotmarketing.portlets.workflows.model.WorkflowProcessor;
+import com.dotmarketing.util.Mailer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Same of the {@link EmailActionlet} but runs asynchronously.
+ * @author jsanca
+ */
+public class AsyncEmailActionlet extends EmailActionlet {
+
+    private static final long serialVersionUID = 1L;
+
+    protected final SystemMessageEventUtil systemMessageEventUtil =
+            SystemMessageEventUtil.getInstance();
+
+
+    @Override
+    public String getName() {
+        return "Async Send an Email";
+    }
+
+    @Override
+    protected void sendEmail(final Mailer mail, final WorkflowProcessor processor) {
+        DotConcurrentFactory.getInstance().getSubmitter().submit(()->{
+            try {
+                mail.sendMessage();
+            } catch (Exception e) {
+
+                final List<String> userList = new ArrayList<>();
+                userList.add(processor.getUser().getUserId());
+                this.systemMessageEventUtil.pushMessage(new SystemMessageBuilder().setMessage("Error sending the email: " + e.getMessage())
+                        .setLife(5000)
+                        .setSeverity(MessageSeverity.ERROR).create(), userList);
+            }
+        });
+    }
+
+}
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/actionlet/EmailActionlet.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/actionlet/EmailActionlet.java
@@ -226,12 +226,15 @@ public void executeAction(WorkflowProcessor processor, Map<String, WorkflowActio
                 }
             }
 
-            mail.sendMessage();
-
+            sendEmail(mail, processor);
         } catch (Exception e) {
             Logger.error(EmailActionlet.class, e.getMessage(), e);
         }
 
     }
 
-}
+    protected void sendEmail(final Mailer mail, final WorkflowProcessor processor) {
+        mail.sendMessage();
+    }
+
+}
diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPIImpl.java
@@ -75,6 +75,7 @@
 import com.dotmarketing.portlets.workflows.MessageActionlet;
 import com.dotmarketing.portlets.workflows.actionlet.Actionlet;
 import com.dotmarketing.portlets.workflows.actionlet.ArchiveContentActionlet;
+import com.dotmarketing.portlets.workflows.actionlet.AsyncEmailActionlet;
 import com.dotmarketing.portlets.workflows.actionlet.BatchAction;
 import com.dotmarketing.portlets.workflows.actionlet.CheckURLAccessibilityActionlet;
 import com.dotmarketing.portlets.workflows.actionlet.CheckinContentActionlet;
@@ -265,6 +266,7 @@ public WorkflowAPIImpl() {
 				PushPublishActionlet.class,
 				CheckURLAccessibilityActionlet.class,
                 EmailActionlet.class,
+				AsyncEmailActionlet.class,
                 SetValueActionlet.class,
                 ReindexContentActionlet.class,
                 PushNowActionlet.class,