JAMES-2414 Use a default method for getExecutionMode
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3dd70a19 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3dd70a19 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3dd70a19 Branch: refs/heads/master Commit: 3dd70a19df91407255ec38071da1dcff38b8ed9f Parents: fd81b29 Author: benwa <[email protected]> Authored: Thu Jun 7 16:58:57 2018 +0700 Committer: benwa <[email protected]> Committed: Tue Jun 12 07:01:45 2018 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/james/mailbox/MailboxListener.java | 4 +++- .../java/org/apache/james/mailbox/MailboxManagerStressTest.java | 5 ----- .../test/java/org/apache/james/mailbox/util/EventCollector.java | 5 ----- .../james/mailbox/caching/CacheInvalidatingMailboxListener.java | 5 ----- .../mailbox/cassandra/MailboxOperationLoggingListener.java | 5 ----- .../quota/mailing/listeners/QuotaThresholdCrossingListener.java | 5 ----- .../elasticsearch/events/ElasticSearchQuotaMailboxListener.java | 5 ----- .../mailbox/store/event/DefaultDelegatingMailboxListener.java | 5 ----- .../james/mailbox/store/event/MailboxAnnotationListener.java | 5 ----- .../event/distributed/BroadcastDelegatingMailboxListener.java | 5 ----- .../event/distributed/RegisteredDelegatingMailboxListener.java | 5 ----- .../james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java | 5 ----- .../james/mailbox/store/search/ListeningMessageSearchIndex.java | 5 ----- .../james/mailbox/indexer/registrations/GlobalRegistration.java | 5 ----- .../mailbox/indexer/registrations/MailboxRegistration.java | 5 ----- .../java/org/apache/james/imap/processor/IdleProcessor.java | 5 ----- .../apache/james/imap/processor/base/SelectedMailboxImpl.java | 5 ----- .../org/apache/james/modules/mailbox/NoopMailboxListener.java | 5 ----- .../james/jmap/methods/integration/SetMessagesMethodTest.java | 5 ----- .../apache/james/jmap/event/PropagateLookupRightListener.java | 5 ----- 20 files changed, 3 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 fc248d6..86fd3d4 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 @@ -57,7 +57,9 @@ public interface MailboxListener { ListenerType getType(); - ExecutionMode getExecutionMode(); + default ExecutionMode getExecutionMode() { + return ExecutionMode.SYNCHRONOUS; + } /** * Informs this listener about the given event. http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 93bb3e8..fc26d15 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 @@ -71,11 +71,6 @@ public abstract class MailboxManagerStressTest { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { MessageUid u = ((Added) event).getUids().get(0); uList.add(u); http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 13f1020..408295f 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 @@ -44,11 +44,6 @@ public class EventCollector implements MailboxListener { return listenerType; } - @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - public List<Event> getEvents() { return events; } http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 80a5ab8..fdbf311 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 @@ -40,11 +40,6 @@ public class CacheInvalidatingMailboxListener implements MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { if (event instanceof MailboxEvent) { mailboxEvent((MailboxEvent) event); http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 ca7f94d..f6bdfb8 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 { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { if (event instanceof MailboxRenamed) { MailboxRenamed mailboxRenamed = (MailboxRenamed) event; http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 6aaf1cb..526679c 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 @@ -80,11 +80,6 @@ public class QuotaThresholdCrossingListener implements MailboxListener, Configur } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { try { if (event instanceof QuotaUsageUpdatedEvent) { http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 3bdd358..1bdd295 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 @@ -53,11 +53,6 @@ public class ElasticSearchQuotaMailboxListener implements MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { try { if (event instanceof QuotaUsageUpdatedEvent) { http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java index fa5d18b..43a236c 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListener.java @@ -45,11 +45,6 @@ public class DefaultDelegatingMailboxListener implements DelegatingMailboxListen return ListenerType.EACH_NODE; } - @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - public DefaultDelegatingMailboxListener() { this(new SynchronousEventDelivery(), new MailboxListenerRegistry()); http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 379f225..a1ba834 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 @@ -47,11 +47,6 @@ public class MailboxAnnotationListener implements MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { if (event instanceof EventFactory.MailboxDeletionImpl) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java index 375c3c5..74fd142 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java @@ -73,11 +73,6 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void addListener(MailboxPath mailboxPath, MailboxListener listener, MailboxSession session) throws MailboxException { mailboxListenerRegistry.addListener(mailboxPath, listener); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java index b129c5a..383da95 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java @@ -74,11 +74,6 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void addListener(MailboxPath path, MailboxListener listener, MailboxSession session) throws MailboxException { mailboxListenerRegistry.addListener(path, listener); mailboxPathRegister.register(path); http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 33f4fff..4ffbf4a 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 @@ -56,11 +56,6 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { try { if (event instanceof Added) { http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java index 5dfc82b..f194ad3 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java @@ -52,11 +52,6 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, this.factory = factory; } - @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - /** * Return the {@link MessageMapperFactory} * http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java index 56e5b54..4991e28 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java @@ -50,11 +50,6 @@ public class GlobalRegistration implements MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { if (event instanceof MailboxDeletion) { MailboxDeletion mailboxDeletion = (MailboxDeletion) event; http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java index 6232c92..f754880 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistration.java @@ -50,11 +50,6 @@ public class MailboxRegistration implements MailboxListener { return ListenerType.MAILBOX; } - @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - public List<ImpactingMessageEvent> getImpactingEvents(MessageUid uid) { return ImmutableList.copyOf(impactingMessageEvents.get(uid)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 58be42b..01cab31 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 @@ -194,11 +194,6 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme public ListenerType getType() { return ListenerType.MAILBOX; } - - @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 dcac60b..0579c61 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 @@ -105,11 +105,6 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public synchronized Optional<MessageUid> getFirstUid() { return uidMsnConverter.getFirstUid(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 06b5f08..003c56e 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 @@ -29,11 +29,6 @@ public class NoopMailboxListener implements MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 8dda617..a886af8 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -2228,11 +2228,6 @@ public abstract class SetMessagesMethodTest { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { events.add(event); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd70a19/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 2a98128..7767a94 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 @@ -52,11 +52,6 @@ public class PropagateLookupRightListener implements MailboxListener { } @Override - public ExecutionMode getExecutionMode() { - return ExecutionMode.SYNCHRONOUS; - } - - @Override public void event(Event event) { MailboxSession mailboxSession = event.getSession(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
