Fix guice dependency resolution

linagora · Oct 25, 2024 · eef7eef · eef7eef
1 parent 0a093a6
commit eef7eef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/tmail-backend/apps/distributed/src/test/resources/openpaas.properties b/tmail-backend/apps/distributed/src/test/resources/openpaas.properties
@@ -0,0 +1 @@
+openpaas.api.uri=http://localhost:5032
diff --git a/...l-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModule.java b/...l-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModule.java
@@ -23,6 +23,7 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.multibindings.ProvidesIntoSet;
+import com.linagora.tmail.api.OpenPaasRestClient;
 import com.linagora.tmail.contact.OpenPaasContactsConsumer;
 
 public class OpenPaasModule extends AbstractModule {
@@ -40,7 +41,7 @@ public InitializationOperation initializeContactsConsumer(OpenPaasContactsConsum
     @Provides
     @Named(OPENPAAS_CONFIGURATION_NAME)
     @Singleton
-    private Configuration providePropertiesConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
+    public Configuration providePropertiesConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
         try {
             return propertiesProvider.getConfiguration(OPENPAAS_CONFIGURATION_NAME);
         } catch (FileNotFoundException e) {
@@ -52,10 +53,15 @@ private Configuration providePropertiesConfiguration(PropertiesProvider properti
 
     @Provides
     @Singleton
-    protected OpenPaasConfiguration provideOpenPaasConfiguration(@Named(OPENPAAS_CONFIGURATION_NAME) Configuration propertiesConfiguration) {
+    public OpenPaasConfiguration provideOpenPaasConfiguration(@Named(OPENPAAS_CONFIGURATION_NAME) Configuration propertiesConfiguration) {
         return OpenPaasConfiguration.from(propertiesConfiguration);
     }
 
+    @Provides
+    public OpenPaasRestClient provideOpenPaasRestCLient(OpenPaasConfiguration openPaasConfiguration) {
+        return new OpenPaasRestClient(openPaasConfiguration);
+    }
+
     @Provides
     @Named(OPENPAAS_INJECTION_KEY)
     @Singleton
@@ -69,7 +75,7 @@ public RabbitMQConfiguration provideRabbitMQConfiguration(OpenPaasConfiguration
     @Named(OPENPAAS_INJECTION_KEY)
     @Singleton
     public SimpleConnectionPool provideSimpleConnectionPool(@Named(OPENPAAS_INJECTION_KEY) RabbitMQConfiguration rabbitMQConfiguration,
-                                                     Provider<Configuration> configuration) {
+                                                            @Named(OPENPAAS_CONFIGURATION_NAME) Provider<Configuration> configuration) {
         RabbitMQConnectionFactory rabbitMQConnectionFactory = new RabbitMQConnectionFactory(rabbitMQConfiguration);
         try {
             return new SimpleConnectionPool(rabbitMQConnectionFactory, SimpleConnectionPool.Configuration.from(configuration.get()));
@@ -82,7 +88,7 @@ public SimpleConnectionPool provideSimpleConnectionPool(@Named(OPENPAAS_INJECTIO
     @Provides
     @Named(OPENPAAS_INJECTION_KEY)
     @Singleton
-    ReactorRabbitMQChannelPool provideReactorRabbitMQChannelPool(
+    public ReactorRabbitMQChannelPool provideReactorRabbitMQChannelPool(
         OpenPaasConfiguration openPaasConfiguration,
         @Named(OPENPAAS_INJECTION_KEY) SimpleConnectionPool simpleConnectionPool,
         ReactorRabbitMQChannelPool.Configuration configuration,