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 44e310843134c666233113810133a2e252dda8d0 Author: Tran Tien Duc <[email protected]> AuthorDate: Tue Jul 2 11:48:05 2019 +0700 JAMES-2806 add defaultBucketName configuration option --- .../objectstorage/ObjectStorageBlobConfiguration.java | 5 +++++ .../modules/objectstorage/aws/s3/DockerAwsS3TestRule.java | 3 +-- .../modules/objectstorage/swift/DockerSwiftTestRule.java | 2 +- .../swift/ObjectStorageBlobConfigurationTest.java | 6 +++--- .../swift/ObjectStorageBlobStoreModuleTest.java | 6 +++--- .../modules/objectstorage/swift/SwiftObjectStorageTest.java | 12 ++++++------ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java index 40752b8..cb1d694 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java @@ -155,6 +155,11 @@ public class ObjectStorageBlobConfiguration { return this; } + public ReadyToBuild defaultBucketName(BucketName defaultBucketName) { + this.defaultBucketName = Optional.of(defaultBucketName); + return this; + } + public ReadyToBuild bucketPrefix(Optional<String> bucketPrefix) { this.bucketPrefix = bucketPrefix; return this; diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java index e9c4bef..72112cd 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java @@ -19,7 +19,6 @@ package org.apache.james.modules.objectstorage.aws.s3; -import java.util.Optional; import java.util.UUID; import javax.inject.Inject; @@ -119,7 +118,7 @@ public class DockerAwsS3TestRule implements GuiceModuleTestRule { .authConfiguration(authConfiguration) .aesSalt("c603a7327ee3dcbc031d8d34b1096c605feca5e1") .aesPassword("dockerAwsS3Encryption".toCharArray()) - .defaultBucketName(Optional.of(defaultBucketName)) + .defaultBucketName(defaultBucketName) .build(); return binder -> { diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java index 0e4c2db..02a12c7 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java @@ -116,7 +116,7 @@ public class DockerSwiftTestRule implements GuiceModuleTestRule { Optional.empty())) .aesSalt("c603a7327ee3dcbc031d8d34b1096c605feca5e1") .aesPassword("dockerSwiftEncryption".toCharArray()) - .defaultBucketName(Optional.of(defaultBucketName)) + .defaultBucketName(defaultBucketName) .build(); return binder -> { diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java index 5b777c7..e158c08 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobConfigurationTest.java @@ -108,7 +108,7 @@ class ObjectStorageBlobConfigurationTest { .build()), Optional.empty(), Optional.empty())) - .defaultBucketName(Optional.of(BucketName.of("foo"))) + .defaultBucketName(BucketName.of("foo")) .build()); } @@ -139,7 +139,7 @@ class ObjectStorageBlobConfigurationTest { .tenantName(TenantName.of("test")) .build()), Optional.empty())) - .defaultBucketName(Optional.of(BucketName.of("foo"))) + .defaultBucketName(BucketName.of("foo")) .build()); } @@ -171,7 +171,7 @@ class ObjectStorageBlobConfigurationTest { .project(Project.of(ProjectName.of("test"))) .identity(IdentityV3.of(DomainName.of("Default"), UserName.of("demo"))) .build()))) - .defaultBucketName(Optional.of(BucketName.of("foo"))) + .defaultBucketName(BucketName.of("foo")) .build()); } diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobStoreModuleTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobStoreModuleTest.java index 38bafac..8858216 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobStoreModuleTest.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobStoreModuleTest.java @@ -90,7 +90,7 @@ class ObjectStorageBlobStoreModuleTest { .build()), Optional.empty(), Optional.empty())) - .defaultBucketName(Optional.of(generateBucketName())) + .defaultBucketName(generateBucketName()) .build(); ObjectStorageBlobConfiguration keystone2 = ObjectStorageBlobConfiguration.builder() .codec(PayloadCodecFactory.DEFAULT) @@ -104,7 +104,7 @@ class ObjectStorageBlobStoreModuleTest { .tenantName(TenantName.of("test")) .build()), Optional.empty())) - .defaultBucketName(Optional.of(generateBucketName())) + .defaultBucketName(generateBucketName()) .build(); ObjectStorageBlobConfiguration keystone3 = ObjectStorageBlobConfiguration.builder() .codec(PayloadCodecFactory.DEFAULT) @@ -118,7 +118,7 @@ class ObjectStorageBlobStoreModuleTest { .project(Project.of(ProjectName.of("test"))) .identity(IdentityV3.of(DomainName.of("Default"), UserName.of("demo"))) .build()))) - .defaultBucketName(Optional.of(generateBucketName())) + .defaultBucketName(generateBucketName()) .build(); return Stream.of(tmpAuth, keystone2, keystone3).map(Arguments::of); } diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorageTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorageTest.java index 8e872f9..1bab6b3 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorageTest.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorageTest.java @@ -38,7 +38,7 @@ class SwiftObjectStorageTest { .codec(PayloadCodecFactory.DEFAULT) .provider(ObjectStorageProvider.SWIFT) .authConfiguration(new SwiftAuthConfiguration("tmpauth", Optional.empty(), Optional.empty(), Optional.empty())) - .defaultBucketName(Optional.of(BucketName.of("myBucket"))) + .defaultBucketName(BucketName.of("myBucket")) .build(); assertThatThrownBy(() -> SwiftObjectStorage.builder(objectStorageBlobConfiguration)) .isInstanceOf(IllegalArgumentException.class) @@ -58,7 +58,7 @@ class SwiftObjectStorageTest { .codec(PayloadCodecFactory.DEFAULT) .provider(ObjectStorageProvider.SWIFT) .authConfiguration(SwiftAuthConfiguration.from(configuration)) - .defaultBucketName(Optional.of(BucketName.of("myBucket"))) + .defaultBucketName(BucketName.of("myBucket")) .build(); SwiftObjectStorage.builder(objectStorageBlobConfiguration); } @@ -69,7 +69,7 @@ class SwiftObjectStorageTest { .codec(PayloadCodecFactory.DEFAULT) .provider(ObjectStorageProvider.SWIFT) .authConfiguration(new SwiftAuthConfiguration("keystone2", Optional.empty(), Optional.empty(), Optional.empty())) - .defaultBucketName(Optional.of(BucketName.of("myBucket"))) + .defaultBucketName(BucketName.of("myBucket")) .build(); assertThatThrownBy(() -> SwiftObjectStorage.builder(objectStorageBlobConfiguration)) .isInstanceOf(IllegalArgumentException.class) @@ -89,7 +89,7 @@ class SwiftObjectStorageTest { .codec(PayloadCodecFactory.DEFAULT) .provider(ObjectStorageProvider.SWIFT) .authConfiguration(SwiftAuthConfiguration.from(configuration)) - .defaultBucketName(Optional.of(BucketName.of("myBucket"))) + .defaultBucketName(BucketName.of("myBucket")) .build(); SwiftObjectStorage.builder(objectStorageBlobConfiguration); } @@ -100,7 +100,7 @@ class SwiftObjectStorageTest { .codec(PayloadCodecFactory.DEFAULT) .provider(ObjectStorageProvider.SWIFT) .authConfiguration(new SwiftAuthConfiguration("keystone3", Optional.empty(), Optional.empty(), Optional.empty())) - .defaultBucketName(Optional.of(BucketName.of("myBucket"))) + .defaultBucketName(BucketName.of("myBucket")) .build(); assertThatThrownBy(() -> SwiftObjectStorage.builder(objectStorageBlobConfiguration)) .isInstanceOf(IllegalArgumentException.class) @@ -120,7 +120,7 @@ class SwiftObjectStorageTest { .codec(PayloadCodecFactory.DEFAULT) .provider(ObjectStorageProvider.SWIFT) .authConfiguration(SwiftAuthConfiguration.from(configuration)) - .defaultBucketName(Optional.of(BucketName.of("myBucket"))) + .defaultBucketName(BucketName.of("myBucket")) .build(); SwiftObjectStorage.builder(objectStorageBlobConfiguration); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
