You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2024/04/01 04:11:25 UTC
(james-project) branch master updated (320c7b099d -> c267f1ed83)
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 320c7b099d JAMES-4023 Avoid blocking the SMTP Netty event loop
new 2dd6999a2f JAMES-2586 Move RuleDTO for data-jmap-cassandra to data-jmap
new 175f4fa5db JAMES-2586 Move some files from event-store-cassandra to event-store-api
new c267f1ed83 JAMES-2586 change javax.inject to jakarta.inject in event-sourcing/event-store-api/pom.xml
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
event-sourcing/event-store-api/pom.xml | 8 ++++++++
.../apache/james/eventsourcing/eventstore}/EventNestedTypes.java | 2 +-
.../james/eventsourcing/eventstore}/JsonEventSerializer.scala | 4 ++--
.../org/apache/james/eventsourcing/eventstore}/dto/EventDTO.scala | 2 +-
.../james/eventsourcing/eventstore}/dto/EventDTOModule.scala | 2 +-
.../james/eventsourcing/eventstore/EventStoreContract.scala | 2 +-
.../apache/james/eventsourcing/eventstore}/dto/OtherEvent.scala | 2 +-
.../james/eventsourcing/eventstore}/dto/OtherTestEventDTO.scala | 3 ++-
.../james/eventsourcing/eventstore}/dto/SnapshotEvent.scala | 2 +-
.../james/eventsourcing/eventstore}/dto/SnapshotEventDTO.scala | 3 ++-
.../apache/james/eventsourcing/eventstore}/dto/TestEventDTO.scala | 3 ++-
.../james/eventsourcing/eventstore}/dto/TestEventDTOModules.scala | 3 ++-
.../james/eventsourcing/eventstore/cassandra/EventStoreDao.scala | 2 +-
.../eventstore/cassandra/CassandraEventStoreExtension.scala | 2 +-
.../cassandra/CassandraEventStoreExtensionForTestEvents.scala | 3 ++-
.../eventstore/cassandra/CassandraEventStoreTest.scala | 2 +-
.../eventstore/cassandra/JsonEventSerializerTest.scala | 3 ++-
.../james/mailbox/cassandra/mail/eventsourcing/acl/ACLModule.java | 2 +-
.../mailbox/cassandra/mail/eventsourcing/acl/ACLUpdatedDTO.java | 2 +-
.../james/mailbox/cassandra/CassandraMailboxManagerTest.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraACLMapperNoACLTest.java | 3 +--
.../james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java | 3 +--
.../org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java | 6 +++---
.../james/mailbox/quota/cassandra/dto/QuotaEventDTOModules.java | 2 +-
.../quota/cassandra/dto/QuotaThresholdChangedEventDTO.java | 2 +-
.../listeners/CassandraQuotaMailingListenersIntegrationTest.java | 2 +-
.../src/main/java/org/apache/james/CassandraJamesServerMain.java | 2 +-
.../java/org/apache/james/CassandraRabbitMQJamesServerMain.java | 2 +-
.../BlobStoreConfigurationValidationStartUpCheckTest.java | 6 +++---
.../java/org/apache/james/DistributedPOP3JamesServerMain.java | 2 +-
.../StoragePolicyConfigurationSanityEnforcementModule.java | 4 ++--
.../modules/blobstore/validation/StorageStrategyChangedDTO.java | 2 +-
.../james/modules/blobstore/validation/StorageStrategyModule.java | 2 +-
.../james/modules/data/CassandraDLPConfigurationStoreModule.java | 4 ++--
.../java/org/apache/james/modules/data/CassandraJmapModule.java | 6 +++---
.../james/modules/eventstore/CassandraEventStoreModule.java | 5 ++---
.../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 6 +++---
.../apache/james/modules/mailbox/CassandraQuotaMailingModule.java | 4 ++--
.../apache/james/modules/DistributedTaskSerializationModule.java | 6 +++---
.../modules/queue/rabbitmq/CassandraMailQueueViewModule.java | 4 ++--
.../dlp/eventsourcing/cassandra/DLPConfigurationItemAddedDTO.java | 2 +-
.../eventsourcing/cassandra/DLPConfigurationItemsRemovedDTO.java | 2 +-
.../dlp/eventsourcing/cassandra/DLPConfigurationModules.java | 2 +-
.../CassandraEventSourcingDLPConfigurationStoreExtension.java | 2 +-
.../jmap/cassandra/filtering/CassandraFilteringProjection.java | 1 +
...CassandraEventSourcingFilteringManagementNoProjectionTest.java | 3 ++-
.../filtering/CassandraEventSourcingFilteringManagementTest.java | 3 ++-
.../java/org/apache/james/jmap/cassandra/filtering/DTOTest.java | 6 ++++--
.../jmap/api}/filtering/FilteringIncrementalRuleChangeDTO.java | 5 ++---
.../jmap/api}/filtering/FilteringRuleSetDefineDTOModules.java | 4 ++--
.../james/jmap/api}/filtering/FilteringRuleSetDefinedDTO.java | 4 ++--
.../main/java/org/apache/james/jmap/api}/filtering/RuleDTO.java | 3 +--
.../james/jmap/api/filtering/FilteringManagementContract.java | 2 +-
.../configuration/CassandraMailQueueViewConfigurationModule.java | 2 +-
.../view/cassandra/configuration/ConfigurationChangedDTO.java | 2 +-
.../queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java | 2 +-
.../configuration/EventsourcingConfigurationManagementTest.java | 2 +-
.../eventsourcing/distributed/RabbitMQTerminationSubscriber.java | 2 +-
.../task/eventsourcing/distributed/TasksSerializationModule.java | 4 ++--
.../james/task/eventsourcing/distributed/TaskEventDTO.scala | 2 +-
.../eventsourcing/distributed/DistributedTaskManagerTest.java | 7 +++----
.../distributed/RabbitMQTerminationSubscriberTest.java | 6 +++---
.../eventsourcing/distributed/TaskEventsSerializationTest.java | 4 ++--
64 files changed, 107 insertions(+), 94 deletions(-)
rename event-sourcing/{event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/main/java/org/apache/james/eventsourcing/eventstore}/EventNestedTypes.java (95%)
rename event-sourcing/{event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore}/JsonEventSerializer.scala (96%)
rename event-sourcing/{event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore}/dto/EventDTO.scala (93%)
rename event-sourcing/{event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore}/dto/EventDTOModule.scala (96%)
rename event-sourcing/{event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore}/dto/OtherEvent.scala (95%)
rename event-sourcing/{event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore}/dto/OtherTestEventDTO.scala (94%)
rename event-sourcing/{event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore}/dto/SnapshotEvent.scala (95%)
rename event-sourcing/{event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore}/dto/SnapshotEventDTO.scala (94%)
rename event-sourcing/{event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore}/dto/TestEventDTO.scala (94%)
rename event-sourcing/{event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra => event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore}/dto/TestEventDTOModules.scala (95%)
rename server/data/{data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra => data-jmap/src/main/java/org/apache/james/jmap/api}/filtering/FilteringIncrementalRuleChangeDTO.java (96%)
rename server/data/{data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra => data-jmap/src/main/java/org/apache/james/jmap/api}/filtering/FilteringRuleSetDefineDTOModules.java (94%)
rename server/data/{data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra => data-jmap/src/main/java/org/apache/james/jmap/api}/filtering/FilteringRuleSetDefinedDTO.java (96%)
rename server/data/{data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra => data-jmap/src/main/java/org/apache/james/jmap/api}/filtering/RuleDTO.java (99%)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 01/03: JAMES-2586 Move RuleDTO for data-jmap-cassandra to data-jmap
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2dd6999a2fc05a2d43d424a967afaa2d0accbe33
Author: hung phan <hp...@linagora.com>
AuthorDate: Thu Feb 1 11:43:51 2024 +0700
JAMES-2586 Move RuleDTO for data-jmap-cassandra to data-jmap
---
.../james/jmap/cassandra/filtering/CassandraFilteringProjection.java | 1 +
.../jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java | 1 +
.../james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java | 1 +
.../src/main/java/org/apache/james/jmap/api}/filtering/RuleDTO.java | 3 +--
.../apache/james/jmap/api/filtering/FilteringManagementContract.java | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/CassandraFilteringProjection.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/CassandraFilteringProjection.java
index ec40661fac..4ad9593b5c 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/CassandraFilteringProjection.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/CassandraFilteringProjection.java
@@ -40,6 +40,7 @@ import org.apache.james.eventsourcing.EventId;
import org.apache.james.eventsourcing.EventWithState;
import org.apache.james.eventsourcing.ReactiveSubscriber;
import org.apache.james.jmap.api.filtering.Rule;
+import org.apache.james.jmap.api.filtering.RuleDTO;
import org.apache.james.jmap.api.filtering.Rules;
import org.apache.james.jmap.api.filtering.Version;
import org.apache.james.jmap.api.filtering.impl.EventSourcingFilteringManagement;
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java
index 92cadb461d..119d522051 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java
@@ -24,6 +24,7 @@ import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
import org.apache.james.jmap.api.filtering.Rule;
+import org.apache.james.jmap.api.filtering.RuleDTO;
import org.apache.james.jmap.api.filtering.impl.FilteringAggregateId;
import org.apache.james.jmap.api.filtering.impl.IncrementalRuleChange;
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java
index e35e6ae16b..2f3e7c544b 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java
@@ -23,6 +23,7 @@ import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.jmap.api.filtering.RuleDTO;
import org.apache.james.jmap.api.filtering.impl.FilteringAggregateId;
import org.apache.james.jmap.api.filtering.impl.RuleSetDefined;
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/RuleDTO.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/RuleDTO.java
similarity index 99%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/RuleDTO.java
rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/RuleDTO.java
index 4629e188ab..9f9794437b 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/RuleDTO.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/RuleDTO.java
@@ -17,14 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.cassandra.filtering;
+package org.apache.james.jmap.api.filtering;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import org.apache.james.core.MailAddress;
-import org.apache.james.jmap.api.filtering.Rule;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/FilteringManagementContract.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/FilteringManagementContract.java
index b8cdb93f48..08c89e9222 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/FilteringManagementContract.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/filtering/FilteringManagementContract.java
@@ -57,7 +57,7 @@ public interface FilteringManagementContract {
@Test
default void listingRulesShouldThrowWhenNullUser() {
Username username = null;
- assertThatThrownBy(() -> instantiateFilteringManagement().listRulesForUser(username))
+ assertThatThrownBy(() -> Mono.from(instantiateFilteringManagement().listRulesForUser(username)).block())
.isInstanceOf(NullPointerException.class);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 02/03: JAMES-2586 Move some files from event-store-cassandra to event-store-api
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 175f4fa5db898ba76b2667af492e987b8371130f
Author: hung phan <hp...@linagora.com>
AuthorDate: Wed Feb 7 17:53:35 2024 +0700
JAMES-2586 Move some files from event-store-cassandra to event-store-api
---
event-sourcing/event-store-api/pom.xml | 8 ++++++++
.../apache/james/eventsourcing/eventstore}/EventNestedTypes.java | 2 +-
.../james/eventsourcing/eventstore}/JsonEventSerializer.scala | 4 ++--
.../org/apache/james/eventsourcing/eventstore}/dto/EventDTO.scala | 2 +-
.../james/eventsourcing/eventstore}/dto/EventDTOModule.scala | 2 +-
.../james/eventsourcing/eventstore/EventStoreContract.scala | 2 +-
.../apache/james/eventsourcing/eventstore}/dto/OtherEvent.scala | 2 +-
.../james/eventsourcing/eventstore}/dto/OtherTestEventDTO.scala | 3 ++-
.../james/eventsourcing/eventstore}/dto/SnapshotEvent.scala | 2 +-
.../james/eventsourcing/eventstore}/dto/SnapshotEventDTO.scala | 3 ++-
.../apache/james/eventsourcing/eventstore}/dto/TestEventDTO.scala | 3 ++-
.../james/eventsourcing/eventstore}/dto/TestEventDTOModules.scala | 3 ++-
.../james/eventsourcing/eventstore/cassandra/EventStoreDao.scala | 2 +-
.../eventstore/cassandra/CassandraEventStoreExtension.scala | 2 +-
.../cassandra/CassandraEventStoreExtensionForTestEvents.scala | 3 ++-
.../eventstore/cassandra/CassandraEventStoreTest.scala | 2 +-
.../eventstore/cassandra/JsonEventSerializerTest.scala | 3 ++-
.../james/mailbox/cassandra/mail/eventsourcing/acl/ACLModule.java | 2 +-
.../mailbox/cassandra/mail/eventsourcing/acl/ACLUpdatedDTO.java | 2 +-
.../james/mailbox/cassandra/CassandraMailboxManagerTest.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraACLMapperNoACLTest.java | 3 +--
.../james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java | 2 +-
.../james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java | 3 +--
.../org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java | 6 +++---
.../james/mailbox/quota/cassandra/dto/QuotaEventDTOModules.java | 2 +-
.../quota/cassandra/dto/QuotaThresholdChangedEventDTO.java | 2 +-
.../listeners/CassandraQuotaMailingListenersIntegrationTest.java | 2 +-
.../src/main/java/org/apache/james/CassandraJamesServerMain.java | 2 +-
.../java/org/apache/james/CassandraRabbitMQJamesServerMain.java | 2 +-
.../BlobStoreConfigurationValidationStartUpCheckTest.java | 6 +++---
.../java/org/apache/james/DistributedPOP3JamesServerMain.java | 2 +-
.../StoragePolicyConfigurationSanityEnforcementModule.java | 4 ++--
.../modules/blobstore/validation/StorageStrategyChangedDTO.java | 2 +-
.../james/modules/blobstore/validation/StorageStrategyModule.java | 2 +-
.../james/modules/data/CassandraDLPConfigurationStoreModule.java | 4 ++--
.../java/org/apache/james/modules/data/CassandraJmapModule.java | 6 +++---
.../james/modules/eventstore/CassandraEventStoreModule.java | 5 ++---
.../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 6 +++---
.../apache/james/modules/mailbox/CassandraQuotaMailingModule.java | 4 ++--
.../apache/james/modules/DistributedTaskSerializationModule.java | 6 +++---
.../modules/queue/rabbitmq/CassandraMailQueueViewModule.java | 4 ++--
.../dlp/eventsourcing/cassandra/DLPConfigurationItemAddedDTO.java | 2 +-
.../eventsourcing/cassandra/DLPConfigurationItemsRemovedDTO.java | 2 +-
.../dlp/eventsourcing/cassandra/DLPConfigurationModules.java | 2 +-
.../CassandraEventSourcingDLPConfigurationStoreExtension.java | 2 +-
...CassandraEventSourcingFilteringManagementNoProjectionTest.java | 3 ++-
.../filtering/CassandraEventSourcingFilteringManagementTest.java | 3 ++-
.../java/org/apache/james/jmap/cassandra/filtering/DTOTest.java | 6 ++++--
.../jmap/api}/filtering/FilteringIncrementalRuleChangeDTO.java | 6 ++----
.../jmap/api}/filtering/FilteringRuleSetDefineDTOModules.java | 4 ++--
.../james/jmap/api}/filtering/FilteringRuleSetDefinedDTO.java | 5 ++---
.../configuration/CassandraMailQueueViewConfigurationModule.java | 2 +-
.../view/cassandra/configuration/ConfigurationChangedDTO.java | 2 +-
.../queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java | 2 +-
.../configuration/EventsourcingConfigurationManagementTest.java | 2 +-
.../eventsourcing/distributed/RabbitMQTerminationSubscriber.java | 2 +-
.../task/eventsourcing/distributed/TasksSerializationModule.java | 4 ++--
.../james/task/eventsourcing/distributed/TaskEventDTO.scala | 2 +-
.../eventsourcing/distributed/DistributedTaskManagerTest.java | 7 +++----
.../distributed/RabbitMQTerminationSubscriberTest.java | 6 +++---
.../eventsourcing/distributed/TaskEventsSerializationTest.java | 4 ++--
61 files changed, 104 insertions(+), 93 deletions(-)
diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml
index bd01ec917a..29942e4a76 100644
--- a/event-sourcing/event-store-api/pom.xml
+++ b/event-sourcing/event-store-api/pom.xml
@@ -42,6 +42,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-json</artifactId>
+ </dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>testing-base</artifactId>
@@ -52,6 +56,10 @@
<artifactId>reactor-scala-extensions_${scala.base}</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
diff --git a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/EventNestedTypes.java b/event-sourcing/event-store-api/src/main/java/org/apache/james/eventsourcing/eventstore/EventNestedTypes.java
similarity index 95%
rename from event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/EventNestedTypes.java
rename to event-sourcing/event-store-api/src/main/java/org/apache/james/eventsourcing/eventstore/EventNestedTypes.java
index 30e0b94593..e766661340 100644
--- a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/EventNestedTypes.java
+++ b/event-sourcing/event-store-api/src/main/java/org/apache/james/eventsourcing/eventstore/EventNestedTypes.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra;
+package org.apache.james.eventsourcing.eventstore;
public interface EventNestedTypes {
String EVENT_NESTED_TYPES_INJECTION_NAME = "EventNestedTypes";
diff --git a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.scala b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/JsonEventSerializer.scala
similarity index 96%
rename from event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.scala
rename to event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/JsonEventSerializer.scala
index 69cf2c1b4c..ac77550dd0 100644
--- a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializer.scala
+++ b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/JsonEventSerializer.scala
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra
+package org.apache.james.eventsourcing.eventstore
import java.io.IOException
import java.util
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.core.JsonProcessingException
import com.google.common.collect.ImmutableSet
import jakarta.inject.{Inject, Named}
import org.apache.james.eventsourcing.Event
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.{EventDTO, EventDTOModule}
+import org.apache.james.eventsourcing.eventstore.dto.{EventDTO, EventDTOModule}
import org.apache.james.json.{DTO, DTOModule, JsonGenericSerializer}
import scala.annotation.varargs
diff --git a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/EventDTO.scala b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/dto/EventDTO.scala
similarity index 93%
rename from event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/EventDTO.scala
rename to event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/dto/EventDTO.scala
index 39ef2accd8..caa366f175 100644
--- a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/EventDTO.scala
+++ b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/dto/EventDTO.scala
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import org.apache.james.json.DTO
diff --git a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/EventDTOModule.scala b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/dto/EventDTOModule.scala
similarity index 96%
rename from event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/EventDTOModule.scala
rename to event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/dto/EventDTOModule.scala
index 86234a4119..9177af53fe 100644
--- a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/EventDTOModule.scala
+++ b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/dto/EventDTOModule.scala
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import org.apache.james.eventsourcing.Event
import org.apache.james.json.DTOModule
diff --git a/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/EventStoreContract.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/EventStoreContract.scala
index 437fdd3014..7b56389d51 100644
--- a/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/EventStoreContract.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/EventStoreContract.scala
@@ -32,7 +32,7 @@ trait EventStoreContract {
@Test
def getEventsOfAggregateShouldThrowOnNullAggregateId(testee: EventStore) : Unit =
- assertThatThrownBy(() => testee.getEventsOfAggregate(null))
+ assertThatThrownBy(() => SMono(testee.getEventsOfAggregate(null)).block())
.isInstanceOf(classOf[NullPointerException])
@Test
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/OtherEvent.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/OtherEvent.scala
similarity index 95%
rename from event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/OtherEvent.scala
rename to event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/OtherEvent.scala
index 7940c1c533..c3bdbf6689 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/OtherEvent.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/OtherEvent.scala
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
* ***************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import org.apache.james.eventsourcing.{Event, EventId, TestAggregateId}
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/OtherTestEventDTO.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/OtherTestEventDTO.scala
similarity index 94%
rename from event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/OtherTestEventDTO.scala
rename to event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/OtherTestEventDTO.scala
index 59ce723b8c..649a99b2df 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/OtherTestEventDTO.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/OtherTestEventDTO.scala
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty}
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO
import org.apache.james.eventsourcing.{EventId, TestAggregateId}
case class OtherTestEventDTO @JsonCreator()(
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/SnapshotEvent.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/SnapshotEvent.scala
similarity index 95%
rename from event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/SnapshotEvent.scala
rename to event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/SnapshotEvent.scala
index 07f9cfa4bb..ffa926ecb6 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/SnapshotEvent.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/SnapshotEvent.scala
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
* ***************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import org.apache.james.eventsourcing.{Event, EventId, TestAggregateId}
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/SnapshotEventDTO.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/SnapshotEventDTO.scala
similarity index 94%
rename from event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/SnapshotEventDTO.scala
rename to event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/SnapshotEventDTO.scala
index dedec58367..723db04702 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/SnapshotEventDTO.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/SnapshotEventDTO.scala
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
* ***************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty}
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO
import org.apache.james.eventsourcing.{EventId, TestAggregateId, TestEvent}
final case class SnapshotEventDTO @JsonCreator()(@JsonProperty("type") `type`: String,
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/TestEventDTO.scala
similarity index 94%
rename from event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.scala
rename to event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/TestEventDTO.scala
index d676aa8295..d0e0761ca1 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTO.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/TestEventDTO.scala
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
* ***************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty}
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO
import org.apache.james.eventsourcing.{EventId, TestAggregateId, TestEvent}
final case class TestEventDTO @JsonCreator() ( @JsonProperty("type") `type`: String,
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.scala b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/TestEventDTOModules.scala
similarity index 95%
rename from event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.scala
rename to event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/TestEventDTOModules.scala
index 90d5f27908..3df562556c 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/dto/TestEventDTOModules.scala
+++ b/event-sourcing/event-store-api/src/test/scala/org/apache/james/eventsourcing/eventstore/dto/TestEventDTOModules.scala
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.eventsourcing.eventstore.cassandra.dto
+package org.apache.james.eventsourcing.eventstore.dto
import org.apache.james.eventsourcing.TestEvent
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule
object TestEventDTOModules {
val TEST_TYPE: EventDTOModule[TestEvent, TestEventDTO] = EventDTOModule.forEvent(classOf[TestEvent])
diff --git a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/EventStoreDao.scala b/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/EventStoreDao.scala
index 62a35fb598..b2d7f11f16 100644
--- a/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/EventStoreDao.scala
+++ b/event-sourcing/event-store-cassandra/src/main/scala/org/apache/james/eventsourcing/eventstore/cassandra/EventStoreDao.scala
@@ -27,7 +27,7 @@ import com.datastax.oss.driver.api.querybuilder.QueryBuilder.{bindMarker, insert
import jakarta.inject.Inject
import org.apache.james.backends.cassandra.init.configuration.JamesExecutionProfiles
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor
-import org.apache.james.eventsourcing.eventstore.History
+import org.apache.james.eventsourcing.eventstore.{History, JsonEventSerializer}
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreTable.{AGGREGATE_ID, EVENT, EVENTS_TABLE, EVENT_ID, SNAPSHOT}
import org.apache.james.eventsourcing.{AggregateId, Event, EventId}
import org.apache.james.util.ReactorUtils
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtension.scala b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtension.scala
index 1adc17ff58..e99965e463 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtension.scala
+++ b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtension.scala
@@ -19,7 +19,7 @@
package org.apache.james.eventsourcing.eventstore.cassandra
import org.apache.james.backends.cassandra.CassandraClusterExtension
-import org.apache.james.eventsourcing.eventstore.EventStore
+import org.apache.james.eventsourcing.eventstore.{EventStore, JsonEventSerializer}
import org.junit.jupiter.api.extension.{AfterAllCallback, AfterEachCallback, BeforeAllCallback, BeforeEachCallback, ExtensionContext, ParameterContext, ParameterResolutionException, ParameterResolver}
class CassandraEventStoreExtension(var cassandra: CassandraClusterExtension, val eventSerializer: JsonEventSerializer)
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtensionForTestEvents.scala b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtensionForTestEvents.scala
index c7002efd5b..142728d00f 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtensionForTestEvents.scala
+++ b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreExtensionForTestEvents.scala
@@ -18,7 +18,8 @@
****************************************************************/
package org.apache.james.eventsourcing.eventstore.cassandra
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.TestEventDTOModules
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer
+import org.apache.james.eventsourcing.eventstore.dto.TestEventDTOModules
import org.junit.jupiter.api.extension.Extension
class CassandraEventStoreExtensionForTestEvents extends CassandraEventStoreExtension(JsonEventSerializer.forModules(TestEventDTOModules.TEST_TYPE, TestEventDTOModules.SNAPSHOT_TYPE).withoutNestedType) with Extension
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreTest.scala b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreTest.scala
index 5d20fbeebe..718f37c842 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreTest.scala
+++ b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreTest.scala
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.eventsourcing.eventstore.cassandra
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.SnapshotEvent
+import org.apache.james.eventsourcing.eventstore.dto.SnapshotEvent
import org.apache.james.eventsourcing.{EventId, TestEvent}
import org.apache.james.eventsourcing.eventstore.{EventStore, EventStoreContract, History}
import org.assertj.core.api.Assertions.assertThat
diff --git a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.scala b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.scala
index 7896527b89..cb07f25239 100644
--- a/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.scala
+++ b/event-sourcing/event-store-cassandra/src/test/scala/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.scala
@@ -19,7 +19,8 @@
package org.apache.james.eventsourcing.eventstore.cassandra
import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.{OtherEvent, TestEventDTOModules}
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer
+import org.apache.james.eventsourcing.eventstore.dto.{OtherEvent, TestEventDTOModules}
import org.apache.james.eventsourcing.{EventId, TestAggregateId, TestEvent}
import org.assertj.core.api.Assertions.{assertThat, assertThatThrownBy}
import org.junit.jupiter.api.Test
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLModule.java
index 60eaab8657..b932aa0a24 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLModule.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLModule.java
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.cassandra.mail.eventsourcing.acl;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTOModule;
public interface ACLModule {
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLUpdatedDTO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLUpdatedDTO.java
index a1a3b4f491..5cf72d169e 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLUpdatedDTO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/eventsourcing/acl/ACLUpdatedDTO.java
@@ -22,7 +22,7 @@ package org.apache.james.mailbox.cassandra.mail.eventsourcing.acl;
import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index b24b4b8f33..64d63e4c6a 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -45,7 +45,7 @@ import org.apache.james.core.Username;
import org.apache.james.events.EventBus;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.mailbox.MailboxManagerTest;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperNoACLTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperNoACLTest.java
index 680023aa28..f8afbdcbaf 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperNoACLTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperNoACLTest.java
@@ -32,13 +32,12 @@ import org.apache.james.backends.cassandra.StatementRecorder;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO;
-import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.backends.cassandra.versions.SchemaVersion;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.mailbox.cassandra.mail.eventsourcing.acl.ACLModule;
import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
import org.apache.james.mailbox.model.MailboxACL;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java
index 57c205d335..37772061a1 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java
@@ -37,7 +37,7 @@ import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.mailbox.cassandra.mail.eventsourcing.acl.ACLModule;
import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
import org.apache.james.mailbox.model.MailboxACL;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 7e0d44b48d..e82847672e 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -33,14 +33,13 @@ import org.apache.james.backends.cassandra.Scenario;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO;
-import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManager;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.backends.cassandra.versions.SchemaVersion;
import org.apache.james.core.Username;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.junit.categories.Unstable;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.mail.eventsourcing.acl.ACLModule;
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
index 8d0e597c5d..b26d0ebdf0 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
@@ -32,9 +32,9 @@ import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
-import org.apache.james.eventsourcing.eventstore.cassandra.EventNestedTypes;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTO;
import org.apache.james.json.DTOModule;
import org.apache.james.mailbox.AttachmentIdFactory;
diff --git a/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaEventDTOModules.java b/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaEventDTOModules.java
index 85266d4caf..1295411bf6 100644
--- a/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaEventDTOModules.java
+++ b/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaEventDTOModules.java
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.quota.cassandra.dto;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.mailbox.quota.mailing.events.QuotaThresholdChangedEvent;
public interface QuotaEventDTOModules {
diff --git a/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaThresholdChangedEventDTO.java b/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaThresholdChangedEventDTO.java
index fe058f8c24..829feda3ae 100644
--- a/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaThresholdChangedEventDTO.java
+++ b/mailbox/plugin/quota-mailing-cassandra/src/main/java/org/apache/james/mailbox/quota/cassandra/dto/QuotaThresholdChangedEventDTO.java
@@ -20,7 +20,7 @@
package org.apache.james.mailbox.quota.cassandra.dto;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import org.apache.james.mailbox.quota.mailing.aggregates.UserQuotaThresholds;
import org.apache.james.mailbox.quota.mailing.events.QuotaThresholdChangedEvent;
diff --git a/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/listeners/CassandraQuotaMailingListenersIntegrationTest.java b/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/listeners/CassandraQuotaMailingListenersIntegrationTest.java
index 55c3c44774..c633050cdb 100644
--- a/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/listeners/CassandraQuotaMailingListenersIntegrationTest.java
+++ b/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/listeners/CassandraQuotaMailingListenersIntegrationTest.java
@@ -20,7 +20,7 @@
package org.apache.james.mailbox.quota.cassandra.listeners;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreExtension;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.mailbox.quota.cassandra.dto.QuotaEventDTOModules;
import org.apache.james.mailbox.quota.mailing.listeners.QuotaThresholdMailingIntegrationTest;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java
index 98c54411b2..2a6c4bfa50 100644
--- a/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java
+++ b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java
@@ -22,7 +22,7 @@ package org.apache.james;
import java.util.Set;
import org.apache.james.data.UsersRepositoryModuleChooser;
-import org.apache.james.eventsourcing.eventstore.cassandra.EventNestedTypes;
+import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
import org.apache.james.jmap.draft.JMAPListenerModule;
import org.apache.james.json.DTOModule;
import org.apache.james.modules.BlobExportMechanismModule;
diff --git a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
index d5b27726c9..7607d56be9 100644
--- a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
+++ b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
@@ -23,7 +23,7 @@ import java.util.Set;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.data.UsersRepositoryModuleChooser;
-import org.apache.james.eventsourcing.eventstore.cassandra.EventNestedTypes;
+import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
import org.apache.james.jmap.draft.JMAPListenerModule;
import org.apache.james.json.DTO;
import org.apache.james.json.DTOModule;
diff --git a/server/apps/distributed-app/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java b/server/apps/distributed-app/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java
index f06eb62a8c..255f914719 100644
--- a/server/apps/distributed-app/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java
+++ b/server/apps/distributed-app/src/test/java/org/apache/james/modules/blobstore/BlobStoreConfigurationValidationStartUpCheckTest.java
@@ -31,9 +31,9 @@ import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreExtension;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.lifecycle.api.StartUpCheck;
import org.apache.james.modules.blobstore.validation.BlobStoreConfigurationValidationStartUpCheck;
import org.apache.james.modules.blobstore.validation.EventsourcingStorageStrategy;
diff --git a/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesServerMain.java b/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesServerMain.java
index d094aaab94..f7c129a50a 100644
--- a/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesServerMain.java
+++ b/server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesServerMain.java
@@ -22,7 +22,7 @@ package org.apache.james;
import java.util.Set;
import org.apache.james.data.UsersRepositoryModuleChooser;
-import org.apache.james.eventsourcing.eventstore.cassandra.EventNestedTypes;
+import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
import org.apache.james.json.DTO;
import org.apache.james.json.DTOModule;
import org.apache.james.mailbox.NoACLMapper;
diff --git a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StoragePolicyConfigurationSanityEnforcementModule.java b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StoragePolicyConfigurationSanityEnforcementModule.java
index 194b8f0339..78e3621436 100644
--- a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StoragePolicyConfigurationSanityEnforcementModule.java
+++ b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StoragePolicyConfigurationSanityEnforcementModule.java
@@ -19,8 +19,8 @@
package org.apache.james.modules.blobstore.validation;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.lifecycle.api.StartUpCheck;
import com.google.inject.AbstractModule;
diff --git a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyChangedDTO.java b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyChangedDTO.java
index 37a620819f..bd8ac648de 100644
--- a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyChangedDTO.java
+++ b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyChangedDTO.java
@@ -22,7 +22,7 @@ package org.apache.james.modules.blobstore.validation;
import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import org.apache.james.server.blob.deduplication.StorageStrategy;
import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyModule.java b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyModule.java
index 6607810ec7..1d49298b28 100644
--- a/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyModule.java
+++ b/server/container/guice/blob/deduplication-gc/src/main/java/org/apache/james/modules/blobstore/validation/StorageStrategyModule.java
@@ -19,7 +19,7 @@
package org.apache.james.modules.blobstore.validation;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
public interface StorageStrategyModule {
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java
index f6fb7eb811..4f62c3eb0a 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraDLPConfigurationStoreModule.java
@@ -23,8 +23,8 @@ import org.apache.james.dlp.api.DLPConfigurationStore;
import org.apache.james.dlp.eventsourcing.EventSourcingDLPConfigurationStore;
import org.apache.james.dlp.eventsourcing.cassandra.DLPConfigurationModules;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java
index f6a1310753..4c83ac4950 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java
@@ -26,10 +26,11 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.core.healthcheck.HealthCheck;
import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.eventstore.EventStore;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.jmap.api.access.AccessTokenRepository;
import org.apache.james.jmap.api.filtering.FilteringManagement;
+import org.apache.james.jmap.api.filtering.FilteringRuleSetDefineDTOModules;
import org.apache.james.jmap.api.filtering.FiltersDeleteUserDataTaskStep;
import org.apache.james.jmap.api.filtering.impl.EventSourcingFilteringManagement;
import org.apache.james.jmap.api.filtering.impl.FilterUsernameChangeTaskStep;
@@ -48,7 +49,6 @@ import org.apache.james.jmap.cassandra.change.CassandraEmailChangeModule;
import org.apache.james.jmap.cassandra.change.CassandraMailboxChangeModule;
import org.apache.james.jmap.cassandra.filtering.CassandraFilteringProjection;
import org.apache.james.jmap.cassandra.filtering.CassandraFilteringProjectionModule;
-import org.apache.james.jmap.cassandra.filtering.FilteringRuleSetDefineDTOModules;
import org.apache.james.jmap.cassandra.identity.CassandraCustomIdentityDAO;
import org.apache.james.jmap.cassandra.identity.CassandraCustomIdentityModule;
import org.apache.james.jmap.cassandra.projections.CassandraEmailQueryView;
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/eventstore/CassandraEventStoreModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/eventstore/CassandraEventStoreModule.java
index 164ccd8989..06d62e8b34 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/eventstore/CassandraEventStoreModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/eventstore/CassandraEventStoreModule.java
@@ -23,8 +23,8 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
@@ -32,7 +32,6 @@ import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.Multibinder;
public class CassandraEventStoreModule extends AbstractModule {
-
@Override
protected void configure() {
bind(CassandraEventStore.class).in(Scopes.SINGLETON);
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
index 4902e2be2b..e9a03a74aa 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
@@ -36,11 +36,11 @@ import org.apache.james.backends.cassandra.init.configuration.CassandraConfigura
import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.events.EventListener;
import org.apache.james.eventsourcing.Event;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.jmap.api.change.EmailChangeRepository;
import org.apache.james.jmap.api.change.Limit;
import org.apache.james.jmap.api.change.MailboxChangeRepository;
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaMailingModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaMailingModule.java
index 21300622f4..fd9145772f 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaMailingModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraQuotaMailingModule.java
@@ -20,8 +20,8 @@
package org.apache.james.modules.mailbox;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.mailbox.quota.cassandra.dto.QuotaEventDTOModules;
import com.google.inject.AbstractModule;
diff --git a/server/container/guice/distributed/src/main/java/org/apache/james/modules/DistributedTaskSerializationModule.java b/server/container/guice/distributed/src/main/java/org/apache/james/modules/DistributedTaskSerializationModule.java
index 8a905b5268..31455dc585 100644
--- a/server/container/guice/distributed/src/main/java/org/apache/james/modules/DistributedTaskSerializationModule.java
+++ b/server/container/guice/distributed/src/main/java/org/apache/james/modules/DistributedTaskSerializationModule.java
@@ -23,9 +23,9 @@ import java.util.Set;
import jakarta.inject.Named;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.EventNestedTypes;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTOConverter;
import org.apache.james.json.DTOModule;
import org.apache.james.modules.mailbox.ReIndexingTaskSerializationModule;
diff --git a/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/CassandraMailQueueViewModule.java b/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/CassandraMailQueueViewModule.java
index 7a8f41267b..b5044c5d1b 100644
--- a/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/CassandraMailQueueViewModule.java
+++ b/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/CassandraMailQueueViewModule.java
@@ -25,8 +25,8 @@ import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.blob.api.BlobReferenceSource;
import org.apache.james.core.healthcheck.HealthCheck;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.lifecycle.api.StartUpCheck;
import org.apache.james.queue.rabbitmq.view.api.MailQueueView;
import org.apache.james.queue.rabbitmq.view.cassandra.BrowseStartDAO;
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemAddedDTO.java b/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemAddedDTO.java
index f42bd393f8..d4adfbb3e4 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemAddedDTO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemAddedDTO.java
@@ -27,7 +27,7 @@ import java.util.Objects;
import org.apache.james.dlp.eventsourcing.aggregates.DLPAggregateId;
import org.apache.james.dlp.eventsourcing.events.ConfigurationItemsAdded;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemsRemovedDTO.java b/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemsRemovedDTO.java
index c6c2ccb522..9df60f96ae 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemsRemovedDTO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationItemsRemovedDTO.java
@@ -27,7 +27,7 @@ import java.util.Objects;
import org.apache.james.dlp.eventsourcing.aggregates.DLPAggregateId;
import org.apache.james.dlp.eventsourcing.events.ConfigurationItemsRemoved;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationModules.java b/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationModules.java
index 36c02177a3..01c795e7a5 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationModules.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/dlp/eventsourcing/cassandra/DLPConfigurationModules.java
@@ -21,7 +21,7 @@ package org.apache.james.dlp.eventsourcing.cassandra;
import org.apache.james.dlp.eventsourcing.events.ConfigurationItemsAdded;
import org.apache.james.dlp.eventsourcing.events.ConfigurationItemsRemoved;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
public interface DLPConfigurationModules {
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
index c128d12b33..9975f41544 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
@@ -25,7 +25,7 @@ import org.apache.james.dlp.eventsourcing.EventSourcingDLPConfigurationStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementNoProjectionTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementNoProjectionTest.java
index dbcfe0599e..711dcffb28 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementNoProjectionTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementNoProjectionTest.java
@@ -24,9 +24,10 @@ import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule$;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.jmap.api.filtering.FilteringManagement;
import org.apache.james.jmap.api.filtering.FilteringManagementContract;
+import org.apache.james.jmap.api.filtering.FilteringRuleSetDefineDTOModules;
import org.apache.james.jmap.api.filtering.impl.EventSourcingFilteringManagement;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementTest.java
index 714851f218..d800844929 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/CassandraEventSourcingFilteringManagementTest.java
@@ -25,9 +25,10 @@ import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule$;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.jmap.api.filtering.FilteringManagement;
import org.apache.james.jmap.api.filtering.FilteringManagementContract;
+import org.apache.james.jmap.api.filtering.FilteringRuleSetDefineDTOModules;
import org.apache.james.jmap.api.filtering.impl.EventSourcingFilteringManagement;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java
index 0111474af1..5d746a540b 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/filtering/DTOTest.java
@@ -31,13 +31,15 @@ import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_SUBJECT;
import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_SUBJECT_2;
import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_TO;
import static org.apache.james.jmap.api.filtering.RuleFixture.RULE_TO_2;
-import static org.apache.james.jmap.cassandra.filtering.FilteringRuleSetDefineDTOModules.FILTERING_INCREMENT;
-import static org.apache.james.jmap.cassandra.filtering.FilteringRuleSetDefineDTOModules.FILTERING_RULE_SET_DEFINED;
+import static org.apache.james.jmap.api.filtering.FilteringRuleSetDefineDTOModules.FILTERING_INCREMENT;
+import static org.apache.james.jmap.api.filtering.FilteringRuleSetDefineDTOModules.FILTERING_RULE_SET_DEFINED;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.JsonSerializationVerifier;
import org.apache.james.core.Username;
import org.apache.james.eventsourcing.EventId;
+import org.apache.james.jmap.api.filtering.FilteringIncrementalRuleChangeDTO;
+import org.apache.james.jmap.api.filtering.FilteringRuleSetDefinedDTO;
import org.apache.james.jmap.api.filtering.Rule;
import org.apache.james.jmap.api.filtering.impl.FilteringAggregateId;
import org.apache.james.jmap.api.filtering.impl.IncrementalRuleChange;
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringIncrementalRuleChangeDTO.java
similarity index 96%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java
rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringIncrementalRuleChangeDTO.java
index 119d522051..a1475cf63b 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringIncrementalRuleChangeDTO.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringIncrementalRuleChangeDTO.java
@@ -17,14 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.cassandra.filtering;
+package org.apache.james.jmap.api.filtering;
import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.jmap.api.filtering.Rule;
-import org.apache.james.jmap.api.filtering.RuleDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import org.apache.james.jmap.api.filtering.impl.FilteringAggregateId;
import org.apache.james.jmap.api.filtering.impl.IncrementalRuleChange;
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefineDTOModules.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringRuleSetDefineDTOModules.java
similarity index 94%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefineDTOModules.java
rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringRuleSetDefineDTOModules.java
index d845202235..3397bfd9e4 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefineDTOModules.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringRuleSetDefineDTOModules.java
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.cassandra.filtering;
+package org.apache.james.jmap.api.filtering;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.jmap.api.filtering.impl.IncrementalRuleChange;
import org.apache.james.jmap.api.filtering.impl.RuleSetDefined;
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringRuleSetDefinedDTO.java
similarity index 95%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java
rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringRuleSetDefinedDTO.java
index 2f3e7c544b..73ed1a9805 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/filtering/FilteringRuleSetDefinedDTO.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/filtering/FilteringRuleSetDefinedDTO.java
@@ -17,13 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.jmap.cassandra.filtering;
+package org.apache.james.jmap.api.filtering;
import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.jmap.api.filtering.RuleDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import org.apache.james.jmap.api.filtering.impl.FilteringAggregateId;
import org.apache.james.jmap.api.filtering.impl.RuleSetDefined;
diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfigurationModule.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfigurationModule.java
index cb0df9a01d..b5c85095e9 100644
--- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfigurationModule.java
+++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfigurationModule.java
@@ -19,7 +19,7 @@
package org.apache.james.queue.rabbitmq.view.cassandra.configuration;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
public interface CassandraMailQueueViewConfigurationModule {
diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/ConfigurationChangedDTO.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/ConfigurationChangedDTO.java
index a621e2a6fe..bca3ffe495 100644
--- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/ConfigurationChangedDTO.java
+++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/ConfigurationChangedDTO.java
@@ -23,7 +23,7 @@ import java.time.Duration;
import java.util.Objects;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java
index 369917eef8..285ba6067d 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueConfigurationChangeTest.java
@@ -43,7 +43,7 @@ import org.apache.james.blob.mail.MimeMessageStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
import org.apache.james.eventsourcing.eventstore.cassandra.EventStoreDao;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.lifecycle.api.StartUpCheck;
import org.apache.james.metrics.api.NoopGaugeRegistry;
import org.apache.james.metrics.tests.RecordingMetricFactory;
diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/EventsourcingConfigurationManagementTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/EventsourcingConfigurationManagementTest.java
index 5d191bf8b7..967a4da546 100644
--- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/EventsourcingConfigurationManagementTest.java
+++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/EventsourcingConfigurationManagementTest.java
@@ -27,7 +27,7 @@ import java.time.Duration;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreExtension;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriber.java b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriber.java
index f17fd11a04..58a68517da 100644
--- a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriber.java
+++ b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriber.java
@@ -35,7 +35,7 @@ import org.apache.james.backends.rabbitmq.QueueArguments;
import org.apache.james.backends.rabbitmq.RabbitMQConfiguration;
import org.apache.james.backends.rabbitmq.ReceiverProvider;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
import org.apache.james.lifecycle.api.Startable;
import org.apache.james.task.eventsourcing.TerminationSubscriber;
import org.reactivestreams.Publisher;
diff --git a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
index 3c202670a2..20fd4fd2f7 100644
--- a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
+++ b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
@@ -23,8 +23,8 @@ import java.util.Set;
import java.util.stream.Stream;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTOConverter;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
diff --git a/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala b/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
index cbc988520e..ab7e65154f 100644
--- a/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
+++ b/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
@@ -23,7 +23,7 @@ import java.util.Optional
import com.fasterxml.jackson.annotation.JsonProperty
import org.apache.james.eventsourcing.EventId
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO
import org.apache.james.json.DTOConverter
import org.apache.james.server.task.json.dto.{AdditionalInformationDTO, TaskDTO}
import org.apache.james.task.TaskExecutionDetails.AdditionalInformation
diff --git a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
index c688dfc000..f3850548e5 100644
--- a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
+++ b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
@@ -31,7 +31,6 @@ import static org.awaitility.Awaitility.await;
import static org.awaitility.Durations.FIVE_SECONDS;
import static org.awaitility.Durations.ONE_SECOND;
-import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
@@ -57,9 +56,9 @@ import org.apache.james.eventsourcing.EventSourcingSystem;
import org.apache.james.eventsourcing.eventstore.EventStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreExtension;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTOConverter;
import org.apache.james.json.DTOModule;
import org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
diff --git a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
index f61751e55e..f5d685ebba 100644
--- a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
+++ b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
@@ -38,9 +38,9 @@ import java.util.stream.IntStream;
import org.apache.james.backends.rabbitmq.RabbitMQExtension;
import org.apache.james.eventsourcing.Event;
-import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.JsonEventSerializer;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTOConverter;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.eventsourcing.TerminationSubscriber;
diff --git a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
index 2444edf31d..66bc3cdb99 100644
--- a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
+++ b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
@@ -25,8 +25,8 @@ import java.util.Set;
import org.apache.james.JsonSerializationVerifier;
import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.EventId;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO;
-import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
+import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
import org.apache.james.json.DTOConverter;
import org.apache.james.json.JsonGenericSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
(james-project) 03/03: JAMES-2586 change javax.inject to jakarta.inject in event-sourcing/event-store-api/pom.xml
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c267f1ed83ce65f286d34b4fc2dabac7e51cdc18
Author: hung phan <hp...@linagora.com>
AuthorDate: Fri Mar 29 11:16:01 2024 +0700
JAMES-2586 change javax.inject to jakarta.inject in event-sourcing/event-store-api/pom.xml
---
event-sourcing/event-store-api/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml
index 29942e4a76..d2703e7ecc 100644
--- a/event-sourcing/event-store-api/pom.xml
+++ b/event-sourcing/event-store-api/pom.xml
@@ -57,8 +57,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org