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 275a8492a2fcab84b87af3390d56d996cb83eb7f Author: Tung Tran <[email protected]> AuthorDate: Tue Nov 21 15:10:44 2023 +0700 JAMES-2586 Parameterize MailboxSession for getUidProvider/getModSeqProvider methods in MailboxSessionMapperFactory --- .../mailbox/cassandra/CassandraMailboxSessionMapperFactory.java | 4 ++-- .../apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java | 4 ++-- .../mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java | 4 ++-- .../james/mailbox/inmemory/mail/InMemoryMapperProvider.java | 4 ++-- .../mailbox/postgres/PostgresMailboxSessionMapperFactory.java | 4 ++-- .../apache/james/mailbox/store/MailboxSessionMapperFactory.java | 4 ++-- .../org/apache/james/mailbox/store/StoreMessageIdManager.java | 9 +++++---- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index c91a6f0678..585b640825 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -179,12 +179,12 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa } @Override - public ModSeqProvider getModSeqProvider() { + public ModSeqProvider getModSeqProvider(MailboxSession session) { return modSeqProvider; } @Override - public UidProvider getUidProvider() { + public UidProvider getUidProvider(MailboxSession session) { return uidProvider; } diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java index 670651b13f..f5a6bc71ae 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java @@ -102,12 +102,12 @@ public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory } @Override - public UidProvider getUidProvider() { + public UidProvider getUidProvider(MailboxSession session) { return uidProvider; } @Override - public ModSeqProvider getModSeqProvider() { + public ModSeqProvider getModSeqProvider(MailboxSession session) { return modSeqProvider; } diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java index 37da525571..082ac65aa5 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java @@ -103,12 +103,12 @@ public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFac } @Override - public UidProvider getUidProvider() { + public UidProvider getUidProvider(MailboxSession session) { return uidProvider; } @Override - public ModSeqProvider getModSeqProvider() { + public ModSeqProvider getModSeqProvider(MailboxSession session) { return modSeqProvider; } 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 4667385719..6106e9572d 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 @@ -118,13 +118,13 @@ public class InMemoryMapperProvider implements MapperProvider { @Override public ModSeq generateModSeq(Mailbox mailbox) throws MailboxException { - return inMemoryMailboxSessionMapperFactory.getModSeqProvider() + return inMemoryMailboxSessionMapperFactory.getModSeqProvider(null) .nextModSeq(mailbox); } @Override public ModSeq highestModSeq(Mailbox mailbox) throws MailboxException { - return inMemoryMailboxSessionMapperFactory.getModSeqProvider() + return inMemoryMailboxSessionMapperFactory.getModSeqProvider(null) .highestModSeq(mailbox); } diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMailboxSessionMapperFactory.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMailboxSessionMapperFactory.java index 9f6a29028b..7b20e1996f 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMailboxSessionMapperFactory.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMailboxSessionMapperFactory.java @@ -109,12 +109,12 @@ public class PostgresMailboxSessionMapperFactory extends MailboxSessionMapperFac } @Override - public UidProvider getUidProvider() { + public UidProvider getUidProvider(MailboxSession session) { return uidProvider; } @Override - public ModSeqProvider getModSeqProvider() { + public ModSeqProvider getModSeqProvider(MailboxSession session) { return modSeqProvider; } diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java index af455608bf..3267a7ce31 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java @@ -124,9 +124,9 @@ public abstract class MailboxSessionMapperFactory implements RequestAware, Mailb */ public abstract SubscriptionMapper createSubscriptionMapper(MailboxSession session); - public abstract UidProvider getUidProvider(); + public abstract UidProvider getUidProvider(MailboxSession session); - public abstract ModSeqProvider getModSeqProvider(); + public abstract ModSeqProvider getModSeqProvider(MailboxSession session); /** * Call endRequest on {@link Mapper} instances 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 591650215d..927259e0e5 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 @@ -493,7 +493,7 @@ public class StoreMessageIdManager implements MessageIdManager { .build()) .build()); - return save(messageIdMapper, copy, mailbox) + return save(messageIdMapper, copy, mailbox, mailboxSession) .flatMap(metadata -> dispatchAddedEvent(mailboxSession, mailbox, metadata, messageMoves)); }).sneakyThrow()) .then(); @@ -522,10 +522,11 @@ public class StoreMessageIdManager implements MessageIdManager { return messageMoves.addedMailboxes().size() == 1 && messageMoves.removedMailboxes().size() == 1; } - private Mono<MessageMetaData> save(MessageIdMapper messageIdMapper, MailboxMessage mailboxMessage, Mailbox mailbox) { + private Mono<MessageMetaData> save(MessageIdMapper messageIdMapper, MailboxMessage mailboxMessage, + Mailbox mailbox, MailboxSession mailboxSession) { return Mono.zip( - mailboxSessionMapperFactory.getModSeqProvider().nextModSeqReactive(mailbox.getMailboxId()), - mailboxSessionMapperFactory.getUidProvider().nextUidReactive(mailbox.getMailboxId())) + mailboxSessionMapperFactory.getModSeqProvider(mailboxSession).nextModSeqReactive(mailbox.getMailboxId()), + mailboxSessionMapperFactory.getUidProvider(mailboxSession).nextUidReactive(mailbox.getMailboxId())) .flatMap(modSeqAndUid -> { mailboxMessage.setModSeq(modSeqAndUid.getT1()); mailboxMessage.setUid(modSeqAndUid.getT2()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
