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 2019/10/10 10:00:40 UTC
[james-project] 02/03: JAMES-2918 Various mailet injection
enhancements
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3b7eb78c5b41414aa6c1cd48588c8f58996222a7
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Oct 9 17:38:07 2019 +0700
JAMES-2918 Various mailet injection enhancements
---
.../main/java/org/apache/james/transport/mailets/Forward.java | 3 +--
.../org/apache/james/transport/mailets/FromRepository.java | 6 +++---
.../java/org/apache/james/transport/mailets/NotifySender.java | 2 +-
.../main/java/org/apache/james/transport/mailets/Redirect.java | 2 +-
.../main/java/org/apache/james/transport/mailets/Sieve.java | 4 ++--
.../java/org/apache/james/transport/mailets/ToRepository.java | 10 ++++------
.../james/transport/mailets/ToSenderDomainRepository.java | 2 +-
.../org/apache/james/transport/mailets/ToRepositoryTest.java | 3 +--
8 files changed, 14 insertions(+), 18 deletions(-)
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 456ba27..517a2ae 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
@@ -102,9 +102,8 @@ public class Forward extends GenericMailet implements RedirectNotify {
private final DNSService dns;
@Inject
- public Forward(DNSService dns) {
+ Forward(DNSService dns) {
this.dns = dns;
-
}
@Override
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
index ecb3abc..8676b15 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
@@ -53,6 +53,8 @@ import org.slf4j.LoggerFactory;
public class FromRepository extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(FromRepository.class);
+ private final MailRepositoryStore mailStore;
+
/** The repository from where this mailet spools mail. */
private MailRepository repository;
@@ -65,10 +67,8 @@ public class FromRepository extends GenericMailet {
/** The processor that will handle the re-spooled message(s) */
private String processor;
- private MailRepositoryStore mailStore;
-
@Inject
- public void setStore(MailRepositoryStore mailStore) {
+ public FromRepository(MailRepositoryStore mailStore) {
this.mailStore = mailStore;
}
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 a8deba1..6a9d22b 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
@@ -133,7 +133,7 @@ public class NotifySender extends GenericMailet implements RedirectNotify {
private Optional<String> to = Optional.empty();
@Inject
- public NotifySender(DNSService dns) {
+ NotifySender(DNSService dns) {
this.dns = dns;
}
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 3e7fd72..ae941e1 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
@@ -310,7 +310,7 @@ public class Redirect extends GenericMailet implements RedirectNotify {
private final DNSService dns;
@Inject
- public Redirect(DNSService dns) {
+ Redirect(DNSService dns) {
this.dns = dns;
}
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java
index 57296d3..77b0d34 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java
@@ -44,11 +44,11 @@ public class Sieve extends GenericMailet {
private SieveExecutor sieveExecutor;
@Inject
- public Sieve(UsersRepository usersRepository, SieveRepository sieveRepository) throws MessagingException {
+ public Sieve(UsersRepository usersRepository, SieveRepository sieveRepository) {
this(usersRepository, new ResourceLocator(sieveRepository, usersRepository));
}
- public Sieve(UsersRepository usersRepository, ResourceLocator resourceLocator) throws MessagingException {
+ public Sieve(UsersRepository usersRepository, ResourceLocator resourceLocator) {
this.usersRepository = usersRepository;
this.resourceLocator = resourceLocator;
}
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
index 8f480bc..30f562c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
@@ -38,16 +38,14 @@ import org.slf4j.LoggerFactory;
public class ToRepository extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(ToRepository.class);
- private MailRepository repository;
-
- private boolean passThrough = false;
+ private final MailRepositoryStore mailStore;
+ private MailRepository repository;
private MailRepositoryUrl repositoryPath;
-
- private MailRepositoryStore mailStore;
+ private boolean passThrough = false;
@Inject
- public void setStore(MailRepositoryStore mailStore) {
+ public ToRepository(MailRepositoryStore mailStore) {
this.mailStore = mailStore;
}
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
index 7f954ba..86fd146 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
@@ -77,7 +77,7 @@ public class ToSenderDomainRepository extends GenericMailet {
private boolean allowRepositoryCreation;
@Inject
- public ToSenderDomainRepository(MailRepositoryStore mailRepositoryStore) {
+ ToSenderDomainRepository(MailRepositoryStore mailRepositoryStore) {
this.mailRepositoryStore = mailRepositoryStore;
}
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
index ae069a4..6b961b7 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
@@ -50,8 +50,7 @@ public class ToRepositoryTest {
@Before
public void setup() throws Exception {
mailRepositoryStore = mock(MailRepositoryStore.class);
- mailet = new ToRepository();
- mailet.setStore(mailRepositoryStore);
+ mailet = new ToRepository(mailRepositoryStore);
message = MailUtil.createMockMail2Recipients(MailUtil.createMimeMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org