This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ffce28ba5b87a9b7d58b16e9c584296bcdfcaf89 Author: Tran Tien Duc <[email protected]> AuthorDate: Tue Jul 9 09:43:28 2019 +0700 JAMES-2812 use random bucket prefix each test --- .../blob/objectstorage/ObjectStorageBlobsDAO.java | 2 +- .../ObjectStorageBlobConfiguration.java | 5 +++++ .../objectstorage/aws/s3/DockerAwsS3TestRule.java | 23 +--------------------- .../objectstorage/swift/DockerSwiftTestRule.java | 23 +--------------------- 4 files changed, 8 insertions(+), 45 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 2e4b2ef..1ecb646 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 @@ -193,7 +193,7 @@ public class ObjectStorageBlobsDAO implements BlobStore { } @VisibleForTesting - public Mono<Void> deleteAllBuckets() { + Mono<Void> deleteAllBuckets() { return Flux.fromIterable(blobStore.list()) .publishOn(Schedulers.elastic()) .filter(storageMetadata -> storageMetadata.getType().equals(StorageType.CONTAINER)) 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 e6ea529..e69db3b 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 @@ -165,6 +165,11 @@ public class ObjectStorageBlobConfiguration { return this; } + public ReadyToBuild bucketPrefix(String bucketPrefix) { + this.bucketPrefix = Optional.ofNullable(bucketPrefix); + return this; + } + public ObjectStorageBlobConfiguration build() { if (payloadCodecFactory == PayloadCodecFactory.AES256) { aesSalt.filter(s -> !s.isEmpty()) 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 72112cd..2dba254 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 @@ -23,7 +23,6 @@ import java.util.UUID; import javax.inject.Inject; -import org.apache.james.CleanupTasksPerformer; import org.apache.james.GuiceModuleTestRule; import org.apache.james.blob.api.BucketName; import org.apache.james.blob.objectstorage.DockerAwsS3Singleton; @@ -57,23 +56,6 @@ public class DockerAwsS3TestRule implements GuiceModuleTestRule { } } - private static class ContainerCleanUp implements CleanupTasksPerformer.CleanupTask { - - private final ObjectStorageBlobsDAO blobsDAO; - - @Inject - public ContainerCleanUp(ObjectStorageBlobsDAO blobsDAO) { - this.blobsDAO = blobsDAO; - } - - @Override - public Result run() { - blobsDAO.deleteBucket(blobsDAO.getDefaultBucketName()).block(); - - return Result.COMPLETED; - } - } - private final PayloadCodecFactory payloadCodecFactory; public DockerAwsS3TestRule() { @@ -119,15 +101,12 @@ public class DockerAwsS3TestRule implements GuiceModuleTestRule { .aesSalt("c603a7327ee3dcbc031d8d34b1096c605feca5e1") .aesPassword("dockerAwsS3Encryption".toCharArray()) .defaultBucketName(defaultBucketName) + .bucketPrefix(UUID.randomUUID().toString()) .build(); return binder -> { binder.bind(ObjectStorageBlobConfiguration.class).toInstance(configuration); - Multibinder.newSetBinder(binder, CleanupTasksPerformer.CleanupTask.class) - .addBinding() - .to(ContainerCleanUp.class); - Multibinder.newSetBinder(binder, GuiceProbe.class).addBinding().to(TestAwsS3BlobStoreProbe.class); }; } 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 02a12c7..4df090e 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 @@ -24,7 +24,6 @@ import java.util.UUID; import javax.inject.Inject; -import org.apache.james.CleanupTasksPerformer; import org.apache.james.GuiceModuleTestRule; import org.apache.james.blob.api.BucketName; import org.apache.james.blob.objectstorage.DockerSwiftRule; @@ -60,23 +59,6 @@ public class DockerSwiftTestRule implements GuiceModuleTestRule { } } - private static class ContainerCleanUp implements CleanupTasksPerformer.CleanupTask { - - private final ObjectStorageBlobsDAO blobsDAO; - - @Inject - public ContainerCleanUp(ObjectStorageBlobsDAO blobsDAO) { - this.blobsDAO = blobsDAO; - } - - @Override - public Result run() { - blobsDAO.deleteBucket(blobsDAO.getDefaultBucketName()).block(); - - return Result.COMPLETED; - } - } - private final PayloadCodecFactory payloadCodecFactory; private DockerSwiftRule swiftContainer = new DockerSwiftRule(); @@ -117,15 +99,12 @@ public class DockerSwiftTestRule implements GuiceModuleTestRule { .aesSalt("c603a7327ee3dcbc031d8d34b1096c605feca5e1") .aesPassword("dockerSwiftEncryption".toCharArray()) .defaultBucketName(defaultBucketName) + .bucketPrefix(UUID.randomUUID().toString()) .build(); return binder -> { binder.bind(ObjectStorageBlobConfiguration.class).toInstance(configuration); - Multibinder.newSetBinder(binder, CleanupTasksPerformer.CleanupTask.class) - .addBinding() - .to(ContainerCleanUp.class); - Multibinder.newSetBinder(binder, GuiceProbe.class).addBinding().to(TestSwiftBlobStoreProbe.class); }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
