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 1824e842bb22962b50b52eab0c1e1701d2d994e1 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Thu Jan 12 09:23:15 2023 +0700 [REFACTORING] SessionProvider: remove unneeded getDelimiter method --- .../main/java/org/apache/james/mailbox/SessionProvider.java | 7 ------- .../org/apache/james/mailbox/store/SessionProviderImpl.java | 7 +------ .../org/apache/james/mailbox/store/StoreMailboxManager.java | 11 +++-------- .../james/imap/processor/base/MailboxEventAnalyserTest.java | 2 -- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/SessionProvider.java b/mailbox/api/src/main/java/org/apache/james/mailbox/SessionProvider.java index 0b8e21dfd1..908b1daa73 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/SessionProvider.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/SessionProvider.java @@ -29,13 +29,6 @@ public interface SessionProvider { MailboxSession withoutDelegation() throws MailboxException; } - /** - * Return the delimiter to use for folders - * - * @return delimiter - */ - char getDelimiter(); - /** * Creates a new system session.<br> * A system session is intended to be used for programmatic access.<br> diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java index 88cbc28b8e..8fa81b24f9 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java @@ -48,11 +48,6 @@ public class SessionProviderImpl implements SessionProvider { this.authorizator = authorizator; } - @Override - public char getDelimiter() { - return MailboxConstants.DEFAULT_DELIMITER; - } - @Override public MailboxSession createSystemSession(Username userName) { return createSession(userName, Optional.empty(), MailboxSession.SessionType.System); @@ -113,7 +108,7 @@ public class SessionProviderImpl implements SessionProvider { } private MailboxSession createSession(Username userName, Optional<Username> loggedInUser, MailboxSession.SessionType type) { - return new MailboxSession(newSessionId(), userName, loggedInUser, new ArrayList<>(), getDelimiter(), type); + return new MailboxSession(newSessionId(), userName, loggedInUser, new ArrayList<>(), MailboxConstants.DEFAULT_DELIMITER, type); } private MailboxSession.SessionId newSessionId() { diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index 78c053f1cd..5090b79815 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -243,11 +243,6 @@ public class StoreMailboxManager implements MailboxManager { return sessionProvider.createSystemSession(userName); } - @Override - public char getDelimiter() { - return sessionProvider.getDelimiter(); - } - @Override public AuthorizationStep authenticate(Username givenUserid, String passwd) { return sessionProvider.authenticate(givenUserid, passwd); @@ -383,7 +378,7 @@ public class StoreMailboxManager implements MailboxManager { // Create parents first // If any creation fails then the mailbox will not be created // TODO: transaction - List<MailboxPath> intermediatePaths = sanitizedMailboxPath.getHierarchyLevels(getDelimiter()); + List<MailboxPath> intermediatePaths = sanitizedMailboxPath.getHierarchyLevels(mailboxSession.getPathDelimiter()); boolean isRootPath = intermediatePaths.size() == 1; return Flux.fromIterable(intermediatePaths) @@ -638,7 +633,7 @@ public class StoreMailboxManager implements MailboxManager { // Find submailboxes MailboxQuery.UserBound query = MailboxQuery.builder() .userAndNamespaceFrom(from) - .expression(new PrefixedWildcard(from.getName() + getDelimiter())) + .expression(new PrefixedWildcard(from.getName() + session.getPathDelimiter())) .build() .asUserBound(); @@ -844,7 +839,7 @@ public class StoreMailboxManager implements MailboxManager { private MailboxMetaData toMailboxMetadata(MailboxSession session, Map<MailboxPath, Boolean> parentMap, Mailbox mailbox, MailboxCounters counters) throws UnsupportedRightException { return new MailboxMetaData( mailbox, - getDelimiter(), + session.getPathDelimiter(), computeChildren(parentMap, mailbox), Selectability.NONE, storeRightManager.getResolvedMailboxACL(mailbox, session), diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java index f2a9753778..b5e13c4197 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java @@ -124,7 +124,6 @@ class MailboxEventAnalyserTest { private static final Username USER = Username.of("user"); private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(USER); private static final MailboxSession OTHER_MAILBOX_SESSION = MailboxSessionUtil.create(USER); - private static final char PATH_DELIMITER = '.'; private static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", USER, "name"); private static final TestId MAILBOX_ID = TestId.of(36); private static final UidValidity UID_VALIDITY = UidValidity.of(1024); @@ -148,7 +147,6 @@ class MailboxEventAnalyserTest { MailboxManager mailboxManager = mock(MailboxManager.class); MessageManager messageManager = mock(MessageManager.class); - when(mailboxManager.getDelimiter()).thenReturn(PATH_DELIMITER); when(mailboxManager.getMailbox(any(MailboxId.class), any(MailboxSession.class))) .thenReturn(messageManager); when(mailboxManager.getMailbox(any(MailboxPath.class), any(MailboxSession.class))) --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org