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:38 UTC
[james-project] branch master updated (3ea4c0c -> 2e9b48c)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 3ea4c0c JAMES-2914 Add CassandraMappingsSolveInconsistenciesTask in webadmin serialization integration tests
new 7bd8059 JAMES-2918 Mailet container should use constructor injections
new 3b7eb78 JAMES-2918 Various mailet injection enhancements
new 2e9b48c JAMES-2906 Add update flag test for ES
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../search/AbstractMessageSearchIndexTest.java | 16 ++++++++++++++++
.../modules/server/CamelMailetContainerModule.java | 5 +----
.../mailetcontainer/impl/JamesMailSpooler.java | 16 ++++------------
.../impl/camel/CamelCompositeProcessor.java | 22 +++++-----------------
.../mailetcontainer/impl/JamesMailSpoolerTest.java | 12 ++++--------
.../impl/camel/CamelCompositeProcessorTest.java | 8 ++++----
.../apache/james/transport/mailets/Forward.java | 3 +--
.../james/transport/mailets/FromRepository.java | 6 +++---
.../james/transport/mailets/NotifySender.java | 2 +-
.../apache/james/transport/mailets/Redirect.java | 2 +-
.../org/apache/james/transport/mailets/Sieve.java | 4 ++--
.../james/transport/mailets/ToRepository.java | 10 ++++------
.../mailets/ToSenderDomainRepository.java | 2 +-
.../james/transport/mailets/ToRepositoryTest.java | 3 +--
14 files changed, 48 insertions(+), 63 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/03: JAMES-2918 Various mailet injection
enhancements
Posted by bt...@apache.org.
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
[james-project] 01/03: JAMES-2918 Mailet container should use
constructor injections
Posted by bt...@apache.org.
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 7bd80591fd17b2901d56e8af7f7a83533885e6fb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Oct 9 17:31:24 2019 +0700
JAMES-2918 Mailet container should use constructor injections
---
.../modules/server/CamelMailetContainerModule.java | 5 +----
.../mailetcontainer/impl/JamesMailSpooler.java | 16 ++++------------
.../impl/camel/CamelCompositeProcessor.java | 22 +++++-----------------
.../mailetcontainer/impl/JamesMailSpoolerTest.java | 12 ++++--------
.../impl/camel/CamelCompositeProcessorTest.java | 8 ++++----
5 files changed, 18 insertions(+), 45 deletions(-)
diff --git a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
index 3c5208f..cad892e 100644
--- a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
+++ b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
@@ -109,20 +109,17 @@ public class CamelMailetContainerModule extends AbstractModule {
@Singleton
public static class SpoolerStarter implements InitialisationOperation {
- private final CamelCompositeProcessor camelCompositeProcessor;
private final JamesMailSpooler jamesMailSpooler;
private final ConfigurationProvider configurationProvider;
@Inject
- public SpoolerStarter(CamelCompositeProcessor camelCompositeProcessor, JamesMailSpooler jamesMailSpooler, ConfigurationProvider configurationProvider) {
- this.camelCompositeProcessor = camelCompositeProcessor;
+ public SpoolerStarter(JamesMailSpooler jamesMailSpooler, ConfigurationProvider configurationProvider) {
this.jamesMailSpooler = jamesMailSpooler;
this.configurationProvider = configurationProvider;
}
@Override
public void initModule() {
- jamesMailSpooler.setMailProcessor(camelCompositeProcessor);
jamesMailSpooler.configure(getJamesSpoolerConfiguration());
jamesMailSpooler.init();
}
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
index bf308ce..6b40d81 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
@@ -73,25 +73,17 @@ public class JamesMailSpooler implements Disposable, Configurable, MailSpoolerMB
/**
* The mail processor
*/
- private MailProcessor mailProcessor;
+ private final MailProcessor mailProcessor;
- private MailQueueFactory<?> queueFactory;
+ private final MailQueueFactory<?> queueFactory;
private reactor.core.Disposable disposable;
private Scheduler spooler;
@Inject
- public JamesMailSpooler(MetricFactory metricFactory) {
+ public JamesMailSpooler(MetricFactory metricFactory, MailProcessor mailProcessor, MailQueueFactory<?> queueFactory) {
this.metricFactory = metricFactory;
- }
-
- @Inject
- public void setMailQueueFactory(MailQueueFactory<?> queueFactory) {
- this.queueFactory = queueFactory;
- }
-
- @Inject
- public void setMailProcessor(MailProcessor mailProcessor) {
this.mailProcessor = mailProcessor;
+ this.queueFactory = queueFactory;
}
@Override
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
index 2ebfa1f..88107a1 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
@@ -45,31 +45,19 @@ import org.apache.mailet.MailetContext;
public class CamelCompositeProcessor extends AbstractStateCompositeProcessor implements CamelContextAware {
private final MetricFactory metricFactory;
+ private final MailetContext mailetContext;
+ private final MatcherLoader matcherLoader;
+ private final MailetLoader mailetLoader;
private CamelContext camelContext;
- private MailetContext mailetContext;
- private MatcherLoader matcherLoader;
- private MailetLoader mailetLoader;
@Inject
- public CamelCompositeProcessor(MetricFactory metricFactory) {
+ CamelCompositeProcessor(MetricFactory metricFactory, MailetContext mailetContext, MatcherLoader matcherLoader, MailetLoader mailetLoader) {
this.metricFactory = metricFactory;
- }
-
- @Inject
- public void setMatcherLoader(MatcherLoader matcherLoader) {
+ this.mailetContext = mailetContext;
this.matcherLoader = matcherLoader;
- }
-
- @Inject
- public void setMailetLoader(MailetLoader mailetLoader) {
this.mailetLoader = mailetLoader;
}
- @Inject
- public void setMailetContext(MailetContext mailetContext) {
- this.mailetContext = mailetContext;
- }
-
@Override
@PostConstruct
public void init() throws Exception {
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java
index 7a10d13..0b62199 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailSpoolerTest.java
@@ -59,8 +59,9 @@ class JamesMailSpoolerTest {
void thrownExceptionShouldAckTheItem() throws MessagingException {
MetricFactory metricFactory = mock(MetricFactory.class);
when(metricFactory.timer(JamesMailSpooler.SPOOL_PROCESSING)).thenAnswer(ignored -> mock(TimeMetric.class));
- JamesMailSpooler spooler = new JamesMailSpooler(metricFactory);
MailQueueFactory<?> queueFactory = mock(MailQueueFactory.class);
+ MailProcessor mailProcessor = mock(MailProcessor.class);
+ JamesMailSpooler spooler = new JamesMailSpooler(metricFactory, mailProcessor, queueFactory);
UnicastProcessor<MockedMailQueueItem> workQueue = UnicastProcessor.create();
MockedMailQueueItem item = new MockedMailQueueItem();
@@ -73,13 +74,10 @@ class JamesMailSpoolerTest {
workQueue.onNext(item);
when(queue.deQueue()).thenAnswer(any -> workQueue.limitRate(1).filter(MockedMailQueueItem::isNotDone));
when(queueFactory.createQueue(MailQueueFactory.SPOOL)).thenAnswer(any -> queue);
- spooler.setMailQueueFactory(queueFactory);
- MailProcessor mailProcessor = mock(MailProcessor.class);
doThrow(new RuntimeException("Arbitrary failure"))
.doNothing()
.when(mailProcessor).service(any());
- spooler.setMailProcessor(mailProcessor);
PropertyListConfiguration configuration = new PropertyListConfiguration();
configuration.addProperty("threads", 2);
@@ -95,8 +93,9 @@ class JamesMailSpoolerTest {
void threadSuicideShouldAckTheItem() throws MessagingException {
MetricFactory metricFactory = mock(MetricFactory.class);
when(metricFactory.timer(JamesMailSpooler.SPOOL_PROCESSING)).thenAnswer(ignored -> mock(TimeMetric.class));
- JamesMailSpooler spooler = new JamesMailSpooler(metricFactory);
MailQueueFactory<?> queueFactory = mock(MailQueueFactory.class);
+ MailProcessor mailProcessor = mock(MailProcessor.class);
+ JamesMailSpooler spooler = new JamesMailSpooler(metricFactory, mailProcessor, queueFactory);
UnicastProcessor<MockedMailQueueItem> workQueue = UnicastProcessor.create();
MockedMailQueueItem item = new MockedMailQueueItem();
@@ -109,14 +108,11 @@ class JamesMailSpoolerTest {
workQueue.onNext(item);
when(queue.deQueue()).thenAnswer(any -> workQueue.limitRate(1).filter(MockedMailQueueItem::isNotDone));
when(queueFactory.createQueue(MailQueueFactory.SPOOL)).thenAnswer(any -> queue);
- spooler.setMailQueueFactory(queueFactory);
- MailProcessor mailProcessor = mock(MailProcessor.class);
doAnswer(ignored -> {
Thread.currentThread().interrupt();
return null;
}).doNothing().when(mailProcessor).service(any());
- spooler.setMailProcessor(mailProcessor);
PropertyListConfiguration configuration = new PropertyListConfiguration();
configuration.addProperty("threads", 2);
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
index ddeb3ca..95d03ae 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessorTest.java
@@ -32,12 +32,12 @@ public class CamelCompositeProcessorTest extends AbstractStateCompositeProcessor
@Override
protected AbstractStateCompositeProcessor createProcessor(HierarchicalConfiguration<ImmutableNode> config) throws Exception {
- CamelCompositeProcessor processor = new CamelCompositeProcessor(new NoopMetricFactory());
+ CamelCompositeProcessor processor = new CamelCompositeProcessor(new NoopMetricFactory(),
+ FakeMailContext.defaultContext(),
+ new MockMatcherLoader(),
+ new MockMailetLoader());
try {
processor.setCamelContext(new DefaultCamelContext());
- processor.setMailetLoader(new MockMailetLoader());
- processor.setMatcherLoader(new MockMatcherLoader());
- processor.setMailetContext(FakeMailContext.defaultContext());
processor.configure(config);
processor.init();
return processor;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/03: JAMES-2906 Add update flag test for ES
Posted by bt...@apache.org.
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 2e9b48cce114ce8e99cfd9692f4b2d584fb60db2
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue Oct 8 11:30:14 2019 +0700
JAMES-2906 Add update flag test for ES
---
.../store/search/AbstractMessageSearchIndexTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index 4e78516..770ff29 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -520,6 +520,22 @@ public abstract class AbstractMessageSearchIndexTest {
assertThat(messageSearchIndex.search(session, mailbox, searchQuery))
.containsOnly(m6.getUid());
}
+
+ @Test
+ public void searchShouldReturnSeenMessagesWhenFlagsGotUpdated() throws MailboxException {
+ inboxMessageManager.setFlags(
+ new Flags(Flags.Flag.SEEN),
+ MessageManager.FlagsUpdateMode.ADD,
+ MessageRange.one(m5.getUid()),
+ session);
+
+ await();
+
+ SearchQuery searchQuery = new SearchQuery(SearchQuery.flagIsSet(Flags.Flag.SEEN));
+
+ assertThat(messageSearchIndex.search(session, mailbox, searchQuery))
+ .contains(m5.getUid());
+ }
@Test
public void multimailboxSearchShouldReturnUidOfMessageMarkedAsSeenInAllMailboxes() throws MailboxException {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org