Merge pull request #1360 from stormpath/async_email

made email async

Author: dogeared

impl/src/main/java/com/stormpath/sdk/impl/mail/CommonsEmailService.java

@@ -25,6 +25,8 @@
 import java.io.InputStream;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static com.stormpath.sdk.mail.MimeType.*;
 
@@ -42,6 +44,8 @@ public class CommonsEmailService implements EmailService {
 
     private final Logger log = LoggerFactory.getLogger(CommonsEmailService.class);
 
+    private final ExecutorService executorService = Executors.newCachedThreadPool();
+
     private final TemplateRenderer templateRenderer;
     private final EmailServiceConfig config;
     private final ResourceFactory resourceFactory;
@@ -64,78 +68,70 @@ public void sendResetEmail(EmailRequest request) {
     }
 
     @Override
-    public void sendEmail(EmailRequest request, String template) {
-
-        try (InputStream inputStream = resourceFactory.createResource(template).getInputStream()) {
+    public void sendEmail(final EmailRequest request, final String template) {
 
-            Map<String, Object> context = new LinkedHashMap<>();
+        executorService.execute(new Runnable() {
 
-            ObjectMapper objectMapper = new ObjectMapper();
-            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            EmailTemplate emailTemplate = objectMapper.readValue(inputStream, EmailTemplate.class);
+            @Override
+            public void run() {
+                log.debug("Start email send to: {}", request.getToAddress());
+                try (InputStream inputStream = resourceFactory.createResource(template).getInputStream()) {
 
-            String url = emailTemplate.getDefaultModel().get("linkBaseUrl") + "?sptoken=" + request.getToken();
+                    Map<String, Object> context = new LinkedHashMap<>();
 
-            context.put(APPLICATION_BASE_URL, url);
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                    EmailTemplate emailTemplate = objectMapper.readValue(inputStream, EmailTemplate.class);
 
-            context.put(FROM_NAME, emailTemplate.getFromName());
-            context.put(FROM_EMAIL_ADDRESS, emailTemplate.getFromName());
-            context.put(SUBJECT, emailTemplate.getSubject());
+                    String url = emailTemplate.getDefaultModel().get("linkBaseUrl") + "?sptoken=" + request.getToken();
 
-            context.put(EXPIRE_WINDOW_HOURS, config.getTokenExpirationHours());
+                    context.put(APPLICATION_BASE_URL, url);
 
-            context.put(TO_EMAIL_ADDRESS, request.getToAddress());
-            context.put(TO_NAME, request.getToDisplayName());
+                    context.put(FROM_NAME, emailTemplate.getFromName());
+                    context.put(FROM_EMAIL_ADDRESS, emailTemplate.getFromName());
+                    context.put(SUBJECT, emailTemplate.getSubject());
 
-            try {
-                Email email;
-                MimeType mimeType = MimeType.fromString(emailTemplate.getMimeType());
+                    context.put(EXPIRE_WINDOW_HOURS, config.getTokenExpirationHours());
 
-                if (PLAIN_TEXT == mimeType) {
+                    context.put(TO_EMAIL_ADDRESS, request.getToAddress());
+                    context.put(TO_NAME, request.getToDisplayName());
 
-                    SimpleEmail simpleEmail = new SimpleEmail();
-                    simpleEmail.setMsg(renderEmail(emailTemplate.getTextBody(), context).toString());
-                    email = simpleEmail;
-                } else if (HTML == mimeType) {
-
-                    HtmlEmail htmlEmail = new HtmlEmail();
-                    htmlEmail.setHtmlMsg(renderEmail(emailTemplate.getHtmlBody(), context).toString());
-                    email = htmlEmail;
-                } else { // both
-                    HtmlEmail htmlEmail = new HtmlEmail();
-                    htmlEmail.setHtmlMsg(renderEmail(emailTemplate.getHtmlBody(), context).toString());
-                    htmlEmail.setTextMsg(renderEmail(emailTemplate.getTextBody(), context).toString());
-                    email = htmlEmail;
-                }
+                    try {
+                        Email email;
+                        MimeType mimeType = MimeType.fromString(emailTemplate.getMimeType());
 
-                email.setFrom(emailTemplate.getFromEmailAddress(), emailTemplate.getFromName());
-                email.addTo(request.getToAddress(), request.getToDisplayName());
-                email.setSubject(emailTemplate.getSubject());
+                        if (PLAIN_TEXT == mimeType) {
 
-                // now send it away
-                sendEmail(email);
-            } catch (EmailException e) {
+                            SimpleEmail simpleEmail = new SimpleEmail();
+                            simpleEmail.setMsg(renderEmail(emailTemplate.getTextBody(), context).toString());
+                            email = simpleEmail;
+                        } else if (HTML == mimeType) {
 
-                String message = "Failed to send email.";
-                log.warn(message, e);
+                            HtmlEmail htmlEmail = new HtmlEmail();
+                            htmlEmail.setHtmlMsg(renderEmail(emailTemplate.getHtmlBody(), context).toString());
+                            email = htmlEmail;
+                        } else { // both
+                            HtmlEmail htmlEmail = new HtmlEmail();
+                            htmlEmail.setHtmlMsg(renderEmail(emailTemplate.getHtmlBody(), context).toString());
+                            htmlEmail.setTextMsg(renderEmail(emailTemplate.getTextBody(), context).toString());
+                            email = htmlEmail;
+                        }
 
-                DefaultError error = new DefaultError(null);
-                error.setMessage(message);
-                error.setDeveloperMessage(e.getMessage());
+                        email.setFrom(emailTemplate.getFromEmailAddress(), emailTemplate.getFromName());
+                        email.addTo(request.getToAddress(), request.getToDisplayName());
+                        email.setSubject(emailTemplate.getSubject());
 
-                throw new ResourceException(error);
+                        // now send it away
+                        sendEmail(email);
+                        log.debug("Finish email send to: {}", request.getToAddress());
+                    } catch (EmailException e) {
+                        log.error("Failed to send email: {}", e.getMessage(), e);
+                    }
+                } catch (IOException e) {
+                    log.warn("Failed to parse email template: {}", e.getMessage(), e);
+                }
             }
-        } catch (IOException e) {
-            String message = "Failed to parse email template.";
-            log.warn(message, e);
-
-            DefaultError error = new DefaultError(null);
-            error.setStatus(500);
-            error.setMessage(message);
-            error.setDeveloperMessage(e.getMessage());
-
-            throw new ResourceException(error);
-        }
+        });
     }
 
     protected void sendEmail(Email email) throws EmailException {