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 5db6823887e6b20917f69e01c71691b0f03fb3e1 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Nov 15 11:04:21 2019 +0700 [Refactoring] MessageRangeProcessor: avoid propagating MailboxManager --- .../apache/james/imap/processor/AbstractMessageRangeProcessor.java | 5 +---- .../src/main/java/org/apache/james/imap/processor/CopyProcessor.java | 4 ++-- .../src/main/java/org/apache/james/imap/processor/MoveProcessor.java | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java index 64c52a0..d26eca9 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java @@ -54,7 +54,6 @@ public abstract class AbstractMessageRangeProcessor<R extends AbstractMessageRan protected abstract List<MessageRange> process(final MailboxPath targetMailbox, final SelectedMailbox currentMailbox, final MailboxSession mailboxSession, - final MailboxManager mailboxManager, MessageRange messageSet) throws MailboxException; protected abstract String getOperationName(); @@ -91,9 +90,7 @@ public abstract class AbstractMessageRangeProcessor<R extends AbstractMessageRan for (IdRange range : request.getIdSet()) { MessageRange messageSet = messageRange(session.getSelected(), range, request.isUseUids()); if (messageSet != null) { - List<MessageRange> processedUids = process( - targetMailbox, session.getSelected(), mailboxSession, - getMailboxManager(), messageSet); + List<MessageRange> processedUids = process(targetMailbox, session.getSelected(), mailboxSession, messageSet); for (MessageRange mr : processedUids) { // Set recent flag on copied message as this SHOULD be // done. diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java index 42b65c7..d96f327 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java @@ -51,8 +51,8 @@ public class CopyProcessor extends AbstractMessageRangeProcessor<CopyRequest> { protected List<MessageRange> process(MailboxPath targetMailbox, SelectedMailbox currentMailbox, MailboxSession mailboxSession, - MailboxManager mailboxManager, MessageRange messageSet) throws MailboxException { - return mailboxManager.copyMessages(messageSet, currentMailbox.getPath(), targetMailbox, mailboxSession); + MessageRange messageSet) throws MailboxException { + return getMailboxManager().copyMessages(messageSet, currentMailbox.getPath(), targetMailbox, mailboxSession); } @Override diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java index 2adb49a..129251c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java @@ -51,9 +51,8 @@ public class MoveProcessor extends AbstractMessageRangeProcessor<MoveRequest> im @Override protected List<MessageRange> process(MailboxPath targetMailbox, SelectedMailbox currentMailbox, - MailboxSession mailboxSession, - MailboxManager mailboxManager, MessageRange messageSet) throws MailboxException { - return mailboxManager.moveMessages(messageSet, currentMailbox.getPath(), targetMailbox, mailboxSession); + MailboxSession mailboxSession, MessageRange messageSet) throws MailboxException { + return getMailboxManager().moveMessages(messageSet, currentMailbox.getPath(), targetMailbox, mailboxSession); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
