MAILBOX-388 Move vault helper class out of Memory implementation package

apache · Mar 28, 2019 · c89529e · c89529e
1 parent e2e9f9c
commit c89529e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/...essages-vault/src/main/java/org/apache/james/vault/memory/MemoryDeletedMessagesVault.java b/...essages-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/...s/vault/memory/DeleteByQueryExecutor.java → ...es/vault/utils/DeleteByQueryExecutor.java b/...s/vault/memory/DeleteByQueryExecutor.java → ...es/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/...lt/memory/VaultGarbageCollectionTask.java → ...ult/utils/VaultGarbageCollectionTask.java b/...lt/memory/VaultGarbageCollectionTask.java → ...ult/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/...ult/memory/DeleteByQueryExecutorTest.java → ...ault/utils/DeleteByQueryExecutorTest.java b/...ult/memory/DeleteByQueryExecutorTest.java → ...ault/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/...lt-repository/src/main/java/org/apache/james/vault/MailRepositoryDeletedMessageVault.java b/...lt-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;