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 8c4b99d6058dba610e7608ae372d4ab43cefcccf Author: Tran Tien Duc <[email protected]> AuthorDate: Fri Jun 28 11:53:09 2019 +0700 JAMES-2806 Fix rename method in ObjectStorageDAO --- .../james/blob/objectstorage/ObjectStorageBlobsDAO.java | 13 +++++-------- .../james/blob/objectstorage/ObjectStorageBlobsDAOTest.java | 8 ++++---- .../modules/objectstorage/aws/s3/DockerAwsS3TestRule.java | 2 +- .../modules/objectstorage/swift/DockerSwiftTestRule.java | 2 +- 4 files changed, 11 insertions(+), 14 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 7cecf82..cdfc166 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 @@ -24,7 +24,6 @@ import java.io.InputStream; import java.util.Optional; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.NotImplementedException; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; import org.apache.james.blob.api.BucketName; @@ -45,6 +44,7 @@ import com.google.common.hash.Hashing; import com.google.common.hash.HashingInputStream; import reactor.core.publisher.Mono; +import reactor.core.scheduler.Schedulers; public class ObjectStorageBlobsDAO implements BlobStore { private static final Location DEFAULT_LOCATION = null; @@ -162,17 +162,14 @@ public class ObjectStorageBlobsDAO implements BlobStore { } @Override - public Mono<Void> deleteBucket(BucketName bucketName) { - throw new NotImplementedException("not implemented"); - } - - @Override public BucketName getDefaultBucketName() { return defaultBucketName; } - public void deleteContainer(BucketName bucketName) { - blobStore.deleteContainer(bucketName.asString()); + @Override + public Mono<Void> deleteBucket(BucketName bucketName) { + return Mono.<Void>fromRunnable(() -> blobStore.deleteContainer(bucketName.asString())) + .subscribeOn(Schedulers.elastic()); } public PayloadCodec getPayloadCodec() { 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 14772bb..12f11b8 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 @@ -118,14 +118,14 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { } @Test - void createContainerShouldMakeTheContainerToExist() { + void createBucketShouldMakeTheContainerToExist() { BucketName bucketName = BucketName.of(UUID.randomUUID().toString()); objectStorageBlobsDAO.createBucket(bucketName).block(); assertThat(blobStore.containerExists(bucketName.asString())).isTrue(); } @Test - void createContainerShouldNotFailWithRuntimeExceptionWhenCreateContainerTwice() { + void createBucketShouldNotFailWithRuntimeExceptionWhenCreateBucketTwice() { BucketName bucketName = BucketName.of(UUID.randomUUID().toString()); objectStorageBlobsDAO.createBucket(bucketName).block(); @@ -171,8 +171,8 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { } @Test - void deleteContainerShouldDeleteSwiftContainer() { - objectStorageBlobsDAO.deleteContainer(defaultBucketName); + void deleteBucketShouldDeleteSwiftContainer() { + objectStorageBlobsDAO.deleteBucket(defaultBucketName).block(); assertThat(blobStore.containerExists(defaultBucketName.asString())) .isFalse(); } 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 6f2b8e3..e9c4bef 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 @@ -69,7 +69,7 @@ public class DockerAwsS3TestRule implements GuiceModuleTestRule { @Override public Result run() { - blobsDAO.deleteContainer(blobsDAO.getDefaultBucketName()); + blobsDAO.deleteBucket(blobsDAO.getDefaultBucketName()).block(); 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 d706221..0e4c2db 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.getDefaultBucketName()); + blobsDAO.deleteBucket(blobsDAO.getDefaultBucketName()).block(); return Result.COMPLETED; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
