[james-project] 04/06: JAMES-2806 bucketPrefix inside the builder

[btellier]

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 69183fa080e7a3f1db7ef62ff87bcc5f89a4479c
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Mon Jul 8 13:59:39 2019 +0700

    JAMES-2806 bucketPrefix inside the builder
---
 .../james/blob/objectstorage/ObjectStorageBlobsDAOBuilder.java |  7 +++++++
 .../objectstorage/ObjectStorageBucketNameResolverTest.java     | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOBuilder.java
 
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOBuilder.java
index b7cb344..d6c289c 100644
--- 
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOBuilder.java
+++ 
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOBuilder.java
@@ -47,6 +47,7 @@ public class ObjectStorageBlobsDAOBuilder {
         private Optional<PayloadCodec> payloadCodec;
         private Optional<BlobPutter> blobPutter;
         private Optional<BucketName> namespace;
+        private Optional<String> bucketPrefix;
 
         public ReadyToBuild(Supplier<BlobStore> supplier, BlobId.Factory 
blobIdFactory) {
             this.blobIdFactory = blobIdFactory;
@@ -54,6 +55,7 @@ public class ObjectStorageBlobsDAOBuilder {
             this.supplier = supplier;
             this.blobPutter = Optional.empty();
             this.namespace = Optional.empty();
+            this.bucketPrefix = Optional.empty();
         }
 
         public ReadyToBuild payloadCodec(PayloadCodec payloadCodec) {
@@ -81,6 +83,11 @@ public class ObjectStorageBlobsDAOBuilder {
             return this;
         }
 
+        public ReadyToBuild bucketPrefix(String prefix) {
+            this.bucketPrefix = Optional.ofNullable(prefix);
+            return this;
+        }
+
         public ObjectStorageBlobsDAO build() {
             Preconditions.checkState(blobIdFactory != null);
 
diff --git 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBucketNameResolverTest.java
 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBucketNameResolverTest.java
index 43119d1..3edee3f 100644
--- 
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBucketNameResolverTest.java
+++ 
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBucketNameResolverTest.java
@@ -60,12 +60,12 @@ class ObjectStorageBucketNameResolverTest {
         @Test
         void resolveShouldReturnPassedValueWithPrefix() {
             ObjectStorageBucketNameResolver resolver = 
ObjectStorageBucketNameResolver.builder()
-                .prefix("prefix-")
+                .prefix("bucketPrefix-")
                 .noNamespace()
                 .build();
 
             assertThat(resolver.resolve(BucketName.of("bucketName")))
-                .isEqualTo(ObjectStorageBucketName.of("prefix-bucketName"));
+                
.isEqualTo(ObjectStorageBucketName.of("bucketPrefix-bucketName"));
         }
     }
 
@@ -90,18 +90,18 @@ class ObjectStorageBucketNameResolverTest {
         @Test
         void resolveShouldReturnPassedValueWithPrefix() {
             ObjectStorageBucketNameResolver resolver = 
ObjectStorageBucketNameResolver.builder()
-                .prefix("prefix-")
+                .prefix("bucketPrefix-")
                 .namespace(BucketName.of("namespace"))
                 .build();
 
             assertThat(resolver.resolve(BucketName.of("bucketName")))
-                .isEqualTo(ObjectStorageBucketName.of("prefix-bucketName"));
+                
.isEqualTo(ObjectStorageBucketName.of("bucketPrefix-bucketName"));
         }
 
         @Test
         void resolveShouldReturnNamespaceWhenPassingNamespace() {
             ObjectStorageBucketNameResolver resolver = 
ObjectStorageBucketNameResolver.builder()
-                .prefix("prefix-")
+                .prefix("bucketPrefix-")
                 .namespace(BucketName.of("namespace"))
                 .build();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org