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 f608394a91b888157916143f1d48a1ad0012a1b3 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Mon Nov 25 11:39:09 2019 +0700 JAMES-2989 Mailbox copier should rely on mailbox-api fetch groups --- .../mailbox/tools/copier/MailboxCopierImpl.java | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java b/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java index 4f04f4b..5955469 100644 --- a/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java +++ b/mailbox/tools/copier/src/main/java/org/apache/james/mailbox/tools/copier/MailboxCopierImpl.java @@ -20,10 +20,8 @@ package org.apache.james.mailbox.tools.copier; import java.io.IOException; import java.util.Calendar; -import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; import javax.mail.Flags.Flag; @@ -34,10 +32,10 @@ import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.copier.MailboxCopier; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxExistsException; +import org.apache.james.mailbox.model.FetchGroupImpl; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.MessageResult; -import org.apache.james.mailbox.model.MessageResult.FetchGroup; import org.apache.james.mailbox.store.streaming.InputStreamContent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,20 +47,6 @@ import org.slf4j.LoggerFactory; public class MailboxCopierImpl implements MailboxCopier { private static final Logger LOGGER = LoggerFactory.getLogger(MailboxCopierImpl.class.getName()); - private static final FetchGroup GROUP = new FetchGroup() { - - @Override - public int content() { - return FULL_CONTENT; - } - - @Override - public Set<PartContentDescriptor> getPartContentDescriptors() { - return new HashSet<>(); - } - - }; - @Override public void copyMailboxes(MailboxManager srcMailboxManager, MailboxManager dstMailboxManager) throws MailboxException, IOException { @@ -115,7 +99,7 @@ public class MailboxCopierImpl implements MailboxCopier { MessageManager dstMessageManager = dstMailboxManager.getMailbox(mailboxPath, dstMailboxSession); int j = 0; - Iterator<MessageResult> messageResultIterator = srcMessageManager.getMessages(MessageRange.all(), GROUP, srcMailboxSession); + Iterator<MessageResult> messageResultIterator = srcMessageManager.getMessages(MessageRange.all(), FetchGroupImpl.FULL_CONTENT, srcMailboxSession); while (messageResultIterator.hasNext()) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org