improve service listener

sources/core/src/main/java/tools/dynamia/modules/email/AutoSendSMSFromEmailServiceListener.java

@@ -28,17 +28,13 @@
 import tools.dynamia.templates.VelocityTemplateEngine;
 
 @Listener
-public class AutoSendSMSFromEmailServiceListener implements EmailServiceListener {
+public class AutoSendSMSFromEmailServiceListener extends EmailServiceListenerAdapter {
 
     @Autowired
     private SMSService smsService;
 
     private LoggingService logger = new SLF4JLoggingService(AutoSendSMSFromEmailServiceListener.class);
 
-    @Override
-    public void onMailSending(EmailMessage message) {
-        //ignore
-    }
 
     @Override
     public void onMailSended(EmailMessage message) {
@@ -74,9 +70,4 @@ public void onMailSended(EmailMessage message) {
     private String parse(EmailMessage message, String text) {
         return new VelocityTemplateEngine().evaluate(text, message.getTemplateModel());
     }
-
-    @Override
-    public void onMailSendFail(EmailMessage message, Throwable cause) {
-//ignore
-    }
 }

sources/core/src/main/java/tools/dynamia/modules/email/EmailServiceListener.java

@@ -26,10 +26,33 @@
  */
 public interface EmailServiceListener {
 
+    /**
+     * Executed after email templates and data is process
+     *
+     * @param message
+     */
+    void onMailProcessing(EmailMessage message);
+
+    /**
+     * Executed just before email is send
+     *
+     * @param message
+     */
     void onMailSending(EmailMessage message);
 
+    /**
+     * Executed after email is sended succefull
+     *
+     * @param message
+     */
     void onMailSended(EmailMessage message);
 
+    /**
+     * Executed if something explode sending the email message
+     *
+     * @param message
+     * @param cause
+     */
     void onMailSendFail(EmailMessage message, Throwable cause);
 
 }

sources/core/src/main/java/tools/dynamia/modules/email/EmailServiceListenerAdapter.java

@@ -0,0 +1,23 @@
+package tools.dynamia.modules.email;
+
+public class EmailServiceListenerAdapter implements EmailServiceListener{
+    @Override
+    public void onMailProcessing(EmailMessage message) {
+
+    }
+
+    @Override
+    public void onMailSending(EmailMessage message) {
+
+    }
+
+    @Override
+    public void onMailSended(EmailMessage message) {
+
+    }
+
+    @Override
+    public void onMailSendFail(EmailMessage message, Throwable cause) {
+
+    }
+}

sources/core/src/main/java/tools/dynamia/modules/email/services/impl/EmailServiceImpl.java

@@ -132,6 +132,10 @@ private EmailSendResult processAndSendEmail(EmailMessage mailMessage, EmailAccou
             if (mailMessage.getTemplate() != null) {
                 processTemplate(mailMessage);
             }
+
+
+            fireOnMailProcessing(mailMessage);
+
             JavaMailSenderImpl jmsi = (JavaMailSenderImpl) createMailSender(emailAccount);
             MimeMessage mimeMessage = jmsi.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
@@ -390,6 +394,13 @@ private String[] parseDestination(String destination, VelocityContext context) {
         return null;
     }
 
+    private void fireOnMailProcessing(EmailMessage message) {
+        Collection<EmailServiceListener> listeners = Containers.get().findObjects(EmailServiceListener.class);
+        for (EmailServiceListener listener : listeners) {
+            listener.onMailProcessing(message);
+        }
+    }
+
     private void fireOnMailSending(EmailMessage message) {
         Collection<EmailServiceListener> listeners = Containers.get().findObjects(EmailServiceListener.class);
         for (EmailServiceListener listener : listeners) {