You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2016/03/02 08:23:25 UTC
[2/6] james-project git commit: JSIEVE-103 To make testing of
vacation extension possible,
ResourceLocator should be passed as a constructor of SieveMailet
JSIEVE-103 To make testing of vacation extension possible, ResourceLocator should be passed as a constructor of SieveMailet
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b8211b40
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b8211b40
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b8211b40
Branch: refs/heads/master
Commit: b8211b408c12e0cde68c7f7360c48aa6c0697ddb
Parents: 8e7edd2
Author: Benoit Tellier <bt...@apache.org>
Authored: Thu Jan 21 23:49:15 2016 +0100
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Mar 2 09:49:52 2016 +0700
----------------------------------------------------------------------
.../james/transport/mailets/LocalDelivery.java | 20 ++++++++++----------
.../transport/mailets/ResourceLocatorImpl.java | 11 +++++++++++
.../james/transport/mailets/SieveMailet.java | 14 +++++---------
.../transport/mailets/ToRecipientFolder.java | 16 +++++++---------
.../mailets/delivery/SieveMailetTest.java | 16 +++++++++-------
5 files changed, 42 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8211b40/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 db058f4..fa9631d 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
@@ -19,12 +19,8 @@
package org.apache.james.transport.mailets;
-import java.util.Iterator;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.mail.MessagingException;
-
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.sieverepository.api.SieveRepository;
@@ -34,8 +30,10 @@ import org.apache.mailet.MailetConfig;
import org.apache.mailet.MailetContext;
import org.apache.mailet.base.GenericMailet;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.mail.MessagingException;
+import java.util.Iterator;
/**
* Receives a Mail from the Queue and takes care of delivery of the
@@ -115,8 +113,10 @@ public class LocalDelivery extends GenericMailet {
recipientRewriteTable.setDomainList(domainList);
recipientRewriteTable.setRecipientRewriteTable(rrt);
recipientRewriteTable.init(getMailetConfig());
-
- sieveMailet = new SieveMailet(usersRepository, mailboxManager, sieveRepository, "INBOX");
+ sieveMailet = new SieveMailet(usersRepository,
+ mailboxManager,
+ ResourceLocatorImpl.instanciate(usersRepository, sieveRepository),
+ "INBOX");
sieveMailet.init(new MailetConfig() {
public String getInitParameter(String name) {
if ("addDeliveryHeader".equals(name)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8211b40/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
index b6698ad..65c9dce 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
@@ -21,12 +21,23 @@ package org.apache.james.transport.mailets;
import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.james.sieverepository.api.exception.SieveRepositoryException;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersRepositoryException;
import org.apache.jsieve.mailet.ResourceLocator;
+import javax.mail.MessagingException;
import java.util.Date;
public class ResourceLocatorImpl implements ResourceLocator {
+ public static ResourceLocatorImpl instanciate(UsersRepository usersRepository, SieveRepository sieveRepository) throws MessagingException {
+ try {
+ return new ResourceLocatorImpl(usersRepository.supportVirtualHosting(), sieveRepository);
+ } catch (UsersRepositoryException e) {
+ throw new MessagingException("Unable to access UsersRepository", e);
+ }
+ }
+
private final boolean virtualHosting;
private final SieveRepository sieveRepository;
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8211b40/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
index 54a7abf..e0678e3 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
@@ -31,6 +31,7 @@ import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.jsieve.mailet.Poster;
+import org.apache.jsieve.mailet.ResourceLocator;
import org.apache.jsieve.mailet.SieveMailboxMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -46,24 +47,19 @@ import java.util.Date;
public class SieveMailet extends SieveMailboxMailet implements Poster {
private final UsersRepository usersRepos;
private final MailboxManager mailboxManager;
- private final SieveRepository sieveRepository;
private final String folder;
+ private final ResourceLocator resourceLocator;
- public SieveMailet(UsersRepository usersRepos, MailboxManager mailboxManager, SieveRepository sieveRepository, String folder) {
+ public SieveMailet(UsersRepository usersRepos, MailboxManager mailboxManager, ResourceLocator resourceLocator, String folder) {
this.usersRepos = usersRepos;
+ this.resourceLocator = resourceLocator;
this.mailboxManager = mailboxManager;
- this.sieveRepository = sieveRepository;
this.folder = folder;
}
@Override
public void init(MailetConfig config) throws MessagingException {
- // ATM Fixed implementation
- try {
- setLocator(new ResourceLocatorImpl(usersRepos.supportVirtualHosting(), sieveRepository));
- } catch (UsersRepositoryException e) {
- throw new MessagingException("Unable to access UsersRepository", e);
- }
+ setLocator(resourceLocator);
setPoster(this);
super.init(config);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8211b40/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
index 563e4c2..2adbb3b 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
@@ -18,13 +18,7 @@
****************************************************************/
package org.apache.james.transport.mailets;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.mail.MessagingException;
-
+import com.google.common.collect.Iterators;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.james.user.api.UsersRepository;
@@ -33,7 +27,11 @@ import org.apache.mailet.MailetConfig;
import org.apache.mailet.MailetContext;
import org.apache.mailet.base.GenericMailet;
-import com.google.common.collect.Iterators;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.mail.MessagingException;
+import java.util.Arrays;
+import java.util.Iterator;
/**
* Receives a Mail from the Queue and takes care to deliver the message
@@ -92,7 +90,7 @@ public class ToRecipientFolder extends GenericMailet {
@Override
public void init() throws MessagingException {
super.init();
- sieveMailet = new SieveMailet(usersRepository, mailboxManager, sieveRepository, getInitParameter(FOLDER_PARAMETER, "INBOX"));
+ sieveMailet = new SieveMailet(usersRepository, mailboxManager, ResourceLocatorImpl.instanciate(usersRepository, sieveRepository), getInitParameter(FOLDER_PARAMETER, "INBOX"));
sieveMailet.init(new MailetConfig() {
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/b8211b40/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
index 7736bc9..2a36ad5 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java
@@ -25,10 +25,10 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
import org.apache.james.transport.mailets.SieveMailet;
import org.apache.james.user.api.UsersRepository;
+import org.apache.jsieve.mailet.ResourceLocator;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.test.FakeMail;
@@ -82,19 +82,19 @@ public class SieveMailetTest {
private UsersRepository usersRepository;
private MailboxManager mailboxManager;
- private SieveRepository sieveRepository;
+ private ResourceLocator resourceLocator;
private SieveMailet sieveMailet;
private FakeMailContext fakeMailContext;
private FakeMailetConfig fakeMailetConfig;
@Before
public void setUp() throws Exception {
- sieveRepository = mock(SieveRepository.class);
+ resourceLocator = mock(ResourceLocator.class);
usersRepository = mock(UsersRepository.class);
mailboxManager = mock(MailboxManager.class);
fakeMailContext = new FakeMailContext();
fakeMailetConfig = new FakeMailetConfig("sieveMailet", fakeMailContext);
- sieveMailet = new SieveMailet(usersRepository, mailboxManager, sieveRepository, "INBOX");
+ sieveMailet = new SieveMailet(usersRepository, mailboxManager, resourceLocator, "INBOX");
}
@Test
@@ -104,7 +104,7 @@ public class SieveMailetTest {
return true;
}
});
- when(sieveRepository.getActive("receiver@domain.com")).thenThrow(new ScriptNotFoundException());
+ when(resourceLocator.get("receiver@domain.com")).thenThrow(new ScriptNotFoundException());
final MessageManager messageManager = prepareMessageManagerOn(new MailboxPath("#private", "receiver@domain.com", "INBOX"));
sieveMailet.init(fakeMailetConfig);
sieveMailet.service(createMail());
@@ -118,7 +118,7 @@ public class SieveMailetTest {
return false;
}
});
- when(sieveRepository.getActive("receiver")).thenThrow(new ScriptNotFoundException());
+ when(resourceLocator.get("receiver")).thenThrow(new ScriptNotFoundException());
final MessageManager messageManager = prepareMessageManagerOn(INBOX);
sieveMailet.init(fakeMailetConfig);
sieveMailet.service(createMail());
@@ -776,7 +776,9 @@ public class SieveMailetTest {
private void prepareTestUsingScript(String script) throws Exception {
when(usersRepository.supportVirtualHosting()).thenReturn(false);
- when(sieveRepository.getActive("receiver")).thenReturn(ClassLoader.getSystemResourceAsStream(script));
+ when(resourceLocator.get("//receiver@localhost/sieve")).thenReturn(new ResourceLocator.UserSieveInformation(new Date(),
+ new Date(),
+ ClassLoader.getSystemResourceAsStream(script)));
sieveMailet.init(fakeMailetConfig);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org