MAILET-115 getRecipients should return a list
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d0100214 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d0100214 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d0100214 Branch: refs/heads/master Commit: d0100214901f1a4e83be3a5bc5ec307af6a40de5 Parents: d6b0899 Author: Antoine Duprat <[email protected]> Authored: Thu Nov 3 16:03:08 2016 +0100 Committer: Benoit Tellier <[email protected]> Committed: Wed Jan 11 10:03:28 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/james/transport/mailets/Bounce.java | 3 +-- .../java/org/apache/james/transport/mailets/DSNBounce.java | 7 ++----- .../main/java/org/apache/james/transport/mailets/Forward.java | 3 +-- .../org/apache/james/transport/mailets/NotifyPostmaster.java | 6 ++---- .../java/org/apache/james/transport/mailets/NotifySender.java | 7 ++----- .../java/org/apache/james/transport/mailets/Redirect.java | 3 +-- .../james/transport/mailets/redirect/AbstractRedirect.java | 6 +++--- .../apache/james/transport/util/SpecialAddressesUtils.java | 7 ++++--- 8 files changed, 16 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 1b07936..4ffac44 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 @@ -19,7 +19,6 @@ package org.apache.james.transport.mailets; -import java.util.Collection; import java.util.List; import javax.mail.MessagingException; @@ -138,7 +137,7 @@ public class Bounce extends AbstractRedirect { } @Override - protected Collection<MailAddress> getRecipients() { + protected List<MailAddress> getRecipients() { return RECIPIENTS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 674cc7a..9790b5d 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 @@ -21,10 +21,8 @@ package org.apache.james.transport.mailets; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.Collection; import java.util.Date; import java.util.List; -import java.util.Set; import java.util.regex.Pattern; import javax.mail.MessagingException; @@ -49,7 +47,6 @@ import org.apache.mailet.base.RFC2822Headers; import org.apache.mailet.base.mail.MimeMultipartReport; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; /** * <p> @@ -94,7 +91,7 @@ import com.google.common.collect.ImmutableSet; public class DSNBounce extends AbstractRedirect { private static final String[] CONFIGURABLE_PARAMETERS = new String[]{ "debug", "passThrough", "messageString", "attachment", "sender", "prefix" }; - private static final Set<MailAddress> RECIPIENT_MAIL_ADDRESSES = ImmutableSet.of(SpecialAddress.REVERSE_PATH); + private static final List<MailAddress> RECIPIENT_MAIL_ADDRESSES = ImmutableList.of(SpecialAddress.REVERSE_PATH); private static final InternetAddress[] TO_INTERNET_ADDRESSES = new InternetAddress[] { SpecialAddress.REVERSE_PATH.toInternetAddress() }; private static final String LOCALHOST = "127.0.0.1"; @@ -132,7 +129,7 @@ public class DSNBounce extends AbstractRedirect { } @Override - protected Collection<MailAddress> getRecipients() { + protected List<MailAddress> getRecipients() { return RECIPIENT_MAIL_ADDRESSES; } http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 d2630ef..9d1f9e0 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 @@ -19,7 +19,6 @@ package org.apache.james.transport.mailets; -import java.util.Collection; import java.util.List; import javax.mail.MessagingException; @@ -111,7 +110,7 @@ public class Forward extends AbstractRedirect { } @Override - protected Collection<MailAddress> getRecipients() throws MessagingException { + protected List<MailAddress> getRecipients() throws MessagingException { ImmutableList.Builder<MailAddress> builder = ImmutableList.builder(); for (InternetAddress address : extractAddresses(getForwardTo())) { builder.add(toMailAddress(address)); http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 16f85f0..fc8620a 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 @@ -19,7 +19,6 @@ package org.apache.james.transport.mailets; -import java.util.Collection; import java.util.List; import javax.mail.MessagingException; @@ -38,7 +37,6 @@ import org.apache.mailet.MailetConfig; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; /** * <p> @@ -147,8 +145,8 @@ public class NotifyPostmaster extends AbstractRedirect { } @Override - protected Collection<MailAddress> getRecipients() { - return ImmutableSet.of(getMailetContext().getPostmaster()); + protected List<MailAddress> getRecipients() { + return ImmutableList.of(getMailetContext().getPostmaster()); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 2a34c5f..3165dc9 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 @@ -19,9 +19,7 @@ package org.apache.james.transport.mailets; -import java.util.Collection; import java.util.List; -import java.util.Set; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; @@ -39,7 +37,6 @@ import org.apache.mailet.MailetConfig; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; /** * <p> @@ -116,7 +113,7 @@ public class NotifySender extends AbstractRedirect { private static final String[] CONFIGURABLE_PARAMETERS = new String[]{ "debug", "passThrough", "fakeDomainCheck", "inline", "attachment", "message", "notice", "sender", "sendingAddress", "prefix", "attachError", "to" }; - private static final Set<MailAddress> RECIPIENT_MAIL_ADDRESSES = ImmutableSet.of(SpecialAddress.SENDER); + private static final List<MailAddress> RECIPIENT_MAIL_ADDRESSES = ImmutableList.of(SpecialAddress.SENDER); private static final List<String> ALLOWED_SPECIALS = ImmutableList.of("sender", "unaltered", "from"); private Optional<String> to = Optional.absent(); @@ -148,7 +145,7 @@ public class NotifySender extends AbstractRedirect { } @Override - protected Collection<MailAddress> getRecipients() { + protected List<MailAddress> getRecipients() { return RECIPIENT_MAIL_ADDRESSES; } http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 b918514..f20c2b4 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 @@ -19,7 +19,6 @@ package org.apache.james.transport.mailets; -import java.util.Collection; import java.util.List; import javax.mail.MessagingException; @@ -318,7 +317,7 @@ public class Redirect extends AbstractRedirect { } @Override - protected Collection<MailAddress> getRecipients() throws MessagingException { + protected List<MailAddress> getRecipients() throws MessagingException { String recipientsOrTo = getRecipientsOrTo(); if (recipientsOrTo == null) { return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/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 59201bd..a3cdced 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 @@ -187,7 +187,7 @@ public abstract class AbstractRedirect extends GenericMailet { * <code>SpecialAddress.RECIPIENTS</code> or <code>null</code> if * missing */ - protected Collection<MailAddress> getRecipients() throws MessagingException { + protected List<MailAddress> getRecipients() throws MessagingException { ImmutableList.Builder<MailAddress> builder = ImmutableList.builder(); List<MailAddress> mailAddresses = AddressExtractor.withContext(getMailetContext()) .allowedSpecials(ImmutableList.of("postmaster", "sender", "from", "replyTo", "reversePath", "unaltered", "recipients", "to", "null")) @@ -204,8 +204,8 @@ public abstract class AbstractRedirect extends GenericMailet { * * @return {@link #replaceMailAddresses} on {@link #getRecipients()}, */ - protected Collection<MailAddress> getRecipients(Mail originalMail) throws MessagingException { - Collection<MailAddress> recipients = getRecipients(); + protected List<MailAddress> getRecipients(Mail originalMail) throws MessagingException { + List<MailAddress> recipients = getRecipients(); if (recipients != null) { if (containsOnlyUnalteredOrRecipients(recipients)) { return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/d0100214/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java index 02318b3..6d8131a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.transport.util; -import java.util.Collection; +import java.util.List; import java.util.Set; import javax.mail.MessagingException; @@ -31,6 +31,7 @@ import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.base.GenericMailet; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; public class SpecialAddressesUtils { @@ -64,8 +65,8 @@ public class SpecialAddressesUtils { * <code>SpecialAddress.UNALTERED</code> are ignored.<br> * Any other address is not replaced. */ - public Collection<MailAddress> replaceSpecialAddresses(Mail mailWithReplacementAddresses, Collection<MailAddress> mailAddresses) { - ImmutableSet.Builder<MailAddress> builder = ImmutableSet.builder(); + public List<MailAddress> replaceSpecialAddresses(Mail mailWithReplacementAddresses, List<MailAddress> mailAddresses) { + ImmutableList.Builder<MailAddress> builder = ImmutableList.builder(); for (MailAddress mailAddress : mailAddresses) { if (!SpecialAddress.isSpecialAddress(mailAddress)) { builder.add(mailAddress); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
