MAILET-115 Remove abstract getMessage implementation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/56cf31c4 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/56cf31c4 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/56cf31c4 Branch: refs/heads/master Commit: 56cf31c4962fd21b19be81a7f9986c081d7a0c79 Parents: 464f684 Author: Antoine Duprat <[email protected]> Authored: Wed Oct 5 11:48:09 2016 +0200 Committer: Benoit Tellier <[email protected]> Committed: Wed Jan 11 10:03:27 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/james/transport/mailets/Bounce.java | 6 ++++++ .../java/org/apache/james/transport/mailets/DSNBounce.java | 6 ++++++ .../java/org/apache/james/transport/mailets/Forward.java | 6 ++++++ .../org/apache/james/transport/mailets/NotifyPostmaster.java | 7 +++++++ .../org/apache/james/transport/mailets/NotifySender.java | 7 +++++++ .../java/org/apache/james/transport/mailets/Redirect.java | 5 +++++ .../main/java/org/apache/james/transport/mailets/Resend.java | 8 ++++++++ .../james/transport/mailets/redirect/AbstractRedirect.java | 7 +------ .../transport/mailets/redirect/AbstractRedirectTest.java | 7 +++++++ 9 files changed, 53 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java index 77780fe..ad605c8 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java @@ -28,6 +28,7 @@ import javax.mail.internet.InternetAddress; import org.apache.james.transport.mailets.redirect.AbstractRedirect; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.NotifyMailetInitParameters; +import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; @@ -136,6 +137,11 @@ public class Bounce extends AbstractRedirect { } @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); + } + + @Override protected Collection<MailAddress> getRecipients() { return RECIPIENTS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index 01b6cb4..f3863fa 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -37,6 +37,7 @@ import org.apache.james.core.MailImpl; import org.apache.james.transport.mailets.redirect.AbstractRedirect; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.NotifyMailetInitParameters; +import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.transport.mailets.redirect.TypeCode; import org.apache.james.transport.util.Patterns; @@ -130,6 +131,11 @@ public class DSNBounce extends AbstractRedirect { } @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); + } + + @Override protected Collection<MailAddress> getRecipients() { return RECIPIENT_MAIL_ADDRESSES; } http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java index e075204..0c68360 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java @@ -31,6 +31,7 @@ import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.RedirectMailetInitParameters; import org.apache.james.transport.mailets.redirect.TypeCode; +import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import com.google.common.base.Optional; @@ -109,6 +110,11 @@ public class Forward extends AbstractRedirect { } @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return getInitParameters().getMessage(); + } + + @Override protected Collection<MailAddress> getRecipients() throws MessagingException { ImmutableList.Builder<MailAddress> builder = ImmutableList.builder(); for (InternetAddress address : extractAddresses(getForwardTo())) { http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java index e9e2daa..c58b581 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java @@ -29,6 +29,8 @@ import org.apache.james.transport.mailets.redirect.AbstractRedirect; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.NotifyMailetInitParameters; +import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; +import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.MailetConfig; @@ -143,6 +145,11 @@ public class NotifyPostmaster extends AbstractRedirect { } @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); + } + + @Override protected Collection<MailAddress> getRecipients() { return ImmutableSet.of(getMailetContext().getPostmaster()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java index 34fe6f5..75bad9c 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java @@ -30,7 +30,9 @@ import org.apache.james.transport.mailets.redirect.AbstractRedirect; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.NotifyMailetInitParameters; +import org.apache.james.transport.mailets.redirect.NotifyMailetsMessage; import org.apache.james.transport.mailets.redirect.SpecialAddress; +import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.MailetConfig; @@ -145,6 +147,11 @@ public class NotifySender extends AbstractRedirect { } @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); + } + + @Override protected Collection<MailAddress> getRecipients() { return RECIPIENT_MAIL_ADDRESSES; } http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java index ae1e8e1..066a4cf 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java @@ -316,6 +316,11 @@ public class Redirect extends AbstractRedirect { } @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return getInitParameters().getMessage(); + } + + @Override protected Collection<MailAddress> getRecipients() throws MessagingException { String recipientsOrTo = getRecipientsOrTo(); if (recipientsOrTo == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java index 05e784d..00705f1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java @@ -19,9 +19,12 @@ package org.apache.james.transport.mailets; +import javax.mail.MessagingException; + import org.apache.james.transport.mailets.redirect.AbstractRedirect; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.RedirectMailetInitParameters; +import org.apache.mailet.Mail; /** * <p> @@ -295,4 +298,9 @@ public class Resend extends AbstractRedirect { return false; } + @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return getInitParameters().getMessage(); + } + } http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java index b8df05c..24f280e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AbstractRedirect.java @@ -175,12 +175,7 @@ public abstract class AbstractRedirect extends GenericMailet { * * @return {@link #getMessage()} */ - protected String getMessage(Mail originalMail) throws MessagingException { - if (isNotifyMailet()) { - return new NotifyMailetsMessage().generateMessage(getInitParameters().getMessage(), originalMail); - } - return getInitParameters().getMessage(); - } + protected abstract String getMessage(Mail originalMail) throws MessagingException; /** * Gets the <code>recipients</code> property. Returns the collection of http://git-wip-us.apache.org/repos/asf/james-project/blob/56cf31c4/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java index 73a297b..1044220 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AbstractRedirectTest.java @@ -24,10 +24,12 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; import java.util.Properties; +import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.RFC2822Headers; @@ -62,6 +64,11 @@ public class AbstractRedirectTest { protected InitParameters getInitParameters() { return RedirectMailetInitParameters.from(this); } + + @Override + protected String getMessage(Mail originalMail) throws MessagingException { + return getInitParameters().getMessage(); + } } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
