This is an automated email from the ASF dual-hosted git repository.
aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e7b56830237716782a7dac3dc2476a44452f379f
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Mon Jul 1 16:00:12 2019 +0700
JAMES-2807 Make it clear that DeletedMessageMetadataVault do not actually
store buckets
It only exposes primitives to take actions on metadata related to a bucket
used for the
DeletedMessageVault
---
.../metadata/MemoryDeletedMessageMetadataVault.java | 6 +++---
.../vault/metadata/DeletedMessageMetadataVault.java | 4 ++--
.../metadata/DeletedMessageMetadataVaultContract.java | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
index ccf5fc6..59ede6d 100644
---
a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
@@ -62,7 +62,7 @@ public class MemoryDeletedMessageMetadataVault implements
DeletedMessageMetadata
}
@Override
- public Publisher<Void> removeBucket(BucketName bucketName) {
+ public Publisher<Void> removeMetadataRelatedToBucket(BucketName
bucketName) {
return Mono.fromRunnable(() -> {
synchronized (table) {
table.row(bucketName).clear();
@@ -81,7 +81,7 @@ public class MemoryDeletedMessageMetadataVault implements
DeletedMessageMetadata
@Override
public Publisher<StorageInformation> retrieveStorageInformation(User user,
MessageId messageId) {
- return Flux.from(listBuckets())
+ return Flux.from(listRelatedBuckets())
.concatMap(bucket -> {
synchronized (table) {
return Mono.justOrEmpty(userVault(bucket,
user).get(messageId));
@@ -102,7 +102,7 @@ public class MemoryDeletedMessageMetadataVault implements
DeletedMessageMetadata
}
@Override
- public Publisher<BucketName> listBuckets() {
+ public Publisher<BucketName> listRelatedBuckets() {
synchronized (table) {
return Flux.fromIterable(ImmutableSet.copyOf(table.rowKeySet()));
}
diff --git
a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
index 25b5a4a..3aab7aa 100644
---
a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
@@ -27,7 +27,7 @@ import org.reactivestreams.Publisher;
public interface DeletedMessageMetadataVault {
Publisher<Void> store(DeletedMessageWithStorageInformation deletedMessage);
- Publisher<Void> removeBucket(BucketName bucketName);
+ Publisher<Void> removeMetadataRelatedToBucket(BucketName bucketName);
Publisher<Void> remove(BucketName bucketName, User user, MessageId
messageId);
@@ -35,5 +35,5 @@ public interface DeletedMessageMetadataVault {
Publisher<DeletedMessageWithStorageInformation> listMessages(BucketName
bucketName, User user);
- Publisher<BucketName> listBuckets();
+ Publisher<BucketName> listRelatedBuckets();
}
diff --git
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
index 3b85bc5..0052f0e 100644
---
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
@@ -79,7 +79,7 @@ public interface DeletedMessageMetadataVaultContract {
@Test
default void listBucketsShouldBeEmptyWhenNoMessageInserted() {
- Stream<BucketName> messages =
Flux.from(metadataVault().listBuckets()).toStream();
+ Stream<BucketName> messages =
Flux.from(metadataVault().listRelatedBuckets()).toStream();
assertThat(messages).isEmpty();
}
@@ -88,7 +88,7 @@ public interface DeletedMessageMetadataVaultContract {
Mono.from(metadataVault().store(DELETED_MESSAGE)).block();
Mono.from(metadataVault().store(DELETED_MESSAGE_2_OTHER_BUCKET)).block();
- Stream<BucketName> messages =
Flux.from(metadataVault().listBuckets()).toStream();
+ Stream<BucketName> messages =
Flux.from(metadataVault().listRelatedBuckets()).toStream();
assertThat(messages).containsOnly(BUCKET_NAME, OTHER_BUCKET_NAME);
}
@@ -97,7 +97,7 @@ public interface DeletedMessageMetadataVaultContract {
Mono.from(metadataVault().store(DELETED_MESSAGE)).block();
Mono.from(metadataVault().store(DELETED_MESSAGE_2)).block();
- Stream<BucketName> messages =
Flux.from(metadataVault().listBuckets()).toStream();
+ Stream<BucketName> messages =
Flux.from(metadataVault().listRelatedBuckets()).toStream();
assertThat(messages).containsExactly(BUCKET_NAME);
}
@@ -106,9 +106,9 @@ public interface DeletedMessageMetadataVaultContract {
Mono.from(metadataVault().store(DELETED_MESSAGE)).block();
Mono.from(metadataVault().store(DELETED_MESSAGE_2_OTHER_BUCKET)).block();
- Mono.from(metadataVault().removeBucket(BUCKET_NAME)).block();
+
Mono.from(metadataVault().removeMetadataRelatedToBucket(BUCKET_NAME)).block();
- Stream<BucketName> messages =
Flux.from(metadataVault().listBuckets()).toStream();
+ Stream<BucketName> messages =
Flux.from(metadataVault().listRelatedBuckets()).toStream();
assertThat(messages).containsOnly(OTHER_BUCKET_NAME);
}
@@ -117,9 +117,9 @@ public interface DeletedMessageMetadataVaultContract {
Mono.from(metadataVault().store(DELETED_MESSAGE)).block();
Mono.from(metadataVault().store(DELETED_MESSAGE_2)).block();
- Mono.from(metadataVault().removeBucket(BUCKET_NAME)).block();
+
Mono.from(metadataVault().removeMetadataRelatedToBucket(BUCKET_NAME)).block();
- Stream<BucketName> messages =
Flux.from(metadataVault().listBuckets()).toStream();
+ Stream<BucketName> messages =
Flux.from(metadataVault().listRelatedBuckets()).toStream();
assertThat(messages).isEmpty();
}
@@ -128,7 +128,7 @@ public interface DeletedMessageMetadataVaultContract {
Mono.from(metadataVault().store(DELETED_MESSAGE)).block();
Mono.from(metadataVault().store(DELETED_MESSAGE_2_OTHER_BUCKET)).block();
- Mono.from(metadataVault().removeBucket(BUCKET_NAME)).block();
+
Mono.from(metadataVault().removeMetadataRelatedToBucket(BUCKET_NAME)).block();
Stream<DeletedMessageWithStorageInformation> messages =
Flux.from(metadataVault().listMessages(OTHER_BUCKET_NAME, USER)).toStream();
assertThat(messages).containsOnly(DELETED_MESSAGE_2_OTHER_BUCKET);
@@ -139,7 +139,7 @@ public interface DeletedMessageMetadataVaultContract {
Mono.from(metadataVault().store(DELETED_MESSAGE)).block();
Mono.from(metadataVault().store(DELETED_MESSAGE_2)).block();
- Mono.from(metadataVault().removeBucket(BUCKET_NAME)).block();
+
Mono.from(metadataVault().removeMetadataRelatedToBucket(BUCKET_NAME)).block();
Stream<DeletedMessageWithStorageInformation> messages =
Flux.from(metadataVault().listMessages(BUCKET_NAME, USER)).toStream();
assertThat(messages).isEmpty();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
