Drop tmail-common module

linagora · Jan 17, 2025 · 8780cbf · 8780cbf
1 parent 11f52fd
commit 8780cbf
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 128 deletions.
diff --git a/...s/distributed/src/main/java/com/linagora/tmail/james/app/TmailEventDeadLettersModule.java b/...s/distributed/src/main/java/com/linagora/tmail/james/app/TmailEventDeadLettersModule.java
@@ -18,6 +18,8 @@
 
 package com.linagora.tmail.james.app;
 
+import static com.linagora.tmail.event.TmailEventModule.TMAIL_EVENT_BUS_INJECT_NAME;
+
 import jakarta.inject.Named;
 
 import org.apache.james.events.CassandraEventDeadLetters;
@@ -29,14 +31,13 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
-import com.linagora.tmail.common.event.TmailInjectNameConstants;
 import com.linagora.tmail.event.TmailEventSerializer;
 
 public class TmailEventDeadLettersModule extends AbstractModule {
 
     @Provides
     @Singleton
-    @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME)
+    @Named(TMAIL_EVENT_BUS_INJECT_NAME)
     EventDeadLetters provideEventDeadLetters(CassandraEventDeadLettersGroupDAO cassandraEventDeadLettersGroupDAO,
                                              CqlSession session,
                                              TmailEventSerializer tmailEventSerializer) {

diff --git a/tmail-backend/backend-commons/tmail-common/pom.xml b/tmail-backend/backend-commons/tmail-common/pom.xml
diff --git a/.../tmail-common/src/main/java/com/linagora/tmail/common/event/TmailInjectNameConstants.java b/.../tmail-common/src/main/java/com/linagora/tmail/common/event/TmailInjectNameConstants.java
diff --git a/...common/src/main/java/com/linagora/tmail/common/event/TmailReactiveGroupEventListener.java b/...common/src/main/java/com/linagora/tmail/common/event/TmailReactiveGroupEventListener.java
diff --git a/tmail-backend/blob/secondary-blob-store/pom.xml b/tmail-backend/blob/secondary-blob-store/pom.xml
@@ -32,11 +32,6 @@
     <name>Twake Mail :: Blob :: SecondaryBlobStore</name>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tmail-common</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>${james.groupId}</groupId>
             <artifactId>blob-api</artifactId>

diff --git a/...src/main/java/com/linagora/tmail/blob/secondaryblobstore/FailedBlobOperationListener.java b/...src/main/java/com/linagora/tmail/blob/secondaryblobstore/FailedBlobOperationListener.java
@@ -24,17 +24,16 @@
 import org.apache.james.blob.api.BlobStoreDAO;
 import org.apache.james.blob.api.BucketName;
 import org.apache.james.events.Event;
+import org.apache.james.events.EventListener;
 import org.apache.james.events.Group;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.linagora.tmail.common.event.TmailReactiveGroupEventListener;
-
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
-public class FailedBlobOperationListener implements TmailReactiveGroupEventListener {
+public class FailedBlobOperationListener implements EventListener.ReactiveGroupEventListener {
     public static final Logger LOGGER = LoggerFactory.getLogger(FailedBlobOperationListener.class);
 
     public static class FailedBlobOperationListenerGroup extends Group {

diff --git a/tmail-backend/guice/blob-guice/pom.xml b/tmail-backend/guice/blob-guice/pom.xml
@@ -40,11 +40,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>secondary-blob-store</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tmail-common</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>${james.groupId}</groupId>
             <artifactId>apache-james-backends-cassandra</artifactId>

diff --git a/...guice/blob-guice/src/main/java/com/linagora/tmail/blob/guice/BlobStoreModulesChooser.java b/...guice/blob-guice/src/main/java/com/linagora/tmail/blob/guice/BlobStoreModulesChooser.java
@@ -39,6 +39,7 @@
 import org.apache.james.blob.objectstorage.aws.sse.S3SSECConfiguration;
 import org.apache.james.blob.objectstorage.aws.sse.S3SSECustomerKeyFactory;
 import org.apache.james.events.EventBus;
+import org.apache.james.events.EventListener;
 import org.apache.james.eventsourcing.Event;
 import org.apache.james.eventsourcing.eventstore.dto.EventDTO;
 import org.apache.james.eventsourcing.eventstore.dto.EventDTOModule;
@@ -74,15 +75,14 @@
 import com.linagora.tmail.blob.blobid.list.SingleSaveBlobStoreDAO;
 import com.linagora.tmail.blob.secondaryblobstore.FailedBlobOperationListener;
 import com.linagora.tmail.blob.secondaryblobstore.SecondaryBlobStoreDAO;
-import com.linagora.tmail.common.event.TmailInjectNameConstants;
-import com.linagora.tmail.common.event.TmailReactiveGroupEventListener;
 
 public class BlobStoreModulesChooser {
     public static final String INITIAL_BLOBSTORE_DAO = "initial_blobstore_dao";
     public static final String MAYBE_SECONDARY_BLOBSTORE = "maybe_secondary_blob_store_dao";
     public static final String MAYBE_ENCRYPTION_BLOBSTORE = "maybe_encryption_blob_store_dao";
     public static final String MAYBE_SINGLE_SAVE_BLOBSTORE = "maybe_single_save_blob_store_dao";
     public static final String SECOND_BLOB_STORE_DAO = "second_blob_store_dao";
+    public static final String TMAIL_EVENT_BUS_INJECT_NAME = "TMAIL_EVENT_BUS";
 
     static class ObjectStorageBlobStoreDAODeclarationModule extends AbstractModule {
         @Override
@@ -161,8 +161,9 @@ BlobStoreDAO getSecondaryS3BlobStoreDAO(BlobId.Factory blobIdFactory,
         }
 
         @ProvidesIntoSet
-        TmailReactiveGroupEventListener provideFailedBlobOperationListener(@Named(INITIAL_BLOBSTORE_DAO) BlobStoreDAO firstBlobStoreDAO,
-                                                                           @Named(SECOND_BLOB_STORE_DAO) BlobStoreDAO secondBlobStoreDAO) {
+        @Named(TMAIL_EVENT_BUS_INJECT_NAME)
+        EventListener.ReactiveGroupEventListener provideFailedBlobOperationListener(@Named(INITIAL_BLOBSTORE_DAO) BlobStoreDAO firstBlobStoreDAO,
+                                                                                    @Named(SECOND_BLOB_STORE_DAO) BlobStoreDAO secondBlobStoreDAO) {
             return new FailedBlobOperationListener(firstBlobStoreDAO, secondBlobStoreDAO, secondaryS3BlobStoreConfiguration.secondaryBucketSuffix());
         }
 
@@ -171,7 +172,7 @@ TmailReactiveGroupEventListener provideFailedBlobOperationListener(@Named(INITIA
         @Named(MAYBE_SECONDARY_BLOBSTORE)
         BlobStoreDAO provideSecondaryBlobStoreDAO(@Named(INITIAL_BLOBSTORE_DAO) BlobStoreDAO firstBlobStoreDAO,
                                                   @Named(SECOND_BLOB_STORE_DAO) BlobStoreDAO secondBlobStoreDAO,
-                                                  @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) EventBus eventBus) {
+                                                  @Named(TMAIL_EVENT_BUS_INJECT_NAME) EventBus eventBus) {
             return new SecondaryBlobStoreDAO(firstBlobStoreDAO, secondBlobStoreDAO, secondaryS3BlobStoreConfiguration.secondaryBucketSuffix(), eventBus);
         }
     }

diff --git a/tmail-backend/guice/distributed/src/main/java/com/linagora/tmail/event/TmailEventModule.java b/tmail-backend/guice/distributed/src/main/java/com/linagora/tmail/event/TmailEventModule.java
@@ -29,6 +29,7 @@
 import org.apache.james.events.EventBusId;
 import org.apache.james.events.EventBusName;
 import org.apache.james.events.EventDeadLetters;
+import org.apache.james.events.EventListener;
 import org.apache.james.events.EventSerializer;
 import org.apache.james.events.NamingStrategy;
 import org.apache.james.events.RabbitMQEventBus;
@@ -47,28 +48,29 @@
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.multibindings.ProvidesIntoSet;
 import com.google.inject.name.Names;
-import com.linagora.tmail.common.event.TmailInjectNameConstants;
-import com.linagora.tmail.common.event.TmailReactiveGroupEventListener;
 
 import reactor.rabbitmq.Sender;
 
 public class TmailEventModule extends AbstractModule {
     public static final NamingStrategy TMAIL_NAMING_STRATEGY = new NamingStrategy(new EventBusName("tmailEvent"));
+    public static final String TMAIL_EVENT_BUS_INJECT_NAME = "TMAIL_EVENT_BUS";
 
     @Override
     protected void configure() {
         bind(TmailEventSerializer.class).in(Scopes.SINGLETON);
-        bind(EventBusId.class).annotatedWith(Names.named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME)).toInstance(EventBusId.random());
+        bind(EventBusId.class).annotatedWith(Names.named(TMAIL_EVENT_BUS_INJECT_NAME)).toInstance(EventBusId.random());
 
         Multibinder.newSetBinder(binder(), EventSerializer.class)
             .addBinding()
             .to(TmailEventSerializer.class);
-        Multibinder.newSetBinder(binder(), TmailReactiveGroupEventListener.class);
+        Multibinder.newSetBinder(binder(), EventListener.ReactiveGroupEventListener.class,
+            Names.named(TMAIL_EVENT_BUS_INJECT_NAME));
+
     }
 
     @ProvidesIntoSet
-    InitializationOperation workQueue(@Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) RabbitMQEventBus instance,
-                                      Set<TmailReactiveGroupEventListener> tmailReactiveGroupEventListeners) {
+    InitializationOperation workQueue(@Named(TMAIL_EVENT_BUS_INJECT_NAME) RabbitMQEventBus instance,
+                                      @Named(TMAIL_EVENT_BUS_INJECT_NAME) Set<EventListener.ReactiveGroupEventListener> tmailReactiveGroupEventListeners) {
         return InitilizationOperationBuilder
             .forClass(RabbitMQEventBus.class)
             .init(() -> {
@@ -79,12 +81,12 @@ InitializationOperation workQueue(@Named(TmailInjectNameConstants.TMAIL_EVENT_BU
 
     @Provides
     @Singleton
-    @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME)
+    @Named(TMAIL_EVENT_BUS_INJECT_NAME)
     RabbitMQEventBus provideEmailAddressContactEventBus(Sender sender, ReceiverProvider receiverProvider,
                                                         RetryBackoffConfiguration retryBackoffConfiguration,
-                                                        @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) EventDeadLetters eventDeadLetters,
+                                                        @Named(TMAIL_EVENT_BUS_INJECT_NAME) EventDeadLetters eventDeadLetters,
                                                         MetricFactory metricFactory, ReactorRabbitMQChannelPool channelPool,
-                                                        @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) EventBusId eventBusId,
+                                                        @Named(TMAIL_EVENT_BUS_INJECT_NAME) EventBusId eventBusId,
                                                         RabbitMQConfiguration configuration,
                                                         TmailEventSerializer tmailEventSerializer) {
         return new RabbitMQEventBus(
@@ -95,13 +97,13 @@ sender, receiverProvider, tmailEventSerializer, retryBackoffConfiguration, new R
 
     @Provides
     @Singleton
-    @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME)
-    EventBus provideEmailAddressContactEventBus(@Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) RabbitMQEventBus eventBus) {
+    @Named(TMAIL_EVENT_BUS_INJECT_NAME)
+    EventBus provideEmailAddressContactEventBus(@Named(TMAIL_EVENT_BUS_INJECT_NAME) RabbitMQEventBus eventBus) {
         return eventBus;
     }
 
     @ProvidesIntoSet
-    EventBus registerEventBus(@Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) EventBus eventBus) {
+    EventBus registerEventBus(@Named(TMAIL_EVENT_BUS_INJECT_NAME) EventBus eventBus) {
         return eventBus;
     }
 }
diff --git a/...sts/src/test/java/com/linagora/tmail/james/DistributedLinagoraSecondaryBlobStoreTest.java b/...sts/src/test/java/com/linagora/tmail/james/DistributedLinagoraSecondaryBlobStoreTest.java
@@ -19,6 +19,7 @@
 package com.linagora.tmail.james;
 
 import static com.linagora.tmail.blob.guice.BlobStoreModulesChooser.MAYBE_SECONDARY_BLOBSTORE;
+import static com.linagora.tmail.event.TmailEventModule.TMAIL_EVENT_BUS_INJECT_NAME;
 import static io.netty.handler.codec.http.HttpHeaderNames.ACCEPT;
 import static io.restassured.RestAssured.given;
 import static io.restassured.RestAssured.requestSpecification;
@@ -83,7 +84,6 @@
 import com.linagora.tmail.blob.secondaryblobstore.FailedBlobEvents;
 import com.linagora.tmail.blob.secondaryblobstore.FailedBlobOperationListener;
 import com.linagora.tmail.blob.secondaryblobstore.SecondaryBlobStoreDAO;
-import com.linagora.tmail.common.event.TmailInjectNameConstants;
 import com.linagora.tmail.encrypted.MailboxConfiguration;
 import com.linagora.tmail.james.app.CassandraExtension;
 import com.linagora.tmail.james.app.DistributedJamesConfiguration;
@@ -119,7 +119,7 @@ static class BlobStoreProbe implements GuiceProbe {
 
         @Inject
         public BlobStoreProbe(@Named(MAYBE_SECONDARY_BLOBSTORE) BlobStoreDAO blobStoreDAO,
-                              @Named(TmailInjectNameConstants.TMAIL_EVENT_BUS_INJECT_NAME) EventDeadLetters eventDeadLetters) {
+                              @Named(TMAIL_EVENT_BUS_INJECT_NAME) EventDeadLetters eventDeadLetters) {
             SecondaryBlobStoreDAO secondaryBlobStoreDAO = (SecondaryBlobStoreDAO) blobStoreDAO;
             this.primaryBlobStoreDAO = (S3BlobStoreDAO) secondaryBlobStoreDAO.getFirstBlobStoreDAO();
             this.secondaryBlobStoreDAO = (S3BlobStoreDAO) secondaryBlobStoreDAO.getSecondBlobStoreDAO();

diff --git a/tmail-backend/pom.xml b/tmail-backend/pom.xml
@@ -38,8 +38,6 @@
     <modules>
         <module>apps</module>
 
-        <module>backend-commons/tmail-common</module>
-
         <module>blob/blobid-list</module>
         <module>blob/secondary-blob-store</module>
 
@@ -187,11 +185,6 @@
                 <artifactId>secondary-blob-store</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>tmail-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>tmail-guice-common</artifactId>