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 70010b95182f81ca9870af5d866f71e5bb04b559 Author: Tran Tien Duc <[email protected]> AuthorDate: Mon Jul 8 10:56:51 2019 +0700 JAMES-2812 integration test for BlobStore based DeletedMessagesVault --- .../CassandraDeletedMessageMetadataVault.java | 3 + .../apache/james/vault/metadata/MetadataDAO.java | 3 + .../vault/metadata/StorageInformationDAO.java | 5 +- .../james/vault/metadata/UserPerBucketDAO.java | 5 +- .../vault/blob/BlobStoreDeletedMessageVault.java | 3 + .../james/vault/blob/BucketNameGenerator.java | 3 + pom.xml | 5 ++ .../james/modules/TestPreDeletionHooksModule.java} | 22 ++--- .../pom.xml | 4 + .../vault/BlobStoreDeletedMessageVaultModule.java | 10 ++- ...assandraDeletedMessageMetadataVaultModule.java} | 29 ++++--- .../RabbitMQBlobStoreDeletedMessagesVaultTest.java | 98 ++++++++++++++++++++++ 12 files changed, 160 insertions(+), 30 deletions(-) diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVault.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVault.java index f5faf02..819fa6d 100644 --- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVault.java +++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVault.java @@ -19,6 +19,8 @@ package org.apache.james.vault.metadata; +import javax.inject.Inject; + import org.apache.james.blob.api.BucketName; import org.apache.james.core.User; import org.apache.james.mailbox.model.MessageId; @@ -29,6 +31,7 @@ public class CassandraDeletedMessageMetadataVault implements DeletedMessageMetad private final StorageInformationDAO storageInformationDAO; private final UserPerBucketDAO userPerBucketDAO; + @Inject CassandraDeletedMessageMetadataVault(MetadataDAO metadataDAO, StorageInformationDAO storageInformationDAO, UserPerBucketDAO userPerBucketDAO) { this.metadataDAO = metadataDAO; this.storageInformationDAO = storageInformationDAO; diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java index de7f22d..c2ec2be 100644 --- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java +++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java @@ -30,6 +30,8 @@ import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.Delet import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.DeletedMessageMetadataTable.PAYLOAD; import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.DeletedMessageMetadataTable.TABLE; +import javax.inject.Inject; + import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.blob.api.BucketName; import org.apache.james.core.User; @@ -51,6 +53,7 @@ public class MetadataDAO { private final MessageId.Factory messageIdFactory; private final MetadataSerializer metadataSerializer; + @Inject MetadataDAO(Session session, MessageId.Factory messageIdFactory, MetadataSerializer metadataSerializer) { this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session); this.addStatement = prepareAdd(session); diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java index e434a8b..380633d 100644 --- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java +++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java @@ -30,6 +30,8 @@ import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.Stora import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.StorageInformationTable.OWNER; import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.StorageInformationTable.TABLE; +import javax.inject.Inject; + import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BucketName; @@ -41,13 +43,14 @@ import com.datastax.driver.core.Session; import reactor.core.publisher.Mono; -class StorageInformationDAO { +public class StorageInformationDAO { private final CassandraAsyncExecutor cassandraAsyncExecutor; private final PreparedStatement addStatement; private final PreparedStatement removeStatement; private final PreparedStatement readStatement; private final BlobId.Factory blobIdFactory; + @Inject StorageInformationDAO(Session session, BlobId.Factory blobIdFactory) { this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session); this.addStatement = prepareAdd(session); diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java index 0525685..25e8537 100644 --- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java +++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java @@ -28,6 +28,8 @@ import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.UserP import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.UserPerBucketTable.TABLE; import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.UserPerBucketTable.USER; +import javax.inject.Inject; + import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.blob.api.BucketName; import org.apache.james.core.User; @@ -38,13 +40,14 @@ import com.datastax.driver.core.Session; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -class UserPerBucketDAO { +public class UserPerBucketDAO { private final CassandraAsyncExecutor cassandraAsyncExecutor; private final PreparedStatement addStatement; private final PreparedStatement removeStatement; private final PreparedStatement listStatement; private final PreparedStatement listBucketsStatement; + @Inject UserPerBucketDAO(Session session) { cassandraAsyncExecutor = new CassandraAsyncExecutor(session); addStatement = prepareAddUser(session); diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java index 501619d..e85ab04 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVault.java @@ -24,6 +24,8 @@ import java.time.Clock; import java.time.ZonedDateTime; import java.util.Optional; +import javax.inject.Inject; + import org.apache.commons.lang3.NotImplementedException; import org.apache.james.blob.api.BlobStore; import org.apache.james.blob.api.BucketName; @@ -56,6 +58,7 @@ public class BlobStoreDeletedMessageVault implements DeletedMessageVault { private final Clock clock; private final RetentionConfiguration retentionConfiguration; + @Inject BlobStoreDeletedMessageVault(DeletedMessageMetadataVault messageMetadataVault, BlobStore blobStore, BucketNameGenerator nameGenerator, Clock clock, RetentionConfiguration retentionConfiguration) { this.messageMetadataVault = messageMetadataVault; this.blobStore = blobStore; diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BucketNameGenerator.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BucketNameGenerator.java index ea5da01..6c504cd 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BucketNameGenerator.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/blob/BucketNameGenerator.java @@ -26,6 +26,8 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; + import org.apache.james.blob.api.BucketName; public class BucketNameGenerator { @@ -34,6 +36,7 @@ public class BucketNameGenerator { private final Clock clock; + @Inject public BucketNameGenerator(Clock clock) { this.clock = clock; } diff --git a/pom.xml b/pom.xml index 5235cf9..ef45723 100644 --- a/pom.xml +++ b/pom.xml @@ -779,6 +779,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>apache-james-mailbox-deleted-messages-vault-cassandra</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>apache-james-mailbox-elasticsearch</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestPreDeletionHooksModule.java similarity index 63% copy from server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java copy to server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestPreDeletionHooksModule.java index fce185b..fd18553 100644 --- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestPreDeletionHooksModule.java @@ -17,26 +17,20 @@ * under the License. * ****************************************************************/ -package org.apache.james.modules.vault; +package org.apache.james.modules; -import org.apache.james.vault.DeletedMessageVault; -import org.apache.james.vault.blob.BlobStoreDeletedMessageVault; -import org.apache.james.vault.memory.metadata.MemoryDeletedMessageMetadataVault; -import org.apache.james.vault.metadata.DeletedMessageMetadataVault; +import org.apache.james.modules.mailbox.PreDeletionHookConfiguration; +import org.apache.james.modules.mailbox.PreDeletionHooksConfiguration; +import org.apache.james.vault.DeletedMessageVaultHook; import com.google.inject.AbstractModule; -import com.google.inject.Scopes; -public class BlobStoreDeletedMessageVaultModule extends AbstractModule { +public class TestPreDeletionHooksModule extends AbstractModule { @Override protected void configure() { - bind(MemoryDeletedMessageMetadataVault.class).in(Scopes.SINGLETON); - bind(DeletedMessageMetadataVault.class) - .to(MemoryDeletedMessageMetadataVault.class); - - bind(BlobStoreDeletedMessageVault.class).in(Scopes.SINGLETON); - bind(DeletedMessageVault.class) - .to(BlobStoreDeletedMessageVault.class); + binder().bind(PreDeletionHooksConfiguration.class) + .toInstance(PreDeletionHooksConfiguration.forHooks( + PreDeletionHookConfiguration.forClass(DeletedMessageVaultHook.class))); } } 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 d9996d1..eca0024 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 @@ -39,6 +39,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>apache-james-mailbox-deleted-messages-vault-cassandra</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-deleted-messages-vault</artifactId> </dependency> <dependency> diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java index fce185b..d5cf9bc 100644 --- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java +++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java @@ -21,7 +21,8 @@ package org.apache.james.modules.vault; import org.apache.james.vault.DeletedMessageVault; import org.apache.james.vault.blob.BlobStoreDeletedMessageVault; -import org.apache.james.vault.memory.metadata.MemoryDeletedMessageMetadataVault; +import org.apache.james.vault.blob.BucketNameGenerator; +import org.apache.james.vault.metadata.CassandraDeletedMessageMetadataVault; import org.apache.james.vault.metadata.DeletedMessageMetadataVault; import com.google.inject.AbstractModule; @@ -31,10 +32,13 @@ public class BlobStoreDeletedMessageVaultModule extends AbstractModule { @Override protected void configure() { - bind(MemoryDeletedMessageMetadataVault.class).in(Scopes.SINGLETON); + install(new CassandraDeletedMessageMetadataVaultModule()); + + bind(CassandraDeletedMessageMetadataVault.class).in(Scopes.SINGLETON); bind(DeletedMessageMetadataVault.class) - .to(MemoryDeletedMessageMetadataVault.class); + .to(CassandraDeletedMessageMetadataVault.class); + bind(BucketNameGenerator.class).in(Scopes.SINGLETON); bind(BlobStoreDeletedMessageVault.class).in(Scopes.SINGLETON); bind(DeletedMessageVault.class) .to(BlobStoreDeletedMessageVault.class); diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java similarity index 54% copy from server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java copy to server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java index fce185b..769ac56 100644 --- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/BlobStoreDeletedMessageVaultModule.java +++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/src/main/java/org/apache/james/modules/vault/CassandraDeletedMessageMetadataVaultModule.java @@ -19,24 +19,31 @@ package org.apache.james.modules.vault; -import org.apache.james.vault.DeletedMessageVault; -import org.apache.james.vault.blob.BlobStoreDeletedMessageVault; -import org.apache.james.vault.memory.metadata.MemoryDeletedMessageMetadataVault; -import org.apache.james.vault.metadata.DeletedMessageMetadataVault; +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; +import org.apache.james.vault.metadata.UserPerBucketDAO; import com.google.inject.AbstractModule; import com.google.inject.Scopes; +import com.google.inject.multibindings.Multibinder; -public class BlobStoreDeletedMessageVaultModule extends AbstractModule { +public class CassandraDeletedMessageMetadataVaultModule extends AbstractModule { @Override protected void configure() { - bind(MemoryDeletedMessageMetadataVault.class).in(Scopes.SINGLETON); - bind(DeletedMessageMetadataVault.class) - .to(MemoryDeletedMessageMetadataVault.class); + 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); - bind(BlobStoreDeletedMessageVault.class).in(Scopes.SINGLETON); - bind(DeletedMessageVault.class) - .to(BlobStoreDeletedMessageVault.class); + Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class); + cassandraDataDefinitions + .addBinding() + .toInstance(DeletedMessageMetadataModule.MODULE); } } 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 new file mode 100644 index 0000000..64b36b7 --- /dev/null +++ b/server/protocols/jmap-integration-testing/rabbitmq-jmap-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/RabbitMQBlobStoreDeletedMessagesVaultTest.java @@ -0,0 +1,98 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.jmap.rabbitmq; + +import java.io.IOException; +import java.time.Clock; + +import org.apache.james.CassandraRabbitMQAwsS3JmapTestRule; +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.webadmin.WebAdminConfiguration; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + +public class RabbitMQBlobStoreDeletedMessagesVaultTest extends DeletedMessagesVaultTest { + @Rule + public DockerCassandraRule cassandra = new DockerCassandraRule(); + + @Rule + public CassandraRabbitMQAwsS3JmapTestRule rule = CassandraRabbitMQAwsS3JmapTestRule.defaultTestRule(); + + @Override + protected GuiceJamesServer createJmapServer(FileSystem fileSystem, Clock clock) throws IOException { + return rule.jmapServer(cassandra.getModule(), + new BlobStoreDeletedMessageVaultModule(), + new TestPreDeletionHooksModule(), + binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), + binder -> binder.bind(FileSystem.class).toInstance(fileSystem), + binder -> binder.bind(Clock.class).toInstance(clock)); + } + + @Override + protected void awaitSearchUpToDate() { + rule.await(); + } + + @Ignore("Will be implemented latter") + @Test + public void vaultPurgeShouldMakeExportProduceEmptyZipWhenAllMessagesAreExpired() throws Exception { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultPurgeShouldMakeExportProduceAZipWhenOneMessageIsNotExpired() throws Exception { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultPurgeShouldMakeExportProduceZipWhenAllMessagesAreNotExpired() throws Exception { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultPurgeShouldNotAppendMessageToTheUserMailbox() { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultDeleteShouldDeleteMessageThenExportWithNoEntry() throws Exception { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultDeleteShouldNotDeleteEmptyVaultThenExportNoEntry() throws Exception { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultDeleteShouldNotDeleteNotMatchedMessageInVaultThenExportAnEntry() throws Exception { + } + + @Ignore("Will be implemented latter") + @Test + public void vaultDeleteShouldNotAppendMessageToTheUserMailbox() { + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
