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 126320bbb2db3836a6700905b9f3e2deb1c95bf6 Author: Tran Tien Duc <dt...@linagora.com> AuthorDate: Fri Jul 5 12:59:51 2019 +0700 JAMES-2806 ObjectStorageBlobDAO no need to create bucket explicitly --- .../blob/objectstorage/ObjectStorageBlobsDAO.java | 7 ------- .../objectstorage/ObjectStorageBlobsDAOAWSTest.java | 1 - .../objectstorage/ObjectStorageBlobsDAOContract.java | 1 - .../blob/objectstorage/ObjectStorageBlobsDAOTest.java | 18 ------------------ .../objectstorage/ObjectStorageDependenciesModule.java | 2 -- .../swift/ObjectStorageBlobStoreModuleTest.java | 4 ---- 6 files changed, 33 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 94f63fe..3a0bf83 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 @@ -86,13 +86,6 @@ public class ObjectStorageBlobsDAO implements BlobStore { return AwsS3ObjectStorage.daoBuilder(testConfig); } - 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)) - .thenReturn(name); - } - @Override public Mono<BlobId> save(BucketName bucketName, byte[] data) { Preconditions.checkNotNull(data); diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java index 716ff23..b9f101b 100644 --- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java @@ -66,7 +66,6 @@ public class ObjectStorageBlobsDAOAWSTest implements MetricableBlobStoreContract blobStore = builder.getSupplier().get(); objectStorageBlobsDAO = builder.build(); - objectStorageBlobsDAO.createBucket(defaultBucketName).block(); testee = new MetricableBlobStore(metricsTestExtension.getMetricFactory(), objectStorageBlobsDAO); } 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 f25393a..92bf2f8 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,6 @@ public interface ObjectStorageBlobsDAOContract { default void assertBlobsDAOCanStoreAndRetrieve(ObjectStorageBlobsDAOBuilder.ReadyToBuild builder) { ObjectStorageBlobsDAO dao = builder.build(); - dao.createBucket(dao.getDefaultBucketName()).block(); BlobId blobId = dao.save(dao.getDefaultBucketName(), 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 a6321f7..9423ee8 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 @@ -20,7 +20,6 @@ package org.apache.james.blob.objectstorage; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -92,7 +91,6 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract, B .blobIdFactory(blobIdFactory); blobStore = daoBuilder.getSupplier().get(); objectStorageBlobsDAO = daoBuilder.build(); - objectStorageBlobsDAO.createBucket(defaultBucketName).block(); testee = new MetricableBlobStore(metricsTestExtension.getMetricFactory(), objectStorageBlobsDAO); } @@ -114,22 +112,6 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract, B } @Test - void createBucketShouldMakeTheContainerToExist() { - BucketName bucketName = BucketName.of(UUID.randomUUID().toString()); - objectStorageBlobsDAO.createBucket(bucketName).block(); - assertThat(blobStore.containerExists(bucketName.asString())).isTrue(); - } - - @Test - void createBucketShouldNotFailWithRuntimeExceptionWhenCreateBucketTwice() { - BucketName bucketName = BucketName.of(UUID.randomUUID().toString()); - - objectStorageBlobsDAO.createBucket(bucketName).block(); - assertThatCode(() -> objectStorageBlobsDAO.createBucket(bucketName).block()) - .doesNotThrowAnyException(); - } - - @Test void supportsEncryptionWithCustomPayloadCodec() throws IOException { ObjectStorageBlobsDAO encryptedDao = ObjectStorageBlobsDAO .builder(testConfig) 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 fc7675b..7d92bcd 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 @@ -20,7 +20,6 @@ package org.apache.james.modules.objectstorage; import java.io.FileNotFoundException; -import java.time.Duration; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -72,7 +71,6 @@ public class ObjectStorageDependenciesModule extends AbstractModule { .payloadCodec(configuration.getPayloadCodec()) .blobPutter(putBlob(blobIdFactory, configuration, awsS3ObjectStorageProvider)) .build(); - 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/swift/ObjectStorageBlobStoreModuleTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/ObjectStorageBlobStoreModuleTest.java index 8858216..7911d16 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 @@ -30,7 +30,6 @@ import org.apache.james.blob.api.BucketName; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.objectstorage.DockerSwift; import org.apache.james.blob.objectstorage.DockerSwiftExtension; -import org.apache.james.blob.objectstorage.ObjectStorageBlobsDAO; import org.apache.james.blob.objectstorage.swift.Credentials; import org.apache.james.blob.objectstorage.swift.DomainName; import org.apache.james.blob.objectstorage.swift.IdentityV3; @@ -136,9 +135,6 @@ class ObjectStorageBlobStoreModuleTest { .override(new ObjectStorageBlobStoreModule()) .with(binder -> binder.bind(ObjectStorageBlobConfiguration.class).toInstance(configuration))); - ObjectStorageBlobsDAO dao = injector.getInstance(ObjectStorageBlobsDAO.class); - dao.createBucket(dao.getDefaultBucketName()).block(); - BlobStore blobStore = injector.getInstance(Key.get(BlobStore.class, Names.named(MetricableBlobStore.BLOB_STORE_IMPLEMENTATION))); assertThatCode(() -> blobStore.save(blobStore.getDefaultBucketName(), new byte[] {0x00})).doesNotThrowAnyException(); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org