Repository: logging-log4j2 Updated Branches: refs/heads/master 010d19101 -> 7f3af9b54
Make MimeMessageBuilder implement Builder. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7f3af9b5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7f3af9b5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7f3af9b5 Branch: refs/heads/master Commit: 7f3af9b54fe1c169bc14d95d8aeff3667c61166b Parents: 010d191 Author: Matt Sicker <[email protected]> Authored: Thu Feb 25 13:27:48 2016 -0600 Committer: Matt Sicker <[email protected]> Committed: Thu Feb 25 13:27:48 2016 -0600 ---------------------------------------------------------------------- .../log4j/core/net/MimeMessageBuilder.java | 15 ++++++++++-- .../logging/log4j/core/net/SmtpManager.java | 2 +- .../log4j/core/appender/SmtpAppenderTest.java | 24 ++++++++++---------- 3 files changed, 26 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f3af9b5/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java index 0ee1691..b4d2549 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java @@ -25,10 +25,12 @@ import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import org.apache.logging.log4j.core.util.Builder; + /** - * Helper class for SmtpManager. + * Builder for {@link MimeMessage} instances. */ -public class MimeMessageBuilder { +public class MimeMessageBuilder implements Builder<MimeMessage> { private final MimeMessage message; public MimeMessageBuilder(final Session session) { @@ -76,7 +78,16 @@ public class MimeMessageBuilder { return this; } + /** + * @deprecated Use {@link #build()}. + */ + @Deprecated public MimeMessage getMimeMessage() { + return build(); + } + + @Override + public MimeMessage build() { return message; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f3af9b5/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java index 2f15042..f3878f9 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java @@ -69,7 +69,7 @@ public class SmtpManager extends AbstractManager { return new MimeMessageBuilder(session).setFrom(data.from).setReplyTo(data.replyto) .setRecipients(Message.RecipientType.TO, data.to).setRecipients(Message.RecipientType.CC, data.cc) .setRecipients(Message.RecipientType.BCC, data.bcc).setSubject(data.subject.toSerializable(appendEvent)) - .getMimeMessage(); + .build(); } protected SmtpManager(final String name, final Session session, final MimeMessage message, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7f3af9b5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java index b0577ee..faf1aab 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java @@ -47,7 +47,7 @@ public class SmtpAppenderTest { final MimeMessageBuilder builder = new MimeMessageBuilder(null); final String address = "[email protected]"; - assertNull(builder.getMimeMessage().getFrom()); + assertNull(builder.build().getFrom()); builder.setFrom(null); Address[] array = null; @@ -55,11 +55,11 @@ public class SmtpAppenderTest { if (addr != null) { array = new Address[] { addr }; } - assertArrayEquals(array, builder.getMimeMessage().getFrom()); + assertArrayEquals(array, builder.build().getFrom()); builder.setFrom(address); assertArrayEquals(new Address[] { new InternetAddress(address) }, - builder.getMimeMessage().getFrom()); + builder.build().getFrom()); } @Test @@ -67,14 +67,14 @@ public class SmtpAppenderTest { final MimeMessageBuilder builder = new MimeMessageBuilder(null); final String addresses = "[email protected],[email protected]"; - assertNull(builder.getMimeMessage().getReplyTo()); + assertNull(builder.build().getReplyTo()); builder.setReplyTo(null); - assertNull(builder.getMimeMessage().getReplyTo()); + assertNull(builder.build().getReplyTo()); builder.setReplyTo(addresses); assertArrayEquals(InternetAddress.parse(addresses), builder - .getMimeMessage().getReplyTo()); + .build().getReplyTo()); } @Test @@ -82,16 +82,16 @@ public class SmtpAppenderTest { final MimeMessageBuilder builder = new MimeMessageBuilder(null); final String addresses = "[email protected],[email protected]"; - assertNull(builder.getMimeMessage().getRecipients( + assertNull(builder.build().getRecipients( Message.RecipientType.TO)); builder.setRecipients(Message.RecipientType.TO, null); - assertNull(builder.getMimeMessage().getRecipients( + assertNull(builder.build().getRecipients( Message.RecipientType.TO)); builder.setRecipients(Message.RecipientType.TO, addresses); assertArrayEquals(InternetAddress.parse(addresses), builder - .getMimeMessage().getRecipients(Message.RecipientType.TO)); + .build().getRecipients(Message.RecipientType.TO)); } @Test @@ -99,13 +99,13 @@ public class SmtpAppenderTest { final MimeMessageBuilder builder = new MimeMessageBuilder(null); final String subject = "Test Subject"; - assertNull(builder.getMimeMessage().getSubject()); + assertNull(builder.build().getSubject()); builder.setSubject(null); - assertNull(builder.getMimeMessage().getSubject()); + assertNull(builder.build().getSubject()); builder.setSubject(subject); - assertEquals(subject, builder.getMimeMessage().getSubject()); + assertEquals(subject, builder.build().getSubject()); } @Test
