You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/04/19 04:04:11 UTC
[james-project] 20/49: JAMES-3737 Reactify eventbus unsubscription operation
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 91637fbf50dfccc19bc42a4c7240c51f45b738d2
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Mar 29 17:29:27 2022 +0700
JAMES-3737 Reactify eventbus unsubscription operation
- IMAP LOGOUT is fully reactive
- IMAP UNSELECT is fully reactive
- Upon channel disconnection we are fully reactive
- IMAP SELECT no longer blocks when a mailbox was selected
- JMAP websockets no longer blocks upon deconnections
- IMAP IDLE events no longer blocks on the event lopp (!)
---
.../java/org/apache/james/events/Registration.java | 4 ++-
.../org/apache/james/events/GroupContract.java | 15 +++++-----
.../java/org/apache/james/events/KeyContract.java | 16 +++++------
.../org/apache/james/events/GroupRegistration.java | 10 ++++---
.../james/events/GroupRegistrationHandler.java | 2 +-
.../org/apache/james/events/KeyRegistration.java | 12 +++++---
.../james/events/KeyRegistrationHandler.java | 7 ++---
.../java/org/apache/james/events/InVMEventBus.java | 4 +--
.../apache/james/mpt/host/JamesImapHostSystem.java | 2 +-
.../apache/james/imap/api/process/ImapSession.java | 8 ++++--
.../james/imap/api/process/SelectedMailbox.java | 4 ++-
.../james/imap/decode/main/DefaultImapDecoder.java | 2 +-
.../imap/decode/main/ImapRequestStreamHandler.java | 2 +-
.../apache/james/imap/encode/FakeImapSession.java | 25 ++++++++--------
.../imap/processor/AbstractAuthProcessor.java | 2 +-
.../imap/processor/AbstractSelectionProcessor.java | 6 ++--
.../james/imap/processor/CloseProcessor.java | 2 +-
.../james/imap/processor/DeleteProcessor.java | 2 +-
.../james/imap/processor/LogoutProcessor.java | 12 +++++---
.../james/imap/processor/UnselectProcessor.java | 10 ++++---
.../imap/processor/base/SelectedMailboxImpl.java | 12 ++++++--
.../james/imap/processor/CopyProcessorTest.java | 8 +++---
.../james/imap/processor/MoveProcessorTest.java | 8 +++---
.../james/imap/processor/SearchProcessorTest.java | 2 +-
.../processor/base/MailboxEventAnalyserTest.java | 2 +-
.../processor/base/SelectedMailboxImplTest.java | 2 +-
.../james/healthcheck/MailReceptionCheck.java | 3 +-
.../apache/james/jmap/routes/WebSocketRoutes.scala | 2 +-
.../jmap/change/MailboxChangeListenerTest.scala | 2 +-
.../netty/ImapChannelUpstreamHandler.java | 33 +++++++++++++---------
.../imapserver/netty/ImapIdleStateHandler.java | 17 ++++++-----
.../james/imapserver/netty/NettyImapSession.java | 24 ++++++++--------
32 files changed, 149 insertions(+), 113 deletions(-)
diff --git a/event-bus/api/src/main/java/org/apache/james/events/Registration.java b/event-bus/api/src/main/java/org/apache/james/events/Registration.java
index 99cf17e1aa..d216f4eda4 100644
--- a/event-bus/api/src/main/java/org/apache/james/events/Registration.java
+++ b/event-bus/api/src/main/java/org/apache/james/events/Registration.java
@@ -19,6 +19,8 @@
package org.apache.james.events;
+import org.reactivestreams.Publisher;
+
public interface Registration {
- void unregister();
+ Publisher<Void> unregister();
}
diff --git a/event-bus/api/src/test/java/org/apache/james/events/GroupContract.java b/event-bus/api/src/test/java/org/apache/james/events/GroupContract.java
index f477006d0b..7cd9732ea2 100644
--- a/event-bus/api/src/test/java/org/apache/james/events/GroupContract.java
+++ b/event-bus/api/src/test/java/org/apache/james/events/GroupContract.java
@@ -55,6 +55,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableSet;
+import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
public interface GroupContract {
@@ -247,7 +248,7 @@ public interface GroupContract {
EventListener listener = EventBusTestFixture.newListener();
Registration registration = eventBus().register(listener, GROUP_A);
- registration.unregister();
+ Mono.from(registration.unregister()).block();
eventBus().dispatch(EVENT, NO_KEYS).block();
verify(listener, after(FIVE_HUNDRED_MS.toMillis()).never())
@@ -270,7 +271,7 @@ public interface GroupContract {
EventListener listener = EventBusTestFixture.newListener();
EventListener listener2 = EventBusTestFixture.newListener();
- eventBus().register(listener, GROUP_A).unregister();
+ Mono.from(eventBus().register(listener, GROUP_A).unregister()).block();
assertThatCode(() -> eventBus().register(listener2, GROUP_A))
.doesNotThrowAnyException();
@@ -281,9 +282,9 @@ public interface GroupContract {
EventListener listener = EventBusTestFixture.newListener();
Registration registration = eventBus().register(listener, GROUP_A);
- registration.unregister();
+ Mono.from(registration.unregister()).block();
- assertThatCode(registration::unregister)
+ assertThatCode(() -> Mono.from(registration.unregister()).block())
.doesNotThrowAnyException();
}
@@ -291,7 +292,7 @@ public interface GroupContract {
default void registerShouldAcceptAlreadyUnregisteredGroups() throws Exception {
EventListener listener = EventBusTestFixture.newListener();
- eventBus().register(listener, GROUP_A).unregister();
+ Mono.from(eventBus().register(listener, GROUP_A).unregister()).block();
eventBus().register(listener, GROUP_A);
eventBus().dispatch(EVENT, NO_KEYS).block();
@@ -384,7 +385,7 @@ public interface GroupContract {
default void redeliverShouldThrowAfterGroupIsUnregistered() {
EventListener listener = EventBusTestFixture.newListener();
- eventBus().register(listener, GROUP_A).unregister();
+ Mono.from(eventBus().register(listener, GROUP_A).unregister()).block();
assertThatThrownBy(() -> eventBus().reDeliver(GROUP_A, EVENT).block())
.isInstanceOf(GroupRegistrationNotFound.class);
@@ -467,7 +468,7 @@ public interface GroupContract {
default void unregisterShouldStopNotificationForDistantGroups() throws Exception {
EventListener listener = EventBusTestFixture.newListener();
- eventBus().register(listener, GROUP_A).unregister();
+ Mono.from(eventBus().register(listener, GROUP_A).unregister()).block();
eventBus2().dispatch(EVENT, NO_KEYS).block();
diff --git a/event-bus/api/src/test/java/org/apache/james/events/KeyContract.java b/event-bus/api/src/test/java/org/apache/james/events/KeyContract.java
index e635286c50..c31857e18b 100644
--- a/event-bus/api/src/test/java/org/apache/james/events/KeyContract.java
+++ b/event-bus/api/src/test/java/org/apache/james/events/KeyContract.java
@@ -236,7 +236,7 @@ public interface KeyContract extends EventBusContract {
default void unregisterShouldRemoveDoubleRegisteredListener() throws Exception {
EventListener listener = EventBusTestFixture.newListener();
Mono.from(eventBus().register(listener, KEY_1)).block();
- Mono.from(eventBus().register(listener, KEY_1)).block().unregister();
+ Mono.from(Mono.from(eventBus().register(listener, KEY_1)).block().unregister()).block();
eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block();
@@ -260,8 +260,8 @@ public interface KeyContract extends EventBusContract {
default void callingAllUnregisterMethodShouldUnregisterTheListener() throws Exception {
EventListener listener = EventBusTestFixture.newListener();
Registration registration = Mono.from(eventBus().register(listener, KEY_1)).block();
- Mono.from(eventBus().register(listener, KEY_1)).block().unregister();
- registration.unregister();
+ Mono.from(Mono.from(eventBus().register(listener, KEY_1)).block().unregister()).block();
+ Mono.from(registration.unregister()).block();
eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block();
@@ -273,7 +273,7 @@ public interface KeyContract extends EventBusContract {
default void unregisterShouldHaveNotNotifyWhenCalledOnDifferentKeys() throws Exception {
EventListener listener = EventBusTestFixture.newListener();
Mono.from(eventBus().register(listener, KEY_1)).block();
- Mono.from(eventBus().register(listener, KEY_2)).block().unregister();
+ Mono.from(Mono.from(eventBus().register(listener, KEY_2)).block().unregister()).block();
eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block();
@@ -285,9 +285,9 @@ public interface KeyContract extends EventBusContract {
EventListener listener = EventBusTestFixture.newListener();
Registration registration = Mono.from(eventBus().register(listener, KEY_1)).block();
- registration.unregister();
+ Mono.from(registration.unregister()).block();
- assertThatCode(registration::unregister)
+ assertThatCode(() -> Mono.from(registration.unregister()).block())
.doesNotThrowAnyException();
}
@@ -315,7 +315,7 @@ public interface KeyContract extends EventBusContract {
@Test
default void dispatchShouldNotNotifyUnregisteredListener() throws Exception {
EventListener listener = EventBusTestFixture.newListener();
- Mono.from(eventBus().register(listener, KEY_1)).block().unregister();
+ Mono.from(Mono.from(eventBus().register(listener, KEY_1)).block().unregister()).block();
eventBus().dispatch(EVENT, ImmutableSet.of(KEY_1)).block();
@@ -398,7 +398,7 @@ public interface KeyContract extends EventBusContract {
default void unregisteredDistantListenersShouldNotBeNotified() throws Exception {
EventListener eventListener = EventBusTestFixture.newListener();
- Mono.from(eventBus().register(eventListener, KEY_1)).block().unregister();
+ Mono.from(Mono.from(eventBus().register(eventListener, KEY_1)).block().unregister()).block();
eventBus2().dispatch(EVENT, ImmutableSet.of(KEY_1)).block();
diff --git a/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java b/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java
index bd1a9d3398..2df0baf570 100644
--- a/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistration.java
@@ -192,9 +192,11 @@ class GroupRegistration implements Registration {
}
@Override
- public void unregister() {
- receiverSubscriber.filter(Predicate.not(Disposable::isDisposed))
- .ifPresent(Disposable::dispose);
- unregisterGroup.run();
+ public Mono<Void> unregister() {
+ return Mono.fromRunnable(() -> {
+ receiverSubscriber.filter(Predicate.not(Disposable::isDisposed))
+ .ifPresent(Disposable::dispose);
+ unregisterGroup.run();
+ });
}
}
\ No newline at end of file
diff --git a/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java b/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
index 2a76665af1..3bc5d85f88 100644
--- a/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/GroupRegistrationHandler.java
@@ -153,7 +153,7 @@ class GroupRegistrationHandler {
}
void stop() {
- groupRegistrations.values().forEach(GroupRegistration::unregister);
+ groupRegistrations.values().forEach(groupRegistration -> Mono.from(groupRegistration.unregister()).block());
consumer.ifPresent(Disposable::dispose);
}
diff --git a/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java
index 53e79b0d25..f64532d1ab 100644
--- a/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistration.java
@@ -19,15 +19,19 @@
package org.apache.james.events;
+import java.util.function.Supplier;
+
+import reactor.core.publisher.Mono;
+
class KeyRegistration implements Registration {
- private final Runnable unregister;
+ private final Supplier<Mono<Void>> unregister;
- KeyRegistration(Runnable unregister) {
+ KeyRegistration(Supplier<Mono<Void>> unregister) {
this.unregister = unregister;
}
@Override
- public void unregister() {
- unregister.run();
+ public Mono<Void> unregister() {
+ return unregister.get();
}
}
\ No newline at end of file
diff --git a/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
index d41a7ced88..ca2d19b7e5 100644
--- a/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
+++ b/event-bus/distributed/src/main/java/org/apache/james/events/KeyRegistrationHandler.java
@@ -143,12 +143,11 @@ class KeyRegistrationHandler {
return registerIfNeeded(key, registration)
.thenReturn(new KeyRegistration(() -> {
if (registration.unregister().lastListenerRemoved()) {
- registrationBinder.unbind(key)
+ return registrationBinder.unbind(key)
.timeout(TOPOLOGY_CHANGES_TIMEOUT)
- .retryWhen(Retry.backoff(retryBackoff.getMaxRetries(), retryBackoff.getFirstBackoff()).jitter(retryBackoff.getJitterFactor()).scheduler(Schedulers.elastic()))
- .subscribeOn(Schedulers.elastic())
- .block();
+ .retryWhen(Retry.backoff(retryBackoff.getMaxRetries(), retryBackoff.getFirstBackoff()).jitter(retryBackoff.getJitterFactor()).scheduler(Schedulers.elastic()));
}
+ return Mono.empty();
}));
}
diff --git a/event-bus/in-vm/src/main/java/org/apache/james/events/InVMEventBus.java b/event-bus/in-vm/src/main/java/org/apache/james/events/InVMEventBus.java
index d3ab03fb99..8be1bcd607 100644
--- a/event-bus/in-vm/src/main/java/org/apache/james/events/InVMEventBus.java
+++ b/event-bus/in-vm/src/main/java/org/apache/james/events/InVMEventBus.java
@@ -56,14 +56,14 @@ public class InVMEventBus implements EventBus {
@Override
public Mono<Registration> register(EventListener.ReactiveEventListener listener, RegistrationKey key) {
registrations.put(key, listener);
- return Mono.just(() -> registrations.remove(key, listener));
+ return Mono.just(() -> Mono.fromRunnable(() -> registrations.remove(key, listener)));
}
@Override
public Registration register(EventListener.ReactiveEventListener listener, Group group) {
EventListener previous = groups.putIfAbsent(group, listener);
if (previous == null) {
- return () -> groups.remove(group, listener);
+ return () -> Mono.fromRunnable(() -> groups.remove(group, listener));
}
throw new GroupAlreadyRegistered(group);
}
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
index cd1e0d7249..9febdff63d 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java
@@ -163,7 +163,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem, GrantRights
@Override
public void stop() throws Exception {
- session.deselect();
+ session.deselect().block();
}
@Override
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java b/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
index bc8eb4e16e..d6de96a27e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java
@@ -31,6 +31,8 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.protocols.api.CommandDetectionSession;
import org.apache.james.protocols.api.OidcSASLConfiguration;
+import reactor.core.publisher.Mono;
+
/**
* Encapsulates all state held for an ongoing Imap session, which commences when
* a client first establishes a connection to the Imap server, and continues
@@ -92,7 +94,7 @@ public interface ImapSession extends CommandDetectionSession {
/**
* Logs out the session. Marks the connection for closure;
*/
- void logout();
+ Mono<Void> logout();
/**
* Gets the current client state.
@@ -113,14 +115,14 @@ public interface ImapSession extends CommandDetectionSession {
* @param mailbox
* The selected mailbox.
*/
- void selected(SelectedMailbox mailbox);
+ Mono<Void> selected(SelectedMailbox mailbox);
/**
* Moves the session out of {@link ImapSessionState#SELECTED} state and back
* into {@link ImapSessionState#AUTHENTICATED} state. The selected mailbox
* is cleared.
*/
- void deselect();
+ Mono<Void> deselect();
/**
* Provides the selected mailbox for this session, or <code>null</code> if
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java b/protocols/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
index b97582eb70..529d6f618d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
@@ -32,6 +32,8 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
+import reactor.core.publisher.Mono;
+
/**
* Interface which represent a selected Mailbox during the selected state
*/
@@ -42,7 +44,7 @@ public interface SelectedMailbox {
/**
* Deselect the Mailbox
*/
- void deselect();
+ Mono<Void> deselect();
void registerIdle(EventListener idle);
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
index 523c6269b9..7f87a82887 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
@@ -88,7 +88,7 @@ public class DefaultImapDecoder implements ImapDecoder {
if (count > maxInvalidCommands || session.getState() == ImapSessionState.NON_AUTHENTICATED) {
ImapMessage message = responseFactory.bye(HumanReadableText.BYE_UNKNOWN_COMMAND);
- session.logout();
+ session.logout().block();
return message;
}
session.setAttribute(INVALID_COMMAND_COUNT, count);
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
index ce8567bded..3b498bd687 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
@@ -113,7 +113,7 @@ public final class ImapRequestStreamHandler extends AbstractImapRequestHandler {
private void abandon(OutputStream out, ImapSession session) {
if (session != null) {
try {
- session.logout();
+ session.logout().block();
} catch (Throwable t) {
LOGGER.warn("Session logout failed. Resources may not be correctly recycled.");
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/FakeImapSession.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/FakeImapSession.java
index 9b1a43463a..9f0e675831 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/FakeImapSession.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/FakeImapSession.java
@@ -35,6 +35,8 @@ import org.apache.james.imap.message.response.ImmutableStatusResponse;
import org.apache.james.protocols.api.OidcSASLConfiguration;
import org.apache.james.util.concurrent.NamedThreadFactory;
+import reactor.core.publisher.Mono;
+
public class FakeImapSession implements ImapSession {
private static final int DEFAULT_SCHEDULED_POOL_CORE_SIZE = 5;
private static final ThreadFactory THREAD_FACTORY = NamedThreadFactory.withClassName(FakeImapSession.class);
@@ -73,9 +75,9 @@ public class FakeImapSession implements ImapSession {
}
@Override
- public void logout() {
- closeMailbox();
- state = ImapSessionState.LOGOUT;
+ public Mono<Void> logout() {
+ return closeMailbox()
+ .then(Mono.fromRunnable(() -> state = ImapSessionState.LOGOUT));
}
@Override
@@ -84,16 +86,16 @@ public class FakeImapSession implements ImapSession {
}
@Override
- public void deselect() {
+ public Mono<Void> deselect() {
this.state = ImapSessionState.AUTHENTICATED;
- closeMailbox();
+ return closeMailbox();
}
@Override
- public void selected(SelectedMailbox mailbox) {
+ public Mono<Void> selected(SelectedMailbox mailbox) {
this.state = ImapSessionState.SELECTED;
- closeMailbox();
- this.selectedMailbox = mailbox;
+ return closeMailbox()
+ .then(Mono.fromRunnable(() -> selectedMailbox = mailbox));
}
@Override
@@ -106,11 +108,12 @@ public class FakeImapSession implements ImapSession {
return this.state;
}
- public void closeMailbox() {
+ private Mono<Void> closeMailbox() {
if (selectedMailbox != null) {
- selectedMailbox.deselect();
- selectedMailbox = null;
+ return selectedMailbox.deselect()
+ .then(Mono.fromRunnable(() -> selectedMailbox = null));
}
+ return Mono.empty();
}
@Override
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 f848df5598..c32daa79ac 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
@@ -153,7 +153,7 @@ public abstract class AbstractAuthProcessor<R extends ImapRequest> extends Abstr
} else {
LOGGER.info("Too many authentication failures. Closing connection.");
bye(responder, HumanReadableText.TOO_MANY_FAILURES);
- session.logout();
+ session.logout().block();
}
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
index 72c79e628e..9748f65dcc 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
@@ -392,10 +392,8 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ
}
SelectedMailboxImpl selectedMailbox = new SelectedMailboxImpl(getMailboxManager(), eventBus, session, mailbox);
return selectedMailbox.finishInit()
- .then(Mono.fromCallable(() -> {
- session.selected(selectedMailbox);
- return selectedMailbox;
- }));
+ .then(session.selected(selectedMailbox))
+ .thenReturn(selectedMailbox);
} else {
return Mono.just(currentMailbox);
}
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
index 9246ada637..0c37adc751 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
@@ -52,7 +52,7 @@ public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> {
final MailboxSession mailboxSession = session.getMailboxSession();
if (getMailboxManager().hasRight(mailbox.getMailboxEntity(), MailboxACL.Right.PerformExpunge, mailboxSession)) {
mailbox.expunge(MessageRange.all(), mailboxSession);
- session.deselect();
+ session.deselect().block();
// Don't send HIGHESTMODSEQ when close. Like correct in the ERRATA of RFC5162
//
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
index 7b777a1eab..9b13ad3fe5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
@@ -50,7 +50,7 @@ public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> {
try {
final SelectedMailbox selected = session.getSelected();
if (selected != null && selected.getPath().equals(mailboxPath)) {
- session.deselect();
+ session.deselect().block();
}
final MailboxManager mailboxManager = getMailboxManager();
mailboxManager.deleteMailbox(mailboxPath, session.getMailboxSession());
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
index 2d404717ea..4c1eff0554 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
@@ -29,6 +29,8 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.util.MDCBuilder;
+import reactor.core.publisher.Mono;
+
public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> {
public LogoutProcessor(MailboxManager mailboxManager, StatusResponseFactory factory,
MetricFactory metricFactory) {
@@ -36,12 +38,14 @@ public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> {
}
@Override
- protected void processRequest(LogoutRequest request, ImapSession session, Responder responder) {
+ protected Mono<Void> processRequestReactive(LogoutRequest request, ImapSession session, Responder responder) {
MailboxSession mailboxSession = session.getMailboxSession();
getMailboxManager().logout(mailboxSession);
- session.logout();
- bye(responder);
- okComplete(request, responder);
+ return session.logout()
+ .then(Mono.fromRunnable(() -> {
+ bye(responder);
+ okComplete(request, responder);
+ }));
}
@Override
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
index 67e34109f6..acb489a46f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java
@@ -34,6 +34,8 @@ import org.apache.james.util.MDCBuilder;
import com.google.common.collect.ImmutableList;
+import reactor.core.publisher.Mono;
+
/**
* Processor which implements the UNSELECT extension.
*
@@ -48,14 +50,14 @@ public class UnselectProcessor extends AbstractMailboxProcessor<UnselectRequest>
}
@Override
- protected void processRequest(UnselectRequest request, ImapSession session, Responder responder) {
+ protected Mono<Void> processRequestReactive(UnselectRequest request, ImapSession session, Responder responder) {
if (session.getSelected() != null) {
- session.deselect();
- okComplete(request, responder);
+ return session.deselect()
+ .then(Mono.fromRunnable(() -> okComplete(request, responder)));
} else {
taggedBad(request, responder, HumanReadableText.UNSELECT);
+ return Mono.empty();
}
-
}
@Override
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
index 1665fba651..e280b50d53 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
@@ -70,6 +70,7 @@ import com.google.common.collect.ImmutableSortedSet;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
/**
* Default implementation of {@link SelectedMailbox}
@@ -190,9 +191,14 @@ public class SelectedMailboxImpl implements SelectedMailbox, EventListener {
}
@Override
- public synchronized void deselect() {
- registration.get().unregister();
-
+ public Mono<Void> deselect() {
+ return Mono.from(registration.get().unregister())
+ .then(Mono.fromRunnable(this::clearInternalStructures)
+ .subscribeOn(Schedulers.elastic()))
+ .then();
+ }
+
+ private synchronized void clearInternalStructures() {
uidMsnConverter.clear();
flagUpdateUids.clear();
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
index 68fc4be067..798bd9aace 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CopyProcessorTest.java
@@ -93,7 +93,7 @@ class CopyProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.just(true));
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
@@ -126,7 +126,7 @@ class CopyProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.just(true));
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
@@ -158,7 +158,7 @@ class CopyProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.just(false));
StatusResponse noResponse = mock(StatusResponse.class);
@@ -182,7 +182,7 @@ class CopyProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.error(new MailboxException()));
StatusResponse noResponse = mock(StatusResponse.class);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
index 05e3f4ed88..f17c168f1f 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/MoveProcessorTest.java
@@ -109,7 +109,7 @@ public class MoveProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.just(true));
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
@@ -142,7 +142,7 @@ public class MoveProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.just(true));
MessageManager targetMessageManager = mock(MessageManager.class);
when(mockMailboxManager.getMailbox(INBOX, mailboxSession)).thenReturn(targetMessageManager);
@@ -173,7 +173,7 @@ public class MoveProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.just(false));
StatusResponse noResponse = mock(StatusResponse.class);
@@ -196,7 +196,7 @@ public class MoveProcessorTest {
when(selectedMailbox.getLastUid()).thenReturn(Optional.of(MessageUid.of(8)));
when(selectedMailbox.existsCount()).thenReturn(8L);
when(selectedMailbox.getPath()).thenReturn(selected);
- imapSession.selected(selectedMailbox);
+ imapSession.selected(selectedMailbox).block();
when(mockMailboxManager.mailboxExists(INBOX, mailboxSession)).thenReturn(Mono.error(new MailboxException()));
StatusResponse noResponse = mock(StatusResponse.class);
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index e223f168d2..9cef6797ea 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -192,7 +192,7 @@ public class SearchProcessorTest {
private void expectsGetSelectedMailbox() throws Exception {
when(mailboxManager.getMailbox(mailboxId, mailboxSession)).thenReturn(mailbox, mailbox);
- session.selected(selectedMailbox);
+ session.selected(selectedMailbox).block();
when(selectedMailbox.isRecentUidRemoved()).thenReturn(false);
when(selectedMailbox.isSizeChanged()).thenReturn(false);
when(selectedMailbox.getPath()).thenReturn(mailboxPath);
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 9760538830..30ec788d3b 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
@@ -234,7 +234,7 @@ class MailboxEventAnalyserTest {
analyser.event(update);
analyser.event(update);
- analyser.deselect();
+ analyser.deselect().block();
assertThat(analyser.flagUpdateUids()).isEmpty();
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
index 2d22b1757c..e0346048a2 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/SelectedMailboxImplTest.java
@@ -212,7 +212,7 @@ class SelectedMailboxImplTest {
LOGGER.error("Error while processing event on a concurrent thread", e);
}
});
- return Mono.just(() -> { });
+ return Mono.just(Mono::empty);
};
}
diff --git a/server/container/feature-checks/src/main/java/org/apache/james/healthcheck/MailReceptionCheck.java b/server/container/feature-checks/src/main/java/org/apache/james/healthcheck/MailReceptionCheck.java
index ef8fe1097d..054b16a559 100644
--- a/server/container/feature-checks/src/main/java/org/apache/james/healthcheck/MailReceptionCheck.java
+++ b/server/container/feature-checks/src/main/java/org/apache/james/healthcheck/MailReceptionCheck.java
@@ -39,6 +39,7 @@ import org.apache.james.core.healthcheck.Result;
import org.apache.james.events.Event;
import org.apache.james.events.EventBus;
import org.apache.james.events.EventListener;
+import org.apache.james.events.Registration;
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -217,7 +218,7 @@ public class MailReceptionCheck implements HealthCheck {
Mono.from(eventBus.register(listener, new MailboxIdRegistrationKey(mailbox.getId()))),
registration -> sendMail(username)
.flatMap(content -> checkReceived(session, listener, mailbox, content)),
- registration -> Mono.fromRunnable(registration::unregister)))
+ Registration::unregister))
.subscribeOn(Schedulers.elastic())
.timeout(configuration.getTimeout(), Mono.error(() -> new RuntimeException("HealthCheck email was not received after " + configuration.getTimeout().toMillis() + "ms")))
.onErrorResume(e -> {
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala
index e56d56045e..75c51f5091 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala
@@ -63,7 +63,7 @@ case class ClientContext(outbound: Sinks.Many[OutboundMessage], pushRegistration
}
def withRegistration(registration: Option[Registration]): Unit = Option(pushRegistration.getAndSet(registration.orNull))
- .foreach(oldRegistration => SMono.fromCallable(() => oldRegistration.unregister())
+ .foreach(oldRegistration => SMono(oldRegistration.unregister())
.subscribeOn(Schedulers.elastic())
.subscribe())
}
diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala
index af266a46d2..26f9309d3e 100644
--- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala
+++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala
@@ -78,7 +78,7 @@ class MailboxChangeListenerTest {
val eventBus = new EventBus {
override def register(listener: EventListener.ReactiveEventListener, key: RegistrationKey): Publisher[Registration] = Mono.empty()
- override def register(listener: EventListener.ReactiveEventListener, group: Group): Registration = () => {}
+ override def register(listener: EventListener.ReactiveEventListener, group: Group): Registration = () => Mono.empty()
override def dispatch(event: Event, key: util.Set[RegistrationKey]): Mono[Void] = Mono.empty()
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
index 7b3244c0eb..4caa578502 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
@@ -52,6 +52,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.codec.TooLongFrameException;
+import reactor.core.publisher.Mono;
/**
* {@link ChannelInboundHandlerAdapter} which handles IMAP
@@ -188,12 +189,13 @@ public class ImapChannelUpstreamHandler extends ChannelInboundHandlerAdapter imp
// remove the stored attribute for the channel to free up resources
// See JAMES-1195
ImapSession imapSession = ctx.channel().attr(IMAP_SESSION_ATTRIBUTE_KEY).getAndSet(null);
- if (imapSession != null) {
- imapSession.logout();
- }
- imapConnectionsMetric.decrement();
- super.channelInactive(ctx);
+ Optional.ofNullable(imapSession)
+ .map(ImapSession::logout)
+ .orElse(Mono.empty())
+ .doFinally(signal -> imapConnectionsMetric.decrement())
+ .doFinally(Throwing.consumer(signal -> super.channelInactive(ctx)))
+ .subscribe();
}
}
@@ -225,16 +227,19 @@ public class ImapChannelUpstreamHandler extends ChannelInboundHandlerAdapter imp
// logout on error not sure if that is the best way to handle it
final ImapSession imapSession = ctx.channel().attr(IMAP_SESSION_ATTRIBUTE_KEY).get();
- if (imapSession != null) {
- imapSession.logout();
- }
-
- // Make sure we close the channel after all the buffers were flushed out
- Channel channel = ctx.channel();
- if (channel.isActive()) {
- channel.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
- }
+ Optional.ofNullable(imapSession)
+ .map(ImapSession::logout)
+ .orElse(Mono.empty())
+ .doFinally(signal -> {
+ // Make sure we close the channel after all the buffers were flushed out
+ Channel channel = ctx.channel();
+ if (channel.isActive()) {
+ channel.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
+ }
+ })
+ .doFinally(Throwing.consumer(signal -> super.channelInactive(ctx)))
+ .subscribe();
}
}
}
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
index b964e08a26..d7d01540fb 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
@@ -24,11 +24,14 @@ import org.apache.james.imap.api.process.ImapSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.github.fge.lambdas.Throwing;
+
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.timeout.IdleState;
import io.netty.handler.timeout.IdleStateEvent;
import io.netty.handler.timeout.IdleStateHandler;
+import reactor.core.publisher.Mono;
/**
* {@link IdleStateHandler} which will call {@link ImapSession#logout()} if the
@@ -59,14 +62,14 @@ public class ImapIdleStateHandler extends IdleStateHandler implements NettyConst
address.getAddress().getHostAddress());
// logout the client
- session.logout();
-
- // close the channel
- ctx.channel().close();
-
+ session.logout()
+ // close the channel
+ .then(Mono.fromRunnable(() -> ctx.channel().close()))
+ .then(Mono.fromRunnable(Throwing.runnable(() -> super.channelIdle(ctx, e))))
+ .subscribe();
+ } else {
+ super.channelIdle(ctx, e);
}
-
- super.channelIdle(ctx, e);
}
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
index 77f196198d..87f00ac4a7 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
@@ -48,6 +48,7 @@ import io.netty.handler.codec.compression.JZlibEncoder;
import io.netty.handler.codec.compression.ZlibDecoder;
import io.netty.handler.codec.compression.ZlibEncoder;
import io.netty.handler.codec.compression.ZlibWrapper;
+import reactor.core.publisher.Mono;
public class NettyImapSession implements ImapSession, NettyConstants {
private static final int BUFFER_SIZE = 2048;
@@ -100,9 +101,9 @@ public class NettyImapSession implements ImapSession, NettyConstants {
}
@Override
- public void logout() {
- closeMailbox();
- state = ImapSessionState.LOGOUT;
+ public Mono<Void> logout() {
+ return closeMailbox()
+ .then(Mono.fromRunnable(() ->state = ImapSessionState.LOGOUT));
}
@Override
@@ -111,16 +112,16 @@ public class NettyImapSession implements ImapSession, NettyConstants {
}
@Override
- public void deselect() {
+ public Mono<Void> deselect() {
this.state = ImapSessionState.AUTHENTICATED;
- closeMailbox();
+ return closeMailbox();
}
@Override
- public void selected(SelectedMailbox mailbox) {
+ public Mono<Void> selected(SelectedMailbox mailbox) {
this.state = ImapSessionState.SELECTED;
- closeMailbox();
- this.selectedMailbox = mailbox;
+ return closeMailbox()
+ .then(Mono.fromRunnable(() -> selectedMailbox = mailbox));
}
@Override
@@ -143,11 +144,12 @@ public class NettyImapSession implements ImapSession, NettyConstants {
return this.state;
}
- private void closeMailbox() {
+ private Mono<Void> closeMailbox() {
if (selectedMailbox != null) {
- selectedMailbox.deselect();
- selectedMailbox = null;
+ return selectedMailbox.deselect()
+ .then(Mono.fromRunnable(() -> selectedMailbox = null));
}
+ return Mono.empty();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org