This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 712ebbd1dd270cb64af98e7cb303963f3e3efa4c Author: Benoit Tellier <[email protected]> AuthorDate: Fri May 8 17:22:10 2020 +0700 [Refactoring] POJOify MailboxMetadata --- .../org/apache/james/mailbox/MessageManager.java | 164 +++++++++++++++------ .../apache/james/mailbox/MailboxManagerTest.java | 16 +- .../manager/QuotaMessageManagerContract.java | 4 +- .../james/mailbox/store/MailboxMetaData.java | 151 ------------------- .../james/mailbox/store/StoreMessageManager.java | 2 +- .../store/AbstractCombinationManagerTest.java | 20 +-- .../mailbox/store/AbstractMessageManagerTest.java | 4 +- .../mailbox/tools/copier/MailboxCopierTest.java | 2 +- .../imap/processor/AbstractMailboxProcessor.java | 14 +- .../imap/processor/AbstractSelectionProcessor.java | 24 +-- .../james/imap/processor/CloseProcessor.java | 2 +- .../james/imap/processor/ExpungeProcessor.java | 6 +- .../james/imap/processor/GetACLProcessor.java | 6 +- .../james/imap/processor/SearchProcessor.java | 4 +- .../james/imap/processor/StatusProcessor.java | 26 ++-- .../james/imap/processor/StoreProcessor.java | 8 +- .../james/imap/processor/fetch/FetchProcessor.java | 4 +- .../imap/processor/DeleteACLProcessorTest.java | 8 +- .../james/imap/processor/GetACLProcessorTest.java | 8 +- .../imap/processor/ListRightsProcessorTest.java | 8 +- .../james/imap/processor/SetACLProcessorTest.java | 6 +- .../org/apache/james/modules/ACLProbeImpl.java | 2 +- .../event/PropagateLookupRightListenerTest.java | 28 ++-- 23 files changed, 222 insertions(+), 295 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java index 2f675c1..975c777 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java @@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.Date; import java.util.EnumSet; import java.util.Iterator; @@ -55,6 +56,7 @@ import org.apache.james.mime4j.dom.Message; import org.apache.james.mime4j.message.DefaultMessageWriter; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; /** * Interface which represent a Mailbox @@ -82,7 +84,7 @@ public interface MessageManager { /** * Return if the Mailbox is writable * @deprecated use - * {@link #getMetaData(boolean, MailboxSession, org.apache.james.mailbox.MessageManager.MetaData.FetchGroup)} + * {@link #getMetaData(boolean, MailboxSession, MailboxMetaData.FetchGroup)} */ @Deprecated boolean isWriteable(MailboxSession session) throws MailboxException; @@ -92,7 +94,7 @@ public interface MessageManager { * way. * * @deprecated use - * {@link #getMetaData(boolean, MailboxSession, org.apache.james.mailbox.MessageManager.MetaData.FetchGroup)} + * {@link #getMetaData(boolean, MailboxSession, MailboxMetaData.FetchGroup)} */ boolean isModSeqPermanent(MailboxSession session); @@ -353,21 +355,21 @@ public interface MessageManager { * describes which optional data should be returned * @return metadata view filtered for the session's user, not null */ - MetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession, MessageManager.MetaData.FetchGroup fetchGroup) throws MailboxException; + MailboxMetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession, MailboxMetaData.FetchGroup fetchGroup) throws MailboxException; /** * Meta data about the current state of the mailbox. */ - interface MetaData { + class MailboxMetaData { /** * Describes the optional data types which will get set in the - * {@link MetaData}. + * {@link MailboxMetaData}. * * These are always set: - HIGHESTMODSEQ - PERMANENTFLAGS - UIDNEXT - * UIDVALIDITY - MODSEQPERMANET - WRITABLE */ - enum FetchGroup { + public enum FetchGroup { /** * Only include the message and recent count @@ -390,104 +392,180 @@ public interface MessageManager { NO_COUNT } - /** - * Gets the UIDs of recent messages if requested or an empty - * {@link List} otherwise. - * - * @return the uids flagged RECENT in this mailbox, - */ - List<MessageUid> getRecent(); + public static MailboxMetaData sensibleInformationFree(MailboxACL resolvedAcl, UidValidity uidValidity, boolean writeable, boolean modSeqPermanent) throws MailboxException { + ImmutableList<MessageUid> recents = ImmutableList.of(); + MessageUid uidNext = MessageUid.MIN_VALUE; + ModSeq highestModSeq = ModSeq.first(); + long messageCount = 0L; + long unseenCount = 0L; + MessageUid firstUnseen = null; + return new MailboxMetaData( + recents, + new Flags(), + uidValidity, + uidNext, + highestModSeq, + messageCount, + unseenCount, + firstUnseen, + writeable, + modSeqPermanent, + resolvedAcl); + } + + private final long recentCount; + private final List<MessageUid> recent; + private final Flags permanentFlags; + private final UidValidity uidValidity; + private final MessageUid nextUid; + private final long messageCount; + private final long unseenCount; + private final MessageUid firstUnseen; + private final boolean writeable; + private final ModSeq highestModSeq; + private final boolean modSeqPermanent; + private final MailboxACL acl; + + public MailboxMetaData(List<MessageUid> recent, Flags permanentFlags, UidValidity uidValidity, MessageUid uidNext, ModSeq highestModSeq, long messageCount, long unseenCount, MessageUid firstUnseen, boolean writeable, boolean modSeqPermanent, MailboxACL acl) { + this.recent = Optional.ofNullable(recent).orElseGet(ArrayList::new); + this.highestModSeq = highestModSeq; + this.recentCount = this.recent.size(); + + this.permanentFlags = permanentFlags; + this.uidValidity = uidValidity; + this.nextUid = uidNext; + this.messageCount = messageCount; + this.unseenCount = unseenCount; + this.firstUnseen = firstUnseen; + this.writeable = writeable; + this.modSeqPermanent = modSeqPermanent; + this.acl = acl; + } /** * Gets the number of recent messages. - * + * * @return the number of messages flagged RECENT in this mailbox */ - long countRecent(); + public long countRecent() { + return recentCount; + } /** * Gets the flags which can be stored by this mailbox. - * + * * @return Flags that can be stored */ - Flags getPermanentFlags(); + public Flags getPermanentFlags() { + return permanentFlags; + } + + + /** + * Gets the UIDs of recent messages if requested or an empty + * {@link List} otherwise. + * + * @return the uids flagged RECENT in this mailbox, + */ + public List<MessageUid> getRecent() { + return recent; + } /** * Gets the UIDVALIDITY. - * + * * @return UIDVALIDITY */ - UidValidity getUidValidity(); + public UidValidity getUidValidity() { + return uidValidity; + } /** * Gets the next UID predicted. The returned UID is not guaranteed to be * the one that is assigned to the next message. Its only guaranteed * that it will be at least equals or bigger then the value - * + * * @return the uid that will be assigned to the next appended message */ - MessageUid getUidNext(); - - /** - * Return the highest mod-sequence for the mailbox. If this value has - * changed till the last check you can be sure that some changes where - * happen on the mailbox - * - * @return higestModSeq - */ - ModSeq getHighestModSeq(); + public MessageUid getUidNext() { + return nextUid; + } /** * Gets the number of messages that this mailbox contains. This is an * optional property.<br> - * + * * @return number of messages contained or -1 when this optional data * has not be requested - * + * */ - long getMessageCount(); + public long getMessageCount() { + return messageCount; + } /** * Gets the number of unseen messages contained in this mailbox. This is * an optional property.<br> - * + * * @return number of unseen messages contained or zero when this * optional data has not been requested * @see FetchGroup#UNSEEN_COUNT */ - long getUnseenCount(); + public long getUnseenCount() { + return unseenCount; + } /** * Gets the UID of the first unseen message. This is an optional * property.<br> - * + * * @return uid of the first unseen message, or null when there are no * unseen messages * @see FetchGroup#FIRST_UNSEEN */ - MessageUid getFirstUnseen(); + public MessageUid getFirstUnseen() { + return firstUnseen; + } /** * Is this mailbox writable? - * + * * @return true if read-write, false if read only */ - boolean isWriteable(); + public boolean isWriteable() { + return writeable; + } + + /** + * Return the highest mod-sequence for the mailbox. If this value has + * changed till the last check you can be sure that some changes where + * happen on the mailbox + * + * @return higestModSeq + */ + public ModSeq getHighestModSeq() { + return highestModSeq; + } /** * Return true if the mailbox does store the mod-sequences in a * permanent way - * + * * @return permanent */ - boolean isModSeqPermanent(); + public boolean isModSeqPermanent() { + return modSeqPermanent; + } + /** * Returns the ACL concerning this mailbox. - * + * * @return acl */ - MailboxACL getACL(); + public MailboxACL getACL() { + return acl; + } } diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java index 28f5f94..15ab35d 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java @@ -1498,28 +1498,28 @@ public abstract class MailboxManagerTest<T extends MailboxManager> { .build(message), session1); boolean resetRecent = false; - MessageManager.MetaData metaData = mailboxManager.getMailbox(inbox1, session2) - .getMetaData(resetRecent, session2, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT); + MessageManager.MailboxMetaData metaData = mailboxManager.getMailbox(inbox1, session2) + .getMetaData(resetRecent, session2, MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT); assertSoftly( softly -> { softly.assertThat(metaData) - .extracting(MessageManager.MetaData::getHighestModSeq) + .extracting(MessageManager.MailboxMetaData::getHighestModSeq) .isEqualTo(ModSeq.first()); softly.assertThat(metaData) - .extracting(MessageManager.MetaData::getUidNext) + .extracting(MessageManager.MailboxMetaData::getUidNext) .isEqualTo(MessageUid.MIN_VALUE); softly.assertThat(metaData) - .extracting(MessageManager.MetaData::getMessageCount) + .extracting(MessageManager.MailboxMetaData::getMessageCount) .isEqualTo(0L); softly.assertThat(metaData) - .extracting(MessageManager.MetaData::getUnseenCount) + .extracting(MessageManager.MailboxMetaData::getUnseenCount) .isEqualTo(0L); softly.assertThat(metaData) - .extracting(MessageManager.MetaData::getRecent) + .extracting(MessageManager.MailboxMetaData::getRecent) .isEqualTo(ImmutableList.of()); softly.assertThat(metaData) - .extracting(MessageManager.MetaData::getPermanentFlags) + .extracting(MessageManager.MailboxMetaData::getPermanentFlags) .isEqualTo(new Flags()); }); } diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerContract.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerContract.java index 5e5fdf9..94d6662 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerContract.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/QuotaMessageManagerContract.java @@ -168,7 +168,7 @@ public interface QuotaMessageManagerContract<T extends MailboxManager> { } List<MessageUid> uids = provisionner.getMessageManager() - .getMetaData(true, provisionner.getSession(), MessageManager.MetaData.FetchGroup.UNSEEN_COUNT) + .getMetaData(true, provisionner.getSession(), MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT) .getRecent(); provisionner.getMessageManager().delete(uids, provisionner.getSession()); // We have suppressed at list one message. Ensure we can add an other message. If is impossible, an exception will be thrown. @@ -191,7 +191,7 @@ public interface QuotaMessageManagerContract<T extends MailboxManager> { } List<MessageUid> uids = provisionner.getMessageManager() - .getMetaData(true, provisionner.getSession(), MessageManager.MetaData.FetchGroup.UNSEEN_COUNT) + .getMetaData(true, provisionner.getSession(), MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT) .getRecent(); provisionner.getMessageManager().delete(uids, provisionner.getSession()); // We have suppressed at list one message. Ensure we can add an other message. If is impossible, an exception will be thrown. diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java deleted file mode 100644 index 36410c6..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java +++ /dev/null @@ -1,151 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.mailbox.store; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import javax.mail.Flags; - -import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageUid; -import org.apache.james.mailbox.ModSeq; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.MailboxACL; -import org.apache.james.mailbox.model.UidValidity; - -import com.google.common.collect.ImmutableList; - -/** - * Describes the current state of a mailbox. - */ -public class MailboxMetaData implements MessageManager.MetaData { - - public static MailboxMetaData sensibleInformationFree(MailboxACL resolvedAcl, UidValidity uidValidity, boolean writeable, boolean modSeqPermanent) throws MailboxException { - ImmutableList<MessageUid> recents = ImmutableList.of(); - MessageUid uidNext = MessageUid.MIN_VALUE; - ModSeq highestModSeq = ModSeq.first(); - long messageCount = 0L; - long unseenCount = 0L; - MessageUid firstUnseen = null; - return new MailboxMetaData( - recents, - new Flags(), - uidValidity, - uidNext, - highestModSeq, - messageCount, - unseenCount, - firstUnseen, - writeable, - modSeqPermanent, - resolvedAcl); - } - - private final long recentCount; - private final List<MessageUid> recent; - private final Flags permanentFlags; - private final UidValidity uidValidity; - private final MessageUid nextUid; - private final long messageCount; - private final long unseenCount; - private final MessageUid firstUnseen; - private final boolean writeable; - private final ModSeq highestModSeq; - private final boolean modSeqPermanent; - private final MailboxACL acl; - - public MailboxMetaData(List<MessageUid> recent, Flags permanentFlags, UidValidity uidValidity, MessageUid uidNext, ModSeq highestModSeq, long messageCount, long unseenCount, MessageUid firstUnseen, boolean writeable, boolean modSeqPermanent, MailboxACL acl) { - this.recent = Optional.ofNullable(recent).orElseGet(ArrayList::new); - this.highestModSeq = highestModSeq; - this.recentCount = this.recent.size(); - - this.permanentFlags = permanentFlags; - this.uidValidity = uidValidity; - this.nextUid = uidNext; - this.messageCount = messageCount; - this.unseenCount = unseenCount; - this.firstUnseen = firstUnseen; - this.writeable = writeable; - this.modSeqPermanent = modSeqPermanent; - this.acl = acl; - } - - @Override - public long countRecent() { - return recentCount; - } - - @Override - public Flags getPermanentFlags() { - return permanentFlags; - } - - @Override - public List<MessageUid> getRecent() { - return recent; - } - - @Override - public UidValidity getUidValidity() { - return uidValidity; - } - - @Override - public MessageUid getUidNext() { - return nextUid; - } - - @Override - public long getMessageCount() { - return messageCount; - } - - @Override - public long getUnseenCount() { - return unseenCount; - } - - @Override - public MessageUid getFirstUnseen() { - return firstUnseen; - } - - @Override - public boolean isWriteable() { - return writeable; - } - - @Override - public ModSeq getHighestModSeq() { - return highestModSeq; - } - - @Override - public boolean isModSeqPermanent() { - return modSeqPermanent; - } - - @Override - public MailboxACL getACL() { - return acl; - } -} 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 090f488..c2d76d8 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 @@ -488,7 +488,7 @@ public class StoreMessageManager implements MessageManager { } @Override - public MetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession, MetaData.FetchGroup fetchGroup) throws MailboxException { + public MailboxMetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession, MailboxMetaData.FetchGroup fetchGroup) throws MailboxException { MailboxACL resolvedAcl = getResolvedAcl(mailboxSession); boolean hasReadRight = storeRightManager.hasRight(mailbox, MailboxACL.Right.Read, mailboxSession); if (!hasReadRight) { diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java index f106aa7..97dcf42 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java @@ -278,10 +278,10 @@ public abstract class AbstractCombinationManagerTest { .withFlags(recent) .build(mailContent), session).getId(); - long mailbox2NextUid = messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT).getUidNext().asLong(); + long mailbox2NextUid = messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT).getUidNext().asLong(); messageIdManager.setInMailboxes(messageId.getMessageId(), ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - List<MessageUid> messageUids = messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT).getRecent(); + List<MessageUid> messageUids = messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT).getRecent(); assertThat(messageUids).hasSize(1); assertThat(messageUids.get(0).asLong()).isGreaterThanOrEqualTo(mailbox2NextUid); @@ -298,7 +298,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setInMailboxes(messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN).countRecent()).isEqualTo(1); + assertThat(messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.FIRST_UNSEEN).countRecent()).isEqualTo(1); } @Test @@ -320,7 +320,7 @@ public abstract class AbstractCombinationManagerTest { .getUid() .asLong(); - assertThat(messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN).getUidNext().asLong()) + assertThat(messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.FIRST_UNSEEN).getUidNext().asLong()) .isGreaterThan(uid2); } @@ -331,7 +331,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setInMailboxes(messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN).getHighestModSeq().asLong()).isNotNegative(); + assertThat(messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.FIRST_UNSEEN).getHighestModSeq().asLong()).isNotNegative(); } @Test @@ -341,7 +341,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setInMailboxes(messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN).getMessageCount()).isEqualTo(1); + assertThat(messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.FIRST_UNSEEN).getMessageCount()).isEqualTo(1); } @Test @@ -351,7 +351,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setInMailboxes(messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT).getUnseenCount()).isEqualTo(1); + assertThat(messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT).getUnseenCount()).isEqualTo(1); } @Test @@ -360,7 +360,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setInMailboxes(messageId.getMessageId(), ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager2.getMetaData(true, session, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN).getFirstUnseen()).isEqualTo(messageId.getUid()); + assertThat(messageManager2.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.FIRST_UNSEEN).getFirstUnseen()).isEqualTo(messageId.getUid()); } @Test @@ -371,7 +371,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setFlags(newFlag, FlagsUpdateMode.ADD, messageId, ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager1.getMetaData(true, session, MessageManager.MetaData.FetchGroup.UNSEEN_COUNT).getUnseenCount()).isEqualTo(1); + assertThat(messageManager1.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT).getUnseenCount()).isEqualTo(1); } @Test @@ -381,7 +381,7 @@ public abstract class AbstractCombinationManagerTest { messageIdManager.setFlags(newFlag, FlagsUpdateMode.ADD, messageId.getMessageId(), ImmutableList.of(mailbox1.getMailboxId(), mailbox2.getMailboxId()), session); - assertThat(messageManager1.getMetaData(true, session, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN).getFirstUnseen()).isEqualTo(messageId.getUid()); + assertThat(messageManager1.getMetaData(true, session, MessageManager.MailboxMetaData.FetchGroup.FIRST_UNSEEN).getFirstUnseen()).isEqualTo(messageId.getUid()); } @Test diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java index 3c23ef3..c952ac7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageManagerTest.java @@ -58,7 +58,7 @@ public abstract class AbstractMessageManagerTest { mailboxManager.applyRightsCommand(INBOX_ALICE, MailboxACL.command().forUser(CEDRIC).rights(MailboxACL.Right.Read).asAddition(), aliceSession); MessageManager messageManager = mailboxManager.getMailbox(INBOX_ALICE, aliceSession); - MessageManager.MetaData actual = messageManager.getMetaData(NO_RESET_RECENT, aliceSession, MessageManager.MetaData.FetchGroup.NO_COUNT); + MessageManager.MailboxMetaData actual = messageManager.getMetaData(NO_RESET_RECENT, aliceSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT); assertThat(actual.getACL().getEntries()).containsKeys(MailboxACL.EntryKey.createUserEntryKey(BOB), MailboxACL.EntryKey.createUserEntryKey(CEDRIC)); } @@ -68,7 +68,7 @@ public abstract class AbstractMessageManagerTest { mailboxManager.applyRightsCommand(INBOX_ALICE, MailboxACL.command().forUser(CEDRIC).rights(MailboxACL.Right.Read).asAddition(), aliceSession); MessageManager messageManager = mailboxManager.getMailbox(INBOX_ALICE, aliceSession); - MessageManager.MetaData actual = messageManager.getMetaData(NO_RESET_RECENT, bobSession, MessageManager.MetaData.FetchGroup.NO_COUNT); + MessageManager.MailboxMetaData actual = messageManager.getMetaData(NO_RESET_RECENT, bobSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT); assertThat(actual.getACL().getEntries()).containsOnlyKeys(MailboxACL.EntryKey.createUserEntryKey(BOB)); } diff --git a/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java b/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java index 06dc53e..5efb540 100644 --- a/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java +++ b/mailbox/tools/copier/src/test/java/org/apache/james/mailbox/tools/copier/MailboxCopierTest.java @@ -27,7 +27,7 @@ import org.apache.james.core.Username; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.exception.BadCredentialsException; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java index 8377e05..a5f2b4a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java @@ -54,7 +54,7 @@ import org.apache.james.imap.processor.base.AbstractChainedProcessor; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.NullableMessageSequenceNumber; @@ -115,7 +115,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab responder.respond(new FlagsResponse(selected.getApplicableFlags())); } - protected void permanentFlags(Responder responder, MessageManager.MetaData metaData, SelectedMailbox selected) { + protected void permanentFlags(Responder responder, MailboxMetaData metaData, SelectedMailbox selected) { final Flags permanentFlags = metaData.getPermanentFlags(); if (permanentFlags.contains(Flags.Flag.USER)) { permanentFlags.add(selected.getApplicableFlags()); @@ -197,7 +197,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab try { // To be lazily initialized only if needed, which is in minority of cases. MessageManager messageManager = null; - MetaData metaData = null; + MailboxMetaData metaData = null; final MailboxSession mailboxSession = session.getMailboxSession(); // Check if we need to send a FLAGS and PERMANENTFLAGS response before the FETCH response @@ -206,7 +206,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab if (selected.hasNewApplicableFlags()) { messageManager = getMailbox(session, selected); flags(responder, selected); - metaData = messageManager.getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT); + metaData = messageManager.getMetaData(false, mailboxSession, MailboxMetaData.FetchGroup.NO_COUNT); permanentFlags(responder, metaData, selected); selected.resetNewApplicableFlags(); @@ -219,7 +219,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab messageManager = getMailbox(session, selected); } if (metaData == null) { - metaData = messageManager.getMetaData(false, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT); + metaData = messageManager.getMetaData(false, mailboxSession, MailboxMetaData.FetchGroup.NO_COUNT); } boolean isModSeqPermanent = metaData.isModSeqPermanent(); while (ranges.hasNext()) { @@ -281,7 +281,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab } } - protected void condstoreEnablingCommand(ImapSession session, Responder responder, MetaData metaData, boolean sendHighestModSeq) { + protected void condstoreEnablingCommand(ImapSession session, Responder responder, MailboxMetaData metaData, boolean sendHighestModSeq) { Set<Capability> enabled = EnableProcessor.getEnabledCapabilities(session); if (!enabled.contains(ImapConstants.SUPPORTS_CONDSTORE)) { if (sendHighestModSeq) { @@ -537,7 +537,7 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab /** * Send VANISHED responses if needed. */ - protected void respondVanished(MailboxSession session, MessageManager mailbox, List<MessageRange> ranges, long changedSince, MetaData metaData, Responder responder) throws MailboxException { + protected void respondVanished(MailboxSession session, MessageManager mailbox, List<MessageRange> ranges, long changedSince, MailboxMetaData metaData, Responder responder) throws MailboxException { // RFC5162 4.2. Server Implementations Storing Minimal State // // A server that stores the HIGHESTMODSEQ value at the time of the last diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java index 97d9055..3905387 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java @@ -45,8 +45,8 @@ import org.apache.james.imap.processor.base.SelectedMailboxImpl; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.events.EventBus; @@ -118,7 +118,7 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ return; } - final MessageManager.MetaData metaData = selectMailbox(fullMailboxPath, session); + final MailboxMetaData metaData = selectMailbox(fullMailboxPath, session); final SelectedMailbox selected = session.getSelected(); MessageUid firstUnseen = metaData.getFirstUnseen(); @@ -317,7 +317,7 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ - private void highestModSeq(Responder responder, MetaData metaData, SelectedMailbox selected) { + private void highestModSeq(Responder responder, MailboxMetaData metaData, SelectedMailbox selected) { final StatusResponse untaggedOk; if (metaData.isModSeqPermanent()) { final ModSeq highestModSeq = metaData.getHighestModSeq(); @@ -328,13 +328,13 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ responder.respond(untaggedOk); } - private void uidNext(Responder responder, MessageManager.MetaData metaData) throws MailboxException { + private void uidNext(Responder responder, MailboxMetaData metaData) throws MailboxException { final MessageUid uid = metaData.getUidNext(); final StatusResponse untaggedOk = statusResponseFactory.untaggedOk(HumanReadableText.UIDNEXT, ResponseCode.uidNext(uid)); responder.respond(untaggedOk); } - private void taggedOk(Responder responder, ImapRequest request, MetaData metaData, HumanReadableText text) { + private void taggedOk(Responder responder, ImapRequest request, MailboxMetaData metaData, HumanReadableText text) { final boolean writeable = metaData.isWriteable() && !openReadOnly; final ResponseCode code; if (writeable) { @@ -364,7 +364,7 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ } - private void uidValidity(Responder responder, MessageManager.MetaData metaData) throws MailboxException { + private void uidValidity(Responder responder, MailboxMetaData metaData) throws MailboxException { final UidValidity uidValidity = metaData.getUidValidity(); final StatusResponse untaggedOk = statusResponseFactory.untaggedOk(HumanReadableText.UID_VALIDITY, ResponseCode.uidValidity(uidValidity)); responder.respond(untaggedOk); @@ -376,13 +376,13 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ responder.respond(recentResponse); } - private void exists(Responder responder, MessageManager.MetaData metaData) throws MailboxException { + private void exists(Responder responder, MailboxMetaData metaData) throws MailboxException { final long messageCount = metaData.getMessageCount(); final ExistsResponse existsResponse = new ExistsResponse(messageCount); responder.respond(existsResponse); } - private MessageManager.MetaData selectMailbox(MailboxPath mailboxPath, ImapSession session) throws MailboxException { + private MailboxMetaData selectMailbox(MailboxPath mailboxPath, ImapSession session) throws MailboxException { final MailboxManager mailboxManager = getMailboxManager(); final MailboxSession mailboxSession = session.getMailboxSession(); final MessageManager mailbox = mailboxManager.getMailbox(mailboxPath, mailboxSession); @@ -407,13 +407,13 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ // TODO: Check if we need to handle CONDSTORE there too sessionMailbox = currentMailbox; } - final MessageManager.MetaData metaData = mailbox.getMetaData(!openReadOnly, mailboxSession, MessageManager.MetaData.FetchGroup.FIRST_UNSEEN); + final MailboxMetaData metaData = mailbox.getMetaData(!openReadOnly, mailboxSession, MailboxMetaData.FetchGroup.FIRST_UNSEEN); addRecent(metaData, sessionMailbox); return metaData; } - private void addRecent(MessageManager.MetaData metaData, SelectedMailbox sessionMailbox) throws MailboxException { + private void addRecent(MailboxMetaData metaData, SelectedMailbox sessionMailbox) throws MailboxException { final List<MessageUid> recentUids = metaData.getRecent(); for (MessageUid uid : recentUids) { sessionMailbox.addRecent(uid); @@ -441,7 +441,7 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ // See http://www.dovecot.org/list/dovecot/2008-March/029561.html if (capability.equals(ImapConstants.SUPPORTS_CONDSTORE) || capability.equals(ImapConstants.SUPPORTS_QRESYNC)) { try { - MetaData metaData = null; + MailboxMetaData metaData = null; boolean send = false; if (sm != null) { MessageManager mailbox = getSelectedMailbox(session); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java index 61436ca..e92891d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java @@ -29,7 +29,7 @@ import org.apache.james.imap.message.request.CloseRequest; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.metrics.api.MetricFactory; diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java index fd45881..c72b385 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java @@ -38,8 +38,8 @@ import org.apache.james.imap.message.request.ExpungeRequest; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MessageRangeException; @@ -68,7 +68,7 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i final MailboxSession mailboxSession = session.getMailboxSession(); int expunged = 0; - MetaData mdata = mailbox.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT); + MailboxMetaData mdata = mailbox.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT); if (!mdata.isWriteable()) { no(request, responder, HumanReadableText.MAILBOX_IS_READ_ONLY); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java index b17250b..ba7729d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java @@ -34,8 +34,8 @@ import org.apache.james.imap.message.response.ACLResponse; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxACL; @@ -93,7 +93,7 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp HumanReadableText text = new HumanReadableText(HumanReadableText.UNSUFFICIENT_RIGHTS_KEY, HumanReadableText.UNSUFFICIENT_RIGHTS_DEFAULT_VALUE, params); no(request, responder, text); } else { - MetaData metaData = messageManager.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT); + MailboxMetaData metaData = messageManager.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT); ACLResponse aclResponse = new ACLResponse(mailboxName, metaData.getACL()); responder.respond(aclResponse); okComplete(request, responder); diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java index 91d4ee4..9ed93cf 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java @@ -50,7 +50,7 @@ import org.apache.james.imap.message.response.SearchResponse; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.exception.MailboxException; @@ -104,7 +104,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp // See RFC4551: 3.4. MODSEQ Search Criterion in SEARCH final ModSeq highestModSeq; if (session.getAttribute(SEARCH_MODSEQ) != null) { - MetaData metaData = mailbox.getMetaData(false, msession, MessageManager.MetaData.FetchGroup.NO_COUNT); + MailboxMetaData metaData = mailbox.getMetaData(false, msession, MailboxMetaData.FetchGroup.NO_COUNT); highestModSeq = findHighestModSeq(msession, mailbox, MessageRange.toRanges(uids), metaData.getHighestModSeq()); // Enable CONDSTORE as this is a CONDSTORE enabling command diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java index 292269a..b96d38a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java @@ -59,7 +59,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { try { LOGGER.debug("Status called on mailbox named {}", mailboxPath); - MessageManager.MetaData metaData = retrieveMetadata(mailboxPath, statusDataItems, mailboxSession); + MessageManager.MailboxMetaData metaData = retrieveMetadata(mailboxPath, statusDataItems, mailboxSession); MailboxStatusResponse response = computeStatusResponse(request, statusDataItems, metaData); // Enable CONDSTORE as this is a CONDSTORE enabling command @@ -76,13 +76,13 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private MessageManager.MetaData retrieveMetadata(MailboxPath mailboxPath, StatusDataItems statusDataItems, MailboxSession mailboxSession) throws MailboxException { + private MessageManager.MailboxMetaData retrieveMetadata(MailboxPath mailboxPath, StatusDataItems statusDataItems, MailboxSession mailboxSession) throws MailboxException { MessageManager mailbox = getMailboxManager().getMailbox(mailboxPath, mailboxSession); - MessageManager.MetaData.FetchGroup fetchGroup = computeFetchGroup(statusDataItems); + MessageManager.MailboxMetaData.FetchGroup fetchGroup = computeFetchGroup(statusDataItems); return mailbox.getMetaData(false, mailboxSession, fetchGroup); } - private MailboxStatusResponse computeStatusResponse(StatusRequest request, StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private MailboxStatusResponse computeStatusResponse(StatusRequest request, StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { Long messages = messages(statusDataItems, metaData); Long recent = recent(statusDataItems, metaData); MessageUid uidNext = uidNext(statusDataItems, metaData); @@ -92,15 +92,15 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { return new MailboxStatusResponse(messages, recent, uidNext, highestModSeq, uidValidity, unseen, request.getMailboxName()); } - private MessageManager.MetaData.FetchGroup computeFetchGroup(StatusDataItems statusDataItems) { + private MessageManager.MailboxMetaData.FetchGroup computeFetchGroup(StatusDataItems statusDataItems) { if (statusDataItems.isUnseen()) { - return MessageManager.MetaData.FetchGroup.UNSEEN_COUNT; + return MessageManager.MailboxMetaData.FetchGroup.UNSEEN_COUNT; } else { - return MessageManager.MetaData.FetchGroup.NO_UNSEEN; + return MessageManager.MailboxMetaData.FetchGroup.NO_UNSEEN; } } - private Long unseen(StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private Long unseen(StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { if (statusDataItems.isUnseen()) { return metaData.getUnseenCount(); } else { @@ -108,7 +108,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private UidValidity uidValidity(StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private UidValidity uidValidity(StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { if (statusDataItems.isUidValidity()) { return metaData.getUidValidity(); } else { @@ -116,7 +116,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private ModSeq highestModSeq(StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private ModSeq highestModSeq(StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { if (statusDataItems.isHighestModSeq()) { return metaData.getHighestModSeq(); } else { @@ -124,7 +124,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private MessageUid uidNext(StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private MessageUid uidNext(StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { if (statusDataItems.isUidNext()) { return metaData.getUidNext(); } else { @@ -132,7 +132,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private Long recent(StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private Long recent(StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { if (statusDataItems.isRecent()) { return metaData.countRecent(); } else { @@ -140,7 +140,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private Long messages(StatusDataItems statusDataItems, MessageManager.MetaData metaData) { + private Long messages(StatusDataItems statusDataItems, MessageManager.MailboxMetaData metaData) { if (statusDataItems.isMessages()) { return metaData.getMessageCount(); } else { diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java index 8c34775..cbc579f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java @@ -46,7 +46,7 @@ import org.apache.james.imap.message.response.FetchResponse; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.ModSeq; import org.apache.james.mailbox.NullableMessageSequenceNumber; @@ -88,7 +88,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { final Flags flags = request.getFlags(); if (unchangedSince != -1) { - MetaData metaData = mailbox.getMetaData(false, mailboxSession, MetaData.FetchGroup.NO_COUNT); + MailboxMetaData metaData = mailbox.getMetaData(false, mailboxSession, MailboxMetaData.FetchGroup.NO_COUNT); if (metaData.isModSeqPermanent() == false) { // Check if the mailbox did not support modsequences. If so return a tagged bad response. // See RFC4551 3.1.2. NOMODSEQ Response Code @@ -236,7 +236,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { // See IMAP-303 if (selected.hasNewApplicableFlags()) { flags(responder, selected); - permanentFlags(responder, mailbox.getMetaData(false, mailboxSession, MetaData.FetchGroup.NO_COUNT), selected); + permanentFlags(responder, mailbox.getMetaData(false, mailboxSession, MailboxMetaData.FetchGroup.NO_COUNT), selected); selected.resetNewApplicableFlags(); } @@ -314,7 +314,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { if (unchangedSince != -1) { // Enable CONDSTORE as this is a CONDSTORE enabling command - condstoreEnablingCommand(session, responder, mailbox.getMetaData(false, mailboxSession, MetaData.FetchGroup.NO_COUNT), true); + condstoreEnablingCommand(session, responder, mailbox.getMetaData(false, mailboxSession, MailboxMetaData.FetchGroup.NO_COUNT), true); } } diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java index a9677a3..b1ef8f8 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java @@ -38,7 +38,7 @@ import org.apache.james.imap.processor.EnableProcessor; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MessageRangeException; import org.apache.james.mailbox.model.FetchGroup; @@ -85,7 +85,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { } final MailboxSession mailboxSession = session.getMailboxSession(); - MetaData metaData = mailbox.getMetaData(false, mailboxSession, org.apache.james.mailbox.MessageManager.MetaData.FetchGroup.NO_COUNT); + MailboxMetaData metaData = mailbox.getMetaData(false, mailboxSession, MailboxMetaData.FetchGroup.NO_COUNT); if (fetch.getChangedSince() != -1 || fetch.contains(Item.MODSEQ)) { // Enable CONDSTORE as this is a CONDSTORE enabling command condstoreEnablingCommand(session, responder, metaData, true); diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java index 69a1ada..34d9d86 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java @@ -41,8 +41,8 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxACL; @@ -64,7 +64,7 @@ public class DeleteACLProcessorTest { private FakeImapSession imapSession; private MailboxManager mailboxManager; private MailboxSession mailboxSession; - private MetaData metaData; + private MailboxMetaData metaData; private DeleteACLRequest deleteACLRequest; private DeleteACLProcessor subject; private EntryKey user1Key; @@ -82,7 +82,7 @@ public class DeleteACLProcessorTest { mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); - metaData = mock(MetaData.class); + metaData = mock(MailboxMetaData.class); responder = mock(Responder.class); imapSession.authenticated(); diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java index 45a889b..3cb320c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java @@ -42,8 +42,8 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxPath; @@ -64,7 +64,7 @@ public class GetACLProcessorTest { private FakeImapSession imapSession; private MailboxManager mailboxManager; private MailboxSession mailboxSession; - private MetaData metaData; + private MailboxMetaData metaData; private GetACLRequest getACLRequest; private GetACLProcessor subject; private MailboxPath path; @@ -80,7 +80,7 @@ public class GetACLProcessorTest { imapSession = new FakeImapSession(); mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); - metaData = mock(MetaData.class); + metaData = mock(MailboxMetaData.class); responder = mock(Responder.class); getACLRequest = new GetACLRequest(TAG, MAILBOX_NAME); diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java index 6bbbd04..2104d9b 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java @@ -42,7 +42,7 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxACL; @@ -65,7 +65,7 @@ public class ListRightsProcessorTest { private FakeImapSession imapSession; private MailboxManager mailboxManager; private MailboxSession mailboxSession; - private MetaData metaData; + private MailboxMetaData metaData; private ListRightsRequest listRightsRequest; private ListRightsProcessor subject; private EntryKey user1Key; @@ -83,14 +83,14 @@ public class ListRightsProcessorTest { imapSession = new FakeImapSession(); mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); - metaData = mock(MetaData.class); + metaData = mock(MailboxMetaData.class); responder = mock(Responder.class); argumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class); imapSession.authenticated(); imapSession.setMailboxSession(mailboxSession); - when(messageManager.getMetaData(anyBoolean(), any(MailboxSession.class), any(MetaData.FetchGroup.class))) + when(messageManager.getMetaData(anyBoolean(), any(MailboxSession.class), any(MailboxMetaData.FetchGroup.class))) .thenReturn(metaData); when(mailboxManager.getMailbox(any(MailboxPath.class), any(MailboxSession.class))) .thenReturn(messageManager); diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java index 8aa91f1..2da308d 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java @@ -41,8 +41,8 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionUtil; import org.apache.james.mailbox.MessageManager; -import org.apache.james.mailbox.MessageManager.MetaData; -import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup; +import org.apache.james.mailbox.MessageManager.MailboxMetaData; +import org.apache.james.mailbox.MessageManager.MailboxMetaData.FetchGroup; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxACL; @@ -85,7 +85,7 @@ public class SetACLProcessorTest { imapSession = new FakeImapSession(); mailboxSession = MailboxSessionUtil.create(USER_1); MessageManager messageManager = mock(MessageManager.class); - MetaData metaData = mock(MetaData.class); + MailboxMetaData metaData = mock(MailboxMetaData.class); responder = mock(Responder.class); argumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class); diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java index 02362dd..b46c41e 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java @@ -63,7 +63,7 @@ public class ACLProbeImpl implements GuiceProbe, ACLProbe { MailboxSession mailboxSession = mailboxManager.createSystemSession(mailboxPath.getUser()); return mailboxManager.getMailbox(mailboxPath, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); } } \ No newline at end of file diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java index 4547f11..8f9ad5f 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/event/PropagateLookupRightListenerTest.java @@ -112,7 +112,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -134,7 +134,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -152,7 +152,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -173,7 +173,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -194,11 +194,11 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualParentACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); MailboxACL actualChildACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualParentACL.getEntries()) @@ -222,7 +222,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -240,7 +240,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -258,7 +258,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -274,7 +274,7 @@ public class PropagateLookupRightListenerTest { storeMailboxManager.renameMailbox(CHILD_MAILBOX, MailboxPath.forUser(OWNER_USER, "shared1.sub1New"), mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId1, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -290,7 +290,7 @@ public class PropagateLookupRightListenerTest { storeMailboxManager.renameMailbox(CHILD_MAILBOX, MailboxPath.forUser(OWNER_USER, "shared1.sub1New"), mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId1, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) @@ -306,10 +306,10 @@ public class PropagateLookupRightListenerTest { storeMailboxManager.renameMailbox(GRAND_CHILD_MAILBOX, MailboxPath.forUser(OWNER_USER, "shared1.sub1.sub2"), mailboxSession); MailboxACL parentActualACL = storeMailboxManager.getMailbox(parentMailboxId1, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); MailboxACL childActualACL = storeMailboxManager.getMailbox(childMailboxId1, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(parentActualACL.getEntries()) @@ -330,7 +330,7 @@ public class PropagateLookupRightListenerTest { mailboxSession); MailboxACL actualACL = storeMailboxManager.getMailbox(parentMailboxId, mailboxSession) - .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MetaData.FetchGroup.NO_COUNT) + .getMetaData(RESET_RECENT, mailboxSession, MessageManager.MailboxMetaData.FetchGroup.NO_COUNT) .getACL(); assertThat(actualACL.getEntries()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
