You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/07/09 07:25:08 UTC
[james-project] 02/03: JAMES-2809 Remove
DeletedMessageVault::userWithVault
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f35e24117360cde59859c2fef2f8276c77386f55
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jul 4 15:26:34 2019 +0200
JAMES-2809 Remove DeletedMessageVault::userWithVault
Tis not generic enough operation is refactored out of the contract (this
was used internally to implement retention but is not required with the
new DeletedMessageVault implementation)
---
.../apache/james/vault/DeletedMessageVault.java | 2 --
.../vault/blob/BlobStoreDeletedMessageVault.java | 5 ----
.../vault/memory/MemoryDeletedMessagesVault.java | 13 ++++++----
.../james/vault/utils/DeleteByQueryExecutor.java | 9 +++++--
.../james/vault/DeletedMessageVaultContract.java | 29 +++++++++++-----------
.../blob/BlobStoreDeletedMessageVaultTest.java | 12 +++------
.../vault/utils/DeleteByQueryExecutorTest.java | 6 ++---
.../vault/MailRepositoryDeletedMessageVault.java | 12 ++++-----
.../routes/DeletedMessagesVaultRoutesTest.java | 4 +--
9 files changed, 43 insertions(+), 49 deletions(-)
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVault.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVault.java
index 420c7cd..dcee403 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVault.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVault.java
@@ -36,7 +36,5 @@ public interface DeletedMessageVault {
Publisher<DeletedMessage> search(User user, Query query);
- Publisher<User> usersWithVault();
-
Task deleteExpiredMessagesTask();
}
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 4f5aa16..ed56d3a 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
@@ -88,11 +88,6 @@ public class BlobStoreDeletedMessageVault implements DeletedMessageVault {
}
@Override
- public Publisher<User> usersWithVault() {
- throw new NotImplementedException("Will be implemented later");
- }
-
- @Override
public Task deleteExpiredMessagesTask() {
throw new NotImplementedException("Will be implemented later");
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/MemoryDeletedMessagesVault.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/MemoryDeletedMessagesVault.java
index ecee56e..a887576 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/MemoryDeletedMessagesVault.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/MemoryDeletedMessagesVault.java
@@ -56,7 +56,7 @@ public class MemoryDeletedMessagesVault implements DeletedMessageVault {
private DeleteByQueryExecutor deleteByQueryExecutor;
public MemoryDeletedMessagesVault(RetentionConfiguration retentionConfiguration, Clock clock) {
- this.deleteByQueryExecutor = new DeleteByQueryExecutor(this);
+ this.deleteByQueryExecutor = new DeleteByQueryExecutor(this, this::usersWithVault);
this.retentionConfiguration = retentionConfiguration;
this.clock = clock;
this.table = HashBasedTable.create();
@@ -111,11 +111,14 @@ public class MemoryDeletedMessagesVault implements DeletedMessageVault {
.filter(query.toPredicate());
}
- @Override
+ @VisibleForTesting
public Publisher<User> usersWithVault() {
- synchronized (table) {
- return Flux.fromIterable(ImmutableList.copyOf(table.rowKeySet()));
- }
+ return Flux.defer(
+ () -> {
+ synchronized (table) {
+ return Flux.fromIterable(ImmutableList.copyOf(table.rowKeySet()));
+ }
+ });
}
public Task deleteExpiredMessagesTask() {
diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java
index 97fe2b1..6226474 100644
--- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java
+++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java
@@ -19,12 +19,15 @@
package org.apache.james.vault.utils;
+import java.util.function.Supplier;
+
import org.apache.james.core.User;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.task.Task;
import org.apache.james.util.FunctionalUtils;
import org.apache.james.vault.DeletedMessageVault;
import org.apache.james.vault.search.Query;
+import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,13 +57,15 @@ public class DeleteByQueryExecutor {
private static final Logger LOGGER = LoggerFactory.getLogger(DeleteByQueryExecutor.class);
private final DeletedMessageVault deletedMessageVault;
+ private final Supplier<Publisher<User>> userWithVaults;
- public DeleteByQueryExecutor(DeletedMessageVault deletedMessageVault) {
+ public DeleteByQueryExecutor(DeletedMessageVault deletedMessageVault, Supplier<Publisher<User>> userWithVaults) {
this.deletedMessageVault = deletedMessageVault;
+ this.userWithVaults = userWithVaults;
}
public Task.Result deleteByQuery(Query query, Notifiers notifiers) {
- return Flux.from(deletedMessageVault.usersWithVault())
+ return Flux.from(userWithVaults.get())
.flatMap(user -> deleteByQueryForUser(query, user, notifiers))
.reduce(Task::combine)
.onErrorResume(e -> {
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultContract.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultContract.java
index 2abaea5..ef872b0 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultContract.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultContract.java
@@ -170,21 +170,6 @@ public interface DeletedMessageVaultContract {
}
@Test
- default void usersWithVaultShouldReturnEmptyWhenNoItem() {
- assertThat(Flux.from(getVault().usersWithVault()).collectList().block())
- .isEmpty();
- }
-
- @Test
- default void usersWithVaultShouldReturnAllUsers() {
- Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block();
- Mono.from(getVault().append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block();
-
- assertThat(Flux.from(getVault().usersWithVault()).collectList().block())
- .containsOnly(USER, USER_2);
- }
-
- @Test
default void appendShouldRunSuccessfullyInAConcurrentContext() throws Exception {
int operationCount = 10;
int threadCount = 10;
@@ -282,4 +267,18 @@ public interface DeletedMessageVaultContract {
assertThat(Flux.from(getVault().search(USER, ALL)).collectList().block())
.isEmpty();
}
+
+ @Test
+ default void deleteExpiredMessagesTaskShouldDeleteOldMailsWhenRunSeveralTime() throws InterruptedException {
+ Mono.from(getVault().append(USER, OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block();
+ getVault().deleteExpiredMessagesTask().run();
+
+ Mono.from(getVault().append(USER_2, OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block();
+ getVault().deleteExpiredMessagesTask().run();
+
+ assertThat(Flux.from(getVault().search(USER, ALL)).collectList().block())
+ .isEmpty();
+ assertThat(Flux.from(getVault().search(USER_2, ALL)).collectList().block())
+ .isEmpty();
+ }
}
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java
index c4e18f9..04eae2d 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreDeletedMessageVaultTest.java
@@ -110,25 +110,19 @@ class BlobStoreDeletedMessageVaultTest implements DeletedMessageVaultContract {
@Disabled("Will be implemented later")
@Override
- public void usersWithVaultShouldReturnEmptyWhenNoItem() {
-
- }
-
- @Disabled("Will be implemented later")
- @Override
- public void usersWithVaultShouldReturnAllUsers() {
+ public void searchAllShouldNotReturnDeletedItems() {
}
@Disabled("Will be implemented later")
@Override
- public void searchAllShouldNotReturnDeletedItems() {
+ public void loadMimeMessageShouldReturnEmptyWhenDeleted() {
}
@Disabled("Will be implemented later")
@Override
- public void loadMimeMessageShouldReturnEmptyWhenDeleted() {
+ public void deleteExpiredMessagesTaskShouldDeleteOldMailsWhenRunSeveralTime() {
}
}
\ No newline at end of file
diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java
index 452772a..45c4af9 100644
--- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java
+++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java
@@ -36,7 +36,6 @@ import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import org.apache.james.task.Task;
-import org.apache.james.vault.DeletedMessageVault;
import org.apache.james.vault.RetentionConfiguration;
import org.apache.james.vault.memory.MemoryDeletedMessagesVault;
import org.apache.james.vault.search.Query;
@@ -48,7 +47,7 @@ import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
class DeleteByQueryExecutorTest {
- private DeletedMessageVault vault;
+ private MemoryDeletedMessagesVault vault;
private DeleteByQueryExecutor testee;
private DeleteByQueryExecutor.Notifiers notifiers;
private DeleteByQueryExecutor.Notifier userHandledNotifier;
@@ -59,7 +58,7 @@ class DeleteByQueryExecutorTest {
@BeforeEach
void setUp() {
vault = Mockito.spy(new MemoryDeletedMessagesVault(RetentionConfiguration.DEFAULT, CLOCK));
- testee = new DeleteByQueryExecutor(vault);
+ testee = new DeleteByQueryExecutor(vault, vault::usersWithVault);
userHandledNotifier = mock(DeleteByQueryExecutor.Notifier.class);
searchErrorNotifier = mock(DeleteByQueryExecutor.Notifier.class);
@@ -75,6 +74,7 @@ class DeleteByQueryExecutorTest {
@Test
void deleteByQueryShouldReturnPartialWhenListingUserFailed() {
when(vault.usersWithVault()).thenReturn(Mono.error(new RuntimeException()));
+ testee = new DeleteByQueryExecutor(vault, vault::usersWithVault);
assertThat(testee.deleteByQuery(Query.ALL, notifiers)).isEqualTo(Task.Result.PARTIAL);
}
diff --git a/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailRepositoryDeletedMessageVault.java b/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailRepositoryDeletedMessageVault.java
index 912fddb..945a486 100644
--- a/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailRepositoryDeletedMessageVault.java
+++ b/server/mailrepository/deleted-messages-vault-repository/src/main/java/org/apache/james/vault/MailRepositoryDeletedMessageVault.java
@@ -75,7 +75,7 @@ public class MailRepositoryDeletedMessageVault implements DeletedMessageVault {
MailRepositoryDeletedMessageVault(MailRepositoryStore mailRepositoryStore, RetentionConfiguration retentionConfiguration, Configuration configuration, MailConverter mailConverter, Clock clock) {
this.retentionConfiguration = retentionConfiguration;
this.clock = clock;
- this.deleteByQueryExecutor = new DeleteByQueryExecutor(this);
+ this.deleteByQueryExecutor = new DeleteByQueryExecutor(this, this::usersWithVault);
this.mailRepositoryStore = mailRepositoryStore;
this.configuration = configuration;
this.mailConverter = mailConverter;
@@ -139,11 +139,11 @@ public class MailRepositoryDeletedMessageVault implements DeletedMessageVault {
}
}
- @Override
- public Publisher<User> usersWithVault() {
- return Flux.fromStream(mailRepositoryStore.getUrls()
- .filter(this::isVault)
- .map(this::userForRepository));
+ private Publisher<User> usersWithVault() {
+ return Flux.defer(() ->
+ Flux.fromStream(mailRepositoryStore.getUrls()
+ .filter(this::isVault)
+ .map(this::userForRepository)));
}
private boolean isVault(MailRepositoryUrl url) {
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 0441abb..944595e 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -2022,7 +2022,7 @@ class DeletedMessagesVaultRoutesTest {
vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block();
vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block();
- doReturn(new DeleteByQueryExecutor(vault)).when(vault).getDeleteByQueryExecutor();
+ doReturn(new DeleteByQueryExecutor(vault, vault::usersWithVault)).when(vault).getDeleteByQueryExecutor();
doReturn(Flux.error(new RuntimeException("mock exception")))
.when(vault)
.search(any(), any());
@@ -2057,7 +2057,7 @@ class DeletedMessagesVaultRoutesTest {
vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block();
vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block();
- doReturn(new DeleteByQueryExecutor(vault)).when(vault).getDeleteByQueryExecutor();
+ doReturn(new DeleteByQueryExecutor(vault, vault::usersWithVault)).when(vault).getDeleteByQueryExecutor();
doReturn(Mono.error(new RuntimeException("mock exception")))
.when(vault)
.delete(any(), any());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org