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 a525f0b6f492760b4d1a121594273aec4e1b8ea3 Author: Benoit Tellier <[email protected]> AuthorDate: Sat May 8 14:46:48 2021 +0700 [REFACTORING] DefaultMailboxesProvisioner: Avoid re-opening a session --- .../apache/james/jmap/http/DefaultMailboxesProvisioner.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java index a576611..8e4ff93 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DefaultMailboxesProvisioner.java @@ -26,7 +26,6 @@ import java.util.function.Function; import javax.inject.Inject; -import org.apache.james.core.Username; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; @@ -63,15 +62,10 @@ public class DefaultMailboxesProvisioner { public Mono<Void> createMailboxesIfNeeded(MailboxSession session) { return metricFactory.decorateSupplierWithTimerMetric("JMAP-mailboxes-provisioning", - () -> { - Username username = session.getUser(); - return createDefaultMailboxes(username); - }); + () -> createDefaultMailboxes(session)); } - private Mono<Void> createDefaultMailboxes(Username username) { - MailboxSession session = mailboxManager.createSystemSession(username); - + private Mono<Void> createDefaultMailboxes(MailboxSession session) { return Flux.fromIterable(DefaultMailboxes.DEFAULT_MAILBOXES) .map(toMailboxPath(session)) .filterWhen(mailboxPath -> mailboxDoesntExist(mailboxPath, session), DEFAULT_CONCURRENCY) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
