This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1df15b5d08ceb3fdb2c83e0dfeb744a9826b348a Author: Tran Tien Duc <[email protected]> AuthorDate: Tue Jul 9 12:36:15 2019 +0700 JAMES-2812 using PreDeletionHook Vault test module in other tests --- pom.xml | 6 ++++++ .../guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml | 5 +++++ .../modules/vault/CassandraDeletedMessageMetadataVaultModule.java | 2 -- .../vault/TestDeleteMessageVaultPreDeletionHookModule.java} | 4 ++-- .../cassandra-jmap-integration-testing/pom.xml | 6 ++++++ .../james/jmap/cassandra/CassandraDeletedMessageVaultTest.java | 8 ++------ .../CassandraLinshareBlobExportMechanismIntegrationTest.java | 8 ++------ .../memory-jmap-integration-testing/pom.xml | 6 ++++++ .../jmap/memory/FileMailRepositoryDeletedMessagesVaultTest.java | 8 ++------ .../apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java | 8 ++------ .../memory/MemoryLinshareBlobExportMechanismIntegrationTest.java | 8 ++------ .../rabbitmq-jmap-integration-testing/pom.xml | 6 ++++++ .../jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java | 4 ++-- .../james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java | 8 ++------ 14 files changed, 45 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index ef45723..17d2e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -1522,6 +1522,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-mailetcontainer-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml index eca0024..ade3db6 100644 --- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml +++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml @@ -51,6 +51,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java index 769ac56..a8ed165 100644 --- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java +++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java @@ -21,7 +21,6 @@ package org.apache.james.modules.vault; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.vault.dto.DeletedMessageWithStorageInformationConverter; -import org.apache.james.vault.metadata.BucketListDAO; import org.apache.james.vault.metadata.DeletedMessageMetadataModule; import org.apache.james.vault.metadata.MetadataDAO; import org.apache.james.vault.metadata.StorageInformationDAO; @@ -36,7 +35,6 @@ public class CassandraDeletedMessageMetadataVaultModule extends AbstractModule { @Override protected void configure() { bind(MetadataDAO.class).in(Scopes.SINGLETON); - bind(BucketListDAO.class).in(Scopes.SINGLETON); bind(StorageInformationDAO.class).in(Scopes.SINGLETON); bind(UserPerBucketDAO.class).in(Scopes.SINGLETON); bind(DeletedMessageWithStorageInformationConverter.class).in(Scopes.SINGLETON); diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestPreDeletionHooksModule.java b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/test/java/org/apache/james/modules/vault/TestDeleteMessageVaultPreDeletionHookModule.java similarity index 93% rename from server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestPreDeletionHooksModule.java rename to server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/test/java/org/apache/james/modules/vault/TestDeleteMessageVaultPreDeletionHookModule.java index fd18553..c2776b0 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestPreDeletionHooksModule.java +++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/test/java/org/apache/james/modules/vault/TestDeleteMessageVaultPreDeletionHookModule.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.modules; +package org.apache.james.modules.vault; import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; @@ -25,7 +25,7 @@ import org.apache.james.vault.DeletedMessageVaultHook; import com.google.inject.AbstractModule; -public class TestPreDeletionHooksModule extends AbstractModule { +public class TestDeleteMessageVaultPreDeletionHookModule extends AbstractModule { @Override protected void configure() { diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index 5d2b2c9..652e2b2 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -155,6 +155,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java index f92628a..fd67be2 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraDeletedMessageVaultTest.java @@ -28,9 +28,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; import org.apache.james.mailrepository.api.MailRepositoryUrl; -import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; -import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; -import org.apache.james.vault.DeletedMessageVaultHook; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Rule; @@ -45,9 +43,7 @@ public class CassandraDeletedMessageVaultTest extends DeletedMessagesVaultTest { @Override protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock clock) throws IOException { return rule.jmapServer(cassandra.getModule(), - binder -> binder.bind(PreDeletionHooksConfiguration.class) - .toInstance(PreDeletionHooksConfiguration.forHooks( - PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))), + new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), binder -> binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("cassandra://var/deletedMessages/user"))), diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraLinshareBlobExportMechanismIntegrationTest.java index 9d8fb46..b0bb3bd 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraLinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraLinshareBlobExportMechanismIntegrationTest.java @@ -30,9 +30,7 @@ import org.apache.james.jmap.methods.integration.LinshareBlobExportMechanismInte import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.LinshareGuiceExtension; import org.apache.james.modules.TestJMAPServerModule; -import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; -import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; -import org.apache.james.vault.DeletedMessageVaultHook; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.jupiter.api.extension.RegisterExtension; @@ -51,12 +49,10 @@ public class CassandraLinshareBlobExportMechanismIntegrationTest extends Linshar .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(ALL_BUT_JMX_CASSANDRA_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(binder -> { binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION); - binder.bind(PreDeletionHooksConfiguration.class) - .toInstance(PreDeletionHooksConfiguration.forHooks( - PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))); binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("cassandra://var/deletedMessages/user"))); })) diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index 18ec2f7..db370f2 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -91,6 +91,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-jmap-integration-testing</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/FileMailRepositoryDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/FileMailRepositoryDeletedMessagesVaultTest.java index 92a6abc..e94262f 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/FileMailRepositoryDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/FileMailRepositoryDeletedMessagesVaultTest.java @@ -27,9 +27,7 @@ import org.apache.james.MemoryJmapTestRule; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; import org.apache.james.mailrepository.api.MailRepositoryUrl; -import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; -import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; -import org.apache.james.vault.DeletedMessageVaultHook; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Rule; @@ -47,9 +45,7 @@ public class FileMailRepositoryDeletedMessagesVaultTest extends DeletedMessagesV @Override protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock clock) throws IOException { return memoryJmap.jmapServer( - binder -> binder.bind(PreDeletionHooksConfiguration.class) - .toInstance(PreDeletionHooksConfiguration.forHooks( - PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))), + new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), binder -> binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("file://var/deletedMessages/user"))), diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java index b74fd4d..ce73c2a 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java @@ -27,9 +27,7 @@ import org.apache.james.MemoryJmapTestRule; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; import org.apache.james.mailrepository.api.MailRepositoryUrl; -import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; -import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; -import org.apache.james.vault.DeletedMessageVaultHook; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Rule; @@ -41,9 +39,7 @@ public class MemoryDeletedMessagesVaultTest extends DeletedMessagesVaultTest { @Override protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock clock) throws IOException { return memoryJmap.jmapServer( - binder -> binder.bind(PreDeletionHooksConfiguration.class) - .toInstance(PreDeletionHooksConfiguration.forHooks( - PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))), + new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), binder -> binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("memory://var/deletedMessages/user"))), diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java index 9c64f07..ea38e40 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java @@ -27,9 +27,7 @@ import org.apache.james.jmap.methods.integration.LinshareBlobExportMechanismInte import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.LinshareGuiceExtension; import org.apache.james.modules.TestJMAPServerModule; -import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; -import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; -import org.apache.james.vault.DeletedMessageVaultHook; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.jupiter.api.extension.RegisterExtension; @@ -46,12 +44,10 @@ class MemoryLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExpor .server(configuration -> GuiceJamesServer.forConfiguration(configuration) .combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) + .overrideWith(new TestDeleteMessageVaultPreDeletionHookModule()) .overrideWith(binder -> { binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION); - binder.bind(PreDeletionHooksConfiguration.class) - .toInstance(PreDeletionHooksConfiguration.forHooks( - PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))); binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("memory://var/deletedMessages/user"))); })) diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/pom.xml index e34011a..c5a2fd4 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/pom.xml @@ -110,6 +110,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java index 64b36b7..3e20900 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java @@ -27,8 +27,8 @@ import org.apache.james.DockerCassandraRule; import org.apache.james.GuiceJamesServer; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; -import org.apache.james.modules.TestPreDeletionHooksModule; import org.apache.james.modules.vault.BlobStoreDeletedMessageVaultModule; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Ignore; import org.junit.Rule; @@ -45,7 +45,7 @@ public class RabbitMQBlobStoreDeletedMessagesVaultTest extends DeletedMessagesVa protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock clock) throws IOException { return rule.jmapServer(cassandra.getModule(), new BlobStoreDeletedMessageVaultModule(), - new TestPreDeletionHooksModule(), + new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), binder -> binder.bind(FileSystem.class).toInstance(fileSystem), binder -> binder.bind(Clock.class).toInstance(clock)); diff --git a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java index 6cdf4ae..215310f 100644 --- a/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQDeletedMessagesVaultTest.java @@ -28,9 +28,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; import org.apache.james.mailrepository.api.MailRepositoryUrl; -import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; -import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; -import org.apache.james.vault.DeletedMessageVaultHook; +import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Rule; @@ -45,9 +43,7 @@ public class RabbitMQDeletedMessagesVaultTest extends DeletedMessagesVaultTest { @Override protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock clock) throws IOException { return rule.jmapServer(cassandra.getModule(), - binder -> binder.bind(PreDeletionHooksConfiguration.class) - .toInstance(PreDeletionHooksConfiguration.forHooks( - PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))), + new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), binder -> binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("cassandra://var/deletedMessages/user"))), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
