From bdd4091a16a42d27a5f155552e99b47dc3252b19 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 8 Sep 2016 14:24:10 +0200
Subject: [PATCH] [New] Implemented a SmtpMailer and Strolch MailHandler
 component

SmtpMailer is a singleton and requires properties.

Configure the MailHandler as follows:
<Component>
    <name>MailHandler</name>
    <api>li.strolch.handler.mail.MailHandler</api>
    <impl>li.strolch.handler.mail.SmtpMailHandler</impl>
    <Properties>
        <fromAddr>relayer@eitchnet.ch</fromAddr>
        <fromName>Consilium</fromName>
        <overrideRecipientAddr>eitch@eitchnet.ch</overrideRecipientAddr>
        <overrideRecipientName>Consilium Test</overrideRecipientName>
        <username>relayer@eitchnet.ch</username>
        <password>M5ztAE4a1NWWZBHaUd2ey9aoH</password>
        <auth>true</auth>
        <startTls>true</startTls>
        <host>smtp.gmail.com</host>
        <port>587</port>
    </Properties>
</Component>
---
 .../src/main/java/li/strolch/utils/SmtpMailer.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/SmtpMailer.java b/li.strolch.utils/src/main/java/li/strolch/utils/SmtpMailer.java
index 556ca0736..00704b482 100644
--- a/li.strolch.utils/src/main/java/li/strolch/utils/SmtpMailer.java
+++ b/li.strolch.utils/src/main/java/li/strolch/utils/SmtpMailer.java
@@ -135,12 +135,22 @@ public class SmtpMailer {
 				message.addRecipients(Message.RecipientType.TO, InternetAddress.parse(recipient));
 
 			message.setSubject(subject);
+
+			if (this.overrideRecipient != null)
+				text = "Override recipient. Original recipient " + recipient + ".\n\n" + text;
 			message.setText(text);
 
 			Transport.send(message);
 
-			logger.info(MessageFormat.format("Sent E-mail to {0}: {1}",
-					message.getRecipients(Message.RecipientType.TO)[0], message.getSubject()));
+			String msg;
+			if (this.overrideRecipient != null)
+				msg = MessageFormat.format("Sent E-mail to override recipient {0}: {1}",
+						message.getRecipients(Message.RecipientType.TO)[0], message.getSubject());
+			else {
+				msg = MessageFormat.format("Sent E-mail to {0}: {1}",
+						message.getRecipients(Message.RecipientType.TO)[0], message.getSubject());
+			}
+			logger.info(msg);
 
 		} catch (MessagingException e) {
 			throw new RuntimeException("Failed to send e-mail due to " + e.getMessage(), e);