This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch postgresql in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5abe1b002e2adafad16afe611804a6b09a8d66de Author: hung phan <[email protected]> AuthorDate: Fri Jan 12 17:48:02 2024 +0700 JAMES-2586 add mailbox para for generateMessageUid method in MapperProvider --- .../cassandra/mail/CassandraMapperProvider.java | 13 +- .../mail/CassandraMessageIdMapperTest.java | 12 +- .../james/mailbox/jpa/mail/JPAMapperProvider.java | 2 +- .../inmemory/mail/InMemoryMapperProvider.java | 2 +- .../mailbox/store/mail/model/MapperProvider.java | 2 +- .../store/mail/model/MessageIdMapperTest.java | 134 ++++++++++----------- 6 files changed, 85 insertions(+), 80 deletions(-) diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java index e3e7cd9f2b..730a2a836f 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java @@ -40,6 +40,7 @@ import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageIdMapper; import org.apache.james.mailbox.store.mail.MessageMapper; +import org.apache.james.mailbox.store.mail.UidProvider; import org.apache.james.mailbox.store.mail.model.MapperProvider; import org.apache.james.mailbox.store.mail.model.MessageUidProvider; import org.apache.james.utils.UpdatableTickingClock; @@ -51,7 +52,7 @@ public class CassandraMapperProvider implements MapperProvider { private static final Factory MESSAGE_ID_FACTORY = new CassandraMessageId.Factory(); private final CassandraCluster cassandra; - private final MessageUidProvider messageUidProvider; + private final UidProvider messageUidProvider; private final CassandraModSeqProvider cassandraModSeqProvider; private final UpdatableTickingClock updatableTickingClock; private final MailboxSession mailboxSession = MailboxSessionUtil.create(Username.of("benwa")); @@ -60,7 +61,7 @@ public class CassandraMapperProvider implements MapperProvider { public CassandraMapperProvider(CassandraCluster cassandra, CassandraConfiguration cassandraConfiguration) { this.cassandra = cassandra; - messageUidProvider = new MessageUidProvider(); + messageUidProvider = new CassandraUidProvider(this.cassandra.getConf(), cassandraConfiguration); cassandraModSeqProvider = new CassandraModSeqProvider( this.cassandra.getConf(), cassandraConfiguration); @@ -116,8 +117,12 @@ public class CassandraMapperProvider implements MapperProvider { } @Override - public MessageUid generateMessageUid() { - return messageUidProvider.next(); + public MessageUid generateMessageUid(Mailbox mailbox) { + try { + return messageUidProvider.nextUid(mailbox); + } catch (MailboxException e) { + throw new RuntimeException(e); + } } @Override diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java index 2c1cb4f8eb..5ff34370b1 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java @@ -152,7 +152,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { .whenQueryStartsWith("UPDATE messagev3")); try { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); } catch (Exception e) { @@ -176,7 +176,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { .whenQueryStartsWith("INSERT INTO blobparts (id,chunknumber,data)")); try { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); } catch (Exception e) { @@ -200,7 +200,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { .whenQueryStartsWith("INSERT INTO blobs (id,position) VALUES (:id,:position)")); try { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); } catch (Exception e) { @@ -224,7 +224,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { .whenQueryStartsWith("INSERT INTO imapuidtable")); try { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); } catch (Exception e) { @@ -248,7 +248,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { .whenQueryStartsWith("INSERT INTO messageidtable")); try { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); } catch (Exception e) { @@ -275,7 +275,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { .times(5) .whenQueryStartsWith("INSERT INTO messageidtable")); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java index c5e054b3bd..47b2777ccb 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java @@ -105,7 +105,7 @@ public class JPAMapperProvider implements MapperProvider { } @Override - public MessageUid generateMessageUid() { + public MessageUid generateMessageUid(Mailbox mailbox) { throw new NotImplementedException("not implemented"); } diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java index 6106e9572d..12ed59d076 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java @@ -90,7 +90,7 @@ public class InMemoryMapperProvider implements MapperProvider { } @Override - public MessageUid generateMessageUid() { + public MessageUid generateMessageUid(Mailbox mailbox) { return messageUidProvider.next(); } diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java index 2db1faa2ae..3a029b49e9 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java @@ -57,7 +57,7 @@ public interface MapperProvider { MailboxId generateId(); - MessageUid generateMessageUid(); + MessageUid generateMessageUid(Mailbox mailbox); ModSeq generateModSeq(Mailbox mailbox) throws MailboxException; diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index a1c2abd8fb..3f7ed29924 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -150,7 +150,7 @@ public abstract class MessageIdMapperTest { saveMessages(); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -160,7 +160,7 @@ public abstract class MessageIdMapperTest { @Test void saveShouldSaveAMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); List<MailboxMessage> messages = sut.find(ImmutableList.of(message1.getMessageId()), FetchType.FULL); @@ -171,7 +171,7 @@ public abstract class MessageIdMapperTest { void saveShouldThrowWhenMailboxDoesntExist() throws Exception { Mailbox notPersistedMailbox = new Mailbox(MailboxPath.forUser(BENWA, "mybox"), UID_VALIDITY, mapperProvider.generateId()); SimpleMailboxMessage message = createMessage(notPersistedMailbox, "Subject: Test \n\nBody\n.\n", BODY_START, new PropertyBuilder()); - message.setUid(mapperProvider.generateMessageUid()); + message.setUid(mapperProvider.generateMessageUid(notPersistedMailbox)); message.setModSeq(mapperProvider.generateModSeq(notPersistedMailbox)); assertThatThrownBy(() -> sut.save(message)) @@ -180,12 +180,12 @@ public abstract class MessageIdMapperTest { @Test void saveShouldSaveMessageInAnotherMailboxWhenMessageAlreadyInOneMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -195,11 +195,11 @@ public abstract class MessageIdMapperTest { @Test void saveShouldWorkWhenSavingTwoTimesWithSameMessageIdAndSameMailboxId() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage copiedMessage = SimpleMailboxMessage.copy(message1.getMailboxId(), message1); - copiedMessage.setUid(mapperProvider.generateMessageUid()); + copiedMessage.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); copiedMessage.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(copiedMessage); @@ -209,13 +209,13 @@ public abstract class MessageIdMapperTest { @Test void copyInMailboxShouldSaveMessageInAnotherMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); MailboxMessage message1InOtherMailbox = sut.find(ImmutableList.of(message1.getMessageId()), FetchType.METADATA).get(0) .copy(benwaWorkMailbox); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.copyInMailbox(message1InOtherMailbox, benwaWorkMailbox); @@ -225,12 +225,12 @@ public abstract class MessageIdMapperTest { @Test void copyInMailboxShouldWorkWhenSavingTwoTimesWithSameMessageIdAndSameMailboxId() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); MailboxMessage copiedMessage = sut.find(ImmutableList.of(message1.getMessageId()), FetchType.METADATA).get(0) .copy(benwaWorkMailbox); - copiedMessage.setUid(mapperProvider.generateMessageUid()); + copiedMessage.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); copiedMessage.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.copyInMailbox(copiedMessage, benwaWorkMailbox); @@ -250,7 +250,7 @@ public abstract class MessageIdMapperTest { @Test void deleteShouldDeleteAMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -263,12 +263,12 @@ public abstract class MessageIdMapperTest { @Test void deleteShouldDeleteMessageIndicesWhenStoredInTwoMailboxes() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -281,11 +281,11 @@ public abstract class MessageIdMapperTest { @Test void deleteShouldDeleteMessageIndicesWhenStoredTwoTimesInTheSameMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage copiedMessage = SimpleMailboxMessage.copy(message1.getMailboxId(), message1); - copiedMessage.setUid(mapperProvider.generateMessageUid()); + copiedMessage.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); copiedMessage.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(copiedMessage); @@ -298,12 +298,12 @@ public abstract class MessageIdMapperTest { @Test void deleteWithMailboxIdsShouldNotDeleteIndicesWhenMailboxIdsIsEmpty() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -316,12 +316,12 @@ public abstract class MessageIdMapperTest { @Test void deleteWithMailboxIdsShouldDeleteOneIndexWhenMailboxIdsContainsOneElement() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -334,12 +334,12 @@ public abstract class MessageIdMapperTest { @Test void deleteWithMailboxIdsShouldDeleteIndicesWhenMailboxIdsContainsMultipleElements() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -352,7 +352,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldReturnUpdatedFlagsWhenMessageIsInOneMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -376,7 +376,7 @@ public abstract class MessageIdMapperTest { Flags messageFlags = new FlagsBuilder().add(Flags.Flag.RECENT, Flags.Flag.FLAGGED) .build(); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setFlags(messageFlags); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -406,7 +406,7 @@ public abstract class MessageIdMapperTest { Flags messageFlags = new FlagsBuilder().add(Flags.Flag.RECENT, Flags.Flag.FLAGGED) .build(); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setFlags(messageFlags); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -436,7 +436,7 @@ public abstract class MessageIdMapperTest { Flags messageFlags = new FlagsBuilder().add(Flags.Flag.RECENT, Flags.Flag.FLAGGED) .build(); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setFlags(messageFlags); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -456,7 +456,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldReturnEmptyWhenMailboxIdsIsEmpty() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -478,7 +478,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldAddFlagsWhenAddUpdateMode() throws Exception { Flags initialFlags = new Flags(Flag.RECENT); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(initialFlags); sut.save(message1); @@ -505,12 +505,12 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldReturnUpdatedFlagsWhenMessageIsInTwoMailboxes() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -541,7 +541,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldUpdateFlagsWhenMessageIsInOneMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -555,7 +555,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldNotModifyModSeqWhenMailboxIdsIsEmpty() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); ModSeq modSeq = mapperProvider.generateModSeq(benwaInboxMailbox); message1.setModSeq(modSeq); sut.save(message1); @@ -571,7 +571,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldUpdateModSeqWhenMessageIsInOneMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); ModSeq modSeq = mapperProvider.generateModSeq(benwaInboxMailbox); message1.setModSeq(modSeq); sut.save(message1); @@ -586,7 +586,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldNotModifyFlagsWhenMailboxIdsIsEmpty() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); ModSeq modSeq = mapperProvider.generateModSeq(benwaInboxMailbox); message1.setModSeq(modSeq); Flags initialFlags = new Flags(Flags.Flag.DRAFT); @@ -604,12 +604,12 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldUpdateFlagsWhenMessageIsInTwoMailboxes() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); SimpleMailboxMessage message1InOtherMailbox = SimpleMailboxMessage.copy(benwaWorkMailbox.getMailboxId(), message1); - message1InOtherMailbox.setUid(mapperProvider.generateMessageUid()); + message1InOtherMailbox.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); message1InOtherMailbox.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.save(message1InOtherMailbox); @@ -624,16 +624,16 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldWorkWhenCalledOnFirstMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); - message2.setUid(mapperProvider.generateMessageUid()); + message2.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message2.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message2); - message3.setUid(mapperProvider.generateMessageUid()); + message3.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message3.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message3); - message4.setUid(mapperProvider.generateMessageUid()); + message4.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message4.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message4); @@ -647,16 +647,16 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldWorkWhenCalledOnDuplicatedMailbox() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); - message2.setUid(mapperProvider.generateMessageUid()); + message2.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message2.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message2); - message3.setUid(mapperProvider.generateMessageUid()); + message3.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message3.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message3); - message4.setUid(mapperProvider.generateMessageUid()); + message4.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message4.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message4); @@ -671,7 +671,7 @@ public abstract class MessageIdMapperTest { @Test public void setFlagsShouldWorkWithConcurrencyWithAdd() throws Exception { Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.THREAD_SAFE_FLAGS_UPDATE)); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -694,7 +694,7 @@ public abstract class MessageIdMapperTest { @Test public void setFlagsShouldWorkWithConcurrencyWithRemove() throws Exception { Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.THREAD_SAFE_FLAGS_UPDATE)); - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -727,7 +727,7 @@ public abstract class MessageIdMapperTest { @Test void countMessageShouldReturnWhenCreateNewMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -736,7 +736,7 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldBeEmptyWhenMessageIsSeen() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.SEEN)); sut.save(message1); @@ -746,7 +746,7 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldReturnWhenMessageIsNotSeen() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -755,7 +755,7 @@ public abstract class MessageIdMapperTest { @Test void countMessageShouldBeEmptyWhenDeleteMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -766,7 +766,7 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldBeEmptyWhenDeleteMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -777,12 +777,12 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldReturnWhenDeleteMessage() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.SEEN)); sut.save(message1); - message2.setUid(mapperProvider.generateMessageUid()); + message2.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message2.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message2); @@ -793,7 +793,7 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldTakeCareOfMessagesMarkedAsRead() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -804,7 +804,7 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldTakeCareOfMessagesMarkedAsUnread() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.SEEN)); sut.save(message1); @@ -816,7 +816,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldNotUpdateModSeqWhenNoop() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); ModSeq modSeq = mapperProvider.generateModSeq(benwaInboxMailbox); message1.setModSeq(modSeq); message1.setFlags(new Flags(Flag.SEEN)); @@ -835,7 +835,7 @@ public abstract class MessageIdMapperTest { @Test void addingFlagToAMessageThatAlreadyHasThisFlagShouldResultInNoChange() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); ModSeq modSeq = mapperProvider.generateModSeq(benwaInboxMailbox); message1.setModSeq(modSeq); Flags flags = new Flags(Flag.SEEN); @@ -855,7 +855,7 @@ public abstract class MessageIdMapperTest { @Test void setFlagsShouldReturnUpdatedFlagsWhenNoop() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); ModSeq modSeq = mapperProvider.generateModSeq(benwaInboxMailbox); message1.setModSeq(modSeq); Flags flags = new Flags(Flag.SEEN); @@ -881,7 +881,7 @@ public abstract class MessageIdMapperTest { @Test void countUnseenMessageShouldNotTakeCareOfOtherFlagsUpdates() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.RECENT)); sut.save(message1); @@ -896,7 +896,7 @@ public abstract class MessageIdMapperTest { saveMessages(); MailboxMessage copiedMessage = sut.find(ImmutableList.of(message1.getMessageId()), FetchType.METADATA).get(0); - copiedMessage.setUid(mapperProvider.generateMessageUid()); + copiedMessage.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); copiedMessage.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.copyInMailbox(copiedMessage, benwaWorkMailbox); @@ -921,7 +921,7 @@ public abstract class MessageIdMapperTest { saveMessages(); MailboxMessage copiedMessage = sut.find(ImmutableList.of(message1.getMessageId()), FetchType.METADATA).get(0); - copiedMessage.setUid(mapperProvider.generateMessageUid()); + copiedMessage.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); copiedMessage.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); sut.copyInMailbox(copiedMessage, benwaWorkMailbox); @@ -962,12 +962,12 @@ public abstract class MessageIdMapperTest { @Test void deletesShouldUpdateUnreadCount() throws Exception { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.SEEN)); sut.save(message1); - message2.setUid(mapperProvider.generateMessageUid()); + message2.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message2.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message2); @@ -993,11 +993,11 @@ public abstract class MessageIdMapperTest { class SaveDateTests { @Test void saveMessagesShouldSetNewSaveDate() throws MailboxException { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.SEEN)); - message2.setUid(mapperProvider.generateMessageUid()); + message2.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message2.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); sut.save(message1); @@ -1012,14 +1012,14 @@ public abstract class MessageIdMapperTest { @Test void copyInMailboxReactiveShouldSetNewSaveDate() throws MailboxException, InterruptedException { - message1.setUid(mapperProvider.generateMessageUid()); + message1.setUid(mapperProvider.generateMessageUid(benwaInboxMailbox)); message1.setModSeq(mapperProvider.generateModSeq(benwaInboxMailbox)); message1.setFlags(new Flags(Flag.SEEN)); sut.save(message1); MailboxMessage copy = sut.find(ImmutableList.of(message1.getMessageId()), FetchType.METADATA).get(0) .copy(benwaWorkMailbox); - copy.setUid(mapperProvider.generateMessageUid()); + copy.setUid(mapperProvider.generateMessageUid(benwaWorkMailbox)); copy.setModSeq(mapperProvider.generateModSeq(benwaWorkMailbox)); updatableTickingClock().setInstant(updatableTickingClock().instant().plus(8, ChronoUnit.DAYS)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
