From 5c71c97f7fa3ff5815369a437a2eafc290c8eb24 Mon Sep 17 00:00:00 2001
From: TungTV <vttran@linagora.com>
Date: Thu, 31 Oct 2024 13:12:56 +0700
Subject: [PATCH] Fixup LinagoraTestJMAPServerModule - should respect jmap
 configuration file when present

---
 .../module/LinagoraTestJMAPServerModule.java  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tmail-backend/guice/protocols/jmap/src/test/java/com/linagora/tmail/module/LinagoraTestJMAPServerModule.java b/tmail-backend/guice/protocols/jmap/src/test/java/com/linagora/tmail/module/LinagoraTestJMAPServerModule.java
index 39c860e0b8..f101a51fc4 100644
--- a/tmail-backend/guice/protocols/jmap/src/test/java/com/linagora/tmail/module/LinagoraTestJMAPServerModule.java
+++ b/tmail-backend/guice/protocols/jmap/src/test/java/com/linagora/tmail/module/LinagoraTestJMAPServerModule.java
@@ -1,10 +1,14 @@
 package com.linagora.tmail.module;
 
+import java.io.FileNotFoundException;
+
 import jakarta.inject.Singleton;
 
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.james.modules.TestJMAPServerModule;
+import org.apache.james.utils.PropertiesProvider;
 
 import com.google.inject.Provides;
 import com.google.inject.name.Named;
@@ -13,10 +17,15 @@ public class LinagoraTestJMAPServerModule extends TestJMAPServerModule {
     @Provides
     @Singleton
     @Named("jmap")
-    Configuration provideConfiguration() {
-        Configuration configuration = new PropertiesConfiguration();
-        configuration.addProperty("calendarEvent.reply.mailTemplateLocation", "classpath://eml/");
-        configuration.addProperty("url.prefix", "http://localhost:8000");
-        return configuration;
+    Configuration provideConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException {
+        try {
+            return propertiesProvider.getConfiguration("jmap");
+        } catch (FileNotFoundException e) {
+            // return a default configuration for the test
+            Configuration configuration = new PropertiesConfiguration();
+            configuration.addProperty("calendarEvent.reply.mailTemplateLocation", "classpath://eml/");
+            configuration.addProperty("url.prefix", "http://localhost:8000");
+            return configuration;
+        }
     }
 }
\ No newline at end of file