Migrate James - Re-guice binding SearchSnippetGetMethod, Lucene searc…

…h module
linagora · Nov 7, 2024 · 2bdf912 · 2bdf912
1 parent 5ad5b8e
commit 2bdf912
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 58 deletions.
diff --git a/...ackend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java b/...ackend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java
@@ -22,8 +22,6 @@
 import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
 import org.apache.james.jmap.InjectionKeys;
 import org.apache.james.jmap.JMAPListenerModule;
-import org.apache.james.jmap.method.Method;
-import org.apache.james.jmap.method.SearchSnippetGetMethod;
 import org.apache.james.json.DTO;
 import org.apache.james.json.DTOModule;
 import org.apache.james.mailbox.MailboxManager;
@@ -205,13 +203,6 @@ protected void configure() {
         }
     }
 
-    public static final Module JMAP_DISTRIBUTED_METHOD_SUPPORTED_MODULE = new AbstractModule() {
-        @Override
-        protected void configure() {
-            Multibinder.newSetBinder(binder(), Method.class).addBinding().to(SearchSnippetGetMethod.class);
-        }
-    };
-
     public static final Module WEBADMIN = Modules.combine(
         new CassandraRoutesModule(),
         new DataRoutesModules(),
@@ -262,8 +253,7 @@ protected void configure() {
         new WebFingerModule(),
         new LabelMethodModule(),
         new JmapSettingsMethodModule(),
-        new ContactSupportCapabilitiesModule(),
-        JMAP_DISTRIBUTED_METHOD_SUPPORTED_MODULE)
+        new ContactSupportCapabilitiesModule())
         .with(new CassandraTicketStoreModule(), new TeamMailboxJmapModule());
 
     public static final Module PROTOCOLS = Modules.combine(

diff --git a/tmail-backend/apps/memory/src/main/java/com/linagora/tmail/james/app/MemoryServer.java b/tmail-backend/apps/memory/src/main/java/com/linagora/tmail/james/app/MemoryServer.java
@@ -9,7 +9,6 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.james.ExtraProperties;
-import org.apache.james.FakeSearchMailboxModule;
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.JamesServerMain;
 import org.apache.james.data.UsersRepositoryModuleChooser;
@@ -172,7 +171,7 @@ public static void main(String[] args) throws Exception {
 
         LOGGER.info("Loading configuration {}", configuration.toString());
         GuiceJamesServer server = createServer(configuration)
-            .combineWith(new FakeSearchMailboxModule(), new JMXServerModule());
+            .combineWith(new JMXServerModule());
 
         JamesServerMain.main(server);
     }

diff --git a/...n-tests/src/test/java/com/linagora/tmail/james/DistributedSearchSnippetGetMethodTest.java b/...n-tests/src/test/java/com/linagora/tmail/james/DistributedSearchSnippetGetMethodTest.java