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 2018/12/19 11:24:48 UTC

[07/10] james-project git commit: JAMES-2633 FlagsUpdated event constructor simplification

JAMES-2633 FlagsUpdated event constructor simplification


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/544924a9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/544924a9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/544924a9

Branch: refs/heads/master
Commit: 544924a9cb181704bbbc42101f0fb8d2d614fad0
Parents: e5a6765
Author: tran tien duc <dt...@linagora.com>
Authored: Tue Dec 18 15:20:38 2018 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Dec 19 18:24:21 2018 +0700

----------------------------------------------------------------------
 .../apache/james/mailbox/MailboxListener.java   |  7 ++++--
 .../james/event/json/EventSerializer.scala      |  1 -
 .../json/FlagsUpdatedSerializationTest.java     | 15 +++++-------
 .../mailbox/store/StoreMessageIdManager.java    |  2 +-
 .../mailbox/store/StoreMessageManager.java      |  2 +-
 .../james/mailbox/store/event/EventFactory.java |  8 ++-----
 .../store/event/MailboxEventDispatcher.java     | 10 ++++----
 .../AbstractMessageIdManagerSideEffectTest.java |  4 ++--
 .../store/MailboxEventDispatcherTest.java       | 24 +-------------------
 .../base/MailboxEventAnalyserTest.java          |  6 -----
 10 files changed, 23 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/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 edce191..3e812c2 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
@@ -37,6 +37,7 @@ import org.apache.james.mailbox.model.Quota;
 import org.apache.james.mailbox.model.QuotaRoot;
 import org.apache.james.mailbox.model.UpdatedFlags;
 
