JAMES-2641 Remove now useless ListenerType
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f063b486 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f063b486 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f063b486 Branch: refs/heads/master Commit: f063b4862d78436fb0473ee72c17c4a443e946c1 Parents: 90f18c4 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Jan 10 14:58:06 2019 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Thu Jan 17 10:23:41 2019 +0700 ---------------------------------------------------------------------- .../org/apache/james/mailbox/MailboxListener.java | 8 -------- .../james/mailbox/MailboxManagerStressTest.java | 15 ++++----------- .../james/mailbox/events/ErrorHandlingContract.java | 5 ----- .../james/mailbox/events/EventBusTestFixture.java | 5 ----- .../apache/james/mailbox/util/EventCollector.java | 15 --------------- .../caching/CacheInvalidatingMailboxListener.java | 4 ---- .../cassandra/MailboxOperationLoggingListener.java | 5 ----- .../quota/CassandraCurrentQuotaManager.java | 6 ------ .../ElasticSearchListeningMessageSearchIndex.java | 5 ----- .../mailbox/jpa/quota/JpaCurrentQuotaManager.java | 6 ------ .../lucene/search/LuceneMessageSearchIndex.java | 5 ----- .../inmemory/quota/InMemoryCurrentQuotaManager.java | 6 ------ .../listeners/QuotaThresholdCrossingListener.java | 5 ----- .../events/ElasticSearchQuotaMailboxListener.java | 5 ----- .../mailbox/spamassassin/SpamAssassinListener.java | 5 ----- .../store/event/MailboxAnnotationListener.java | 5 ----- .../store/quota/ListeningCurrentQuotaUpdater.java | 5 ----- .../store/quota/StoreCurrentQuotaManager.java | 3 --- .../mailbox/store/search/LazyMessageSearchIndex.java | 5 ----- .../apache/james/imap/processor/IdleProcessor.java | 5 ----- .../imap/processor/base/SelectedMailboxImpl.java | 5 ----- .../james/modules/mailbox/NoopMailboxListener.java | 5 ----- .../jmap/event/PropagateLookupRightListener.java | 5 ----- .../jmap/event/PropagateLookupRightListenerTest.java | 5 ----- 24 files changed, 4 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java index 253347c..fd79dd9 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java @@ -53,19 +53,11 @@ public interface MailboxListener { Group getGroup(); } - enum ListenerType { - ONCE, - EACH_NODE, - MAILBOX - } - enum ExecutionMode { SYNCHRONOUS, ASYNCHRONOUS } - ListenerType getType(); - default ExecutionMode getExecutionMode() { return ExecutionMode.SYNCHRONOUS; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java index ce1f83c..d769815 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java @@ -66,18 +66,11 @@ public abstract class MailboxManagerStressTest { mailboxManager.startProcessingRequest(session); MailboxPath path = MailboxPath.forUser(username, "INBOX"); MailboxId mailboxId = mailboxManager.createMailbox(path, session).get(); - mailboxManager.register(new MailboxListener() { - @Override - public ListenerType getType() { - return ListenerType.MAILBOX; - } - - @Override - public void event(Event event) { - MessageUid u = ((Added) event).getUids().iterator().next(); + mailboxManager.register( + event -> { + MessageUid u = ((MailboxListener.Added) event).getUids().iterator().next(); uList.add(u); - } - }, mailboxId); + }, mailboxId); mailboxManager.endProcessingRequest(session); mailboxManager.logout(session, false); http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/api/src/test/java/org/apache/james/mailbox/events/ErrorHandlingContract.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/ErrorHandlingContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/ErrorHandlingContract.java index 3f0cdf7..39d7729 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/ErrorHandlingContract.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/ErrorHandlingContract.java @@ -50,11 +50,6 @@ interface ErrorHandlingContract extends EventBusContract { } @Override - public ListenerType getType() { - return MailboxListener.ListenerType.ONCE; - } - - @Override public void event(Event event) { timeElapsed.add(Instant.now()); throw new RuntimeException("throw to trigger reactor retry"); http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java index 85c798b..acac797 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventBusTestFixture.java @@ -46,11 +46,6 @@ public interface EventBusTestFixture { private final AtomicInteger calls = new AtomicInteger(0); @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public void event(Event event) { calls.incrementAndGet(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java index 7b8cffa..c88eefb 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java @@ -33,26 +33,11 @@ public class EventCollector implements MailboxListener.GroupMailboxListener { private final List<Event> events = new ArrayList<>(); - private final ListenerType listenerType; - - public EventCollector(ListenerType listenerType) { - this.listenerType = listenerType; - } - - public EventCollector() { - this(ListenerType.EACH_NODE); - } - @Override public Group getGroup() { return GROUP; } - @Override - public ListenerType getType() { - return listenerType; - } - public List<Event> getEvents() { return events; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java index f693c7a..1c98ce1 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java @@ -41,10 +41,6 @@ public class CacheInvalidatingMailboxListener implements MailboxListener.GroupMa eventBus.register(this); } - @Override - public ListenerType getType() { - return ListenerType.EACH_NODE; - } @Override public void event(Event event) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java index 2d96b04..bf1822a 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java @@ -40,11 +40,6 @@ public class MailboxOperationLoggingListener implements MailboxListener.GroupMai private static final Group GROUP = new MailboxOperationLoggingListenerGroup(); @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public Group getGroup() { return GROUP; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java index 79f8aa2..873cc9c 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManager.java @@ -30,7 +30,6 @@ import javax.inject.Inject; import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; -import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.cassandra.table.CassandraCurrentQuota; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.QuotaRoot; @@ -69,11 +68,6 @@ public class CassandraCurrentQuotaManager implements StoreCurrentQuotaManager { } @Override - public MailboxListener.ListenerType getAssociatedListenerType() { - return MailboxListener.ListenerType.ONCE; - } - - @Override public void increase(QuotaRoot quotaRoot, long count, long size) throws MailboxException { checkArguments(count, size); session.execute(increaseStatement.bind(count, size, quotaRoot.getValue())); http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java index 644a5ee..010b7e7 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java @@ -82,11 +82,6 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe } @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public Group getGroup() { return GROUP; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java index 222a96b..bca9406 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/quota/JpaCurrentQuotaManager.java @@ -28,7 +28,6 @@ import javax.persistence.EntityManagerFactory; import org.apache.james.backends.jpa.TransactionRunner; import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; -import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.quota.model.JpaCurrentQuota; import org.apache.james.mailbox.model.QuotaRoot; @@ -51,11 +50,6 @@ public class JpaCurrentQuotaManager implements StoreCurrentQuotaManager { } @Override - public MailboxListener.ListenerType getAssociatedListenerType() { - return MailboxListener.ListenerType.ONCE; - } - - @Override public QuotaCount getCurrentMessageCount(QuotaRoot quotaRoot) { EntityManager entityManager = entityManagerFactory.createEntityManager(); return Optional.ofNullable(retrieveUserQuota(entityManager, quotaRoot)) http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java index 8ab47aa..3952deb 100644 --- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java +++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java @@ -407,11 +407,6 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex { } @Override - public ListenerType getType() { - return ListenerType.EACH_NODE; - } - - @Override public EnumSet<SearchCapabilities> getSupportedCapabilities(EnumSet<MailboxManager.MessageCapabilities> messageCapabilities) { return EnumSet.of(SearchCapabilities.MultimailboxSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java index 3bc7d36..85d914d 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java @@ -26,7 +26,6 @@ import javax.inject.Inject; import org.apache.james.core.quota.QuotaCount; import org.apache.james.core.quota.QuotaSize; -import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.store.SessionProvider; @@ -53,11 +52,6 @@ public class InMemoryCurrentQuotaManager implements StoreCurrentQuotaManager { } @Override - public MailboxListener.ListenerType getAssociatedListenerType() { - return MailboxListener.ListenerType.EACH_NODE; - } - - @Override public void increase(QuotaRoot quotaRoot, long count, long size) throws MailboxException { checkArguments(count, size); doIncrease(quotaRoot, count, size); http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java b/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java index cb87c55..ee8546b 100644 --- a/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java +++ b/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java @@ -71,11 +71,6 @@ public class QuotaThresholdCrossingListener implements MailboxListener.GroupMail } @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public void event(Event event) { try { if (event instanceof QuotaUsageUpdatedEvent) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java b/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java index ac9fed0..03b5d6f 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java @@ -56,11 +56,6 @@ public class ElasticSearchQuotaMailboxListener implements MailboxListener.GroupM } @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public void event(Event event) { try { if (event instanceof QuotaUsageUpdatedEvent) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java index f64061c..8efc15c 100644 --- a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java +++ b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java @@ -77,11 +77,6 @@ public class SpamAssassinListener implements SpamEventListener { } @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public ExecutionMode getExecutionMode() { return executionMode; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java index 09e30f8..eff61a7 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java @@ -56,11 +56,6 @@ public class MailboxAnnotationListener implements MailboxListener.GroupMailboxLi } @Override - public ListenerType getType() { - return ListenerType.EACH_NODE; - } - - @Override public void event(Event event) { if (event instanceof MailboxDeletion) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java index 97cfdea..272ced8 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java @@ -65,11 +65,6 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener.GroupMailbo } @Override - public ListenerType getType() { - return currentQuotaManager.getAssociatedListenerType(); - } - - @Override public void event(Event event) { try { if (event instanceof Added) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManager.java index de7b306..d977dd2 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManager.java @@ -19,15 +19,12 @@ package org.apache.james.mailbox.store.quota; -import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.QuotaRoot; import org.apache.james.mailbox.quota.CurrentQuotaManager; public interface StoreCurrentQuotaManager extends CurrentQuotaManager { - MailboxListener.ListenerType getAssociatedListenerType(); - void increase(QuotaRoot quotaRoot, long count, long size) throws MailboxException; void decrease(QuotaRoot quotaRoot, long count, long size) throws MailboxException; http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java index 7ad6fce..9145620 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java @@ -76,11 +76,6 @@ public class LazyMessageSearchIndex extends ListeningMessageSearchIndex { public Group getGroup() { return GROUP; } - - @Override - public ListenerType getType() { - return index.getType(); - } @Override public EnumSet<SearchCapabilities> getSupportedCapabilities(EnumSet<MailboxManager.MessageCapabilities> messageCapabilities) { http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java index ce886e5..9913da9 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java @@ -172,11 +172,6 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme unsolicitedResponses(session, responder, false); } } - - @Override - public ListenerType getType() { - return ListenerType.MAILBOX; - } } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java index 7adacec..e9fc609 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java @@ -95,11 +95,6 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener { } @Override - public ListenerType getType() { - return ListenerType.MAILBOX; - } - - @Override public synchronized Optional<MessageUid> getFirstUid() { return uidMsnConverter.getFirstUid(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/NoopMailboxListener.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/NoopMailboxListener.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/NoopMailboxListener.java index 1c1f555..14dd45d 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/NoopMailboxListener.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/NoopMailboxListener.java @@ -28,11 +28,6 @@ public class NoopMailboxListener implements MailboxListener.GroupMailboxListener static final Group GROUP = new NoopMailboxListenerGroup(); @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public Group getGroup() { return GROUP; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java index 53cd813..4f6dc0c 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java @@ -59,11 +59,6 @@ public class PropagateLookupRightListener implements MailboxListener.GroupMailbo } @Override - public ListenerType getType() { - return ListenerType.ONCE; - } - - @Override public void event(Event event) { try { MailboxSession mailboxSession = createMailboxSession(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/f063b486/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java index 7ebeaa8..f5f7787 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java @@ -93,11 +93,6 @@ public class PropagateLookupRightListenerTest { } @Test - public void getTypeShouldReturnOnce() throws Exception { - assertThat(testee.getType()).isEqualTo(MailboxListener.ListenerType.ONCE); - } - - @Test public void getExecutionModeShouldReturnAsynchronous() throws Exception { assertThat(testee.getExecutionMode()).isEqualTo(MailboxListener.ExecutionMode.SYNCHRONOUS); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org