You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2020/07/28 03:20:39 UTC
[james-project] 11/25: JAMES-3318 Remove BlobStore::delete from
BlobStore contract
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 75ad3e2f0f6e030aa4305e240da433a5cc0896a0
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jul 24 09:12:24 2020 +0700
JAMES-3318 Remove BlobStore::delete from BlobStore contract
---
.../java/org/apache/james/blob/api/BlobStoreContract.java | 2 +-
.../blob/cassandra/CassandraPassTroughBlobStoreTest.java | 3 ++-
.../james/blob/memory/MemoryBlobStorePassThroughTest.java | 3 ++-
.../objectstorage/ObjectStorageBlobStoreAWSCryptoTest.java | 13 -------------
.../ObjectStorageBlobStoreAWSNamespaceTest.java | 13 -------------
.../ObjectStorageBlobStoreAWSPrefixAndNamespaceTest.java | 13 -------------
.../objectstorage/ObjectStorageBlobStoreAWSPrefixTest.java | 13 -------------
.../blob/objectstorage/ObjectStorageBlobStoreAWSTest.java | 13 -------------
8 files changed, 5 insertions(+), 68 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 b9f8e1b..92f9063 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
@@ -39,7 +39,7 @@ import com.google.common.base.Strings;
import reactor.core.publisher.Mono;
-public interface BlobStoreContract extends DeleteBlobStoreContract, BucketBlobStoreContract {
+public interface BlobStoreContract extends BucketBlobStoreContract {
static Stream<Arguments> storagePolicies() {
return Stream.of(
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java
index 755dc28..2df512e 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraPassTroughBlobStoreTest.java
@@ -27,13 +27,14 @@ import org.apache.james.backends.cassandra.init.configuration.CassandraConfigura
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
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.server.blob.deduplication.BlobStoreFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.RegisterExtension;
-public class CassandraPassTroughBlobStoreTest implements CassandraBlobStoreContract {
+public class CassandraPassTroughBlobStoreTest implements DeleteBlobStoreContract, CassandraBlobStoreContract {
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraBlobModule.MODULE);
diff --git a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java
index aa72550..3ab634b 100644
--- a/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java
+++ b/server/blob/blob-memory/src/test/java/org/apache/james/blob/memory/MemoryBlobStorePassThroughTest.java
@@ -21,12 +21,13 @@ 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.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 MemoryBlobStorePassThroughTest implements MetricableBlobStoreContract {
+public class MemoryBlobStorePassThroughTest implements DeleteBlobStoreContract, 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/ObjectStorageBlobStoreAWSCryptoTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSCryptoTest.java
index 3a23b22..ffb5c21 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSCryptoTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSCryptoTest.java
@@ -35,7 +35,6 @@ import org.apache.james.blob.objectstorage.crypto.CryptoConfig;
import org.apache.james.blob.objectstorage.swift.Credentials;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(DockerAwsS3Extension.class)
@@ -87,16 +86,4 @@ public class ObjectStorageBlobStoreAWSCryptoTest implements MetricableBlobStoreC
public BlobId.Factory blobIdFactory() {
return BLOB_ID_FACTORY;
}
-
- @Override
- @Disabled("JAMES-2829 Unstable with scality/S3 impl")
- public void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
-
- @Override
- @Disabled("JAMES-2838 Unstable with scality/S3 impl")
- public void readBytesShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSNamespaceTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSNamespaceTest.java
index 9b17ceb..11d0850 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSNamespaceTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSNamespaceTest.java
@@ -34,7 +34,6 @@ import org.apache.james.blob.objectstorage.aws.DockerAwsS3Container;
import org.apache.james.blob.objectstorage.aws.DockerAwsS3Extension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(DockerAwsS3Extension.class)
@@ -80,17 +79,5 @@ public class ObjectStorageBlobStoreAWSNamespaceTest implements MetricableBlobSto
public BlobId.Factory blobIdFactory() {
return new HashBlobId.Factory();
}
-
- @Override
- @Disabled("JAMES-2829 Unstable with scality/S3 impl")
- public void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
-
- @Override
- @Disabled("JAMES-2838 Unstable with scality/S3 impl")
- public void readBytesShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixAndNamespaceTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixAndNamespaceTest.java
index 4592820..1479f47 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixAndNamespaceTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixAndNamespaceTest.java
@@ -34,7 +34,6 @@ import org.apache.james.blob.objectstorage.aws.DockerAwsS3Container;
import org.apache.james.blob.objectstorage.aws.DockerAwsS3Extension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(DockerAwsS3Extension.class)
@@ -81,17 +80,5 @@ public class ObjectStorageBlobStoreAWSPrefixAndNamespaceTest implements Metricab
public BlobId.Factory blobIdFactory() {
return new HashBlobId.Factory();
}
-
- @Override
- @Disabled("JAMES-2829 Unstable with scality/S3 impl")
- public void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
-
- @Override
- @Disabled("JAMES-2838 Unstable with scality/S3 impl")
- public void readBytesShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixTest.java
index 3de820c..48af903 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSPrefixTest.java
@@ -33,7 +33,6 @@ import org.apache.james.blob.objectstorage.aws.DockerAwsS3Container;
import org.apache.james.blob.objectstorage.aws.DockerAwsS3Extension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(DockerAwsS3Extension.class)
@@ -79,17 +78,5 @@ public class ObjectStorageBlobStoreAWSPrefixTest implements MetricableBlobStoreC
public BlobId.Factory blobIdFactory() {
return new HashBlobId.Factory();
}
-
- @Override
- @Disabled("JAMES-2829 Unstable with scality/S3 impl")
- public void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
-
- @Override
- @Disabled("JAMES-2838 Unstable with scality/S3 impl")
- public void readBytesShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
}
diff --git a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSTest.java
index 1e66e98..cc16ad0 100644
--- a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSTest.java
+++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStoreAWSTest.java
@@ -33,7 +33,6 @@ import org.apache.james.blob.objectstorage.aws.DockerAwsS3Container;
import org.apache.james.blob.objectstorage.aws.DockerAwsS3Extension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(DockerAwsS3Extension.class)
@@ -79,16 +78,4 @@ public class ObjectStorageBlobStoreAWSTest implements MetricableBlobStoreContrac
public BlobId.Factory blobIdFactory() {
return BLOB_ID_FACTORY;
}
-
- @Override
- @Disabled("JAMES-2829 Unstable with scality/S3 impl")
- public void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
-
- @Override
- @Disabled("JAMES-2838 Unstable with scality/S3 impl")
- public void readBytesShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() {
-
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org