+import com.github.steveash.guavate.Guavate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -430,10 +431,12 @@ public interface MailboxListener {
         private final List<MessageUid> uids;
         private final List<UpdatedFlags> updatedFlags;
 
-        public FlagsUpdated(MailboxSession.SessionId sessionId, User user, MailboxPath path, MailboxId mailboxId, List<MessageUid> uids, List<UpdatedFlags> updatedFlags) {
+        public FlagsUpdated(MailboxSession.SessionId sessionId, User user, MailboxPath path, MailboxId mailboxId, List<UpdatedFlags> updatedFlags) {
             super(sessionId, user, path, mailboxId);
-            this.uids = ImmutableList.copyOf(uids);
             this.updatedFlags = ImmutableList.copyOf(updatedFlags);
+            this.uids = updatedFlags.stream()
+                .map(UpdatedFlags::getUid)
+                .collect(Guavate.toImmutableList());
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
----------------------------------------------------------------------
diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
index c6732e0..b434164 100644
--- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
+++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala
@@ -103,7 +103,6 @@ private object DTO {
       user,
       path.toJava,
       mailboxId,
-      updatedFlags.map(_.uid).asJava,
       updatedFlags.map(_.toJava).asJava)
   }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java b/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
index 5b478ad..63316e1 100644
--- a/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
+++ b/mailbox/event/json/src/test/java/org/apache/james/event/json/FlagsUpdatedSerializationTest.java
@@ -55,8 +55,6 @@ class FlagsUpdatedSerializationTest {
     private static final MailboxPath MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", MAILBOX_NAME);
     private static final MessageUid MESSAGE_UID_1 = MessageUid.of(123456);
     private static final MessageUid MESSAGE_UID_2 = MessageUid.of(654321);
-    private static final List<MessageUid> MESSAGE_UID_1_IN_LIST = ImmutableList.of(MESSAGE_UID_1);
-    private static final List<MessageUid> MESSAGE_UID_LIST = ImmutableList.of(MESSAGE_UID_1, MESSAGE_UID_2);
 
     private static final int MOD_SEQ_1 = 35;
     private static final Flags OLD_FLAGS_1 = FlagsBuilder.builder()
@@ -93,7 +91,7 @@ class FlagsUpdatedSerializationTest {
     private static List<UpdatedFlags> UPDATED_FLAGS_LIST = ImmutableList.of(UPDATED_FLAG_1, UPDATED_FLAG_2);
 
     private static final MailboxListener.FlagsUpdated DEFAULT_EVENT = new MailboxListener.FlagsUpdated(SESSION_ID, USER,
-        MAILBOX_PATH, MAILBOX_ID, MESSAGE_UID_LIST, UPDATED_FLAGS_LIST);
+        MAILBOX_PATH, MAILBOX_ID, UPDATED_FLAGS_LIST);
     private static final String DEFAULT_EVENT_JSON =
         "{" +
         "  \"FlagsUpdated\": {" +
@@ -210,7 +208,7 @@ class FlagsUpdatedSerializationTest {
         private final String nullUser = null;
         private final MailboxListener.FlagsUpdated nullUserEvent = new MailboxListener.FlagsUpdated(SESSION_ID, USER,
             new MailboxPath(MailboxConstants.USER_NAMESPACE, nullUser, MAILBOX_NAME),
-            MAILBOX_ID, MESSAGE_UID_LIST, UPDATED_FLAGS_LIST);
+            MAILBOX_ID, UPDATED_FLAGS_LIST);
 
         private static final String EVENT_JSON_WITH_NULL_USER_IN_PATH =
             "{" +
@@ -258,10 +256,9 @@ class FlagsUpdatedSerializationTest {
 
         @Nested
         class EmptyUpdatedFlags {
-            private final List<MessageUid> emptyUids = ImmutableList.of();
             private final List<UpdatedFlags> emptyUpdatedFlags = ImmutableList.of();
             private final MailboxListener.FlagsUpdated emptyUpdatedFlagsEvent = new MailboxListener.FlagsUpdated(SESSION_ID, USER, MAILBOX_PATH,
-                MAILBOX_ID, emptyUids, emptyUpdatedFlags);
+                MAILBOX_ID, emptyUpdatedFlags);
 
             private static final String EVENT_JSON_WITH_EMPTY_UPDATED_FLAGS =
                 "{" +
@@ -301,7 +298,7 @@ class FlagsUpdatedSerializationTest {
                 .newFlags(NEW_FLAGS_1)
                 .build();
             private final MailboxListener.FlagsUpdated emptyOldFlagsUpdatedFlagsEvent = new MailboxListener.FlagsUpdated(SESSION_ID, USER, MAILBOX_PATH,
-                MAILBOX_ID, MESSAGE_UID_1_IN_LIST, ImmutableList.of(emptyOldFlags));
+                MAILBOX_ID, ImmutableList.of(emptyOldFlags));
 
             private static final String EVENT_JSON_WITH_EMPTY_OLD_FLAGS =
                 "{" +
@@ -348,7 +345,7 @@ class FlagsUpdatedSerializationTest {
                 .newFlags(FlagsBuilder.builder().build())
                 .build();
             private final MailboxListener.FlagsUpdated emptyNewFlagsUpdatedFlagsEvent = new MailboxListener.FlagsUpdated(SESSION_ID, USER, MAILBOX_PATH,
-                MAILBOX_ID, MESSAGE_UID_1_IN_LIST, ImmutableList.of(emptyNewFlags));
+                MAILBOX_ID, ImmutableList.of(emptyNewFlags));
 
             private static final String EVENT_JSON_WITH_EMPTY_NEW_FLAGS =
                 "{" +
@@ -395,7 +392,7 @@ class FlagsUpdatedSerializationTest {
                 .newFlags(FlagsBuilder.builder().build())
                 .build();
             private final MailboxListener.FlagsUpdated emptyFlagsUpdatedFlagsEvent = new MailboxListener.FlagsUpdated(SESSION_ID, USER, MAILBOX_PATH,
-                MAILBOX_ID, MESSAGE_UID_1_IN_LIST, ImmutableList.of(emptyFlags));
+                MAILBOX_ID, ImmutableList.of(emptyFlags));
 
             private static final String EVENT_JSON_WITH_EMPTY_OLD_AND_NEW_FLAGS =
                 "{" +

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
index 907d675..ff93e53 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
@@ -301,7 +301,7 @@ public class StoreMessageIdManager implements MessageIdManager {
     private void dispatchFlagsChange(MailboxSession mailboxSession, MailboxId mailboxId, UpdatedFlags updatedFlags) throws MailboxException {
         if (updatedFlags.flagsChanged()) {
             Mailbox mailbox = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession).findMailboxById(mailboxId);
-            dispatcher.flagsUpdated(mailboxSession, updatedFlags.getUid(), mailbox, updatedFlags);
+            dispatcher.flagsUpdated(mailboxSession, mailbox, updatedFlags);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index 76595af..217940d 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -582,7 +582,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
             uFlags.put(flag.getUid(), flag);
         }
 
-        dispatcher.flagsUpdated(mailboxSession, new ArrayList<>(uFlags.keySet()), getMailboxEntity(), new ArrayList<>(uFlags.values()));
+        dispatcher.flagsUpdated(mailboxSession, getMailboxEntity(), new ArrayList<>(uFlags.values()));
 
         return newFlagsByUid;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/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 433bf8f..4dfd76c 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
@@ -59,12 +59,8 @@ public class EventFactory {
         return new MailboxListener.Expunged(sessionId, user, mailbox.generateAssociatedPath(), mailbox.getMailboxId(), uids);
     }
 
-    public MailboxListener.FlagsUpdated flagsUpdated(MailboxSession session, List<MessageUid> uids, Mailbox mailbox, List<UpdatedFlags> uflags) {
-        return flagsUpdated(session.getSessionId(), session.getUser(), uids, mailbox, uflags);
-    }
-
-    public MailboxListener.FlagsUpdated flagsUpdated(MailboxSession.SessionId sessionId, User user, List<MessageUid> uids, Mailbox mailbox, List<UpdatedFlags> uflags) {
-        return new MailboxListener.FlagsUpdated(sessionId, user, mailbox.generateAssociatedPath(), mailbox.getMailboxId(), uids, uflags);
+    public MailboxListener.FlagsUpdated flagsUpdated(MailboxSession session, Mailbox mailbox, List<UpdatedFlags> uflags) {
+        return new MailboxListener.FlagsUpdated(session.getSessionId(), session.getUser(), mailbox.generateAssociatedPath(), mailbox.getMailboxId(), uflags);
     }
 
     public MailboxListener.MailboxRenamed mailboxRenamed(MailboxSession session, MailboxPath from, Mailbox to) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/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 139c807..812472c 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
@@ -127,14 +127,14 @@ public class MailboxEventDispatcher {
      * Should get called when the message flags were update in a Mailbox. All
      * registered MailboxListener will get triggered then
      */
-    public void flagsUpdated(MailboxSession session, List<MessageUid> uids, Mailbox mailbox, List<UpdatedFlags> uflags) {
-        if (!uids.isEmpty()) {
-            listener.event(eventFactory.flagsUpdated(session, uids, mailbox, uflags));
+    public void flagsUpdated(MailboxSession session, Mailbox mailbox, List<UpdatedFlags> uflags) {
+        if (!uflags.isEmpty()) {
+            listener.event(eventFactory.flagsUpdated(session, mailbox, uflags));
         }
     }
 
-    public void flagsUpdated(MailboxSession session, MessageUid uid, Mailbox mailbox, UpdatedFlags uflags) {
-        flagsUpdated(session, ImmutableList.of(uid), mailbox, ImmutableList.of(uflags));
+    public void flagsUpdated(MailboxSession session, Mailbox mailbox, UpdatedFlags uflags) {
+        flagsUpdated(session, mailbox, ImmutableList.of(uflags));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
index 0a02502..e98bd59 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
@@ -275,7 +275,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest {
 
         messageIdManager.setFlags(newFlags, MessageManager.FlagsUpdateMode.ADD, messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session);
 
-        verify(dispatcher, times(2)).flagsUpdated(eq(session), any(MessageUid.class), any(Mailbox.class), any(UpdatedFlags.class));
+        verify(dispatcher, times(2)).flagsUpdated(eq(session), any(Mailbox.class), any(UpdatedFlags.class));
         verifyNoMoreInteractions(dispatcher);
     }
 
@@ -300,7 +300,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest {
             .newFlags(newFlags)
             .build();
 
-        verify(dispatcher, times(1)).flagsUpdated(session, messageUid, mailbox2, updatedFlags);
+        verify(dispatcher, times(1)).flagsUpdated(session, mailbox2, updatedFlags);
         verifyNoMoreInteractions(dispatcher);
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java
index d681c9a..8b1e92b 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import javax.mail.Flags;
-import javax.mail.Flags.Flag;
 
 import org.apache.james.mailbox.Event;
 import org.apache.james.mailbox.FlagsBuilder;
@@ -81,7 +80,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldReturnNoChangesWhenSystemFlagsUnchanged() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -100,7 +98,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowAnsweredAdded() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(
                 UpdatedFlags.builder()
@@ -121,7 +118,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowAnsweredRemoved() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(
                 UpdatedFlags.builder()
@@ -142,7 +138,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowDeletedAdded() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -162,7 +157,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowDeletedRemoved() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -182,7 +176,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowDraftAdded() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -202,7 +195,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowDraftRemoved() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -222,7 +214,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowFlaggedAdded() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -242,7 +233,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowFlaggedRemoved() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -262,7 +252,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowRecentAdded() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -282,7 +271,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowRecentRemoved() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -302,7 +290,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowSeenAdded() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -322,7 +309,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowSeenRemoved() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -342,7 +328,6 @@ public class MailboxEventDispatcherTest {
     @Test
     public void testShouldShowMixedChanges() {
         dispatcher.flagsUpdated(session,
-            ImmutableList.of(result.getUid()),
             mailbox,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(result.getUid())
@@ -371,14 +356,7 @@ public class MailboxEventDispatcherTest {
 
     @Test
     public void flagsUpdatedShouldNotFireEventWhenEmptyIdList() {
-        UpdatedFlags updatedFlags = UpdatedFlags.builder()
-                .uid(MessageUid.of(1))
-                .modSeq(2)
-                .oldFlags(new Flags(Flag.RECENT))
-                .newFlags(new Flags(Flag.ANSWERED))
-                .build();
-        
-        dispatcher.flagsUpdated(session, ImmutableList.of(), mailbox, ImmutableList.of(updatedFlags));
+        dispatcher.flagsUpdated(session, mailbox, ImmutableList.of());
         assertThat(collector.getEvents()).isEmpty();
     }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/544924a9/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 cc12128..14bab7a 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
@@ -171,7 +171,6 @@ public class MailboxEventAnalyserTest {
     public void testShouldNotSetUidWhenNoSystemFlagChange() {
         MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
             MAILBOX_SESSION,
-            ImmutableList.of(MessageUid.of(90L)),
             DEFAULT_MAILBOX,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(MessageUid.of(90))
@@ -190,7 +189,6 @@ public class MailboxEventAnalyserTest {
         
         MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
             OTHER_MAILBOX_SESSION,
-            ImmutableList.of(uid),
             DEFAULT_MAILBOX,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(uid)
@@ -210,7 +208,6 @@ public class MailboxEventAnalyserTest {
         
         MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
             MAILBOX_SESSION,
-            ImmutableList.of(uid),
             DEFAULT_MAILBOX,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(uid)
@@ -231,7 +228,6 @@ public class MailboxEventAnalyserTest {
 
         MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
             OTHER_MAILBOX_SESSION,
-            ImmutableList.of(uid),
             DEFAULT_MAILBOX,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(uid)
@@ -250,7 +246,6 @@ public class MailboxEventAnalyserTest {
     public void testShouldNotSetUidWhenSystemFlagChangeSameSessionInSilentMode() {
         MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
             MAILBOX_SESSION,
-            ImmutableList.of(MessageUid.of(345)),
             DEFAULT_MAILBOX,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(MessageUid.of(345))
@@ -269,7 +264,6 @@ public class MailboxEventAnalyserTest {
     public void testShouldNotSetUidWhenOnlyRecentFlagUpdated() {
         MailboxListener.FlagsUpdated update = eventFactory.flagsUpdated(
             MAILBOX_SESSION,
-            ImmutableList.of(MessageUid.of(886)),
             DEFAULT_MAILBOX,
             ImmutableList.of(UpdatedFlags.builder()
                 .uid(MessageUid.of(886))


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org