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 85f0a621aef967cd2d4204691ebd4321e75362a1 Author: Tran Tien Duc <[email protected]> AuthorDate: Wed Jun 26 16:28:49 2019 +0700 JAMES-2806 Rework delete & create bucket in ObjectStorageDAO --- .../apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java | 6 +++--- .../blob/objectstorage/ObjectStorageBlobsDAOContract.java | 2 +- .../james/blob/objectstorage/ObjectStorageBlobsDAOTest.java | 10 +++++----- .../modules/objectstorage/ObjectStorageDependenciesModule.java | 2 +- .../modules/objectstorage/aws/s3/DockerAwsS3TestRule.java | 2 +- .../james/modules/objectstorage/swift/DockerSwiftTestRule.java | 2 +- .../objectstorage/swift/ObjectStorageBlobStoreModuleTest.java | 2 +- 7 files changed, 13 insertions(+), 13 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 c288f6b..7cecf82 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 @@ -85,7 +85,7 @@ public class ObjectStorageBlobsDAO implements BlobStore { return AwsS3ObjectStorage.daoBuilder(testConfig); } - public Mono<BucketName> createContainer(BucketName name) { + public Mono<BucketName> createBucket(BucketName name) { return Mono.fromCallable(() -> blobStore.createContainerInLocation(DEFAULT_LOCATION, name.asString())) .filter(created -> created == false) .doOnNext(ignored -> LOGGER.debug("{} already existed", name)) @@ -171,8 +171,8 @@ public class ObjectStorageBlobsDAO implements BlobStore { return defaultBucketName; } - public void deleteContainer() { - blobStore.deleteContainer(defaultBucketName.asString()); + public void deleteContainer(BucketName bucketName) { + blobStore.deleteContainer(bucketName.asString()); } public PayloadCodec getPayloadCodec() { diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOContract.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOContract.java index 883416f..ba597e2 100644 --- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOContract.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOContract.java @@ -37,7 +37,7 @@ public interface ObjectStorageBlobsDAOContract { default void assertBlobsDAOCanStoreAndRetrieve(ObjectStorageBlobsDAOBuilder.ReadyToBuild builder) { ObjectStorageBlobsDAO dao = builder.build(); - dao.createContainer(bucketName()).block(); + dao.createBucket(bucketName()).block(); BlobId blobId = dao.save(BucketName.DEFAULT, CONTENT).block(); 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 44cbf99..ad794fe 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 @@ -91,7 +91,7 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { .blobIdFactory(blobIdFactory); blobStore = daoBuilder.getSupplier().get(); objectStorageBlobsDAO = daoBuilder.build(); - objectStorageBlobsDAO.createContainer(bucketName).block(); + objectStorageBlobsDAO.createBucket(bucketName).block(); testee = new MetricableBlobStore(metricsTestExtension.getMetricFactory(), objectStorageBlobsDAO); } @@ -120,7 +120,7 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { @Test void createContainerShouldMakeTheContainerToExist() { BucketName bucketName = BucketName.of(UUID.randomUUID().toString()); - objectStorageBlobsDAO.createContainer(bucketName).block(); + objectStorageBlobsDAO.createBucket(bucketName).block(); assertThat(blobStore.containerExists(bucketName.asString())).isTrue(); } @@ -128,8 +128,8 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { void createContainerShouldNotFailWithRuntimeExceptionWhenCreateContainerTwice() { BucketName bucketName = BucketName.of(UUID.randomUUID().toString()); - objectStorageBlobsDAO.createContainer(bucketName).block(); - assertThatCode(() -> objectStorageBlobsDAO.createContainer(bucketName).block()) + objectStorageBlobsDAO.createBucket(bucketName).block(); + assertThatCode(() -> objectStorageBlobsDAO.createBucket(bucketName).block()) .doesNotThrowAnyException(); } @@ -172,7 +172,7 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { @Test void deleteContainerShouldDeleteSwiftContainer() { - objectStorageBlobsDAO.deleteContainer(); + objectStorageBlobsDAO.deleteContainer(bucketName); assertThat(blobStore.containerExists(bucketName.asString())) .isFalse(); } 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 94718d0..550238e 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 @@ -72,7 +72,7 @@ public class ObjectStorageDependenciesModule extends AbstractModule { .payloadCodec(configuration.getPayloadCodec()) .putBlob(putBlob(blobIdFactory, configuration, awsS3ObjectStorageProvider)) .build(); - dao.createContainer(dao.getDefaultBucketName()).block(Duration.ofMinutes(1)); + dao.createBucket(dao.getDefaultBucketName()).block(Duration.ofMinutes(1)); return dao; } 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 3dca764..b8bf038 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 @@ -68,7 +68,7 @@ public class DockerAwsS3TestRule implements GuiceModuleTestRule { @Override public Result run() { - blobsDAO.deleteContainer(); + blobsDAO.deleteContainer(blobsDAO.getDefaultBucketName()); return Result.COMPLETED; } 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 b0c041b..7f08fe1 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 @@ -71,7 +71,7 @@ public class DockerSwiftTestRule implements GuiceModuleTestRule { @Override public Result run() { - blobsDAO.deleteContainer(); + blobsDAO.deleteContainer(blobsDAO.getDefaultBucketName()); return Result.COMPLETED; } 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 476c6d5..e27f990 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(dao.getDefaultBucketName()).block(); + dao.createBucket(dao.getDefaultBucketName()).block(); BlobStore blobStore = injector.getInstance(Key.get(BlobStore.class, Names.named(MetricableBlobStore.BLOB_STORE_IMPLEMENTATION))); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
