This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3578c0b0e5798c133c3d4a8f0e68460e7ac2fe8c Author: Tran Tien Duc <[email protected]> AuthorDate: Wed Feb 19 10:10:01 2020 +0700 [Refactoring] integrate filePrefix directly with string --- .../java/org/apache/james/blob/export/api/BlobExportMechanism.java | 4 ++++ .../james/blob/export/file/LocalFileBlobExportMechanismTest.java | 3 +-- .../java/org/apache/james/webadmin/vault/routes/ExportService.java | 3 +-- .../org/apache/james/linshare/LinshareBlobExportMechanismTest.java | 5 ++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/blob/blob-export-api/src/main/java/org/apache/james/blob/export/api/BlobExportMechanism.java b/server/blob/blob-export-api/src/main/java/org/apache/james/blob/export/api/BlobExportMechanism.java index d9fffa5..4bf04e3 100644 --- a/server/blob/blob-export-api/src/main/java/org/apache/james/blob/export/api/BlobExportMechanism.java +++ b/server/blob/blob-export-api/src/main/java/org/apache/james/blob/export/api/BlobExportMechanism.java @@ -49,6 +49,10 @@ public interface BlobExportMechanism { default FileExtensionStage noFileCustomPrefix() { return filePrefix(Optional.empty()); } + + default FileExtensionStage filePrefix(String prefix) { + return filePrefix(Optional.of(prefix)); + } } @FunctionalInterface diff --git a/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java b/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java index 51c86bc..dc1262c 100644 --- a/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java +++ b/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import java.io.FileInputStream; import java.net.InetAddress; import java.nio.charset.StandardCharsets; -import java.util.Optional; import javax.mail.Message; import javax.mail.internet.InternetAddress; @@ -208,7 +207,7 @@ class LocalFileBlobExportMechanismTest { testee.blobId(blobId) .with(MailAddressFixture.RECIPIENT1) .explanation("The content of a deleted message vault had been shared with you.") - .filePrefix(Optional.of(filePrefix)) + .filePrefix(filePrefix) .fileExtension(FileExtension.ZIP) .export(); diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/ExportService.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/ExportService.java index 1ba4ed2..9af103c 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/ExportService.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/ExportService.java @@ -22,7 +22,6 @@ package org.apache.james.webadmin.vault.routes; import static org.apache.james.blob.api.BlobStore.StoragePolicy.LOW_COST; import java.io.IOException; -import java.util.Optional; import java.util.function.Predicate; import javax.inject.Inject; @@ -78,7 +77,7 @@ class ExportService { blobExport.blobId(blobId) .with(exportToAddress) .explanation(exportMessage(username)) - .filePrefix(Optional.of(String.format("deleted-message-of-%s_", username.asString()))) + .filePrefix(String.format("deleted-message-of-%s_", username.asString())) .fileExtension(FileExtension.ZIP) .export(); } diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java index 3148e50..5f5d03f 100644 --- a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java +++ b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java @@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.nio.charset.StandardCharsets; -import java.util.Optional; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.HashBlobId; @@ -76,7 +75,7 @@ class LinshareBlobExportMechanismTest { testee.blobId(blobId) .with(new MailAddress(USER_2.getUsername())) .explanation(EXPLANATION) - .filePrefix(Optional.of(filePrefix)) + .filePrefix(filePrefix) .fileExtension(FILE_TEXT_EXTENSION) .export(); @@ -124,7 +123,7 @@ class LinshareBlobExportMechanismTest { testee.blobId(blobId) .with(new MailAddress(USER_2.getUsername())) .explanation(EXPLANATION) - .filePrefix(Optional.of(filePrefix)) + .filePrefix(filePrefix) .fileExtension(FILE_TEXT_EXTENSION) .export(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
