This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch 3.9.x in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 7de5b97a519d5e6cbaaa03649f21018f2af5a271 Author: Benoit TELLIER <[email protected]> AuthorDate: Mon Nov 10 11:33:28 2025 +0100 JAMES-3728 Leverage MessageIdManager::updateEmail in PostDequeueDecorator --- .../java/org/apache/james/jmap/send/PostDequeueDecorator.java | 6 +----- .../java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java | 8 +++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java b/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java index f7f92cadd9..f03931ca5e 100644 --- a/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java +++ b/server/protocols/jmap-rfc-8621/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java @@ -138,11 +138,7 @@ public class PostDequeueDecorator extends MailQueueItemDecorator { .then(getSentMailboxId(mailboxSession) .switchIfEmpty(Mono.error(() -> new MailboxRoleNotFoundException(Role.SENT))) .flatMap(sentMailboxId -> - Mono.from(messageIdManager.setInMailboxesReactive(messageId, - ImmutableList.of(sentMailboxId), mailboxSession)) - .then(Mono.from(messageIdManager.setFlagsReactive(new Flags(Flag.SEEN), - MessageManager.FlagsUpdateMode.ADD, - messageId, ImmutableList.of(sentMailboxId), mailboxSession))))) + Mono.from(messageIdManager.updateEmail(messageId, ImmutableList.of(sentMailboxId), new Flags(Flag.SEEN), MessageManager.FlagsUpdateMode.ADD, mailboxSession)))) .block(); } diff --git a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java index 7812f7a6a8..6d7d3bc04d 100644 --- a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java +++ b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java @@ -277,17 +277,15 @@ public class PostDequeueDecoratorTest { when(messageIdManager.getMessagesReactive(any(), eq(FetchGroup.MINIMAL), any(MailboxSession.class))) .thenReturn(Flux.fromIterable(allMessages)); - when(messageIdManager.setInMailboxesReactive(eq(messageId.getMessageId()), eq(ImmutableList.of(sentMailboxId)), any(MailboxSession.class))) - .thenReturn(Mono.empty()); - when(messageIdManager.setFlagsReactive(eq(new Flags(Flag.SEEN)), eq(MessageManager.FlagsUpdateMode.ADD), eq(messageId.getMessageId()), eq(ImmutableList.of(sentMailboxId)), any(MailboxSession.class))) + when(messageIdManager.updateEmail(eq(messageId.getMessageId()), eq(ImmutableList.of(sentMailboxId)), + eq(new Flags(Flag.SEEN)), eq(MessageManager.FlagsUpdateMode.ADD), any(MailboxSession.class))) .thenReturn(Mono.empty()); testee.done(MailQueueItem.CompletionStatus.SUCCESS); testee.done(MailQueueItem.CompletionStatus.SUCCESS); verify(messageIdManager, times(1)).getMessagesReactive(any(), eq(FetchGroup.MINIMAL), any(MailboxSession.class)); - verify(messageIdManager, times(1)).setInMailboxesReactive(eq(messageId.getMessageId()), eq(ImmutableList.of(sentMailboxId)), any(MailboxSession.class)); - verify(messageIdManager, times(1)).setFlagsReactive(eq(new Flags(Flag.SEEN)), eq(MessageManager.FlagsUpdateMode.ADD), eq(messageId.getMessageId()), eq(ImmutableList.of(sentMailboxId)), any(MailboxSession.class)); + verify(messageIdManager, times(1)).updateEmail(eq(messageId.getMessageId()), eq(ImmutableList.of(sentMailboxId)), eq(new Flags(Flag.SEEN)), eq(MessageManager.FlagsUpdateMode.ADD), any(MailboxSession.class)); verifyNoMoreInteractions(messageIdManager); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
