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 73df0c0489b155a8882b25339952524fe7a79d19 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Apr 4 11:40:12 2019 +0700 JAMES-2723 StoreMailboxManager::doCreateMailbox can now be private --- .../james/mailbox/cassandra/CassandraMailboxManager.java | 9 --------- .../org/apache/james/mailbox/jpa/JPAMailboxManager.java | 7 ------- .../org/apache/james/mailbox/store/StoreMailboxManager.java | 13 ++----------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java index 4ce2fbb..c0f8006 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java @@ -28,8 +28,6 @@ import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.events.EventBus; import org.apache.james.mailbox.model.Mailbox; -import org.apache.james.mailbox.model.MailboxACL; -import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.MailboxManagerConfiguration; import org.apache.james.mailbox.store.PreDeletionHooks; @@ -91,13 +89,6 @@ public class CassandraMailboxManager extends StoreMailboxManager { public EnumSet<MessageCapabilities> getSupportedMessageCapabilities() { return MESSAGE_CAPABILITIES; } - - @Override - protected Mailbox doCreateMailbox(MailboxPath mailboxPath, MailboxSession session) { - Mailbox cassandraMailbox = new Mailbox(mailboxPath, randomUidValidity()); - cassandraMailbox.setACL(MailboxACL.EMPTY); - return cassandraMailbox; - } @Override protected StoreMessageManager createMessageManager(Mailbox mailboxRow, MailboxSession session) { diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java index 4c80be4..e17a316 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java @@ -25,8 +25,6 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.events.EventBus; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.mail.JPAMailboxMapper; -import org.apache.james.mailbox.model.Mailbox; -import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.MailboxManagerConfiguration; import org.apache.james.mailbox.store.PreDeletionHooks; @@ -64,11 +62,6 @@ public abstract class JPAMailboxManager extends StoreMailboxManager { eventBus, storeRightManager, quotaComponents, index, MailboxManagerConfiguration.DEFAULT, PreDeletionHooks.NO_PRE_DELETION_HOOK); } - - @Override - protected Mailbox doCreateMailbox(MailboxPath path, MailboxSession session) { - return new Mailbox(path, randomUidValidity()); - } @Override public EnumSet<MailboxCapabilities> getSupportedMailboxCapabilities() { 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 726da72..437b289 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 @@ -264,16 +264,7 @@ public class StoreMailboxManager implements MailboxManager { getStoreRightManager(), preDeletionHooks); } - /** - * Create a Mailbox for the given mailbox path. This will by default return a {@link Mailbox}. - * <p/> - * If you need to return something more special just override this method - * - * @param mailboxPath - * @param session - * @throws MailboxException - */ - protected Mailbox doCreateMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException { + private Mailbox doCreateMailbox(MailboxPath mailboxPath) { return new Mailbox(mailboxPath, randomUidValidity()); } @@ -348,7 +339,7 @@ public class StoreMailboxManager implements MailboxManager { for (MailboxPath mailbox : sanitizedMailboxPath.getHierarchyLevels(getDelimiter())) { locker.executeWithLock(mailboxSession, mailbox, (LockAwareExecution<Void>) () -> { if (!mailboxExists(mailbox, mailboxSession)) { - Mailbox m = doCreateMailbox(mailbox, mailboxSession); + Mailbox m = doCreateMailbox(mailbox); MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(mailboxSession); try { mapper.execute(Mapper.toTransaction(() -> mailboxIds.add(mapper.save(m)))); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
