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 f92dadf2ff1f6217728c739c4f8df195c576952f Author: Tran Tien Duc <[email protected]> AuthorDate: Mon Apr 1 13:03:28 2019 +0700 JAMES-2705 Putting .eml extension to zipped file --- .../main/java/org/apache/james/vault/DeletedMessageZipper.java | 7 ++++++- .../java/org/apache/james/vault/DeletedMessageZipperTest.java | 7 ++++--- .../james/jmap/methods/integration/DeletedMessagesVaultTest.java | 9 +++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageZipper.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageZipper.java index 1d4a89b..e5272af 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageZipper.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/DeletedMessageZipper.java @@ -43,6 +43,8 @@ public class DeletedMessageZipper { Optional<InputStream> load(DeletedMessage deletedMessage); } + static final String ZIPPED_FILE_EXTENSION = ".eml"; + public DeletedMessageZipper() { ExtraFieldUtils.register(MessageIdExtraField.class); ExtraFieldUtils.register(SizeExtraField.class); @@ -79,7 +81,10 @@ public class DeletedMessageZipper { ZipArchiveEntry createEntry(ZipArchiveOutputStream zipOutputStream, DeletedMessage message) throws IOException { MessageId messageId = message.getMessageId(); - ZipArchiveEntry archiveEntry = (ZipArchiveEntry) zipOutputStream.createArchiveEntry(new File(messageId.serialize()), messageId.serialize()); + ZipArchiveEntry archiveEntry = (ZipArchiveEntry) zipOutputStream.createArchiveEntry( + new File(messageId.serialize()), + messageId.serialize() + ZIPPED_FILE_EXTENSION); + archiveEntry.addExtraField(new MessageIdExtraField(messageId)); archiveEntry.addExtraField(new SizeExtraField(message.getSize())); diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageZipperTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageZipperTest.java index efd9355..ece8944 100644 --- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageZipperTest.java +++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/DeletedMessageZipperTest.java @@ -27,6 +27,7 @@ import static org.apache.james.vault.DeletedMessageFixture.DELETED_MESSAGE_2; import static org.apache.james.vault.DeletedMessageFixture.MESSAGE_ID; import static org.apache.james.vault.DeletedMessageFixture.MESSAGE_ID_2; import static org.apache.james.vault.DeletedMessageZipper.DeletedMessageContentLoader; +import static org.apache.james.vault.DeletedMessageZipper.ZIPPED_FILE_EXTENSION; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -88,8 +89,8 @@ class DeletedMessageZipperTest { try (ZipAssert zipAssert = assertThatZip(outputStream)) { zipAssert.containsOnlyEntriesMatching( - hasName(MESSAGE_ID.serialize()).hasStringContent(MESSAGE_CONTENT), - hasName(MESSAGE_ID_2.serialize()).hasStringContent(MESSAGE_CONTENT)); + hasName(MESSAGE_ID.serialize() + ZIPPED_FILE_EXTENSION).hasStringContent(MESSAGE_CONTENT), + hasName(MESSAGE_ID_2.serialize() + ZIPPED_FILE_EXTENSION).hasStringContent(MESSAGE_CONTENT)); } } @@ -101,7 +102,7 @@ class DeletedMessageZipperTest { try (ZipAssert zipAssert = assertThatZip(outputStream)) { zipAssert.containsOnlyEntriesMatching( - hasName(MESSAGE_ID.serialize()) + hasName(MESSAGE_ID.serialize() + ZIPPED_FILE_EXTENSION) .containsExtraFields(new MessageIdExtraField(MESSAGE_ID)) .containsExtraFields(new SizeExtraField(CONTENT.length))); } diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java index 7807d7b..6bdfc20 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java @@ -124,6 +124,7 @@ public abstract class DeletedMessagesVaultTest { .userExportFrom(HOMER) .exportTo(BART) .query(MATCH_ALL_QUERY); + private static final String EML_EXTENSION = ".eml"; private MailboxId otherMailboxId; @@ -467,7 +468,7 @@ public abstract class DeletedMessagesVaultTest { String fileLocation = exportAndGetFileLocationFromLastMail(EXPORT_ALL_HOMER_MESSAGES_TO_BART, bartAccessToken); try (ZipAssert zipAssert = assertThatZip(fileSystem.getResource(fileLocation))) { - zipAssert.containsOnlyEntriesMatching(hasName(messageIdOfHomer)); + zipAssert.containsOnlyEntriesMatching(hasName(messageIdOfHomer + EML_EXTENSION)); } } @@ -489,7 +490,7 @@ public abstract class DeletedMessagesVaultTest { String fileLocation = exportAndGetFileLocationFromLastMail(EXPORT_ALL_HOMER_MESSAGES_TO_BART, bartAccessToken); try (ZipAssert zipAssert = assertThatZip(fileSystem.getResource(fileLocation))) { - zipAssert.containsOnlyEntriesMatching(hasName(messageIdOfHomer)); + zipAssert.containsOnlyEntriesMatching(hasName(messageIdOfHomer + EML_EXTENSION)); } } @@ -513,7 +514,7 @@ public abstract class DeletedMessagesVaultTest { String fileLocation = exportAndGetFileLocationFromLastMail(EXPORT_ALL_HOMER_MESSAGES_TO_BART, bartAccessToken); try (ZipAssert zipAssert = assertThatZip(fileSystem.getResource(fileLocation))) { - zipAssert.containsOnlyEntriesMatching(hasName(messageIdOfHomer)); + zipAssert.containsOnlyEntriesMatching(hasName(messageIdOfHomer + EML_EXTENSION)); } } @@ -541,7 +542,7 @@ public abstract class DeletedMessagesVaultTest { String fileLocation = exportAndGetFileLocationFromLastMail(exportRequest, bartAccessToken); try (ZipAssert zipAssert = assertThatZip(fileSystem.getResource(fileLocation))) { - zipAssert.containsOnlyEntriesMatching(hasName(firstMessageIdOfHomer)); + zipAssert.containsOnlyEntriesMatching(hasName(firstMessageIdOfHomer + EML_EXTENSION)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
