vttranlina commented on code in PR #1450:
URL: https://github.com/apache/james-project/pull/1450#discussion_r1115351084
##########
mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java:
##########
@@ -533,52 +534,64 @@ public List<MailboxRenamedResult>
renameMailbox(MailboxPath from, MailboxPath to
@Override
public Mono<List<MailboxRenamedResult>> renameMailboxReactive(MailboxPath
from, MailboxPath to, RenameOption option, MailboxSession session) {
+ return renameMailboxReactive(from, to, option, session, session);
+ }
+
+ public Mono<List<MailboxRenamedResult>> renameMailboxReactive(MailboxPath
from, MailboxPath to, RenameOption option,
+
MailboxSession fromSession, MailboxSession toSession) {
LOGGER.debug("renameMailbox {} to {}", from, to);
- MailboxMapper mapper =
mailboxSessionMapperFactory.getMailboxMapper(session);
+ MailboxMapper mapper =
mailboxSessionMapperFactory.getMailboxMapper(fromSession);
- return sanitizedPath(from, to, session)
+ return sanitizedPath(from, to, fromSession, toSession)
.flatMap(sanitizedPath -> mapper.executeReactive(
mapper.findMailboxByPath(from)
.switchIfEmpty(Mono.error(() -> new
MailboxNotFoundException(from)))
- .flatMap(mailbox -> doRenameMailbox(mailbox, sanitizedPath,
session, mapper)
- .flatMap(renamedResults ->
renameSubscriptionsIfNeeded(renamedResults, option, session)))));
+ .flatMap(mailbox -> doRenameMailbox(mailbox, sanitizedPath,
fromSession, toSession, mapper)
+ .flatMap(renamedResults ->
renameSubscriptionsIfNeeded(renamedResults, option, fromSession, toSession)))));
}
private Mono<MailboxPath> sanitizedPath(MailboxPath from, MailboxPath to,
MailboxSession session) {
Review Comment:
unused method
##########
mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java:
##########
@@ -533,52 +534,64 @@ public List<MailboxRenamedResult>
renameMailbox(MailboxPath from, MailboxPath to
@Override
public Mono<List<MailboxRenamedResult>> renameMailboxReactive(MailboxPath
from, MailboxPath to, RenameOption option, MailboxSession session) {
+ return renameMailboxReactive(from, to, option, session, session);
+ }
+
+ public Mono<List<MailboxRenamedResult>> renameMailboxReactive(MailboxPath
from, MailboxPath to, RenameOption option,
+
MailboxSession fromSession, MailboxSession toSession) {
LOGGER.debug("renameMailbox {} to {}", from, to);
- MailboxMapper mapper =
mailboxSessionMapperFactory.getMailboxMapper(session);
+ MailboxMapper mapper =
mailboxSessionMapperFactory.getMailboxMapper(fromSession);
- return sanitizedPath(from, to, session)
+ return sanitizedPath(from, to, fromSession, toSession)
.flatMap(sanitizedPath -> mapper.executeReactive(
mapper.findMailboxByPath(from)
.switchIfEmpty(Mono.error(() -> new
MailboxNotFoundException(from)))
- .flatMap(mailbox -> doRenameMailbox(mailbox, sanitizedPath,
session, mapper)
- .flatMap(renamedResults ->
renameSubscriptionsIfNeeded(renamedResults, option, session)))));
+ .flatMap(mailbox -> doRenameMailbox(mailbox, sanitizedPath,
fromSession, toSession, mapper)
+ .flatMap(renamedResults ->
renameSubscriptionsIfNeeded(renamedResults, option, fromSession, toSession)))));
}
private Mono<MailboxPath> sanitizedPath(MailboxPath from, MailboxPath to,
MailboxSession session) {
- return Mono.fromCallable(() -> {
- MailboxPath sanitizedMailboxPath =
to.sanitize(session.getPathDelimiter());
- validateDestinationPath(sanitizedMailboxPath, session);
- assertIsOwner(session, from);
- return sanitizedMailboxPath;
- });
+ return sanitizedPath(from, to, session, session);
+ }
+
+ private Mono<MailboxPath> sanitizedPath(MailboxPath from, MailboxPath to,
MailboxSession fromSession, MailboxSession toSession) {
+ MailboxPath sanitizedMailboxPath =
to.sanitize(toSession.getPathDelimiter());
+
+ return validateDestinationPath(sanitizedMailboxPath, toSession)
+ .then(Mono.fromRunnable(Throwing.runnable(() ->
assertIsOwner(fromSession, from))))
+ .thenReturn(sanitizedMailboxPath);
}
private Mono<MailboxPath> sanitizedPath(MailboxPath to, MailboxSession
session) {
- return Mono.fromCallable(() -> {
- MailboxPath sanitizedMailboxPath =
to.sanitize(session.getPathDelimiter());
- validateDestinationPath(sanitizedMailboxPath, session);
- return sanitizedMailboxPath;
- });
+ MailboxPath sanitizedMailboxPath =
to.sanitize(session.getPathDelimiter());
+
+ return validateDestinationPath(sanitizedMailboxPath, session)
+ .thenReturn(sanitizedMailboxPath);
}
private Mono<List<MailboxRenamedResult>>
renameSubscriptionsIfNeeded(List<MailboxRenamedResult> renamedResults,
RenameOption option, MailboxSession session) {
+ return renameSubscriptionsIfNeeded(renamedResults, option, session,
session);
+ }
+
+ private Mono<List<MailboxRenamedResult>>
renameSubscriptionsIfNeeded(List<MailboxRenamedResult> renamedResults,
+
RenameOption option, MailboxSession fromSession, MailboxSession toSession) {
if (option == RenameOption.RENAME_SUBSCRIPTIONS) {
- SubscriptionMapper subscriptionMapper =
mailboxSessionMapperFactory.getSubscriptionMapper(session);
+ SubscriptionMapper subscriptionMapper =
mailboxSessionMapperFactory.getSubscriptionMapper(fromSession);
- return
subscriptionMapper.findSubscriptionsForUserReactive(session.getUser())
+ return
subscriptionMapper.findSubscriptionsForUserReactive(fromSession.getUser())
.collectList()
.flatMap(subscriptions -> Flux.fromIterable(renamedResults)
.flatMap(renamedResult -> {
- Subscription legacySubscription = new
Subscription(session.getUser(), renamedResult.getOriginPath().getName());
+ Subscription legacySubscription = new
Subscription(fromSession.getUser(), renamedResult.getOriginPath().getName());
if (subscriptions.contains(legacySubscription)) {
return
subscriptionMapper.deleteReactive(legacySubscription)
- .then(subscriptionMapper.saveReactive(new
Subscription(session.getUser(),
renamedResult.getDestinationPath().asEscapedString())));
+ .then(subscriptionMapper.saveReactive(new
Subscription(toSession.getUser(),
renamedResult.getDestinationPath().asEscapedString())));
}
- Subscription subscription = new
Subscription(session.getUser(),
renamedResult.getOriginPath().asEscapedString());
+ Subscription subscription = new
Subscription(fromSession.getUser(),
renamedResult.getOriginPath().asEscapedString());
if (subscriptions.contains(subscription)) {
return
subscriptionMapper.deleteReactive(subscription)
- .then(subscriptionMapper.saveReactive(new
Subscription(session.getUser(),
renamedResult.getDestinationPath().asEscapedString())));
+ .then(subscriptionMapper.saveReactive(new
Subscription(toSession.getUser(),
renamedResult.getDestinationPath().asEscapedString())));
}
Review Comment:
easier to read.
```java
Function<Subscription, Mono<Void>> renameFunction =
subscription1 -> subscriptionMapper.deleteReactive(subscription1)
.then(subscriptionMapper.saveReactive(new
Subscription(toSession.getUser(),
renamedResult.getDestinationPath().asEscapedString())));
Subscription legacySubscription = new
Subscription(fromSession.getUser(), renamedResult.getOriginPath().getName());
if (subscriptions.contains(legacySubscription)) {
return renameFunction.apply(legacySubscription);
}
Subscription subscription = new
Subscription(fromSession.getUser(),
renamedResult.getOriginPath().asEscapedString());
if (subscriptions.contains(subscription)) {
return renameFunction.apply(subscription);
}
```
##########
server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxUsernameChangeTaskStep.java:
##########
@@ -0,0 +1,97 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.adapter.mailbox;
+
+import javax.inject.Inject;
+
+import org.apache.james.core.Username;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.search.MailboxQuery;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.user.api.UsernameChangeTaskStep;
+import org.reactivestreams.Publisher;
+
+import com.github.fge.lambdas.Throwing;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class MailboxUsernameChangeTaskStep implements UsernameChangeTaskStep {
+ private final StoreMailboxManager mailboxManager;
+ private final SubscriptionManager subscriptionManager;
+
+ @Inject
+ public MailboxUsernameChangeTaskStep(StoreMailboxManager mailboxManager,
SubscriptionManager subscriptionManager) {
+ this.mailboxManager = mailboxManager;
+ this.subscriptionManager = subscriptionManager;
+ }
+
+ @Override
+ public StepName name() {
+ return new StepName("MailboxUsernameChangeTaskStep");
+ }
+
+ @Override
+ public int priority() {
+ return 2;
+ }
+
+ @Override
+ public Publisher<Void> changeUsername(Username oldUsername, Username
newUsername) {
+ MailboxSession fromSession =
mailboxManager.createSystemSession(oldUsername);
+ MailboxSession toSession =
mailboxManager.createSystemSession(newUsername);
+
+ MailboxQuery queryUser = MailboxQuery.builder()
+ .privateNamespace()
+ .user(fromSession.getUser())
+ .build();
+
+ return mailboxManager.search(queryUser,
MailboxManager.MailboxSearchFetchType.Minimal, fromSession)
+ // Only keep top level, rename takes care of sub mailboxes
+ .filter(mailbox ->
mailbox.getPath().getHierarchyLevels(fromSession.getPathDelimiter()).size() ==
1)
+ .concatMap(mailbox -> migrateMailbox(fromSession, toSession,
mailbox));
+ }
+
+ private Mono<Void> migrateMailbox(MailboxSession fromSession,
MailboxSession toSession, org.apache.james.mailbox.model.MailboxMetaData
mailbox) {
+ MailboxPath renamedPath =
mailbox.getPath().withUser(toSession.getUser());
+ return mailboxManager.renameMailboxReactive(mailbox.getPath(),
renamedPath,
+ MailboxManager.RenameOption.RENAME_SUBSCRIPTIONS,
+ fromSession, toSession)
+ .then(renameSubscriptionsForDelegatee(mailbox, renamedPath))
+ .then();
+ }
+
+ private Mono<Void> renameSubscriptionsForDelegatee(MailboxMetaData
mailbox, MailboxPath renamedPath) {
+ return
Flux.fromIterable(mailbox.getResolvedAcls().getEntries().entrySet())
+ .filter(entry -> entry.getKey().getNameType() ==
MailboxACL.NameType.user && !entry.getKey().isNegative())
+ .map(entry -> Username.of(entry.getKey().getName()))
+ .concatMap(Throwing.function(userWithAccess ->
+
Flux.from(subscriptionManager.subscriptionsReactive(mailboxManager.createSystemSession(userWithAccess)))
+ .filter(subscribedMailbox ->
subscribedMailbox.equals(mailbox.getPath()))
+ .concatMap(any ->
Mono.from(subscriptionManager.subscribeReactive(renamedPath,
mailboxManager.createSystemSession(userWithAccess)))
+
.then(Mono.from(subscriptionManager.unsubscribeReactive(mailbox.getPath(),
mailboxManager.createSystemSession(userWithAccess)))))))
Review Comment:
create mailboxSession one time
```java
.concatMap(Throwing.function(userWithAccess -> {
MailboxSession userWithAccessSession =
mailboxManager.createSystemSession(userWithAccess);
return
Flux.from(subscriptionManager.subscriptionsReactive(userWithAccessSession))
.filter(subscribedMailbox ->
subscribedMailbox.equals(mailbox.getPath()))
.concatMap(any ->
Mono.from(subscriptionManager.subscribeReactive(renamedPath,
userWithAccessSession))
.then(Mono.from(subscriptionManager.unsubscribeReactive(mailbox.getPath(),
userWithAccessSession))));
}
))
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
