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 18b10b90a4590655c0dcc9fd2b552f29ae576584
Author: LanKhuat <khuatdang...@gmail.com>
AuthorDate: Tue Mar 10 11:04:12 2020 +0700
JAMES-3072 Move bindings for backup task from MailboxRoutesModule to new
module
---
.../org/apache/james/CassandraJamesServerMain.java | 2 ++
.../org/apache/james/MemoryJamesServerMain.java | 2 ++
.../james/modules/server/MailboxRoutesModule.java | 28 -------------------
...outesModule.java => MailboxesBackupModule.java} | 32 +---------------------
4 files changed, 5 insertions(+), 59 deletions(-)
diff --git
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
index 19e4a29..297cdbd 100644
---
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
+++
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
@@ -60,6 +60,7 @@ import org.apache.james.modules.server.JmapTasksModule;
import org.apache.james.modules.server.MailQueueRoutesModule;
import org.apache.james.modules.server.MailRepositoriesRoutesModule;
import org.apache.james.modules.server.MailboxRoutesModule;
+import org.apache.james.modules.server.MailboxesBackupModule;
import org.apache.james.modules.server.MessagesRoutesModule;
import org.apache.james.modules.server.ReIndexingModule;
import org.apache.james.modules.server.SieveRoutesModule;
@@ -86,6 +87,7 @@ public class CassandraJamesServerMain implements
JamesServerMain {
new DLPRoutesModule(),
new InconsistencySolvingRoutesModule(),
new JmapTasksModule(),
+ new MailboxesBackupModule(),
new MailboxRoutesModule(),
new MailQueueRoutesModule(),
new MailRepositoriesRoutesModule(),
diff --git
a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
index 5618b09..5e8c919 100644
---
a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
+++
b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
@@ -46,6 +46,7 @@ import org.apache.james.modules.server.JmapTasksModule;
import org.apache.james.modules.server.MailQueueRoutesModule;
import org.apache.james.modules.server.MailRepositoriesRoutesModule;
import org.apache.james.modules.server.MailboxRoutesModule;
+import org.apache.james.modules.server.MailboxesBackupModule;
import org.apache.james.modules.server.MemoryMailQueueModule;
import org.apache.james.modules.server.RawPostDequeueDecoratorModule;
import org.apache.james.modules.server.SieveRoutesModule;
@@ -69,6 +70,7 @@ public class MemoryJamesServerMain implements JamesServerMain
{
new DataRoutesModules(),
new DeletedMessageVaultRoutesModule(),
new DLPRoutesModule(),
+ new MailboxesBackupModule(),
new MailboxRoutesModule(),
new MailQueueRoutesModule(),
new MailRepositoriesRoutesModule(),
diff --git
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
index fb14490..42a7c88 100644
---
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
+++
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
@@ -24,14 +24,6 @@ import static
org.apache.james.webadmin.routes.MailboxesRoutes.ONE_MAILBOX_TASKS
import static org.apache.james.webadmin.routes.MailboxesRoutes.ONE_MAIL_TASKS;
import static
org.apache.james.webadmin.routes.UserMailboxesRoutes.USER_MAILBOXES_OPERATIONS_INJECTION_KEY;
-import org.apache.james.mailbox.backup.ArchiveService;
-import org.apache.james.mailbox.backup.DefaultMailboxBackup;
-import org.apache.james.mailbox.backup.MailArchiveRestorer;
-import org.apache.james.mailbox.backup.MailArchivesLoader;
-import org.apache.james.mailbox.backup.MailboxBackup;
-import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
-import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
-import org.apache.james.mailbox.backup.zip.Zipper;
import org.apache.james.webadmin.Routes;
import org.apache.james.webadmin.jackson.QuotaModule;
import org.apache.james.webadmin.routes.DomainQuotaRoutes;
@@ -40,14 +32,10 @@ import org.apache.james.webadmin.routes.GlobalQuotaRoutes;
import org.apache.james.webadmin.routes.MailboxesRoutes;
import org.apache.james.webadmin.routes.UserMailboxesRoutes;
import org.apache.james.webadmin.routes.UserQuotaRoutes;
-import org.apache.james.webadmin.service.ExportService;
-import org.apache.james.webadmin.service.MailboxesExportRequestToTask;
-import org.apache.james.webadmin.tasks.TaskFromRequestRegistry;
import
org.apache.james.webadmin.tasks.TaskFromRequestRegistry.TaskRegistration;
import org.apache.james.webadmin.utils.JsonTransformerModule;
import com.google.inject.AbstractModule;
-import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;
@@ -70,21 +58,5 @@ public class MailboxRoutesModule extends AbstractModule {
Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(ALL_MAILBOXES_TASKS));
Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(ONE_MAILBOX_TASKS));
Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(ONE_MAIL_TASKS));
-
- bind(Zipper.class).in(Scopes.SINGLETON);
- bind(ArchiveService.class).to(Zipper.class);
-
- bind(ZipMailArchiveRestorer.class).in(Scopes.SINGLETON);
- bind(MailArchiveRestorer.class).to(ZipMailArchiveRestorer.class);
-
- bind(ZipArchivesLoader.class).in(Scopes.SINGLETON);
- bind(MailArchivesLoader.class).to(ZipArchivesLoader.class);
-
- bind(DefaultMailboxBackup.class).in(Scopes.SINGLETON);
- bind(MailboxBackup.class).to(DefaultMailboxBackup.class);
-
- bind(ExportService.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(),
TaskFromRequestRegistry.TaskRegistration.class,
Names.named(UserMailboxesRoutes.USER_MAILBOXES_OPERATIONS_INJECTION_KEY))
- .addBinding().to(MailboxesExportRequestToTask.class);
}
}
diff --git
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
similarity index 58%
copy from
server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
copy to
server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
index fb14490..7eb120a 100644
---
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxRoutesModule.java
+++
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
@@ -19,11 +19,6 @@
package org.apache.james.modules.server;
-import static
org.apache.james.webadmin.routes.MailboxesRoutes.ALL_MAILBOXES_TASKS;
-import static
org.apache.james.webadmin.routes.MailboxesRoutes.ONE_MAILBOX_TASKS;
-import static org.apache.james.webadmin.routes.MailboxesRoutes.ONE_MAIL_TASKS;
-import static
org.apache.james.webadmin.routes.UserMailboxesRoutes.USER_MAILBOXES_OPERATIONS_INJECTION_KEY;
-
import org.apache.james.mailbox.backup.ArchiveService;
import org.apache.james.mailbox.backup.DefaultMailboxBackup;
import org.apache.james.mailbox.backup.MailArchiveRestorer;
@@ -32,45 +27,20 @@ import org.apache.james.mailbox.backup.MailboxBackup;
import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
import org.apache.james.mailbox.backup.zip.Zipper;
-import org.apache.james.webadmin.Routes;
-import org.apache.james.webadmin.jackson.QuotaModule;
-import org.apache.james.webadmin.routes.DomainQuotaRoutes;
-import org.apache.james.webadmin.routes.EventDeadLettersRoutes;
-import org.apache.james.webadmin.routes.GlobalQuotaRoutes;
-import org.apache.james.webadmin.routes.MailboxesRoutes;
import org.apache.james.webadmin.routes.UserMailboxesRoutes;
-import org.apache.james.webadmin.routes.UserQuotaRoutes;
import org.apache.james.webadmin.service.ExportService;
import org.apache.james.webadmin.service.MailboxesExportRequestToTask;
import org.apache.james.webadmin.tasks.TaskFromRequestRegistry;
-import
org.apache.james.webadmin.tasks.TaskFromRequestRegistry.TaskRegistration;
-import org.apache.james.webadmin.utils.JsonTransformerModule;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;
-public class MailboxRoutesModule extends AbstractModule {
+public class MailboxesBackupModule extends AbstractModule {
@Override
protected void configure() {
- Multibinder<Routes> routesMultibinder =
Multibinder.newSetBinder(binder(), Routes.class);
- routesMultibinder.addBinding().to(DomainQuotaRoutes.class);
- routesMultibinder.addBinding().to(EventDeadLettersRoutes.class);
- routesMultibinder.addBinding().to(GlobalQuotaRoutes.class);
- routesMultibinder.addBinding().to(UserQuotaRoutes.class);
- routesMultibinder.addBinding().to(UserMailboxesRoutes.class);
- routesMultibinder.addBinding().to(MailboxesRoutes.class);
-
- Multibinder<JsonTransformerModule> jsonTransformerModuleMultibinder =
Multibinder.newSetBinder(binder(), JsonTransformerModule.class);
- jsonTransformerModuleMultibinder.addBinding().to(QuotaModule.class);
-
- Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(USER_MAILBOXES_OPERATIONS_INJECTION_KEY));
- Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(ALL_MAILBOXES_TASKS));
- Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(ONE_MAILBOX_TASKS));
- Multibinder.newSetBinder(binder(), TaskRegistration.class,
Names.named(ONE_MAIL_TASKS));
-
bind(Zipper.class).in(Scopes.SINGLETON);
bind(ArchiveService.class).to(Zipper.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
