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 4a0596433a5887d742b050a0a4aff490fa1d8cd4
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Thu Oct 10 20:37:13 2024 +0200
JAMES-2182 PathConverter: use MailboxSession where more convenient
---
.../org/apache/james/imap/processor/AbstractAuthProcessor.java | 8 ++++----
.../java/org/apache/james/imap/processor/StatusProcessor.java | 6 +++---
.../java/org/apache/james/imap/main/PathConverterTest.java | 10 ++--------
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 17ac2f13c6..d37017eaf3 100644
---
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -185,18 +185,18 @@ public abstract class AbstractAuthProcessor<R extends
ImapRequest> extends Abstr
if (Mono.from(mailboxManager.mailboxExists(inboxPath,
mailboxSession)).block()) {
LOGGER.debug("INBOX exists. No need to create it.");
} else {
- provisionMailbox(DefaultMailboxes.INBOX, session, mailboxManager,
mailboxSession);
+ provisionMailbox(DefaultMailboxes.INBOX, mailboxManager,
mailboxSession);
if (imapConfiguration.isProvisionDefaultMailboxes()) {
for (String mailbox : DefaultMailboxes.DEFAULT_MAILBOXES) {
- provisionMailbox(mailbox, session, mailboxManager,
mailboxSession);
+ provisionMailbox(mailbox, mailboxManager, mailboxSession);
}
}
}
}
- private void provisionMailbox(String mailbox, ImapSession session,
MailboxManager mailboxManager,
+ private void provisionMailbox(String mailbox, MailboxManager
mailboxManager,
MailboxSession mailboxSession) throws
MailboxException {
- MailboxPath mailboxPath =
pathConverterFactory.forSession(session).buildFullPath(mailbox);
+ MailboxPath mailboxPath =
pathConverterFactory.forSession(mailboxSession).buildFullPath(mailbox);
if (Mono.from(mailboxManager.mailboxExists(mailboxPath,
mailboxSession)).block()) {
LOGGER.debug("{} exists. No need to create it.", mailbox);
return;
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 038d41e553..d1f8114321 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
@@ -126,7 +126,7 @@ public class StatusProcessor extends
AbstractMailboxProcessor<StatusRequest> imp
Mono<MailboxStatusResponse> sendStatus(MessageManager mailbox,
StatusDataItems statusDataItems, Responder responder, ImapSession session,
MailboxSession mailboxSession) {
return retrieveMetadata(mailbox, statusDataItems, mailboxSession)
- .flatMap(metaData -> computeStatusResponse(mailbox,
statusDataItems, metaData, mailboxSession, session)
+ .flatMap(metaData -> computeStatusResponse(mailbox,
statusDataItems, metaData, mailboxSession)
.doOnNext(response -> {
// Enable CONDSTORE as this is a CONDSTORE enabling command
if (response.getHighestModSeq() != null) {
@@ -165,7 +165,7 @@ public class StatusProcessor extends
AbstractMailboxProcessor<StatusRequest> imp
private Mono<MailboxStatusResponse> computeStatusResponse(MessageManager
mailbox,
StatusDataItems
statusDataItems,
MessageManager.MailboxMetaData metaData,
- MailboxSession
mailboxSession, ImapSession session) {
+ MailboxSession
mailboxSession) {
return iterateMailbox(statusDataItems, mailbox, mailboxSession)
.map(maybeIterationResult -> {
Optional<Long> appendLimit = appendLimit(statusDataItems);
@@ -181,7 +181,7 @@ public class StatusProcessor extends
AbstractMailboxProcessor<StatusRequest> imp
maybeIterationResult.flatMap(result ->
result.getSize(statusDataItems)).orElse(null),
maybeIterationResult.flatMap(result ->
result.getDeleted(statusDataItems)).orElse(null),
maybeIterationResult.flatMap(result ->
result.getDeletedStorage(statusDataItems)).orElse(null),
- messages, recent, uidNext, highestModSeq, uidValidity,
unseen, pathConverterFactory.forSession(session).mailboxName(RELATIVE,
mailbox.getMailboxPath(), mailboxSession), mailboxId);
+ messages, recent, uidNext, highestModSeq, uidValidity,
unseen, pathConverterFactory.forSession(mailboxSession).mailboxName(RELATIVE,
mailbox.getMailboxPath(), mailboxSession), mailboxId);
});
}
diff --git
a/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java
b/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java
index 428d391861..02a9a12807 100644
---
a/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java
+++
b/protocols/imap/src/test/java/org/apache/james/imap/main/PathConverterTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.james.core.Username;
-import org.apache.james.imap.encode.FakeImapSession;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.model.MailboxConstants;
@@ -44,16 +43,13 @@ class PathConverterTest {
private static final char PATH_DELIMITER = '.';
public static final boolean RELATIVE = true;
- private FakeImapSession imapSession;
private MailboxSession mailboxSession;
private PathConverter pathConverter;
@BeforeEach
void setUp() {
- imapSession = new FakeImapSession();
mailboxSession = MailboxSessionUtil.create(USERNAME);
- pathConverter = PathConverter.Factory.DEFAULT.forSession(imapSession);
- imapSession.setMailboxSession(mailboxSession);
+ pathConverter =
PathConverter.Factory.DEFAULT.forSession(mailboxSession);
}
@Test
@@ -190,10 +186,8 @@ class PathConverterTest {
class WithEmail {
@BeforeEach
void setUp() {
- imapSession = new FakeImapSession();
mailboxSession = MailboxSessionUtil.create(USERNAME_WITH_MAIL);
- pathConverter =
PathConverter.Factory.DEFAULT.forSession(imapSession);
- imapSession.setMailboxSession(mailboxSession);
+ pathConverter =
PathConverter.Factory.DEFAULT.forSession(mailboxSession);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
