You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/07/05 07:00:53 UTC
[james-project] 05/12: JAMES-2806 rename bucketName in
ObjectStorageDAO to be more clear
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 e39ba7f5a3d869f124bddc0931118b570e015af2
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Wed Jun 26 16:04:18 2019 +0700
JAMES-2806 rename bucketName in ObjectStorageDAO to be more clear
---
.../blob/objectstorage/ObjectStorageBlobsDAO.java | 25 +++++++++++++---------
.../ObjectStorageBlobsDAOBuilder.java | 18 ++++++++--------
.../blob/objectstorage/aws/AwsS3ObjectStorage.java | 2 +-
.../swift/SwiftKeystone2ObjectStorage.java | 2 +-
.../swift/SwiftKeystone3ObjectStorage.java | 2 +-
.../swift/SwiftTempAuthObjectStorage.java | 2 +-
.../blob/objectstorage/DockerAwsS3Singleton.java | 2 +-
.../blob/objectstorage/DockerSwiftSingleton.java | 2 +-
.../objectstorage/ObjectStorageBlobsDAOTest.java | 6 +++---
.../aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java | 6 +++---
...tKeystone2ObjectStorageBlobsDAOBuilderTest.java | 6 +++---
...tKeystone3ObjectStorageBlobsDAOBuilderTest.java | 6 +++---
...ftTempAuthObjectStorageBlobsDAOBuilderTest.java | 6 +++---
.../ObjectStorageDependenciesModule.java | 6 +++---
.../objectstorage/swift/SwiftObjectStorage.java | 8 +++----
.../swift/ObjectStorageBlobStoreModuleTest.java | 2 +-
16 files changed, 53 insertions(+), 48 deletions(-)
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
index 22e52db..0507935 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java
@@ -53,35 +53,35 @@ public class ObjectStorageBlobsDAO implements BlobStore {
private final BlobId.Factory blobIdFactory;
- private final BucketName bucketName;
+ private final BucketName defaultBucketName;
private final org.jclouds.blobstore.BlobStore blobStore;
private final PutBlobFunction putBlobFunction;
private final PayloadCodec payloadCodec;
- ObjectStorageBlobsDAO(BucketName bucketName, BlobId.Factory blobIdFactory,
+ ObjectStorageBlobsDAO(BucketName defaultBucketName, BlobId.Factory blobIdFactory,
org.jclouds.blobstore.BlobStore blobStore,
PutBlobFunction putBlobFunction,
PayloadCodec payloadCodec) {
this.blobIdFactory = blobIdFactory;
- this.bucketName = bucketName;
+ this.defaultBucketName = defaultBucketName;
this.blobStore = blobStore;
this.putBlobFunction = putBlobFunction;
this.payloadCodec = payloadCodec;
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(SwiftTempAuthObjectStorage.Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(SwiftTempAuthObjectStorage.Configuration testConfig) {
return SwiftTempAuthObjectStorage.daoBuilder(testConfig);
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(SwiftKeystone2ObjectStorage.Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(SwiftKeystone2ObjectStorage.Configuration testConfig) {
return SwiftKeystone2ObjectStorage.daoBuilder(testConfig);
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(SwiftKeystone3ObjectStorage.Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(SwiftKeystone3ObjectStorage.Configuration testConfig) {
return SwiftKeystone3ObjectStorage.daoBuilder(testConfig);
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(AwsS3AuthConfiguration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(AwsS3AuthConfiguration testConfig) {
return AwsS3ObjectStorage.daoBuilder(testConfig);
}
@@ -117,7 +117,7 @@ public class ObjectStorageBlobsDAO implements BlobStore {
}
private Mono<BlobId> updateBlobId(BlobId from, BlobId to) {
- String bucketName = this.bucketName.asString();
+ String bucketName = this.defaultBucketName.asString();
return Mono
.fromCallable(() -> blobStore.copyBlob(bucketName, from.asString(), bucketName, to.asString(), CopyOptions.NONE))
.then(Mono.fromRunnable(() -> blobStore.removeBlob(bucketName, from.asString())))
@@ -146,7 +146,7 @@ public class ObjectStorageBlobsDAO implements BlobStore {
@Override
public InputStream read(BucketName bucketName, BlobId blobId) throws ObjectStoreException {
- Blob blob = blobStore.getBlob(this.bucketName.asString(), blobId.asString());
+ Blob blob = blobStore.getBlob(this.defaultBucketName.asString(), blobId.asString());
try {
if (blob != null) {
@@ -166,8 +166,13 @@ public class ObjectStorageBlobsDAO implements BlobStore {
throw new NotImplementedException("not implemented");
}
+ @Override
+ public BucketName getDefaultBucketName() {
+ return defaultBucketName;
+ }
+
public void deleteContainer() {
- blobStore.deleteContainer(bucketName.asString());
+ blobStore.deleteContainer(defaultBucketName.asString());
}
public PayloadCodec getPayloadCodec() {
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 f890f0d..4b8d212 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
@@ -31,13 +31,13 @@ import com.google.common.base.Preconditions;
public class ObjectStorageBlobsDAOBuilder {
- public static RequireBucketName forBlobStore(Supplier<BlobStore> supplier) {
+ public static RequireDefaultBucketName forBlobStore(Supplier<BlobStore> supplier) {
return bucketName -> blobIdFactory -> new ReadyToBuild(supplier, blobIdFactory, bucketName);
}
@FunctionalInterface
- public interface RequireBucketName {
- RequireBlobIdFactory container(BucketName bucketName);
+ public interface RequireDefaultBucketName {
+ RequireBlobIdFactory defaultBucketName(BucketName bucketName);
}
@FunctionalInterface
@@ -48,14 +48,14 @@ public class ObjectStorageBlobsDAOBuilder {
public static class ReadyToBuild {
private final Supplier<BlobStore> supplier;
- private final BucketName bucketName;
+ private final BucketName defaultBucketName;
private final BlobId.Factory blobIdFactory;
private Optional<PayloadCodec> payloadCodec;
private Optional<PutBlobFunction> putBlob;
- public ReadyToBuild(Supplier<BlobStore> supplier, BlobId.Factory blobIdFactory, BucketName bucketName) {
+ public ReadyToBuild(Supplier<BlobStore> supplier, BlobId.Factory blobIdFactory, BucketName defaultBucketName) {
this.blobIdFactory = blobIdFactory;
- this.bucketName = bucketName;
+ this.defaultBucketName = defaultBucketName;
this.payloadCodec = Optional.empty();
this.supplier = supplier;
this.putBlob = Optional.empty();
@@ -77,12 +77,12 @@ public class ObjectStorageBlobsDAOBuilder {
}
public ObjectStorageBlobsDAO build() {
- Preconditions.checkState(bucketName != null);
+ Preconditions.checkState(defaultBucketName != null);
Preconditions.checkState(blobIdFactory != null);
BlobStore blobStore = supplier.get();
- return new ObjectStorageBlobsDAO(bucketName,
+ return new ObjectStorageBlobsDAO(defaultBucketName,
blobIdFactory,
blobStore,
putBlob.orElse(defaultPutBlob(blobStore)),
@@ -90,7 +90,7 @@ public class ObjectStorageBlobsDAOBuilder {
}
private PutBlobFunction defaultPutBlob(BlobStore blobStore) {
- return (blob) -> blobStore.putBlob(bucketName.asString(), blob);
+ return (blob) -> blobStore.putBlob(defaultBucketName.asString(), blob);
}
@VisibleForTesting
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java
index 0d8ef20..257e40c 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java
@@ -89,7 +89,7 @@ public class AwsS3ObjectStorage {
executorService.shutdownNow();
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName daoBuilder(AwsS3AuthConfiguration configuration) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName daoBuilder(AwsS3AuthConfiguration configuration) {
return ObjectStorageBlobsDAOBuilder.forBlobStore(new BlobStoreBuilder(configuration));
}
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorage.java
index 5756a29..1b46c3a 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorage.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorage.java
@@ -43,7 +43,7 @@ public class SwiftKeystone2ObjectStorage {
private static final Iterable<Module> JCLOUDS_MODULES =
ImmutableSet.of(new SLF4JLoggingModule());
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName daoBuilder(Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName daoBuilder(Configuration testConfig) {
return ObjectStorageBlobsDAOBuilder.forBlobStore(new BlobStoreBuilder(testConfig));
}
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java
index c526a5d..5ca8cf3 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java
@@ -45,7 +45,7 @@ public class SwiftKeystone3ObjectStorage {
private static final Iterable<Module> JCLOUDS_MODULES =
ImmutableSet.of(new SLF4JLoggingModule());
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName daoBuilder(Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName daoBuilder(Configuration testConfig) {
return ObjectStorageBlobsDAOBuilder.forBlobStore(new BlobStoreBuilder(testConfig));
}
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java
index e55ee34..9481337 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java
@@ -44,7 +44,7 @@ public class SwiftTempAuthObjectStorage {
private static final Iterable<Module> JCLOUDS_MODULES =
ImmutableSet.of(new SLF4JLoggingModule());
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName daoBuilder(Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName daoBuilder(Configuration testConfig) {
return ObjectStorageBlobsDAOBuilder.forBlobStore(new BlobStoreBuilder(testConfig));
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerAwsS3Singleton.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerAwsS3Singleton.java
index 22fff45..c5aeb79 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerAwsS3Singleton.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerAwsS3Singleton.java
@@ -29,6 +29,6 @@ public class DockerAwsS3Singleton {
singleton.start();
}
- // Cleanup will be performed by test container resource reaper
+ // Cleanup will be performed by test defaultBucketName resource reaper
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftSingleton.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftSingleton.java
index 3137797..2c34972 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftSingleton.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/DockerSwiftSingleton.java
@@ -27,5 +27,5 @@ public class DockerSwiftSingleton {
singleton.start();
}
- // Cleanup will be performed by test container resource reaper
+ // Cleanup will be performed by test defaultBucketName resource reaper
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
index 674a340..e4f83d1 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
@@ -87,7 +87,7 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract {
BlobId.Factory blobIdFactory = blobIdFactory();
ObjectStorageBlobsDAOBuilder.ReadyToBuild daoBuilder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(blobIdFactory);
blobStore = daoBuilder.getSupplier().get();
objectStorageBlobsDAO = daoBuilder.build();
@@ -137,7 +137,7 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract {
void supportsEncryptionWithCustomPayloadCodec() throws IOException {
ObjectStorageBlobsDAO encryptedDao = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(blobIdFactory())
.payloadCodec(new AESPayloadCodec(CRYPTO_CONFIG))
.build();
@@ -153,7 +153,7 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract {
void encryptionWithCustomPayloadCodeCannotBeReadFromUnencryptedDAO() throws Exception {
ObjectStorageBlobsDAO encryptedDao = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(blobIdFactory())
.payloadCodec(new AESPayloadCodec(CRYPTO_CONFIG))
.build();
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
index efd784d..3db7533 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
@@ -65,7 +65,7 @@ class AwsS3ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlobsDAOCont
void bucketNameIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(configuration)
- .container(null)
+ .defaultBucketName(null)
.blobIdFactory(new HashBlobId.Factory());
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -75,7 +75,7 @@ class AwsS3ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlobsDAOCont
void blobIdFactoryIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(configuration)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(null);
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -85,7 +85,7 @@ class AwsS3ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlobsDAOCont
void builtBlobsDAOCanStoreAndRetrieve() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(configuration)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(new HashBlobId.Factory())
.putBlob(awsS3ObjectStorage.putBlob(bucketName, configuration));
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
index b807a59..fd8f296 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
@@ -66,7 +66,7 @@ class SwiftKeystone2ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlo
void bucketNameIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(null)
+ .defaultBucketName(null)
.blobIdFactory(new HashBlobId.Factory());
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -76,7 +76,7 @@ class SwiftKeystone2ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlo
void blobIdFactoryIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(null);
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -86,7 +86,7 @@ class SwiftKeystone2ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlo
void builtBlobsDAOCanStoreAndRetrieve() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(new HashBlobId.Factory());
assertBlobsDAOCanStoreAndRetrieve(builder);
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
index d9e0576..16ac758 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
@@ -99,7 +99,7 @@ class SwiftKeystone3ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlo
void bucketNameIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(null)
+ .defaultBucketName(null)
.blobIdFactory(new HashBlobId.Factory());
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -109,7 +109,7 @@ class SwiftKeystone3ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlo
void blobIdFactoryIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(null);
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -122,7 +122,7 @@ class SwiftKeystone3ObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlo
configBuilders.get(key).endpoint(dockerSwift.keystoneV3Endpoint()).build();
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(config)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(new HashBlobId.Factory());
assertBlobsDAOCanStoreAndRetrieve(builder);
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
index 662211b..8ecf795 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
@@ -68,7 +68,7 @@ class SwiftTempAuthObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlob
void bucketNameIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(null)
+ .defaultBucketName(null)
.blobIdFactory(new HashBlobId.Factory());
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -78,7 +78,7 @@ class SwiftTempAuthObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlob
void blobIdFactoryIsMandatoryToBuildBlobsDAO() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(null);
assertThatThrownBy(builder::build).isInstanceOf(IllegalStateException.class);
@@ -88,7 +88,7 @@ class SwiftTempAuthObjectStorageBlobsDAOBuilderTest implements ObjectStorageBlob
void builtBlobsDAOCanStoreAndRetrieve() {
ObjectStorageBlobsDAOBuilder.ReadyToBuild builder = ObjectStorageBlobsDAO
.builder(testConfig)
- .container(bucketName)
+ .defaultBucketName(bucketName)
.blobIdFactory(new HashBlobId.Factory());
assertBlobsDAOCanStoreAndRetrieve(builder);
diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageDependenciesModule.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageDependenciesModule.java
index 7f11da9..34ce338 100644
--- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageDependenciesModule.java
+++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageDependenciesModule.java
@@ -67,16 +67,16 @@ public class ObjectStorageDependenciesModule extends AbstractModule {
@Singleton
private ObjectStorageBlobsDAO buildObjectStore(ObjectStorageBlobConfiguration configuration, BlobId.Factory blobIdFactory, Provider<AwsS3ObjectStorage> awsS3ObjectStorageProvider) throws InterruptedException, ExecutionException, TimeoutException {
ObjectStorageBlobsDAO dao = selectDaoBuilder(configuration)
- .container(configuration.getNamespace())
+ .defaultBucketName(configuration.getNamespace())
.blobIdFactory(blobIdFactory)
.payloadCodec(configuration.getPayloadCodec())
.putBlob(putBlob(blobIdFactory, configuration, awsS3ObjectStorageProvider))
.build();
- dao.createContainer(configuration.getNamespace()).block(Duration.ofMinutes(1));
+ dao.createContainer(dao.getDefaultBucketName()).block(Duration.ofMinutes(1));
return dao;
}
- private ObjectStorageBlobsDAOBuilder.RequireBucketName selectDaoBuilder(ObjectStorageBlobConfiguration configuration) {
+ private ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName selectDaoBuilder(ObjectStorageBlobConfiguration configuration) {
switch (configuration.getProvider()) {
case SWIFT:
return SwiftObjectStorage.builder(configuration);
diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorage.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorage.java
index 6cc6a44..795d66f 100644
--- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorage.java
+++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftObjectStorage.java
@@ -29,7 +29,7 @@ import org.apache.james.modules.objectstorage.ObjectStorageProvider;
public class SwiftObjectStorage {
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(ObjectStorageBlobConfiguration configuration) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(ObjectStorageBlobConfiguration configuration) {
if (configuration.getProvider() != ObjectStorageProvider.SWIFT) {
throw new IllegalArgumentException("unknown provider " + configuration.getProvider());
}
@@ -52,15 +52,15 @@ public class SwiftObjectStorage {
}
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(SwiftTempAuthObjectStorage.Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(SwiftTempAuthObjectStorage.Configuration testConfig) {
return SwiftTempAuthObjectStorage.daoBuilder(testConfig);
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(SwiftKeystone2ObjectStorage.Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(SwiftKeystone2ObjectStorage.Configuration testConfig) {
return SwiftKeystone2ObjectStorage.daoBuilder(testConfig);
}
- public static ObjectStorageBlobsDAOBuilder.RequireBucketName builder(SwiftKeystone3ObjectStorage.Configuration testConfig) {
+ public static ObjectStorageBlobsDAOBuilder.RequireDefaultBucketName builder(SwiftKeystone3ObjectStorage.Configuration testConfig) {
return SwiftKeystone3ObjectStorage.daoBuilder(testConfig);
}
}
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 503b3d1..476c6d5 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
@@ -137,7 +137,7 @@ class ObjectStorageBlobStoreModuleTest {
.with(binder -> binder.bind(ObjectStorageBlobConfiguration.class).toInstance(configuration)));
ObjectStorageBlobsDAO dao = injector.getInstance(ObjectStorageBlobsDAO.class);
- dao.createContainer(configuration.getNamespace()).block();
+ dao.createContainer(dao.getDefaultBucketName()).block();
BlobStore blobStore = injector.getInstance(Key.get(BlobStore.class, Names.named(MetricableBlobStore.BLOB_STORE_IMPLEMENTATION)));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org