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 67ce3e4920ae52b4e9c6975f5e6ff571f45b7715 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jul 11 14:30:53 2019 +0200 JAMES-2808 Remove duplicated User parameter is DeletedMessageVault::append The owner is also a field of the DeletedMessage. This duplication lead to possible inconsistencies needing runtime checks. We reworked the API to remove this duplication. --- .../apache/james/vault/DeletedMessageVault.java | 2 +- .../james/vault/DeletedMessageVaultHook.java | 2 +- .../vault/blob/BlobStoreDeletedMessageVault.java | 3 +- .../vault/memory/MemoryDeletedMessagesVault.java | 5 +- .../apache/james/vault/DeletedMessageFixture.java | 12 ++ .../james/vault/DeletedMessageVaultContract.java | 46 +++---- .../vault/DeletedMessageVaultSearchContract.java | 41 +++--- .../vault/utils/DeleteByQueryExecutorTest.java | 32 ++--- .../vault/MailRepositoryDeletedMessageVault.java | 5 +- .../routes/DeletedMessagesVaultRoutesTest.java | 148 ++++++++++----------- 10 files changed, 146 insertions(+), 150 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 dcee403..26e6a45 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 @@ -28,7 +28,7 @@ import org.apache.james.vault.search.Query; import org.reactivestreams.Publisher; public interface DeletedMessageVault { - Publisher<Void> append(User user, DeletedMessage deletedMessage, InputStream mimeMessage); + Publisher<Void> append(DeletedMessage deletedMessage, InputStream mimeMessage); Publisher<InputStream> loadMimeMessage(User user, MessageId messageId); diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java index 69042e5..162e4ad 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageVaultHook.java @@ -142,7 +142,7 @@ public class DeletedMessageVaultHook implements PreDeletionHook { deletedMessageConverter.convert(deletedMessageMailboxContext, mailboxMessage, ZonedDateTime.ofInstant(clock.instant(), ZoneOffset.UTC))))) .map(Throwing.function(pairs -> Mono.from(deletedMessageVault - .append(pairs.getRight().getOwner(), pairs.getRight(), pairs.getLeft().getFullContent())))) + .append(pairs.getRight(), pairs.getLeft().getFullContent())))) .orElse(Mono.empty()); } 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 53fcf2c..28ee722 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 @@ -65,8 +65,7 @@ public class BlobStoreDeletedMessageVault implements DeletedMessageVault { } @Override - public Publisher<Void> append(User user, DeletedMessage deletedMessage, InputStream mimeMessage) { - Preconditions.checkNotNull(user); + public Publisher<Void> append(DeletedMessage deletedMessage, InputStream mimeMessage) { Preconditions.checkNotNull(deletedMessage); Preconditions.checkNotNull(mimeMessage); BucketName bucketName = nameGenerator.currentBucket(); 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 a887576..cf24b0e 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 @@ -63,13 +63,12 @@ public class MemoryDeletedMessagesVault implements DeletedMessageVault { } @Override - public Mono<Void> append(User user, DeletedMessage deletedMessage, InputStream mimeMessage) { - Preconditions.checkNotNull(user); + public Mono<Void> append(DeletedMessage deletedMessage, InputStream mimeMessage) { Preconditions.checkNotNull(deletedMessage); synchronized (table) { try { - table.put(user, deletedMessage.getMessageId(), + table.put(deletedMessage.getOwner(), deletedMessage.getMessageId(), Pair.of(deletedMessage, IOUtils.toByteArray(mimeMessage))); return Mono.empty(); } catch (IOException e) { diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageFixture.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageFixture.java index 0144cac..a48bc08 100644 --- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageFixture.java +++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageFixture.java @@ -90,4 +90,16 @@ public interface DeletedMessageFixture { .size(CONTENT.length) .build(); DeletedMessage DELETED_MESSAGE_2 = DELETED_MESSAGE_GENERATOR.apply(MESSAGE_ID_2.getRawId()); + + DeletedMessage DELETED_MESSAGE_OTHER_USER = DeletedMessage.builder() + .messageId(InMemoryMessageId.of(48)) + .originMailboxes(MAILBOX_ID_1, MAILBOX_ID_2) + .user(USER_2) + .deliveryDate(DELIVERY_DATE) + .deletionDate(DELETION_DATE) + .sender(MaybeSender.of(SENDER)) + .recipients(RECIPIENT1, RECIPIENT2) + .hasAttachment(false) + .size(CONTENT.length) + .build(); } 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 ddcc471..a7eae46 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 @@ -70,19 +70,13 @@ public interface DeletedMessageVaultContract { @Test default void appendShouldThrowOnNullMessage() { - assertThatThrownBy(() -> getVault().append(USER, null, new ByteArrayInputStream(CONTENT))) - .isInstanceOf(NullPointerException.class); - } - - @Test - default void appendShouldThrowOnNullUser() { - assertThatThrownBy(() -> getVault().append(null, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))) + assertThatThrownBy(() -> getVault().append(null, new ByteArrayInputStream(CONTENT))) .isInstanceOf(NullPointerException.class); } @Test default void appendShouldThrowOnNullContent() { - assertThatThrownBy(() -> getVault().append(USER, DELETED_MESSAGE, null)) + assertThatThrownBy(() -> getVault().append(DELETED_MESSAGE, null)) .isInstanceOf(NullPointerException.class); } @@ -118,7 +112,7 @@ public interface DeletedMessageVaultContract { @Test default void searchAllShouldReturnContainedItems() { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); assertThat(Flux.from(getVault().search(USER, ALL)).collectList().block()) .containsOnly(DELETED_MESSAGE); @@ -126,8 +120,8 @@ public interface DeletedMessageVaultContract { @Test default void searchAllShouldReturnAllContainedItems() { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(getVault().append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); assertThat(Flux.from(getVault().search(USER, ALL)).collectList().block()) .containsOnly(DELETED_MESSAGE, DELETED_MESSAGE_2); @@ -135,8 +129,8 @@ public interface DeletedMessageVaultContract { @Test default void searchShouldReturnMatchingItems() { - Mono.from(getVault().append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(getVault().append(USER, DELETED_MESSAGE_WITH_SUBJECT, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE_WITH_SUBJECT, new ByteArrayInputStream(CONTENT))).block(); assertThat( Flux.from(getVault().search(USER, @@ -147,7 +141,7 @@ public interface DeletedMessageVaultContract { @Test default void vaultShouldBePartitionnedByUser() { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); assertThat(Flux.from(getVault().search(USER_2, ALL)).collectList().block()) .isEmpty(); @@ -155,7 +149,7 @@ public interface DeletedMessageVaultContract { @Test default void searchAllShouldNotReturnDeletedItems() { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); Mono.from(getVault().delete(USER, MESSAGE_ID)).block(); @@ -171,7 +165,7 @@ public interface DeletedMessageVaultContract { @Test default void loadMimeMessageShouldReturnStoredValue() { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); assertThat(Mono.from(getVault().loadMimeMessage(USER, MESSAGE_ID)).blockOptional()) .isNotEmpty() @@ -180,7 +174,7 @@ public interface DeletedMessageVaultContract { @Test default void loadMimeMessageShouldReturnEmptyWhenDeleted() { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); Mono.from(getVault().delete(USER, MESSAGE_ID)).block(); @@ -193,7 +187,7 @@ public interface DeletedMessageVaultContract { int operationCount = 10; int threadCount = 10; ConcurrentTestRunner.builder() - .operation((a, b) -> Mono.from(getVault().append(USER, + .operation((a, b) -> Mono.from(getVault().append( DELETED_MESSAGE_GENERATOR.apply(Long.valueOf(a * threadCount + b)), new ByteArrayInputStream(CONTENT))).block()) .threadCount(threadCount) @@ -209,7 +203,7 @@ public interface DeletedMessageVaultContract { int operationCount = 10; int threadCount = 10; Flux.range(0, operationCount * threadCount) - .flatMap(i -> Mono.from(getVault().append(USER, + .flatMap(i -> Mono.from(getVault().append( DELETED_MESSAGE_GENERATOR.apply(Long.valueOf(i)), new ByteArrayInputStream(CONTENT)))) .blockLast(); @@ -233,7 +227,7 @@ public interface DeletedMessageVaultContract { @Test default void deleteExpiredMessagesTaskShouldCompleteWhenAllMailsDeleted() throws InterruptedException { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); Mono.from(getVault().delete(USER, DELETED_MESSAGE.getMessageId())).block(); Task.Result result = getVault().deleteExpiredMessagesTask().run(); @@ -243,7 +237,7 @@ public interface DeletedMessageVaultContract { @Test default void deleteExpiredMessagesTaskShouldCompleteWhenOnlyRecentMails() throws InterruptedException { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); Task.Result result = getVault().deleteExpiredMessagesTask().run(); @@ -252,7 +246,7 @@ public interface DeletedMessageVaultContract { @Test default void deleteExpiredMessagesTaskShouldCompleteWhenOnlyOldMails() throws InterruptedException { - Mono.from(getVault().append(USER, OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); Task.Result result = getVault().deleteExpiredMessagesTask().run(); @@ -269,7 +263,7 @@ public interface DeletedMessageVaultContract { @Test default void deleteExpiredMessagesTaskShouldNotDeleteRecentMails() throws InterruptedException { - Mono.from(getVault().append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); getVault().deleteExpiredMessagesTask().run(); @@ -279,7 +273,7 @@ public interface DeletedMessageVaultContract { @Test default void deleteExpiredMessagesTaskShouldDeleteOldMails() throws InterruptedException { - Mono.from(getVault().append(USER, OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); getClock().setInstant(NOW.plusYears(2).toInstant()); getVault().deleteExpiredMessagesTask().run(); @@ -290,11 +284,11 @@ public interface DeletedMessageVaultContract { @Test default void deleteExpiredMessagesTaskShouldDeleteOldMailsWhenRunSeveralTime() throws InterruptedException { - Mono.from(getVault().append(USER, OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); getClock().setInstant(NOW.plusYears(2).toInstant()); getVault().deleteExpiredMessagesTask().run(); - Mono.from(getVault().append(USER_2, OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(getVault().append(OLD_DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); getClock().setInstant(NOW.plusYears(4).toInstant()); getVault().deleteExpiredMessagesTask().run(); diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java index 3a446f6..3962d93 100644 --- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java +++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageVaultSearchContract.java @@ -20,6 +20,9 @@ package org.apache.james.vault; import static org.apache.james.vault.DeletedMessageFixture.CONTENT; +import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE; +import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE_2; +import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE_OTHER_USER; import static org.apache.james.vault.DeletedMessageFixture.DELETION_DATE; import static org.apache.james.vault.DeletedMessageFixture.DELIVERY_DATE; import static org.apache.james.vault.DeletedMessageFixture.MAILBOX_ID_1; @@ -27,7 +30,6 @@ import static org.apache.james.vault.DeletedMessageFixture.MAILBOX_ID_2; import static org.apache.james.vault.DeletedMessageFixture.MAILBOX_ID_3; import static org.apache.james.vault.DeletedMessageFixture.SUBJECT; import static org.apache.james.vault.DeletedMessageFixture.USER; -import static org.apache.james.vault.DeletedMessageFixture.USER_2; import static org.apache.mailet.base.MailAddressFixture.RECIPIENT1; import static org.apache.mailet.base.MailAddressFixture.RECIPIENT2; import static org.apache.mailet.base.MailAddressFixture.RECIPIENT3; @@ -503,20 +505,11 @@ public interface DeletedMessageVaultSearchContract { } interface PerUserContract extends DeletedMessageVaultSearchContract { - - default DeletedMessage storeMessageWithUser(User user) { - DeletedMessage deletedMessage = defaultDeletedMessageFinalStage(DELIVERY_DATE, DELETION_DATE) - .subject(SUBJECT) - .build(); - - return storeDeletedMessage(deletedMessage, user); - } - @Test default void searchForAnUserShouldNotReturnMessagesFromAnotherUser() { - DeletedMessage message1 = storeMessageWithUser(USER); - DeletedMessage message2 = storeMessageWithUser(USER); - storeMessageWithUser(USER_2); + DeletedMessage message1 = storeDeletedMessage(DELETED_MESSAGE); + DeletedMessage message2 = storeDeletedMessage(DELETED_MESSAGE_2); + storeDeletedMessage(DELETED_MESSAGE_OTHER_USER); assertThat(search(USER, Query.ALL)) .containsOnly(message1, message2); @@ -553,14 +546,14 @@ public interface DeletedMessageVaultSearchContract { DeletedMessage deletedMessage = defaultDeletedMessageFinalStage(deliveryDate, DELETION_DATE) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageWithDeletionDate(ZonedDateTime delitionDate) { DeletedMessage deletedMessage = defaultDeletedMessageFinalStage(DELIVERY_DATE, delitionDate) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageWithRecipients(MailAddress... recipients) { @@ -576,7 +569,7 @@ public interface DeletedMessageVaultSearchContract { .size(CONTENT.length) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageWithSender(MaybeSender sender) { @@ -592,7 +585,7 @@ public interface DeletedMessageVaultSearchContract { .size(CONTENT.length) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageWithHasAttachment(boolean hasAttachment) { @@ -608,7 +601,7 @@ public interface DeletedMessageVaultSearchContract { .size(CONTENT.length) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageWithOriginMailboxes(MailboxId... originMailboxIds) { @@ -624,14 +617,14 @@ public interface DeletedMessageVaultSearchContract { .size(CONTENT.length) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageNoSubject() { DeletedMessage deletedMessage = defaultDeletedMessageFinalStage(DELIVERY_DATE, DELETION_DATE) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeMessageWithSubject(String subject) { @@ -639,7 +632,7 @@ public interface DeletedMessageVaultSearchContract { .subject(subject) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } default DeletedMessage storeDefaultMessage() { @@ -647,11 +640,11 @@ public interface DeletedMessageVaultSearchContract { .subject(SUBJECT) .build(); - return storeDeletedMessage(deletedMessage, USER); + return storeDeletedMessage(deletedMessage); } - default DeletedMessage storeDeletedMessage(DeletedMessage deletedMessage, User user) { - Mono.from(getVault().append(user, deletedMessage, new ByteArrayInputStream(CONTENT))) + default DeletedMessage storeDeletedMessage(DeletedMessage deletedMessage) { + Mono.from(getVault().append(deletedMessage, new ByteArrayInputStream(CONTENT))) .block(); return deletedMessage; } 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 45c4af9..9b544f0 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 @@ -22,8 +22,8 @@ package org.apache.james.vault.utils; import static org.apache.james.vault.DeletedMessageFixture.CONTENT; import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE; import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE_2; +import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE_OTHER_USER; import static org.apache.james.vault.DeletedMessageFixture.USER; -import static org.apache.james.vault.DeletedMessageFixture.USER_2; import static org.apache.james.vault.DeletedMessageVaultContract.CLOCK; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -93,17 +93,17 @@ class DeleteByQueryExecutorTest { @Test void deleteByQueryShouldReturnCompletedUponNormalExecution() { - Mono.from(vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); assertThat(testee.deleteByQuery(Query.ALL, notifiers)).isEqualTo(Task.Result.COMPLETED); } @Test void deleteByQueryShouldUpdateNotifiesdUponNormalExecution() { - Mono.from(vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE_OTHER_USER, new ByteArrayInputStream(CONTENT))).block(); testee.deleteByQuery(Query.ALL, notifiers); @@ -120,8 +120,8 @@ class DeleteByQueryExecutorTest { @Test void deleteByQueryShouldReturnPartialWhenSearchingFails() { - Mono.from(vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); when(vault.search(USER, Query.ALL)).thenReturn(Flux.error(new RuntimeException())); @@ -130,8 +130,8 @@ class DeleteByQueryExecutorTest { @Test void deleteByQueryShouldUpdateNotifiesWhenSearchingFails() { - Mono.from(vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE_OTHER_USER, new ByteArrayInputStream(CONTENT))).block(); when(vault.search(USER, Query.ALL)).thenReturn(Flux.error(new RuntimeException())); @@ -151,9 +151,9 @@ class DeleteByQueryExecutorTest { @Test void deleteByQueryShouldReturnPartialWhenDeletionFails() { when(vault.delete(USER, DELETED_MESSAGE.getMessageId())).thenReturn(Mono.error(new RuntimeException())); - Mono.from(vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); assertThat(testee.deleteByQuery(Query.ALL, notifiers)).isEqualTo(Task.Result.PARTIAL); } @@ -161,9 +161,9 @@ class DeleteByQueryExecutorTest { @Test void deleteByQueryShouldUpdateNotifiesWhenDeletionFails() { when(vault.delete(USER, DELETED_MESSAGE.getMessageId())).thenReturn(Mono.error(new RuntimeException())); - Mono.from(vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); - Mono.from(vault.append(USER_2, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT))).block(); + Mono.from(vault.append(DELETED_MESSAGE_OTHER_USER, new ByteArrayInputStream(CONTENT))).block(); testee.deleteByQuery(Query.ALL, notifiers); 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 945a486..a230506 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 @@ -82,12 +82,11 @@ public class MailRepositoryDeletedMessageVault implements DeletedMessageVault { } @Override - public Publisher<Void> append(User user, DeletedMessage deletedMessage, InputStream inputStream) { - Preconditions.checkNotNull(user); + public Publisher<Void> append(DeletedMessage deletedMessage, InputStream inputStream) { Preconditions.checkNotNull(deletedMessage); Preconditions.checkNotNull(inputStream); - MailRepository mailRepository = repositoryForUser(user); + MailRepository mailRepository = repositoryForUser(deletedMessage.getOwner()); return Mono.fromCallable(() -> mailRepository.store(mailConverter.toMail(deletedMessage, inputStream))) .subscribeOn(Schedulers.elastic()) 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 944595e..740a170 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 @@ -371,7 +371,7 @@ class DeletedMessagesVaultRoutesTest { @ParameterizedTest @ValueSource(strings = {"restore", "export"}) void userVaultAPIShouldReturnBadRequestWhenPassingUnsupportedField(String action) throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -400,7 +400,7 @@ class DeletedMessagesVaultRoutesTest { @ParameterizedTest @ValueSource(strings = {"restore", "export"}) void userVaultAPIShouldReturnBadRequestWhenPassingUnsupportedOperator(String action) throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -429,7 +429,7 @@ class DeletedMessagesVaultRoutesTest { @ParameterizedTest @ValueSource(strings = {"restore", "export"}) void userVaultAPIShouldReturnBadRequestWhenPassingUnsupportedPairOfFieldNameAndOperator(String action) throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -458,7 +458,7 @@ class DeletedMessagesVaultRoutesTest { @ParameterizedTest @ValueSource(strings = {"restore", "export"}) void userVaultAPIShouldReturnBadRequestWhenPassingInvalidMailAddress(String action) throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -487,7 +487,7 @@ class DeletedMessagesVaultRoutesTest { @ParameterizedTest @ValueSource(strings = {"restore", "export"}) void userVaultAPIShouldReturnBadRequestWhenPassingOrCombinator(String action) throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -517,7 +517,7 @@ class DeletedMessagesVaultRoutesTest { @ParameterizedTest @ValueSource(strings = {"restore", "export"}) void userVaultAPIShouldReturnBadRequestWhenPassingNestedStructuredQuery(String action) throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -559,7 +559,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingSubjectContains() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("subject contains should match") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -593,7 +593,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenSubjectDoesntContains() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("subject") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -625,7 +625,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingSubjectContainsIgnoreCase() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("SUBJECT contains should match") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -659,7 +659,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenSubjectDoesntContainsIgnoreCase() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("subject") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -691,7 +691,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingSubjectEquals() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("subject should match") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -725,7 +725,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenSubjectDoesntEquals() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("subject") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -757,7 +757,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingSubjectEqualsIgnoreCase() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("SUBJECT should MatCH") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -791,7 +791,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenSubjectDoesntEqualsIgnoreCase() throws Exception { - vault.append(USER, FINAL_STAGE.get() + vault.append(FINAL_STAGE.get() .subject("subject") .build(), new ByteArrayInputStream(CONTENT)).block(); @@ -827,7 +827,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingDeletionDateBeforeOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -859,7 +859,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenNotMatchingDeletionDateBeforeOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -889,7 +889,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingDeletionDateAfterOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -921,7 +921,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenNotMatchingDeletionDateAfterOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -955,7 +955,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingDeliveryDateBeforeOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -987,7 +987,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenNotMatchingDeliveryDateBeforeOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1017,7 +1017,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingDeliveryDateAfterOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1049,7 +1049,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenNotMatchingDeliveryDateAfterOrEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1083,7 +1083,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingRecipientContains() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1115,7 +1115,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenMatchingRecipientsDoNotContain() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1148,7 +1148,7 @@ class DeletedMessagesVaultRoutesTest { class SenderTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingSenderEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1180,7 +1180,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenMatchingSenderDoesntEquals() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1324,7 +1324,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenContainsMailboxId() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1356,7 +1356,7 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenDoNotContainsMailboxId() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String query = "{" + @@ -1390,8 +1390,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendMessageToMailboxWhenAllcriteriaAreMatched() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String query = "" + "{" + @@ -1443,8 +1443,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessageToMailboxWhenASingleCriterionDoesntMatch() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String query = "" + "{" + @@ -1499,8 +1499,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldProduceFailedTaskWhenTheVaultGetsError() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); doThrow(new RuntimeException("mock exception")) .when(vault) @@ -1533,8 +1533,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldProduceFailedTaskWithErrorRestoreCountWhenMessageAppendGetsError() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); MessageManager mockMessageManager = mock(MessageManager.class); doReturn(mockMessageManager) @@ -1571,8 +1571,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldProduceFailedTaskWhenMailboxMangerGetsError() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); doThrow(new RuntimeException("mock exception")) .when(mailboxManager) @@ -1617,8 +1617,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldProduceASuccessfulTaskWithAdditionalInformation() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = given() @@ -1647,8 +1647,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldKeepAllMessagesInTheVaultOfCorrespondingUser() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = given() @@ -1680,8 +1680,8 @@ class DeletedMessagesVaultRoutesTest { MessageManager.AppendCommand.builder().build(new ByteArrayInputStream(CONTENT)), session); - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = given() @@ -1705,8 +1705,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldAppendAllMessageFromVaultToRestoreMailboxOfCorrespondingUser() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = given() @@ -1732,8 +1732,8 @@ class DeletedMessagesVaultRoutesTest { @Test void restoreShouldNotAppendMessagesToAnOtherUserMailbox() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = given() @@ -1812,8 +1812,8 @@ class DeletedMessagesVaultRoutesTest { @Test void exportShouldProduceASuccessfulTaskWithInformation() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -1843,8 +1843,8 @@ class DeletedMessagesVaultRoutesTest { @Test void exportShouldCallBlobExportingTargetToExportAddress() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -1865,8 +1865,8 @@ class DeletedMessagesVaultRoutesTest { @Test void exportShouldNotDeleteMessagesInTheVault() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -1886,8 +1886,8 @@ class DeletedMessagesVaultRoutesTest { @Test void exportShouldSaveDeletedMessagesDataToBlobStore() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -1933,8 +1933,8 @@ class DeletedMessagesVaultRoutesTest { @Test void purgeShouldProduceASuccessfulTaskWithAdditionalInformation() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -1975,9 +1975,9 @@ class DeletedMessagesVaultRoutesTest { .size(CONTENT.length) .build(); - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, notExpiredMessage, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(notExpiredMessage, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -1996,8 +1996,8 @@ class DeletedMessagesVaultRoutesTest { @Test void purgeShouldNotAppendMessagesToUserMailbox() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -2019,8 +2019,8 @@ class DeletedMessagesVaultRoutesTest { @Test void purgeShouldProduceAFailedTaskWithVaultSearchError() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); doReturn(new DeleteByQueryExecutor(vault, vault::usersWithVault)).when(vault).getDeleteByQueryExecutor(); doReturn(Flux.error(new RuntimeException("mock exception"))) @@ -2054,8 +2054,8 @@ class DeletedMessagesVaultRoutesTest { @Test void purgeShouldProduceAFailedTaskWithVaultDeleteError() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); doReturn(new DeleteByQueryExecutor(vault, vault::usersWithVault)).when(vault).getDeleteByQueryExecutor(); doReturn(Mono.error(new RuntimeException("mock exception"))) @@ -2126,8 +2126,8 @@ class DeletedMessagesVaultRoutesTest { @Test void deleteShouldProduceASuccessfulTask() { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -2152,8 +2152,8 @@ class DeletedMessagesVaultRoutesTest { @Test void deleteShouldNotAppendMessagesToUserMailbox() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -2171,7 +2171,7 @@ class DeletedMessagesVaultRoutesTest { @Test void deleteShouldDeleteMessagesFromTheVault() throws Exception { - vault.append(USER, DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -2189,7 +2189,7 @@ class DeletedMessagesVaultRoutesTest { @Test void deleteShouldNotDeleteNotMatchMessagesFromTheVault() throws Exception { - vault.append(USER, DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); + vault.append(DELETED_MESSAGE_2, new ByteArrayInputStream(CONTENT)).block(); String taskId = with() @@ -2310,7 +2310,7 @@ class DeletedMessagesVaultRoutesTest { } private DeletedMessage storeDeletedMessage(DeletedMessage deletedMessage) { - Mono.from(vault.append(USER, deletedMessage, new ByteArrayInputStream(CONTENT))) + Mono.from(vault.append(deletedMessage, new ByteArrayInputStream(CONTENT))) .block(); return deletedMessage; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
