From c89529e47b13a3ba210bc9049c5513bf923cc608 Mon Sep 17 00:00:00 2001 From: Benoit Tellier Date: Wed, 27 Mar 2019 15:00:14 +0700 Subject: [PATCH] MAILBOX-388 Move vault helper class out of Memory implementation package --- .../james/vault/memory/MemoryDeletedMessagesVault.java | 2 ++ .../vault/{memory => utils}/DeleteByQueryExecutor.java | 2 +- .../{memory => utils}/VaultGarbageCollectionTask.java | 2 +- .../vault/{memory => utils}/DeleteByQueryExecutorTest.java | 7 ++++--- .../james/vault/MailRepositoryDeletedMessageVault.java | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) rename mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/{memory => utils}/DeleteByQueryExecutor.java (99%) rename mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/{memory => utils}/VaultGarbageCollectionTask.java (99%) rename mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/{memory => utils}/DeleteByQueryExecutorTest.java (97%) 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 d48bfda1ca4..773faecb9b7 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 @@ -36,6 +36,8 @@ import org.apache.james.vault.DeletedMessageVault; import org.apache.james.vault.RetentionConfiguration; import org.apache.james.vault.search.Query; +import org.apache.james.vault.utils.DeleteByQueryExecutor; +import org.apache.james.vault.utils.VaultGarbageCollectionTask; import org.reactivestreams.Publisher; import com.google.common.base.Preconditions; diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/DeleteByQueryExecutor.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java similarity index 99% rename from mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/DeleteByQueryExecutor.java rename to mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java index 81234f56b2b..97fe2b133a8 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/DeleteByQueryExecutor.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/DeleteByQueryExecutor.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.vault.memory; +package org.apache.james.vault.utils; import org.apache.james.core.User; import org.apache.james.mailbox.model.MessageId; diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/VaultGarbageCollectionTask.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/VaultGarbageCollectionTask.java similarity index 99% rename from mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/VaultGarbageCollectionTask.java rename to mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/VaultGarbageCollectionTask.java index 93c8ce3512f..36170f3d2c2 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/VaultGarbageCollectionTask.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/utils/VaultGarbageCollectionTask.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.vault.memory; +package org.apache.james.vault.utils; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/memory/DeleteByQueryExecutorTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java similarity index 97% rename from mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/memory/DeleteByQueryExecutorTest.java rename to mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java index 285192b2b94..452772ad473 100644 --- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/memory/DeleteByQueryExecutorTest.java +++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/DeleteByQueryExecutorTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.vault.memory; +package org.apache.james.vault.utils; import static org.apache.james.vault.DeletedMessageFixture.CONTENT; import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE; @@ -27,7 +27,6 @@ import static org.apache.james.vault.DeletedMessageVaultContract.CLOCK; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -39,9 +38,11 @@ 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; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -57,7 +58,7 @@ class DeleteByQueryExecutorTest { @BeforeEach void setUp() { - vault = spy(new MemoryDeletedMessagesVault(RetentionConfiguration.DEFAULT, CLOCK)); + vault = Mockito.spy(new MemoryDeletedMessagesVault(RetentionConfiguration.DEFAULT, CLOCK)); testee = new DeleteByQueryExecutor(vault); userHandledNotifier = mock(DeleteByQueryExecutor.Notifier.class); 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 4d8ab8cb6af..912fddb18a7 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 @@ -37,9 +37,9 @@ import org.apache.james.server.core.MimeMessageInputStream; import org.apache.james.task.Task; import org.apache.james.util.streams.Iterators; -import org.apache.james.vault.memory.DeleteByQueryExecutor; -import org.apache.james.vault.memory.VaultGarbageCollectionTask; import org.apache.james.vault.search.Query; +import org.apache.james.vault.utils.DeleteByQueryExecutor; +import org.apache.james.vault.utils.VaultGarbageCollectionTask; import org.reactivestreams.Publisher; import com.github.fge.lambdas.Throwing;