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/01/02 10:34:13 UTC
[03/11] james-project git commit: MAILBOX-370 Avoid using anonymous
events
MAILBOX-370 Avoid using anonymous events
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/df5d4c12
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/df5d4c12
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/df5d4c12
Branch: refs/heads/master
Commit: df5d4c122c8013c02241bc09504ba83ca56dfba9
Parents: c6af362
Author: Benoit Tellier <bt...@linagora.com>
Authored: Fri Dec 28 11:04:06 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Jan 2 17:27:55 2019 +0700
----------------------------------------------------------------------
.../DefaultDelegatingMailboxListenerTest.java | 24 ++++++++++----------
.../event/MailboxAnnotationListenerTest.java | 2 +-
.../base/MailboxEventAnalyserTest.java | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d4c12/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java
index 4f19fe9..6360ce0 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/DefaultDelegatingMailboxListenerTest.java
@@ -81,7 +81,7 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void eventShouldWork() {
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).containsExactly(event);
assertThat(eachNodeEventCollector.getEvents()).containsExactly(event);
@@ -90,7 +90,7 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void eventShouldOnlyTriggerMAILBOXListenerRelatedToTheEvent() {
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, OTHER_MAILBOX_PATH, OTHER_MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, OTHER_MAILBOX_PATH, OTHER_MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).isEmpty();
assertThat(eachNodeEventCollector.getEvents()).containsExactly(event);
@@ -102,9 +102,9 @@ public class DefaultDelegatingMailboxListenerTest {
QuotaRoot quotaRoot = QuotaRoot.quotaRoot("root", null);
QuotaCount deletedMessageCount = QuotaCount.count(123);
QuotaSize totalDeletedSize = QuotaSize.size(456);
- MailboxListener.MailboxDeletion event = new MailboxListener.MailboxDeletion(null, null, MAILBOX_PATH, quotaRoot, deletedMessageCount, totalDeletedSize, MAILBOX_ID) {};
+ MailboxListener.MailboxDeletion event = new MailboxListener.MailboxDeletion(null, null, MAILBOX_PATH, quotaRoot, deletedMessageCount, totalDeletedSize, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
- MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(secondEvent);
assertThat(mailboxEventCollector.getEvents()).containsExactly(event);
assertThat(eachNodeEventCollector.getEvents()).containsOnly(event, secondEvent);
@@ -116,9 +116,9 @@ public class DefaultDelegatingMailboxListenerTest {
QuotaRoot quotaRoot = QuotaRoot.quotaRoot("root", null);
QuotaCount quotaCount = QuotaCount.count(123);
QuotaSize quotaSize = QuotaSize.size(456);
- MailboxListener.MailboxDeletion event = new MailboxListener.MailboxDeletion(null, null, MAILBOX_PATH, quotaRoot, quotaCount, quotaSize, MAILBOX_ID) {};
+ MailboxListener.MailboxDeletion event = new MailboxListener.MailboxDeletion(null, null, MAILBOX_PATH, quotaRoot, quotaCount, quotaSize, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
- MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxEvent(null, null, OTHER_MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent secondEvent = new MailboxListener.MailboxAdded(null, null, OTHER_MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(secondEvent);
assertThat(mailboxEventCollector.getEvents()).containsExactly(event);
assertThat(eachNodeEventCollector.getEvents()).containsOnly(event, secondEvent);
@@ -128,7 +128,7 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void removeListenerShouldWork() {
defaultDelegatingMailboxListener.removeListener(MAILBOX_ID, mailboxEventCollector, null);
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).isEmpty();
assertThat(eachNodeEventCollector.getEvents()).containsExactly(event);
@@ -138,7 +138,7 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void removeListenerShouldNotRemoveAListenerFromADifferentPath() {
defaultDelegatingMailboxListener.removeListener(OTHER_MAILBOX_ID, mailboxEventCollector, null);
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).containsExactly(event);
assertThat(eachNodeEventCollector.getEvents()).containsExactly(event);
@@ -148,7 +148,7 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void removeGlobalListenerShouldWorkForONCE() {
defaultDelegatingMailboxListener.removeGlobalListener(eachNodeEventCollector, null);
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).containsExactly(event);
assertThat(eachNodeEventCollector.getEvents()).isEmpty();
@@ -158,7 +158,7 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void removeGlobalListenerShouldWorkForEACH_NODE() throws Exception {
defaultDelegatingMailboxListener.removeGlobalListener(onceEventCollector, null);
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
defaultDelegatingMailboxListener.event(event);
assertThat(mailboxEventCollector.getEvents()).containsExactly(event);
assertThat(eachNodeEventCollector.getEvents()).containsExactly(event);
@@ -168,8 +168,8 @@ public class DefaultDelegatingMailboxListenerTest {
@Test
public void listenersErrorsShouldNotBePropageted() throws Exception {
MailboxSession session = MailboxSessionUtil.create("benwa");
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(session.getSessionId(),
- session.getUser(), MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(session.getSessionId(),
+ session.getUser(), MAILBOX_PATH, MAILBOX_ID);
MailboxListener mockedListener = mock(MailboxListener.class);
when(mockedListener.getType()).thenReturn(MailboxListener.ListenerType.ONCE);
doThrow(new RuntimeException()).when(mockedListener).event(event);
http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d4c12/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
index f643cf4..1ccca6a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java
@@ -95,7 +95,7 @@ public class MailboxAnnotationListenerTest {
@Test
public void eventShouldDoNothingIfDoNotHaveMailboxDeletionEvent() {
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(null, null, MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(null, null, MAILBOX_PATH, MAILBOX_ID);
listener.event(event);
verifyNoMoreInteractions(mailboxSessionMapperFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d4c12/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index 14bab7a..1dc277a 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -135,8 +135,8 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldBeNoSizeChangeOnOtherEvent() {
- MailboxListener.MailboxEvent event = new MailboxListener.MailboxEvent(MAILBOX_SESSION.getSessionId(),
- MAILBOX_SESSION.getUser(), MAILBOX_PATH, MAILBOX_ID) {};
+ MailboxListener.MailboxEvent event = new MailboxListener.MailboxAdded(MAILBOX_SESSION.getSessionId(),
+ MAILBOX_SESSION.getUser(), MAILBOX_PATH, MAILBOX_ID);
testee.event(event);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org