JAMES-2214 MailFactory should not throw IOException
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9f1d7672 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9f1d7672 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9f1d7672 Branch: refs/heads/master Commit: 9f1d7672ca92be42ffba4cdaac37a3149c099e51 Parents: a04c071 Author: benwa <[email protected]> Authored: Mon Nov 13 17:17:22 2017 +0700 Committer: benwa <[email protected]> Committed: Wed Nov 15 18:05:45 2017 +0700 ---------------------------------------------------------------------- .../org/apache/james/jmap/methods/MessageSender.java | 12 +----------- .../java/org/apache/james/jmap/send/MailFactory.java | 4 +--- 2 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/9f1d7672/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageSender.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageSender.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageSender.java index 8d86355..3ce4086 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageSender.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MessageSender.java @@ -19,8 +19,6 @@ package org.apache.james.jmap.methods; -import java.io.IOException; - import javax.inject.Inject; import javax.mail.MessagingException; @@ -48,7 +46,7 @@ public class MessageSender { Envelope envelope, MailboxSession session) throws MailboxException, MessagingException { assertUserIsInSenders(envelope, session); - Mail mail = buildMessage(message, envelope); + Mail mail = mailFactory.build(message, envelope); try { MailMetadata metadata = new MailMetadata(message.getMessageId(), session.getUser().getUserName()); mailSpool.send(mail, metadata); @@ -57,14 +55,6 @@ public class MessageSender { } } - private Mail buildMessage(MessageFactory.MetaDataWithContent message, Envelope envelope) throws MessagingException { - try { - return mailFactory.build(message, envelope); - } catch (IOException e) { - throw new MessagingException("error building message to send", e); - } - } - private void assertUserIsInSenders(Envelope envelope, MailboxSession session) throws MailboxSendingNotAllowedException { String allowedSender = session.getUser().getUserName(); if (!session.getUser().isSameUser(envelope.getFrom().asString())) { http://git-wip-us.apache.org/repos/asf/james-project/blob/9f1d7672/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java index 7db6a9b..405bab1 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java @@ -19,8 +19,6 @@ package org.apache.james.jmap.send; -import java.io.IOException; - import javax.mail.MessagingException; import org.apache.james.core.MailAddress; @@ -38,7 +36,7 @@ public class MailFactory { @VisibleForTesting MailFactory() { } - public Mail build(MetaDataWithContent message, Envelope envelope) throws MessagingException, IOException { + public Mail build(MetaDataWithContent message, Envelope envelope) throws MessagingException { ImmutableSet<MailAddress> recipients = Sets.union( Sets.union(envelope.getTo(), envelope.getCc()), envelope.getBcc()).immutableCopy(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
