Skip to content

Fix james upgrade #2281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Arsnael wants to merge 2 commits into from
Closed

Fix james upgrade #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800f102
Update james-sha1
Arsnael Mar 23, 2026
87a2d79
JAMES-4191 Enrich MessageContentDeletionEvent with mailboxACL
Arsnael Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion james-project
Open in desktop
Submodule james-project updated 18 files
+1 −1 mailbox/api/src/main/java/org/apache/james/mailbox/events/MailboxEvents.java
+26 −22 mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/DeleteMessageListener.java
+8 −3 mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapper.java
+3 −2 mailbox/event/json/src/main/scala/org/apache/james/event/json/MailboxEventSerializer.scala
+76 −0 mailbox/event/json/src/test/java/org/apache/james/event/json/MessageContentDeletionSerializationTest.java
+9 −4 mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageIdMapper.java
+21 −3 ...plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultDeletionListener.java
+15 −0 mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java
+42 −8 mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/DeleteMessageListener.java
+1 −1 mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMailboxSessionMapperFactory.java
+5 −0 mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageIdMapper.java
+1 −1 mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/PostgresMailboxManagerAttachmentTest.java
+8 −3 mailbox/store/src/main/java/org/apache/james/mailbox/store/event/EventFactory.java
+2 −0 mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/MessageIdMapper.java
+7 −0 mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
+26 −2 ...ata-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionDeletionListener.java
+160 −2 ...st-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java
+1 −1 src/homepage/Gemfile.lock
2 changes: 1 addition & 1 deletion .../src/test/java/com/linagora/tmail/james/jmap/event/KeywordEmailQueryViewListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ void shouldDeleteConcernedKeywords() throws Exception {
assertThat(messageIdsByKeywordView(OWNER, USER_NEW_KEYWORD)).containsExactly(messageId);
});

MailboxEvents.MessageContentDeletionEvent event = new MailboxEvents.MessageContentDeletionEvent(Event.EventId.random(), OWNER, mailboxId, messageId, 12L,
MailboxEvents.MessageContentDeletionEvent event = new MailboxEvents.MessageContentDeletionEvent(Event.EventId.random(), OWNER, mailboxId, MailboxACL.EMPTY, messageId, 12L,
INTERNAL_DATE, asFlags(List.of(Flags.Flag.FLAGGED), USER_NEW_KEYWORD), false, Optional.empty(), Optional.empty(), "bodyBlobId",
Optional.empty());

Expand Down
9 changes: 7 additions & 2 deletions ...rc/main/java/com/linagora/tmail/vault/TeamMailboxDeletedMessageVaultDeletionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.core.Username;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.SessionProvider;
import org.apache.james.mailbox.events.MailboxEvents.MessageContentDeletionEvent;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.vault.DeletedMessageVault;
Expand All @@ -52,8 +54,10 @@ public class TeamMailboxDeletedMessageVaultDeletionListener extends DeletedMessa
public TeamMailboxDeletedMessageVaultDeletionListener(BlobId.Factory blobIdFactory,
DeletedMessageVault deletedMessageVault,
BlobStore blobStore,
Clock clock) {
super(blobIdFactory, deletedMessageVault, blobStore, clock);
Clock clock,
MessageIdManager messageIdManager,
SessionProvider sessionProvider) {
super(blobIdFactory, deletedMessageVault, blobStore, clock, messageIdManager, sessionProvider);
}

@Override
Expand Down Expand Up @@ -84,6 +88,7 @@ private MessageContentDeletionEvent remapUsername(MessageContentDeletionEvent ev
event.eventId(),
username,
event.mailboxId(),
event.mailboxACL(),
event.messageId(),
event.size(),
event.internalDate(),
Expand Down
4 changes: 4 additions & 0 deletions ...ird-party/ai-bot/src/test/java/com/linagora/tmail/mailet/rag/RagDeletionListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.james.events.delivery.InVmEventDelivery;
import org.apache.james.mailbox.events.MailboxEvents;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.TestMessageId;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.awaitility.Awaitility;
Expand Down Expand Up @@ -101,6 +102,7 @@ void shouldDeleteRagDocumentOnMessageContentDeletionEvent() {
Event.EventId.random(),
username,
InMemoryId.of(1),
MailboxACL.EMPTY,
TestMessageId.of(1),
123L,
Instant.now(),
Expand Down Expand Up @@ -129,6 +131,7 @@ void shouldNotDeleteRagDocumentWhenAiRagSettingIsDisabled() {
Event.EventId.random(),
username,
InMemoryId.of(1),
MailboxACL.EMPTY,
TestMessageId.of(1),
123L,
Instant.now(),
Expand Down Expand Up @@ -158,6 +161,7 @@ void shouldNotDeleteRagDocumentWhenAiRagSettingIsNotSet() {
Event.EventId.random(),
username,
InMemoryId.of(1),
MailboxACL.EMPTY,
TestMessageId.of(1),
123L,
Instant.now(),
Expand Down