This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 39ced51c7efebcfc09537c94784c4afc4bf023b0 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Nov 21 13:29:38 2019 +0700 [Refactoring] ModSeqProvider do not need mailboxSession --- .../cassandra/CassandraMailboxSessionMapperFactory.java | 2 +- .../mailbox/cassandra/mail/CassandraMessageIdMapper.java | 7 ++----- .../mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +- .../mailbox/cassandra/mail/CassandraModSeqProvider.java | 11 +++++------ .../mailbox/cassandra/mail/CassandraMapperProvider.java | 6 ++---- .../mailbox/cassandra/mail/CassandraModSeqProviderTest.java | 12 ++++++------ .../apache/james/mailbox/jpa/mail/JPAModSeqProvider.java | 9 ++++----- .../java/org/apache/james/mailbox/maildir/MaildirStore.java | 8 ++++---- .../james/mailbox/inmemory/mail/InMemoryModSeqProvider.java | 10 ++++------ .../james/mailbox/inmemory/mail/InMemoryMapperProvider.java | 4 ++-- .../apache/james/mailbox/store/StoreMessageIdManager.java | 2 +- .../james/mailbox/store/mail/AbstractMessageMapper.java | 8 ++++---- .../org/apache/james/mailbox/store/mail/MessageUtils.java | 4 ++-- .../org/apache/james/mailbox/store/mail/ModSeqProvider.java | 13 ++++++------- .../apache/james/mailbox/store/mail/MessageUtilsTest.java | 6 +++--- 15 files changed, 47 insertions(+), 57 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 1015608..320f195 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 @@ -160,7 +160,7 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa public MessageIdMapper createMessageIdMapper(MailboxSession mailboxSession) throws MailboxException { return new CassandraMessageIdMapper(getMailboxMapper(mailboxSession), mailboxDAO, createAttachmentMapper(mailboxSession), - imapUidDAO, messageIdDAO, messageDAO, indexTableHandler, modSeqProvider, mailboxSession, + imapUidDAO, messageIdDAO, messageDAO, indexTableHandler, modSeqProvider, cassandraConfiguration); } diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java index c69b4e5..f317f6b 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java @@ -28,7 +28,6 @@ import javax.mail.Flags; import org.apache.commons.lang3.tuple.Pair; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; @@ -67,14 +66,13 @@ public class CassandraMessageIdMapper implements MessageIdMapper { private final CassandraMessageDAO messageDAO; private final CassandraIndexTableHandler indexTableHandler; private final ModSeqProvider modSeqProvider; - private final MailboxSession mailboxSession; private final AttachmentLoader attachmentLoader; private final CassandraConfiguration cassandraConfiguration; public CassandraMessageIdMapper(MailboxMapper mailboxMapper, CassandraMailboxDAO mailboxDAO, CassandraAttachmentMapper attachmentMapper, CassandraMessageIdToImapUidDAO imapUidDAO, CassandraMessageIdDAO messageIdDAO, CassandraMessageDAO messageDAO, CassandraIndexTableHandler indexTableHandler, - ModSeqProvider modSeqProvider, MailboxSession mailboxSession, CassandraConfiguration cassandraConfiguration) { + ModSeqProvider modSeqProvider, CassandraConfiguration cassandraConfiguration) { this.mailboxMapper = mailboxMapper; this.mailboxDAO = mailboxDAO; @@ -83,7 +81,6 @@ public class CassandraMessageIdMapper implements MessageIdMapper { this.messageDAO = messageDAO; this.indexTableHandler = indexTableHandler; this.modSeqProvider = modSeqProvider; - this.mailboxSession = mailboxSession; this.attachmentLoader = new AttachmentLoader(attachmentMapper); this.cassandraConfiguration = cassandraConfiguration; } @@ -274,7 +271,7 @@ public class CassandraMessageIdMapper implements MessageIdMapper { ComposedMessageIdWithMetaData newComposedId = new ComposedMessageIdWithMetaData( oldComposedId.getComposedMessageId(), newFlags, - modSeqProvider.nextModSeq(mailboxSession, cassandraId)); + modSeqProvider.nextModSeq(cassandraId)); return updateFlags(oldComposedId, newComposedId); } diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java index 0d3b43c..b06ef42 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java @@ -263,7 +263,7 @@ public class CassandraMessageMapper implements MessageMapper { @Override public ModSeq getHighestModSeq(Mailbox mailbox) throws MailboxException { - return modSeqProvider.highestModSeq(mailboxSession, mailbox); + return modSeqProvider.highestModSeq(mailbox); } @Override diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java index b2e7460..7aeb45e 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProvider.java @@ -38,7 +38,6 @@ import javax.inject.Inject; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.exception.MailboxException; @@ -120,7 +119,7 @@ public class CassandraModSeqProvider implements ModSeqProvider { @Override - public ModSeq nextModSeq(MailboxSession mailboxSession, Mailbox mailbox) throws MailboxException { + public ModSeq nextModSeq(Mailbox mailbox) throws MailboxException { CassandraId mailboxId = (CassandraId) mailbox.getMailboxId(); return nextModSeq(mailboxId) .blockOptional() @@ -128,19 +127,19 @@ public class CassandraModSeqProvider implements ModSeqProvider { } @Override - public ModSeq nextModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq nextModSeq(MailboxId mailboxId) throws MailboxException { return nextModSeq((CassandraId) mailboxId) .blockOptional() .orElseThrow(() -> new MailboxException("Can not retrieve modseq for " + mailboxId)); } @Override - public ModSeq highestModSeq(MailboxSession mailboxSession, Mailbox mailbox) throws MailboxException { - return highestModSeq(mailboxSession, mailbox.getMailboxId()); + public ModSeq highestModSeq(Mailbox mailbox) throws MailboxException { + return highestModSeq(mailbox.getMailboxId()); } @Override - public ModSeq highestModSeq(MailboxSession mailboxSession, MailboxId mailboxId) throws MailboxException { + public ModSeq highestModSeq(MailboxId mailboxId) throws MailboxException { return unbox(() -> findHighestModSeq((CassandraId) mailboxId).block().orElse(ModSeq.first())); } 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 cc84fad..8510f27 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 @@ -114,14 +114,12 @@ public class CassandraMapperProvider implements MapperProvider { @Override public ModSeq generateModSeq(Mailbox mailbox) throws MailboxException { - MailboxSession mailboxSession = null; - return cassandraModSeqProvider.nextModSeq(mailboxSession, mailbox); + return cassandraModSeqProvider.nextModSeq(mailbox); } @Override public ModSeq highestModSeq(Mailbox mailbox) throws MailboxException { - MailboxSession mailboxSession = null; - return cassandraModSeqProvider.highestModSeq(mailboxSession, mailbox); + return cassandraModSeqProvider.highestModSeq(mailbox); } } diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java index b0f0af4..55a8088 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java @@ -65,12 +65,12 @@ class CassandraModSeqProviderTest { @Test void highestModSeqShouldRetrieveValueStoredNextModSeq() throws Exception { int nbEntries = 100; - ModSeq result = modSeqProvider.highestModSeq(null, mailbox); + ModSeq result = modSeqProvider.highestModSeq(mailbox); assertThat(result).isEqualTo(0); LongStream.range(0, nbEntries) .forEach(Throwing.longConsumer(value -> { - ModSeq modSeq = modSeqProvider.nextModSeq(null, mailbox); - assertThat(modSeq).isEqualTo(modSeqProvider.highestModSeq(null, mailbox)); + ModSeq modSeq = modSeqProvider.nextModSeq(mailbox); + assertThat(modSeq).isEqualTo(modSeqProvider.highestModSeq(mailbox)); }) ); } @@ -78,10 +78,10 @@ class CassandraModSeqProviderTest { @Test void nextModSeqShouldIncrementValueByOne() throws Exception { int nbEntries = 100; - ModSeq lastModSeq = modSeqProvider.highestModSeq(null, mailbox); + ModSeq lastModSeq = modSeqProvider.highestModSeq(mailbox); LongStream.range(lastModSeq.asLong() + 1, lastModSeq.asLong() + nbEntries) .forEach(Throwing.longConsumer(value -> { - ModSeq result = modSeqProvider.nextModSeq(null, mailbox); + ModSeq result = modSeqProvider.nextModSeq(mailbox); assertThat(result.asLong()).isEqualTo(value); })); } @@ -93,7 +93,7 @@ class CassandraModSeqProviderTest { ConcurrentSkipListSet<ModSeq> modSeqs = new ConcurrentSkipListSet<>(); ConcurrentTestRunner.builder() .operation( - (threadNumber, step) -> modSeqs.add(modSeqProvider.nextModSeq(null, mailbox))) + (threadNumber, step) -> modSeqs.add(modSeqProvider.nextModSeq(mailbox))) .threadCount(10) .operationCount(nbEntries) .runSuccessfullyWithin(Duration.ofMinutes(1)); diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java index ff1a5e2..da24f12 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java @@ -23,7 +23,6 @@ import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceException; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.JPAId; @@ -42,23 +41,23 @@ public class JPAModSeqProvider implements ModSeqProvider { } @Override - public ModSeq highestModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException { + public ModSeq highestModSeq(Mailbox mailbox) throws MailboxException { JPAId mailboxId = (JPAId) mailbox.getMailboxId(); return highestModSeq(mailboxId); } @Override - public ModSeq nextModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException { + public ModSeq nextModSeq(Mailbox mailbox) throws MailboxException { return nextModSeq((JPAId) mailbox.getMailboxId()); } @Override - public ModSeq nextModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq nextModSeq(MailboxId mailboxId) throws MailboxException { return nextModSeq((JPAId) mailboxId); } @Override - public ModSeq highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq highestModSeq(MailboxId mailboxId) throws MailboxException { return highestModSeq((JPAId) mailboxId); } diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java index 63f2a96..f46efb6 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java @@ -261,12 +261,12 @@ public class MaildirStore implements UidProvider, ModSeqProvider { } @Override - public ModSeq nextModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException { + public ModSeq nextModSeq(Mailbox mailbox) { return ModSeq.of(System.currentTimeMillis()); } @Override - public ModSeq highestModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException { + public ModSeq highestModSeq(Mailbox mailbox) throws MailboxException { try { return createMaildirFolder(mailbox).getHighestModSeq(); } catch (IOException e) { @@ -300,7 +300,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider { } @Override - public ModSeq nextModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq nextModSeq(MailboxId mailboxId) { return ModSeq.of(System.currentTimeMillis()); } @@ -310,7 +310,7 @@ public class MaildirStore implements UidProvider, ModSeqProvider { } @Override - public ModSeq highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq highestModSeq(MailboxId mailboxId) { throw new NotImplementedException("Not implemented"); } } diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java index 08c1007..d4c80a1 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java @@ -23,9 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.ModSeq; -import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.Mailbox; import org.apache.james.mailbox.model.MailboxId; @@ -35,23 +33,23 @@ public class InMemoryModSeqProvider implements ModSeqProvider { private final ConcurrentMap<InMemoryId, AtomicLong> map = new ConcurrentHashMap<>(); @Override - public ModSeq nextModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException { + public ModSeq nextModSeq(Mailbox mailbox) { return ModSeq.of(nextModSeq((InMemoryId) mailbox.getMailboxId())); } @Override - public ModSeq nextModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq nextModSeq(MailboxId mailboxId) { return ModSeq.of(nextModSeq((InMemoryId) mailboxId)); } @Override - public ModSeq highestModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException { + public ModSeq highestModSeq(Mailbox mailbox) { return ModSeq.of(getHighest((InMemoryId) mailbox.getMailboxId()).get()); } @Override - public ModSeq highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException { + public ModSeq highestModSeq(MailboxId mailboxId) { return ModSeq.of(getHighest((InMemoryId) mailboxId).get()); } 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 99ccba0..8f60b26 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 @@ -115,13 +115,13 @@ public class InMemoryMapperProvider implements MapperProvider { @Override public ModSeq generateModSeq(Mailbox mailbox) throws MailboxException { return inMemoryMailboxSessionMapperFactory.getModSeqProvider() - .nextModSeq(MAILBOX_SESSION, mailbox); + .nextModSeq(mailbox); } @Override public ModSeq highestModSeq(Mailbox mailbox) throws MailboxException { return inMemoryMailboxSessionMapperFactory.getModSeqProvider() - .highestModSeq(MAILBOX_SESSION, mailbox); + .highestModSeq(mailbox); } } 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 c4a8bd1..a6c19f8 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 @@ -396,7 +396,7 @@ public class StoreMessageIdManager implements MessageIdManager { } private void save(MailboxSession mailboxSession, MessageIdMapper messageIdMapper, MailboxMessage mailboxMessage) throws MailboxException { - ModSeq modSeq = mailboxSessionMapperFactory.getModSeqProvider().nextModSeq(mailboxSession, mailboxMessage.getMailboxId()); + ModSeq modSeq = mailboxSessionMapperFactory.getModSeqProvider().nextModSeq(mailboxMessage.getMailboxId()); MessageUid uid = mailboxSessionMapperFactory.getUidProvider().nextUid(mailboxSession, mailboxMessage.getMailboxId()); mailboxMessage.setModSeq(modSeq); mailboxMessage.setUid(uid); diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java index 915be78..ecac854 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java @@ -62,7 +62,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen @Override public ModSeq getHighestModSeq(Mailbox mailbox) throws MailboxException { - return modSeqProvider.highestModSeq(mailboxSession, mailbox); + return modSeqProvider.highestModSeq(mailbox); } @Override @@ -87,7 +87,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen if (!messages.hasNext()) { return ImmutableList.<UpdatedFlags>of().iterator(); } - ModSeq modSeq = modSeqProvider.nextModSeq(mailboxSession, mailbox); + ModSeq modSeq = modSeqProvider.nextModSeq(mailbox); while (messages.hasNext()) { final MailboxMessage member = messages.next(); Flags originalFlags = member.createFlags(); @@ -118,7 +118,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen // if a mailbox does not support mod-sequences the provider may be null if (modSeqProvider != null) { - message.setModSeq(modSeqProvider.nextModSeq(mailboxSession, mailbox)); + message.setModSeq(modSeqProvider.nextModSeq(mailbox)); } MessageMetaData data = save(mailbox, message); @@ -130,7 +130,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen @Override public MessageMetaData copy(Mailbox mailbox, MailboxMessage original) throws MailboxException { MessageUid uid = uidProvider.nextUid(mailboxSession, mailbox); - ModSeq modSeq = modSeqProvider.nextModSeq(mailboxSession, mailbox); + ModSeq modSeq = modSeqProvider.nextModSeq(mailbox); final MessageMetaData metaData = copy(mailbox, uid, modSeq, original); return metaData; diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageUtils.java index b72e314..6d7c0b7 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageUtils.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageUtils.java @@ -51,7 +51,7 @@ public class MessageUtils { } public ModSeq getHighestModSeq(Mailbox mailbox) throws MailboxException { - return modSeqProvider.highestModSeq(mailboxSession, mailbox); + return modSeqProvider.highestModSeq(mailbox); } public Optional<MessageUid> getLastUid(Mailbox mailbox) throws MailboxException { @@ -64,7 +64,7 @@ public class MessageUtils { } public ModSeq nextModSeq(Mailbox mailbox) throws MailboxException { - return modSeqProvider.nextModSeq(mailboxSession, mailbox); + return modSeqProvider.nextModSeq(mailbox); } public void enrichMessage(Mailbox mailbox, MailboxMessage message) throws MailboxException { diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java index 716e7d1..7c96c74 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.mailbox.store.mail; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.Mailbox; @@ -37,7 +36,7 @@ public interface ModSeqProvider { * * The first mod-seq must be >= 1 */ - ModSeq nextModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException; + ModSeq nextModSeq(Mailbox mailbox) throws MailboxException; /** * Return the next mod-sequence which can be used for the {@link Mailbox}. @@ -46,15 +45,15 @@ public interface ModSeqProvider { * * The first mod-seq must be >= 1 */ - ModSeq nextModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException; - + ModSeq nextModSeq(MailboxId mailboxId) throws MailboxException; + /** * Return the highest mod-sequence which were used for the {@link Mailbox} */ - ModSeq highestModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException; - + ModSeq highestModSeq(Mailbox mailbox) throws MailboxException; + /** * Return the highest mod-sequence which were used for the {@link Mailbox} */ - ModSeq highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException; + ModSeq highestModSeq(MailboxId mailboxId) throws MailboxException; } diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java index 0c8d05e..82bd23d 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/MessageUtilsTest.java @@ -87,13 +87,13 @@ public class MessageUtilsTest { @Test public void getHighestModSeqShouldCallModSeqProvider() throws Exception { messageUtils.getHighestModSeq(mailbox); - verify(modSeqProvider).highestModSeq(eq(mailboxSession), eq(mailbox)); + verify(modSeqProvider).highestModSeq(eq(mailbox)); } @Test public void nextModSeqShouldCallModSeqProvider() throws Exception { messageUtils.nextModSeq(mailbox); - verify(modSeqProvider).nextModSeq(eq(mailboxSession), eq(mailbox)); + verify(modSeqProvider).nextModSeq(eq(mailbox)); } @Test @@ -111,7 +111,7 @@ public class MessageUtilsTest { @Test public void enrichMesageShouldEnrichUidAndModSeq() throws Exception { when(uidProvider.nextUid(eq(mailboxSession), eq(mailbox))).thenReturn(MESSAGE_UID); - when(modSeqProvider.nextModSeq(eq(mailboxSession), eq(mailbox))).thenReturn(ModSeq.of(11)); + when(modSeqProvider.nextModSeq(eq(mailbox))).thenReturn(ModSeq.of(11)); messageUtils.enrichMessage(mailbox, message); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
