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 181ea96c4cbce4a70eb56cfab3ad89cf47315700 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Aug 2 18:57:41 2019 +0200 JAMES-2829 Delete and Bucket contracts should be included in BlobStoreContract This avoids forgetting a contract against a part of the API --- .../src/test/java/org/apache/james/blob/api/BlobStoreContract.java | 2 +- .../java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java | 4 +--- .../test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java | 4 +--- .../james/blob/objectstorage/ObjectStorageBlobsDAOAWSCryptoTest.java | 4 +--- .../blob/objectstorage/ObjectStorageBlobsDAOAWSNamespaceTest.java | 4 +--- .../objectstorage/ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest.java | 4 +--- .../james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixTest.java | 4 +--- .../apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java | 4 +--- .../apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java | 4 +--- .../src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java | 4 +--- 10 files changed, 10 insertions(+), 28 deletions(-) diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java index 3c89b9c..004c44f 100644 --- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java +++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import com.google.common.base.Strings; -public interface BlobStoreContract { +public interface BlobStoreContract extends DeleteBlobStoreContract, BucketBlobStoreContract { String SHORT_STRING = "toto"; byte[] EMPTY_BYTEARRAY = {}; diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java index a958128..86b0c69 100644 --- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java +++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobStoreTest.java @@ -34,8 +34,6 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -51,7 +49,7 @@ import com.google.common.hash.HashingInputStream; import reactor.core.publisher.Mono; -public class CassandraBlobStoreTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class CassandraBlobStoreTest implements MetricableBlobStoreContract { private static final int CHUNK_SIZE = 10240; private static final int MULTIPLE_CHUNK_SIZE = 3; diff --git a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java index 6f8686a..6dbac34 100644 --- a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java +++ b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStoreTest.java @@ -21,14 +21,12 @@ package org.apache.james.blob.memory; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; import org.junit.jupiter.api.BeforeEach; -public class MemoryBlobStoreTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class MemoryBlobStoreTest implements MetricableBlobStoreContract { private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory(); private BlobStore blobStore; diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSCryptoTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSCryptoTest.java index 202e01a..c69acd8 100644 --- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSCryptoTest.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSCryptoTest.java @@ -21,8 +21,6 @@ package org.apache.james.blob.objectstorage; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -38,7 +36,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(DockerAwsS3Extension.class) -public class ObjectStorageBlobsDAOAWSCryptoTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class ObjectStorageBlobsDAOAWSCryptoTest implements MetricableBlobStoreContract { private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory(); private static final Credentials PASSWORD = Credentials.of("testing"); private static final String SAMPLE_SALT = "c603a7327ee3dcbc031d8d34b1096c605feca5e1"; diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSNamespaceTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSNamespaceTest.java index 5b44d4a..63443fc 100644 --- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSNamespaceTest.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSNamespaceTest.java @@ -21,9 +21,7 @@ package org.apache.james.blob.objectstorage; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; import org.apache.james.blob.api.BucketName; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -37,7 +35,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(DockerAwsS3Extension.class) -public class ObjectStorageBlobsDAOAWSNamespaceTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class ObjectStorageBlobsDAOAWSNamespaceTest implements MetricableBlobStoreContract { private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory(); private BlobStore testee; diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest.java index 1f4fb0d..ff9b7e9 100644 --- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest.java @@ -21,9 +21,7 @@ package org.apache.james.blob.objectstorage; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; import org.apache.james.blob.api.BucketName; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -37,7 +35,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(DockerAwsS3Extension.class) -public class ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest implements MetricableBlobStoreContract { private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory(); private BlobStore testee; diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixTest.java index 5db797d..680f342 100644 --- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixTest.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSPrefixTest.java @@ -21,8 +21,6 @@ package org.apache.james.blob.objectstorage; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -36,7 +34,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(DockerAwsS3Extension.class) -public class ObjectStorageBlobsDAOAWSPrefixTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class ObjectStorageBlobsDAOAWSPrefixTest implements MetricableBlobStoreContract { private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory(); private BlobStore testee; 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 43eea81..9261eca 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 @@ -21,8 +21,6 @@ package org.apache.james.blob.objectstorage; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -36,7 +34,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(DockerAwsS3Extension.class) -public class ObjectStorageBlobsDAOAWSTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class ObjectStorageBlobsDAOAWSTest implements MetricableBlobStoreContract { private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory(); 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 6e1520f..5bab274 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 @@ -29,9 +29,7 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; -import org.apache.james.blob.api.BucketBlobStoreContract; import org.apache.james.blob.api.BucketName; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.MetricableBlobStore; import org.apache.james.blob.api.MetricableBlobStoreContract; @@ -57,7 +55,7 @@ import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; @ExtendWith(DockerSwiftExtension.class) -public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract { +public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract { private static final String BIG_STRING = Strings.repeat("big blob content", 10 * 1024); private static final TenantName TENANT_NAME = TenantName.of("test"); diff --git a/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java b/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java index 598f44b..e981edf 100644 --- a/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java +++ b/server/blob/blob-union/src/test/java/org/apache/james/blob/union/UnionBlobStoreTest.java @@ -33,9 +33,7 @@ import java.util.stream.Stream; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BlobStore; import org.apache.james.blob.api.BlobStoreContract; -import org.apache.james.blob.api.BucketBlobStoreContract; import org.apache.james.blob.api.BucketName; -import org.apache.james.blob.api.DeleteBlobStoreContract; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.api.ObjectStoreException; import org.apache.james.blob.memory.MemoryBlobStore; @@ -54,7 +52,7 @@ import com.google.common.collect.ImmutableList; import reactor.core.publisher.Mono; -class UnionBlobStoreTest implements BlobStoreContract, DeleteBlobStoreContract, BucketBlobStoreContract { +class UnionBlobStoreTest implements BlobStoreContract { private static class FailingBlobStore implements BlobStore { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
