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/08 08:00:49 UTC
[30/47] james-project git commit: MAILBOX-364 EventFactory methods
can be statics
MAILBOX-364 EventFactory methods can be statics
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4eb79904
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4eb79904
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4eb79904
Branch: refs/heads/master
Commit: 4eb79904c6c01b7cc087fb92df2a956f5a0c99cf
Parents: 2713b4d
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Dec 19 14:02:14 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Jan 8 14:40:28 2019 +0700
----------------------------------------------------------------------
.../spamassassin/SpamAssassinListenerTest.java | 4 ++--
.../james/mailbox/store/event/EventFactory.java | 16 ++++++-------
.../store/event/MailboxEventDispatcher.java | 25 +++++++++-----------
.../event/MailboxAnnotationListenerTest.java | 2 +-
.../base/MailboxEventAnalyserTest.java | 16 ++++++-------
.../processor/base/SelectedMailboxImplTest.java | 2 +-
6 files changed, 30 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4eb79904/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
index ff0db16..a46d836 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinListenerTest.java
@@ -232,7 +232,7 @@ public class SpamAssassinListenerTest {
public void eventShouldCallSpamAssassinHamLearningWhenTheMessageIsAddedInInbox() throws Exception {
SimpleMailboxMessage message = createMessage(inbox);
- MailboxListener.Added addedEvent = new EventFactory().added()
+ MailboxListener.Added addedEvent = EventFactory.added()
.mailboxSession(MAILBOX_SESSION)
.mailbox(inbox)
.addMessage(message)
@@ -247,7 +247,7 @@ public class SpamAssassinListenerTest {
public void eventShouldNotCallSpamAssassinHamLearningWhenTheMessageIsAddedInAMailboxOtherThanInbox() throws Exception {
SimpleMailboxMessage message = createMessage(mailbox1);
- MailboxListener.Added addedEvent = new EventFactory().added()
+ MailboxListener.Added addedEvent = EventFactory.added()
.mailboxSession(MAILBOX_SESSION)
.mailbox(mailbox1)
.addMessage(message)
http://git-wip-us.apache.org/repos/asf/james-project/blob/4eb79904/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
index 1c0a477..c581816 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
@@ -300,35 +300,35 @@ public class EventFactory {
}
}
- public AddedBuilder added() {
+ public static AddedBuilder added() {
return new AddedBuilder();
}
- public ExpungedBuilder expunged() {
+ public static ExpungedBuilder expunged() {
return new ExpungedBuilder();
}
- public FlagsUpdatedBuilder flagsUpdated() {
+ public static FlagsUpdatedBuilder flagsUpdated() {
return new FlagsUpdatedBuilder();
}
- public MailboxRenamedBuilder mailboxRenamed() {
+ public static MailboxRenamedBuilder mailboxRenamed() {
return new MailboxRenamedBuilder();
}
- public MailboxDeletionBuilder mailboxDeleted() {
+ public static MailboxDeletionBuilder mailboxDeleted() {
return new MailboxDeletionBuilder();
}
- public MailboxAddedBuilder mailboxAdded() {
+ public static MailboxAddedBuilder mailboxAdded() {
return new MailboxAddedBuilder();
}
- public MailboxAclUpdatedBuilder aclUpdated() {
+ public static MailboxAclUpdatedBuilder aclUpdated() {
return new MailboxAclUpdatedBuilder();
}
- public MessageMoveEvent.Builder moved() {
+ public static MessageMoveEvent.Builder moved() {
return MessageMoveEvent.builder();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4eb79904/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java
index d161338..f1deaab 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxEventDispatcher.java
@@ -55,23 +55,20 @@ import com.google.common.collect.ImmutableSortedMap;
* Helper class to dispatch {@link org.apache.james.mailbox.Event}'s to registerend MailboxListener
*/
public class MailboxEventDispatcher {
-
@VisibleForTesting
public static MailboxEventDispatcher ofListener(MailboxListener mailboxListener) {
- return new MailboxEventDispatcher(mailboxListener, new EventFactory());
+ return new MailboxEventDispatcher(mailboxListener);
}
private final MailboxListener listener;
- private final EventFactory eventFactory;
@Inject
public MailboxEventDispatcher(DelegatingMailboxListener delegatingMailboxListener) {
- this(delegatingMailboxListener, new EventFactory());
+ this((MailboxListener) delegatingMailboxListener);
}
- private MailboxEventDispatcher(MailboxListener listener, EventFactory eventFactory) {
+ private MailboxEventDispatcher(MailboxListener listener) {
this.listener = listener;
- this.eventFactory = eventFactory;
}
/**
@@ -83,7 +80,7 @@ public class MailboxEventDispatcher {
* @param mailbox The mailbox
*/
public void added(MailboxSession session, SortedMap<MessageUid, MessageMetaData> uids, Mailbox mailbox) {
- event(eventFactory.added()
+ event(EventFactory.added()
.mailbox(mailbox)
.mailboxSession(session)
.addMetaData(uids.values())
@@ -114,7 +111,7 @@ public class MailboxEventDispatcher {
* @param mailbox The mailbox
*/
public void expunged(MailboxSession session, Map<MessageUid, MessageMetaData> uids, Mailbox mailbox) {
- event(eventFactory.expunged()
+ event(EventFactory.expunged()
.mailbox(mailbox)
.mailboxSession(session)
.addMetaData(uids.values())
@@ -133,7 +130,7 @@ public class MailboxEventDispatcher {
* registered MailboxListener will get triggered then
*/
public void flagsUpdated(MailboxSession session, Mailbox mailbox, List<UpdatedFlags> uflags) {
- event(eventFactory.flagsUpdated()
+ event(EventFactory.flagsUpdated()
.mailbox(mailbox)
.mailboxSession(session)
.updatedFags(uflags)
@@ -149,7 +146,7 @@ public class MailboxEventDispatcher {
* MailboxListener will get triggered then
*/
public void mailboxRenamed(MailboxSession session, MailboxPath from, Mailbox to) {
- event(eventFactory.mailboxRenamed()
+ event(EventFactory.mailboxRenamed()
.mailboxSession(session)
.mailboxId(to.getMailboxId())
.oldPath(from)
@@ -162,7 +159,7 @@ public class MailboxEventDispatcher {
* MailboxListener will get triggered then
*/
public void mailboxDeleted(MailboxSession session, Mailbox mailbox, QuotaRoot quotaRoot, QuotaCount deletedMessageCount, QuotaSize totalDeletedSize) {
- event(eventFactory.mailboxDeleted()
+ event(EventFactory.mailboxDeleted()
.mailboxSession(session)
.mailbox(mailbox)
.quotaRoot(quotaRoot)
@@ -176,14 +173,14 @@ public class MailboxEventDispatcher {
* MailboxListener will get triggered then
*/
public void mailboxAdded(MailboxSession session, Mailbox mailbox) {
- event(eventFactory.mailboxAdded()
+ event(EventFactory.mailboxAdded()
.mailbox(mailbox)
.mailboxSession(session)
.build());
}
public void aclUpdated(MailboxSession session, MailboxPath mailboxPath, ACLDiff aclDiff, MailboxId mailboxId) {
- event(eventFactory.aclUpdated()
+ event(EventFactory.aclUpdated()
.mailboxSession(session)
.path(mailboxPath)
.mailboxId(mailboxId)
@@ -192,7 +189,7 @@ public class MailboxEventDispatcher {
}
public void moved(MailboxSession session, MessageMoves messageMoves, Collection<MessageId> messageIds) {
- event(eventFactory.moved()
+ event(EventFactory.moved()
.session(session)
.messageMoves(messageMoves)
.messageId(messageIds)
http://git-wip-us.apache.org/repos/asf/james-project/blob/4eb79904/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 cb6f7e1..fe8eaf1 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
@@ -77,7 +77,7 @@ public class MailboxAnnotationListenerTest {
mailboxSession = MailboxSessionUtil.create("test");
listener = new MailboxAnnotationListener(mailboxSessionMapperFactory, mailboxManager);
- deleteEvent = new EventFactory().mailboxDeleted()
+ deleteEvent = EventFactory.mailboxDeleted()
.mailboxSession(mailboxSession)
.mailboxId(mailboxId)
.path(MailboxPath.forUser("user", "name"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/4eb79904/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 165ff04..9115010 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
@@ -114,14 +114,13 @@ public class MailboxEventAnalyserTest {
private static final TestId MAILBOX_ID = TestId.of(36);
private static final int UID_VALIDITY = 1024;
private static final SimpleMailbox DEFAULT_MAILBOX = new SimpleMailbox(MAILBOX_PATH, UID_VALIDITY, MAILBOX_ID);
- private static final MailboxListener.Added ADDED = new EventFactory().added()
+ private static final MailboxListener.Added ADDED = EventFactory.added()
.mailboxSession(MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.addMetaData(new MessageMetaData(MessageUid.of(11), 0, new Flags(), 45, new Date(), new DefaultMessageId()))
.build();
private SelectedMailboxImpl testee;
- private EventFactory eventFactory;
@Before
public void setUp() throws MailboxException {
@@ -152,7 +151,6 @@ public class MailboxEventAnalyserTest {
.thenReturn(new SingleMessageResultIterator(messageResult));
testee = new SelectedMailboxImpl(mailboxManager, imapSession, MAILBOX_PATH);
- eventFactory = new EventFactory();
}
@Test
@@ -182,7 +180,7 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldNotSetUidWhenNoSystemFlagChange() {
- MailboxListener.FlagsUpdated update = new EventFactory().flagsUpdated()
+ MailboxListener.FlagsUpdated update = EventFactory.flagsUpdated()
.mailboxSession(MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.updatedFags(NOOP_UPDATED_FLAGS)
@@ -195,7 +193,7 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldSetUidWhenSystemFlagChange() {
- MailboxListener.FlagsUpdated update = new EventFactory().flagsUpdated()
+ MailboxListener.FlagsUpdated update = EventFactory.flagsUpdated()
.mailboxSession(OTHER_MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.updatedFags(ADD_ANSWERED_UPDATED_FLAGS)
@@ -210,7 +208,7 @@ public class MailboxEventAnalyserTest {
public void testShouldClearFlagUidsUponReset() {
SelectedMailboxImpl analyser = this.testee;
- MailboxListener.FlagsUpdated update = new EventFactory().flagsUpdated()
+ MailboxListener.FlagsUpdated update = EventFactory.flagsUpdated()
.mailboxSession(MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.updatedFags(ADD_ANSWERED_UPDATED_FLAGS)
@@ -225,7 +223,7 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldSetUidWhenSystemFlagChangeDifferentSessionInSilentMode() {
- MailboxListener.FlagsUpdated update = new EventFactory().flagsUpdated()
+ MailboxListener.FlagsUpdated update = EventFactory.flagsUpdated()
.mailboxSession(OTHER_MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.updatedFags(ADD_ANSWERED_UPDATED_FLAGS)
@@ -240,7 +238,7 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldNotSetUidWhenSystemFlagChangeSameSessionInSilentMode() {
- MailboxListener.FlagsUpdated update = new EventFactory().flagsUpdated()
+ MailboxListener.FlagsUpdated update = EventFactory.flagsUpdated()
.mailboxSession(MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.updatedFags(NOOP_UPDATED_FLAGS)
@@ -255,7 +253,7 @@ public class MailboxEventAnalyserTest {
@Test
public void testShouldNotSetUidWhenOnlyRecentFlagUpdated() {
- MailboxListener.FlagsUpdated update = new EventFactory().flagsUpdated()
+ MailboxListener.FlagsUpdated update = EventFactory.flagsUpdated()
.mailboxSession(MAILBOX_SESSION)
.mailbox(DEFAULT_MAILBOX)
.updatedFags(ADD_RECENT_UPDATED_FLAGS)
http://git-wip-us.apache.org/repos/asf/james-project/blob/4eb79904/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
index 86a5023..2622c4b 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
@@ -163,7 +163,7 @@ public class SelectedMailboxImplTest {
}
private void emitEvent(MailboxListener mailboxListener) {
- mailboxListener.event(new EventFactory().added()
+ mailboxListener.event(EventFactory.added()
.mailbox(mailbox)
.addMetaData(new MessageMetaData(EMITTED_EVENT_UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId()))
.mailboxSession(MailboxSessionUtil.create("user"))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org