Repository: james-project Updated Branches: refs/heads/master fce7b92ba -> 7ceab1ef3
JAMES-1973 LocalDelivery should not compose RRT Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8d60e1c7 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8d60e1c7 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8d60e1c7 Branch: refs/heads/master Commit: 8d60e1c72e6518a8370563e509690690544994ac Parents: fce7b92 Author: benwa <btell...@linagora.com> Authored: Tue Mar 21 12:12:39 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Mar 21 12:14:19 2017 +0700 ---------------------------------------------------------------------- .../org/apache/james/transport/mailets/LocalDelivery.java | 9 ++------- .../james/transport/mailets/delivery/LocalDeliveryTest.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/8d60e1c7/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java index 130bf91..d7415b9 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java @@ -50,21 +50,18 @@ public class LocalDelivery extends GenericMailet { public static final String LOCAL_DELIVERED_MAILS_METRIC_NAME = "localDeliveredMails"; private final UsersRepository usersRepository; private final MailboxManager mailboxManager; - private final RecipientRewriteTable recipientRewriteTable; private final MetricFactory metricFactory; private MailDispatcher mailDispatcher; @Inject - public LocalDelivery(org.apache.james.rrt.api.RecipientRewriteTable rrt, UsersRepository usersRepository, - @Named("mailboxmanager") MailboxManager mailboxManager, DomainList domainList, MetricFactory metricFactory) { + public LocalDelivery(UsersRepository usersRepository, @Named("mailboxmanager") MailboxManager mailboxManager, + MetricFactory metricFactory) { this.metricFactory = metricFactory; this.usersRepository = usersRepository; this.mailboxManager = mailboxManager; - this.recipientRewriteTable = new RecipientRewriteTable(rrt, domainList); } public void service(Mail mail) throws MessagingException { - recipientRewriteTable.service(mail); mailDispatcher.dispatch(mail); } @@ -73,8 +70,6 @@ public class LocalDelivery extends GenericMailet { } public void init() throws MessagingException { - recipientRewriteTable.init(getMailetConfig()); - Log log = CommonsLoggingAdapter.builder() .wrappedLogger(getMailetContext().getLogger()) .quiet(getInitParameter("quiet", false)) http://git-wip-us.apache.org/repos/asf/james-project/blob/8d60e1c7/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java index 26fee78..3ac9165 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java @@ -76,7 +76,7 @@ public class LocalDeliveryTest { MetricFactory metricFactory = mock(MetricFactory.class); when(metricFactory.generate(anyString())).thenReturn(mock(Metric.class)); - testee = new LocalDelivery(recipientRewriteTable, usersRepository, mailboxManager, domainList, metricFactory); + testee = new LocalDelivery(usersRepository, mailboxManager, metricFactory); user = mock(MailboxSession.User.class); MailboxSession session = mock(MailboxSession.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
