JAMES-1854 Improve mailStore API
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/27517fd8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/27517fd8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/27517fd8 Branch: refs/heads/master Commit: 27517fd89538ffc651dfc7a1f6e74ad89a4feaff Parents: da6d92e Author: Benoit Tellier <[email protected]> Authored: Fri Nov 18 13:19:27 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Nov 23 18:19:30 2016 +0700 ---------------------------------------------------------------------- .../james/transport/mailets/delivery/MailDispatcher.java | 2 +- .../james/transport/mailets/delivery/MailStore.java | 2 +- .../james/transport/mailets/delivery/SimpleMailStore.java | 4 ++-- .../transport/mailets/jsieve/delivery/SieveMailStore.java | 4 ++-- .../transport/mailets/delivery/MailDispatcherTest.java | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/27517fd8/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java index 21c2b2d..0dc03c3 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java @@ -141,7 +141,7 @@ public class MailDispatcher { try { // Add qmail's de facto standard Delivered-To header message.addHeader(DELIVERED_TO, recipient.toString()); - mailStore.storeMail(mail.getSender(), recipient, mail); + mailStore.storeMail(recipient, mail); message.removeHeader(DELIVERED_TO); } catch (Exception ex) { log.error("Error while storing mail.", ex); http://git-wip-us.apache.org/repos/asf/james-project/blob/27517fd8/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java index 069d696..567e9ec 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java @@ -25,5 +25,5 @@ import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; public interface MailStore { - void storeMail(MailAddress sender, MailAddress recipient, Mail mail) throws MessagingException; + void storeMail(MailAddress recipient, Mail mail) throws MessagingException; } http://git-wip-us.apache.org/repos/asf/james-project/blob/27517fd8/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java index bec5ae8..db21a22 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java @@ -83,12 +83,12 @@ public class SimpleMailStore implements MailStore { } @Override - public void storeMail(MailAddress sender, MailAddress recipient, Mail mail) throws MessagingException { + public void storeMail(MailAddress recipient, Mail mail) throws MessagingException { String username = computeUsername(recipient); mailboxAppender.append(mail.getMessage(), username, folder); - log.info("Local delivered mail " + mail.getName() + " successfully from " + DeliveryUtils.prettyPrint(sender) + log.info("Local delivered mail " + mail.getName() + " successfully from " + DeliveryUtils.prettyPrint(mail.getSender()) + " to " + DeliveryUtils.prettyPrint(recipient) + " in folder " + this.folder); } http://git-wip-us.apache.org/repos/asf/james-project/blob/27517fd8/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveMailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveMailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveMailStore.java index a5f655c..fa13bf4 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveMailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveMailStore.java @@ -131,13 +131,13 @@ public class SieveMailStore implements MailStore { } } - public void storeMail(MailAddress sender, MailAddress recipient, Mail mail) throws MessagingException { + public void storeMail(MailAddress recipient, Mail mail) throws MessagingException { Preconditions.checkNotNull(recipient, "Recipient for mail to be spooled cannot be null."); Preconditions.checkNotNull(mail.getMessage(), "Mail message to be spooled cannot be null."); sieveMessage(recipient, mail, log); // If no exception was thrown the message was successfully stored in the mailbox - log.info("Local delivered mail " + mail.getName() + " sucessfully from " + DeliveryUtils.prettyPrint(sender) + " to " + DeliveryUtils.prettyPrint(recipient) + log.info("Local delivered mail " + mail.getName() + " sucessfully from " + DeliveryUtils.prettyPrint(mail.getSender()) + " to " + DeliveryUtils.prettyPrint(recipient) + " in folder " + this.folder); } http://git-wip-us.apache.org/repos/asf/james-project/blob/27517fd8/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java index 20f4eb0..2a1e923 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java @@ -81,8 +81,8 @@ public class MailDispatcherTest { .build(); testee.dispatch(mail); - verify(mailStore).storeMail(MailAddressFixture.OTHER_AT_JAMES, MailAddressFixture.ANY_AT_JAMES, mail); - verify(mailStore).storeMail(MailAddressFixture.OTHER_AT_JAMES, MailAddressFixture.ANY_AT_JAMES2, mail); + verify(mailStore).storeMail(MailAddressFixture.ANY_AT_JAMES, mail); + verify(mailStore).storeMail(MailAddressFixture.ANY_AT_JAMES2, mail); verifyNoMoreInteractions(mailStore); } @@ -135,7 +135,7 @@ public class MailDispatcherTest { .build(); doThrow(new MessagingException()) .when(mailStore) - .storeMail(any(MailAddress.class), any(MailAddress.class), any(Mail.class)); + .storeMail(any(MailAddress.class), any(Mail.class)); MimeMessage mimeMessage = new MimeMessage(Session.getDefaultInstance(new Properties())); Multipart multipart = new MimeMultipart(); @@ -186,7 +186,7 @@ public class MailDispatcherTest { testee.dispatch(mail); ArgumentCaptor<Mail> mailCaptor = ArgumentCaptor.forClass(Mail.class); - verify(mailStore).storeMail(any(MailAddress.class), any(MailAddress.class), mailCaptor.capture()); + verify(mailStore).storeMail(any(MailAddress.class), mailCaptor.capture()); assertThat(mailCaptor.getValue().getMessage().getHeader(RFC2822Headers.RETURN_PATH)) .containsExactly("<" + MailAddressFixture.OTHER_AT_JAMES +">"); @@ -248,7 +248,7 @@ public class MailDispatcherTest { } @Override - public void storeMail(MailAddress sender, MailAddress recipient, Mail mail) throws MessagingException { + public void storeMail(MailAddress recipient, Mail mail) throws MessagingException { deliveredToHeaderValues.add(mail.getMessage().getHeader(MailDispatcher.DELIVERED_TO)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
