(james-project) branch master updated: [ENHANCEMENT] Allow overriding AttachmentIdAssignationStrategy (#2622)

[btellier]

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


The following commit(s) were added to refs/heads/master by this push:
     new e8a335bdc9 [ENHANCEMENT] Allow overriding 
AttachmentIdAssignationStrategy (#2622)
e8a335bdc9 is described below

commit e8a335bdc9284320bf122738edc4819c349802e5
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Tue Feb 4 14:37:48 2025 +0100

    [ENHANCEMENT] Allow overriding AttachmentIdAssignationStrategy (#2622)
---
 .../mailbox/cassandra/CassandraMailboxSessionMapperFactory.java     | 6 ++----
 .../james/mailbox/cassandra/CassandraSubscriptionManagerTest.java   | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
 
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
index 17abbdab44..b4552c62b2 100644
--- 
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
+++ 
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
@@ -26,7 +26,6 @@ import jakarta.inject.Inject;
 import 
org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
 import org.apache.james.blob.api.BlobStore;
 import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.StringBackedAttachmentIdFactory;
 import org.apache.james.mailbox.cassandra.mail.ACLMapper;
 import org.apache.james.mailbox.cassandra.mail.CassandraAnnotationMapper;
 import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO;
@@ -105,7 +104,7 @@ public class CassandraMailboxSessionMapperFactory extends 
MailboxSessionMapperFa
                                                 CassandraUserMailboxRightsDAO 
userMailboxRightsDAO,
                                                 
RecomputeMailboxCountersService recomputeMailboxCountersService,
                                                 CassandraConfiguration 
cassandraConfiguration,
-                                                BatchSizes batchSizes,
+                                                BatchSizes batchSizes, 
CassandraAttachmentMapper.AttachmentIdAssignationStrategy 
attachmentIdAssignationStrategy,
                                                 Clock clock) {
         this.uidProvider = uidProvider;
         this.modSeqProvider = modSeqProvider;
@@ -132,8 +131,7 @@ public class CassandraMailboxSessionMapperFactory extends 
MailboxSessionMapperFa
             deletedMessageDAO);
         this.cassandraMailboxMapper = new CassandraMailboxMapper(mailboxDAO, 
mailboxPathV3DAO, userMailboxRightsDAO, aclMapper, cassandraConfiguration);
         this.cassandraSubscriptionMapper = new 
CassandraSubscriptionMapper(session);
-        this.cassandraAttachmentMapper = new 
CassandraAttachmentMapper(attachmentDAOV2, blobStore,
-            new 
CassandraAttachmentMapper.AttachmentIdAssignationStrategy.Default(new 
StringBackedAttachmentIdFactory()));
+        this.cassandraAttachmentMapper = new 
CassandraAttachmentMapper(attachmentDAOV2, blobStore, 
attachmentIdAssignationStrategy);
         this.cassandraMessageMapper = new CassandraMessageMapper(
             uidProvider,
             modSeqProvider,
diff --git 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
index 21377ac4b6..07fd00820c 100644
--- 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
+++ 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
@@ -38,6 +38,7 @@ import org.apache.james.mailbox.SubscriptionManagerContract;
 import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper;
 import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO;
 import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2;
+import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentMapper;
 import org.apache.james.mailbox.cassandra.mail.CassandraDeletedMessageDAO;
 import org.apache.james.mailbox.cassandra.mail.CassandraFirstUnseenDAO;
 import org.apache.james.mailbox.cassandra.mail.CassandraMailboxCounterDAO;
@@ -109,6 +110,7 @@ class CassandraSubscriptionManagerTest implements 
SubscriptionManagerContract {
         CassandraUidProvider uidProvider = null;
         CassandraModSeqProvider modSeqProvider = null;
         RecomputeMailboxCountersService recomputeMailboxCountersService = null;
+        CassandraAttachmentMapper.AttachmentIdAssignationStrategy 
attachmentIdAssignationStrategy = null;
 
         mailboxSessionMapperFactory =  new 
CassandraMailboxSessionMapperFactory(
             uidProvider,
@@ -133,6 +135,7 @@ class CassandraSubscriptionManagerTest implements 
SubscriptionManagerContract {
             recomputeMailboxCountersService,
             CassandraConfiguration.DEFAULT_CONFIGURATION,
             BatchSizes.defaultValues(),
+            attachmentIdAssignationStrategy,
             Clock.systemUTC());
 
         InVMEventBus eventBus = new InVMEventBus(new InVmEventDelivery(new 
RecordingMetricFactory()), EventBusTestFixture.RETRY_BACKOFF_CONFIGURATION, new 
MemoryEventDeadLetters());


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org