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 ro...@apache.org on 2019/07/19 12:13:11 UTC

[james-project] branch master updated (1e1abc6 -> 3d3d540)

This is an automated email from the ASF dual-hosted git repository.

rouazana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.


    from 1e1abc6  Merge remote-tracking branch 'benoit/vault-it'
     new 3df612d  JAMES-2829 add delete skeleton method in BlobStore API
     new 2e17ce2  JAMES-2829 add delete tests methods to a new DeleteBlobStoreContract
     new 4168bf1  JAMES-2829 add delete implementation for MetricableBlobStore and test in its contract
     new 0a6fd19  JAMES-2829 memory implementation of delete method for BlobStore
     new 3a35368  JAMES-2829 refactor BlobStoreContract for more clarity
     new 3d3d540  JAMES-2829 extract BlobStore function call into a local variable in all BlobStore contracts for better clarity

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/james/blob/api/BlobStore.java  |   2 +
 .../apache/james/blob/api/MetricableBlobStore.java |   9 +-
 .../apache/james/blob/api/BlobStoreContract.java   | 104 ++++++++----
 .../james/blob/api/BucketBlobStoreContract.java    |  76 ++++++---
 .../james/blob/api/DeleteBlobStoreContract.java    | 174 +++++++++++++++++++++
 .../blob/api/MetricableBlobStoreContract.java      |  61 ++++++--
 .../james/blob/cassandra/CassandraBlobsDAO.java    |   5 +
 .../blob/cassandra/CassandraBlobsDAOTest.java      |   8 +-
 .../apache/james/blob/memory/MemoryBlobStore.java  |  12 ++
 .../james/blob/memory/MemoryBlobStoreTest.java     |   3 +-
 .../blob/objectstorage/ObjectStorageBlobsDAO.java  |   6 +
 .../ObjectStorageBlobsDAOAWSCryptoTest.java        |   7 +
 .../ObjectStorageBlobsDAOAWSNamespaceTest.java     |   6 +
 ...ctStorageBlobsDAOAWSPrefixAndNamespaceTest.java |   6 +
 .../ObjectStorageBlobsDAOAWSPrefixTest.java        |   6 +
 .../ObjectStorageBlobsDAOAWSTest.java              |   7 +
 .../objectstorage/ObjectStorageBlobsDAOTest.java   |   7 +
 .../apache/james/blob/union/UnionBlobStore.java    |  14 +-
 .../james/blob/union/UnionBlobStoreTest.java       |  49 ++++++
 19 files changed, 489 insertions(+), 73 deletions(-)
 create mode 100644 server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 06/06: JAMES-2829 extract BlobStore function call into a local variable in all BlobStore contracts for better clarity

Posted by ro...@apache.org.
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 3d3d54008400eff590077af3d325be7248a38e43
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Jul 19 15:33:54 2019 +0700

    JAMES-2829 extract BlobStore function call into a local variable in all BlobStore contracts for better clarity
---
 .../apache/james/blob/api/BlobStoreContract.java   | 103 ++++++++++++---------
 .../james/blob/api/BucketBlobStoreContract.java    |  76 ++++++++++-----
 .../james/blob/api/DeleteBlobStoreContract.java    |  75 ++++++++-------
 .../blob/api/MetricableBlobStoreContract.java      |  54 +++++++----
 4 files changed, 187 insertions(+), 121 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 cd63407..1b25ada 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
@@ -44,167 +44,184 @@ public interface BlobStoreContract {
 
     @Test
     default void saveShouldThrowWhenNullData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        assertThatThrownBy(() -> testee().save(defaultBucketName, (byte[]) null).block())
+        assertThatThrownBy(() -> store.save(defaultBucketName, (byte[]) null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveShouldThrowWhenNullString() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        assertThatThrownBy(() -> testee().save(defaultBucketName, (String) null).block())
+        assertThatThrownBy(() -> store.save(defaultBucketName, (String) null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveShouldThrowWhenNullInputStream() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        assertThatThrownBy(() -> testee().save(defaultBucketName, (InputStream) null).block())
+        assertThatThrownBy(() -> store.save(defaultBucketName, (InputStream) null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveShouldSaveEmptyData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, EMPTY_BYTEARRAY).block();
+        BlobId blobId = store.save(defaultBucketName, EMPTY_BYTEARRAY).block();
 
-        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
+        byte[] bytes = store.readBytes(defaultBucketName, blobId).block();
 
         assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty();
     }
 
     @Test
     default void saveShouldSaveEmptyString() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, new String()).block();
+        BlobId blobId = store.save(defaultBucketName, new String()).block();
 
-        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
+        byte[] bytes = store.readBytes(defaultBucketName, blobId).block();
 
         assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty();
     }
 
     @Test
     default void saveShouldSaveEmptyInputStream() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, new ByteArrayInputStream(EMPTY_BYTEARRAY)).block();
+        BlobId blobId = store.save(defaultBucketName, new ByteArrayInputStream(EMPTY_BYTEARRAY)).block();
 
-        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
+        byte[] bytes = store.readBytes(defaultBucketName, blobId).block();
 
         assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty();
     }
 
     @Test
     default void saveShouldReturnBlobId() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
 
         assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66"));
     }
 
     @Test
     default void saveShouldReturnBlobIdOfString() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, SHORT_STRING).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_STRING).block();
 
         assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66"));
     }
 
     @Test
     default void saveShouldReturnBlobIdOfInputStream() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, new ByteArrayInputStream(SHORT_BYTEARRAY)).block();
+        BlobId blobId = store.save(defaultBucketName, new ByteArrayInputStream(SHORT_BYTEARRAY)).block();
 
         assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66"));
     }
 
     @Test
     default void readBytesShouldThrowWhenNoExisting() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        assertThatThrownBy(() -> testee().readBytes(defaultBucketName, blobIdFactory().from("unknown")).block())
+        assertThatThrownBy(() -> store.readBytes(defaultBucketName, blobIdFactory().from("unknown")).block())
             .isExactlyInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void readBytesShouldReturnSavedData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
 
-        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
+        byte[] bytes = store.readBytes(defaultBucketName, blobId).block();
 
         assertThat(bytes).isEqualTo(SHORT_BYTEARRAY);
     }
 
     @Test
     default void readBytesShouldReturnLongSavedData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block();
+        BlobId blobId = store.save(defaultBucketName, ELEVEN_KILOBYTES).block();
 
-        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
+        byte[] bytes = store.readBytes(defaultBucketName, blobId).block();
 
         assertThat(bytes).isEqualTo(ELEVEN_KILOBYTES);
     }
 
     @Test
     default void readBytesShouldReturnBigSavedData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
+        BlobId blobId = store.save(defaultBucketName, TWELVE_MEGABYTES).block();
 
-        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
+        byte[] bytes = store.readBytes(defaultBucketName, blobId).block();
 
         assertThat(bytes).isEqualTo(TWELVE_MEGABYTES);
     }
 
     @Test
     default void readShouldThrowWhenNoExistingStream() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        assertThatThrownBy(() -> testee().read(defaultBucketName, blobIdFactory().from("unknown")))
+        assertThatThrownBy(() -> store.read(defaultBucketName, blobIdFactory().from("unknown")))
             .isInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void readShouldReturnSavedData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
 
-        InputStream read = testee().read(defaultBucketName, blobId);
+        InputStream read = store.read(defaultBucketName, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY));
     }
 
     @Test
     default void readShouldReturnLongSavedData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block();
+        BlobId blobId = store.save(defaultBucketName, ELEVEN_KILOBYTES).block();
 
-        InputStream read = testee().read(defaultBucketName, blobId);
+        InputStream read = store.read(defaultBucketName, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(ELEVEN_KILOBYTES));
     }
 
     @Test
     default void readShouldReturnBigSavedData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
         // 12 MB of text
-        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
+        BlobId blobId = store.save(defaultBucketName, TWELVE_MEGABYTES).block();
 
-        InputStream read = testee().read(defaultBucketName, blobId);
+        InputStream read = store.read(defaultBucketName, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(TWELVE_MEGABYTES));
     }
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java
index d52d703..a36feb2 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BucketBlobStoreContract.java
@@ -41,89 +41,113 @@ public interface BucketBlobStoreContract {
 
     @Test
     default void deleteBucketShouldThrowWhenNullBucketName() {
-        assertThatThrownBy(() -> testee().deleteBucket(null).block())
+        BlobStore store = testee();
+
+        assertThatThrownBy(() -> store.deleteBucket(null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void deleteBucketShouldDeleteExistingBucketWithItsData() {
-        BlobId blobId = testee().save(CUSTOM, SHORT_BYTEARRAY).block();
-        testee().deleteBucket(CUSTOM).block();
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(CUSTOM, SHORT_BYTEARRAY).block();
+        store.deleteBucket(CUSTOM).block();
 
-        assertThatThrownBy(() -> testee().read(CUSTOM, blobId))
+        assertThatThrownBy(() -> store.read(CUSTOM, blobId))
             .isInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void deleteBucketShouldBeIdempotent(){
-        testee().save(CUSTOM, SHORT_BYTEARRAY).block();
-        testee().deleteBucket(CUSTOM).block();
+        BlobStore store = testee();
 
-        assertThatCode(() -> testee().deleteBucket(CUSTOM).block())
+        store.save(CUSTOM, SHORT_BYTEARRAY).block();
+        store.deleteBucket(CUSTOM).block();
+
+        assertThatCode(() -> store.deleteBucket(CUSTOM).block())
             .doesNotThrowAnyException();
     }
 
     @Test
     default void saveBytesShouldThrowWhenNullBucketName() {
-        assertThatThrownBy(() -> testee().save(null, SHORT_BYTEARRAY).block())
+        BlobStore store = testee();
+
+        assertThatThrownBy(() -> store.save(null, SHORT_BYTEARRAY).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveStringShouldThrowWhenNullBucketName() {
-        assertThatThrownBy(() -> testee().save(null, SHORT_STRING).block())
+        BlobStore store = testee();
+
+        assertThatThrownBy(() -> store.save(null, SHORT_STRING).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveInputStreamShouldThrowWhenNullBucketName() {
-        assertThatThrownBy(() -> testee().save(null, new ByteArrayInputStream(SHORT_BYTEARRAY)).block())
+        BlobStore store = testee();
+
+        assertThatThrownBy(() -> store.save(null, new ByteArrayInputStream(SHORT_BYTEARRAY)).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void readShouldThrowWhenNullBucketName() {
-        BlobId blobId = testee().save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
-        assertThatThrownBy(() -> testee().read(null, blobId))
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
+        assertThatThrownBy(() -> store.read(null, blobId))
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void readBytesStreamShouldThrowWhenNullBucketName() {
-        BlobId blobId = testee().save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
-        assertThatThrownBy(() -> testee().readBytes(null, blobId).block())
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
+        assertThatThrownBy(() -> store.readBytes(null, blobId).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void readStringShouldThrowWhenBucketDoesNotExist() {
-        BlobId blobId = testee().save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
-        assertThatThrownBy(() -> testee().read(CUSTOM, blobId))
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
+        assertThatThrownBy(() -> store.read(CUSTOM, blobId))
             .isInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void readBytesStreamShouldThrowWhenBucketDoesNotExist() {
-        BlobId blobId = testee().save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
-        assertThatThrownBy(() -> testee().readBytes(CUSTOM, blobId).block())
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
+        assertThatThrownBy(() -> store.readBytes(CUSTOM, blobId).block())
             .isInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void shouldBeAbleToSaveDataInMultipleBuckets() {
-        BlobId blobIdDefault = testee().save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
-        BlobId blobIdCustom = testee().save(CUSTOM, SHORT_BYTEARRAY).block();
+        BlobStore store = testee();
 
-        byte[] bytesDefault = testee().readBytes(BucketName.DEFAULT, blobIdDefault).block();
-        byte[] bytesCustom = testee().readBytes(CUSTOM, blobIdCustom).block();
+        BlobId blobIdDefault = store.save(BucketName.DEFAULT, SHORT_BYTEARRAY).block();
+        BlobId blobIdCustom = store.save(CUSTOM, SHORT_BYTEARRAY).block();
+
+        byte[] bytesDefault = store.readBytes(BucketName.DEFAULT, blobIdDefault).block();
+        byte[] bytesCustom = store.readBytes(CUSTOM, blobIdCustom).block();
 
         assertThat(bytesDefault).isEqualTo(bytesCustom);
     }
 
     @Test
     default void saveConcurrentlyWithNonPreExistingBucketShouldNotFail() throws Exception {
+        BlobStore store = testee();
+
         ConcurrentTestRunner.builder()
-            .operation(((threadNumber, step) -> testee().save(CUSTOM, SHORT_STRING + threadNumber + step).block()))
+            .operation(((threadNumber, step) -> store.save(CUSTOM, SHORT_STRING + threadNumber + step).block()))
             .threadCount(10)
             .operationCount(10)
             .runSuccessfullyWithin(Duration.ofMinutes(1));
@@ -131,10 +155,12 @@ public interface BucketBlobStoreContract {
 
     @Test
     default void deleteBucketConcurrentlyShouldNotFail() throws Exception {
-        testee().save(CUSTOM, SHORT_BYTEARRAY).block();
+        BlobStore store = testee();
+
+        store.save(CUSTOM, SHORT_BYTEARRAY).block();
 
         ConcurrentTestRunner.builder()
-            .operation(((threadNumber, step) -> testee().deleteBucket(CUSTOM).block()))
+            .operation(((threadNumber, step) -> store.deleteBucket(CUSTOM).block()))
             .threadCount(10)
             .operationCount(10)
             .runSuccessfullyWithin(Duration.ofMinutes(1));
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
index 1602a6f..58d8e32 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
@@ -49,56 +49,61 @@ public interface DeleteBlobStoreContract {
 
     @Test
     default void deleteShouldNotThrowWhenBlobDoesNotExist() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        assertThatCode(() -> testee().delete(defaultBucketName, blobIdFactory().randomId()).block())
+        assertThatCode(() -> store.delete(defaultBucketName, blobIdFactory().randomId()).block())
             .doesNotThrowAnyException();
     }
 
     @Test
     default void deleteShouldDeleteExistingBlobData() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
-        testee().delete(defaultBucketName, blobId).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
+        store.delete(defaultBucketName, blobId).block();
 
-        assertThatThrownBy(() -> testee().read(defaultBucketName, blobId))
+        assertThatThrownBy(() -> store.read(defaultBucketName, blobId))
             .isInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void deleteShouldBeIdempotent() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
-        testee().delete(defaultBucketName, blobId).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
+        store.delete(defaultBucketName, blobId).block();
 
-        assertThatCode(() -> testee().delete(defaultBucketName, blobId).block())
+        assertThatCode(() -> store.delete(defaultBucketName, blobId).block())
             .doesNotThrowAnyException();
     }
 
     @Test
     default void deleteShouldNotDeleteOtherBlobs() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobIdToDelete = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
-        BlobId otherBlobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block();
+        BlobId blobIdToDelete = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
+        BlobId otherBlobId = store.save(defaultBucketName, ELEVEN_KILOBYTES).block();
 
-        testee().delete(defaultBucketName, blobIdToDelete).block();
+        store.delete(defaultBucketName, blobIdToDelete).block();
 
-        InputStream read = testee().read(defaultBucketName, otherBlobId);
+        InputStream read = store.read(defaultBucketName, otherBlobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(ELEVEN_KILOBYTES));
     }
 
     @Test
     default void deleteConcurrentlyShouldNotFail() throws Exception {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
+        BlobId blobId = store.save(defaultBucketName, TWELVE_MEGABYTES).block();
 
         ConcurrentTestRunner.builder()
-            .operation(((threadNumber, step) -> testee().delete(defaultBucketName, blobId).block()))
+            .operation(((threadNumber, step) -> store.delete(defaultBucketName, blobId).block()))
             .threadCount(10)
             .operationCount(10)
             .runSuccessfullyWithin(Duration.ofMinutes(1));
@@ -106,48 +111,52 @@ public interface DeleteBlobStoreContract {
 
     @Test
     default void deleteShouldThrowWhenNullBucketName() {
-        assertThatThrownBy(() -> testee().delete(null, blobIdFactory().randomId()).block())
+        BlobStore store = testee();
+        assertThatThrownBy(() -> store.delete(null, blobIdFactory().randomId()).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void deleteShouldNotDeleteFromOtherBucket() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId customBlobId = testee().save(CUSTOM, "custom_string").block();
-        BlobId defaultBlobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        BlobId customBlobId = store.save(CUSTOM, "custom_string").block();
+        BlobId defaultBlobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
 
-        testee().delete(CUSTOM, customBlobId).block();
+        store.delete(CUSTOM, customBlobId).block();
 
-        InputStream read = testee().read(defaultBucketName, defaultBlobId);
+        InputStream read = store.read(defaultBucketName, defaultBlobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY));
     }
 
     @Test
     default void deleteShouldNotDeleteFromOtherBucketWhenSameBlobId() {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        testee().save(CUSTOM, SHORT_BYTEARRAY).block();
-        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        store.save(CUSTOM, SHORT_BYTEARRAY).block();
+        BlobId blobId = store.save(defaultBucketName, SHORT_BYTEARRAY).block();
 
-        testee().delete(defaultBucketName, blobId).block();
+        store.delete(defaultBucketName, blobId).block();
 
-        InputStream read = testee().read(CUSTOM, blobId);
+        InputStream read = store.read(CUSTOM, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY));
     }
 
     @Test
     default void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() throws Exception {
-        BucketName defaultBucketName = testee().getDefaultBucketName();
+        BlobStore store = testee();
+        BucketName defaultBucketName = store.getDefaultBucketName();
 
-        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
+        BlobId blobId = store.save(defaultBucketName, TWELVE_MEGABYTES).block();
 
         ConcurrentTestRunner.builder()
             .operation(((threadNumber, step) -> {
                 try {
-                    InputStream read = testee().read(defaultBucketName, blobId);
+                    InputStream read = store.read(defaultBucketName, blobId);
 
                     if (!IOUtils.toString(read, StandardCharsets.UTF_8).equals(TWELVE_MEGABYTES_STRING)) {
                         throw new RuntimeException("Should not read partial blob when an other thread is deleting it");
@@ -156,7 +165,7 @@ public interface DeleteBlobStoreContract {
                     // normal behavior here
                 }
 
-                testee().delete(defaultBucketName, blobId).block();
+                store.delete(defaultBucketName, blobId).block();
             }))
             .threadCount(10)
             .operationCount(10)
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
index e3c50c9..efe2b8d 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
@@ -59,8 +59,10 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void saveBytesShouldPublishSaveBytesTimerMetrics() {
-        testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
-        testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
+        BlobStore store = testee();
+
+        store.save(store.getDefaultBucketName(), BYTES_CONTENT).block();
+        store.save(store.getDefaultBucketName(), BYTES_CONTENT).block();
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(SAVE_BYTES_TIMER_NAME))
             .hasSize(2);
@@ -68,8 +70,10 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void saveStringShouldPublishSaveBytesTimerMetrics() {
-        testee().save(testee().getDefaultBucketName(), STRING_CONTENT).block();
-        testee().save(testee().getDefaultBucketName(), STRING_CONTENT).block();
+        BlobStore store = testee();
+
+        store.save(store.getDefaultBucketName(), STRING_CONTENT).block();
+        store.save(store.getDefaultBucketName(), STRING_CONTENT).block();
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(SAVE_BYTES_TIMER_NAME))
             .hasSize(2);
@@ -77,8 +81,10 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void saveInputStreamShouldPublishSaveInputStreamTimerMetrics() {
-        testee().save(testee().getDefaultBucketName(), new ByteArrayInputStream(BYTES_CONTENT)).block();
-        testee().save(testee().getDefaultBucketName(), new ByteArrayInputStream(BYTES_CONTENT)).block();
+        BlobStore store = testee();
+
+        store.save(store.getDefaultBucketName(), new ByteArrayInputStream(BYTES_CONTENT)).block();
+        store.save(store.getDefaultBucketName(), new ByteArrayInputStream(BYTES_CONTENT)).block();
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(SAVE_INPUT_STREAM_TIMER_NAME))
             .hasSize(2);
@@ -86,9 +92,11 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void readBytesShouldPublishReadBytesTimerMetrics() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
-        testee().readBytes(testee().getDefaultBucketName(), blobId).block();
-        testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(store.getDefaultBucketName(), BYTES_CONTENT).block();
+        store.readBytes(store.getDefaultBucketName(), blobId).block();
+        store.readBytes(store.getDefaultBucketName(), blobId).block();
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(READ_BYTES_TIMER_NAME))
             .hasSize(2);
@@ -96,9 +104,11 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void readShouldPublishReadTimerMetrics() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
-        testee().read(testee().getDefaultBucketName(), blobId);
-        testee().read(testee().getDefaultBucketName(), blobId);
+        BlobStore store = testee();
+
+        BlobId blobId = store.save(store.getDefaultBucketName(), BYTES_CONTENT).block();
+        store.read(store.getDefaultBucketName(), blobId);
+        store.read(store.getDefaultBucketName(), blobId);
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(READ_TIMER_NAME))
             .hasSize(2);
@@ -106,12 +116,14 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void deleteBucketShouldPublishDeleteBucketTimerMetrics() {
+        BlobStore store = testee();
+
         BucketName bucketName = BucketName.of("custom");
-        testee().save(BucketName.DEFAULT, BYTES_CONTENT).block();
-        testee().save(bucketName, BYTES_CONTENT).block();
+        store.save(BucketName.DEFAULT, BYTES_CONTENT).block();
+        store.save(bucketName, BYTES_CONTENT).block();
 
-        testee().deleteBucket(BucketName.DEFAULT).block();
-        testee().deleteBucket(bucketName).block();
+        store.deleteBucket(BucketName.DEFAULT).block();
+        store.deleteBucket(bucketName).block();
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(DELETE_BUCKET_TIMER_NAME))
             .hasSize(2);
@@ -119,11 +131,13 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
 
     @Test
     default void deleteShouldPublishDeleteTimerMetrics() {
-        BlobId blobId1 = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
-        BlobId blobId2 = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
+        BlobStore store = testee();
+
+        BlobId blobId1 = store.save(store.getDefaultBucketName(), BYTES_CONTENT).block();
+        BlobId blobId2 = store.save(store.getDefaultBucketName(), BYTES_CONTENT).block();
 
-        testee().delete(BucketName.DEFAULT, blobId1).block();
-        testee().delete(BucketName.DEFAULT, blobId2).block();
+        store.delete(BucketName.DEFAULT, blobId1).block();
+        store.delete(BucketName.DEFAULT, blobId2).block();
 
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(DELETE_TIMER_NAME))
             .hasSize(2);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 03/06: JAMES-2829 add delete implementation for MetricableBlobStore and test in its contract

Posted by ro...@apache.org.
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 4168bf1389dc6a962ba6110e86023f70fdd17cd3
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Jul 15 14:40:16 2019 +0700

    JAMES-2829 add delete implementation for MetricableBlobStore and test in its contract
---
 .../org/apache/james/blob/api/MetricableBlobStore.java  |  7 ++++---
 .../james/blob/api/MetricableBlobStoreContract.java     | 17 ++++++++++++++++-
 .../james/blob/cassandra/CassandraBlobsDAOTest.java     |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java
index d673b97..5b82cb4 100644
--- a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java
+++ b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.metrics.api.MetricFactory;
 
 import reactor.core.publisher.Mono;
@@ -38,6 +37,7 @@ public class MetricableBlobStore implements BlobStore {
     static final String READ_BYTES_TIMER_NAME = BLOB_STORE_METRIC_PREFIX + "readBytes";
     static final String READ_TIMER_NAME = BLOB_STORE_METRIC_PREFIX + "read";
     static final String DELETE_TIMER_NAME = BLOB_STORE_METRIC_PREFIX + "delete";
+    static final String DELETE_BUCKET_TIMER_NAME = BLOB_STORE_METRIC_PREFIX + "deleteBucket";
 
     private final MetricFactory metricFactory;
     private final BlobStore blobStoreImpl;
@@ -76,7 +76,7 @@ public class MetricableBlobStore implements BlobStore {
     @Override
     public Mono<Void> deleteBucket(BucketName bucketName) {
         return metricFactory
-            .runPublishingTimerMetric(DELETE_TIMER_NAME, () -> blobStoreImpl.deleteBucket(bucketName));
+            .runPublishingTimerMetric(DELETE_BUCKET_TIMER_NAME, () -> blobStoreImpl.deleteBucket(bucketName));
     }
 
     @Override
@@ -86,6 +86,7 @@ public class MetricableBlobStore implements BlobStore {
 
     @Override
     public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
-        throw new NotImplementedException("not implemented");
+        return metricFactory
+            .runPublishingTimerMetric(DELETE_TIMER_NAME, () -> blobStoreImpl.delete(bucketName, blobId));
     }
 }
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
index 6373b42..481aa98 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
@@ -19,6 +19,7 @@
 
 package org.apache.james.blob.api;
 
+import static org.apache.james.blob.api.MetricableBlobStore.DELETE_BUCKET_TIMER_NAME;
 import static org.apache.james.blob.api.MetricableBlobStore.DELETE_TIMER_NAME;
 import static org.apache.james.blob.api.MetricableBlobStore.READ_BYTES_TIMER_NAME;
 import static org.apache.james.blob.api.MetricableBlobStore.READ_TIMER_NAME;
@@ -30,6 +31,7 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.james.metrics.tests.RecordingMetricFactory;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -104,7 +106,7 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
     }
 
     @Test
-    default void deleteBucketShouldPublishDeleteTimerMetrics() {
+    default void deleteBucketShouldPublishDeleteBucketTimerMetrics() {
         BucketName bucketName = BucketName.of("custom");
         testee().save(BucketName.DEFAULT, BYTES_CONTENT).block();
         testee().save(bucketName, BYTES_CONTENT).block();
@@ -112,6 +114,19 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
         testee().deleteBucket(BucketName.DEFAULT).block();
         testee().deleteBucket(bucketName).block();
 
+        assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(DELETE_BUCKET_TIMER_NAME))
+            .hasSize(2);
+    }
+
+    @Test
+    @Disabled("JAMES-2829 Not supported yet")
+    default void deleteShouldPublishDeleteTimerMetrics() {
+        BlobId blobId1 = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
+        BlobId blobId2 = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
+
+        testee().delete(BucketName.DEFAULT, blobId1).block();
+        testee().delete(BucketName.DEFAULT, blobId2).block();
+
         assertThat(metricsTestExtension.getMetricFactory().executionTimesFor(DELETE_TIMER_NAME))
             .hasSize(2);
     }
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
index 5bf792f..2ba4ccd 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
@@ -72,7 +72,7 @@ public class CassandraBlobsDAOTest implements MetricableBlobStoreContract {
 
     @Override
     @Disabled("JAMES-2806: delete bucket not implemented yet for Cassandra")
-    public void deleteBucketShouldPublishDeleteTimerMetrics() {
+    public void deleteBucketShouldPublishDeleteBucketTimerMetrics() {
 
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 04/06: JAMES-2829 memory implementation of delete method for BlobStore

Posted by ro...@apache.org.
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 0a6fd194467e253644d375c7c88d41e5ac4455a0
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Jul 15 17:38:07 2019 +0700

    JAMES-2829 memory implementation of delete method for BlobStore
---
 .../blob/api/MetricableBlobStoreContract.java      |  2 --
 .../blob/cassandra/CassandraBlobsDAOTest.java      |  6 ++++
 .../apache/james/blob/memory/MemoryBlobStore.java  | 10 ++++--
 .../james/blob/memory/MemoryBlobStoreTest.java     |  3 +-
 .../ObjectStorageBlobsDAOAWSCryptoTest.java        |  7 ++++
 .../ObjectStorageBlobsDAOAWSNamespaceTest.java     |  6 ++++
 ...ctStorageBlobsDAOAWSPrefixAndNamespaceTest.java |  6 ++++
 .../ObjectStorageBlobsDAOAWSPrefixTest.java        |  6 ++++
 .../ObjectStorageBlobsDAOAWSTest.java              |  7 ++++
 .../objectstorage/ObjectStorageBlobsDAOTest.java   |  7 ++++
 .../apache/james/blob/union/UnionBlobStore.java    | 16 ++++++---
 .../james/blob/union/UnionBlobStoreTest.java       | 39 ++++++++++++++++++++++
 12 files changed, 105 insertions(+), 10 deletions(-)

diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
index 481aa98..e3c50c9 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/MetricableBlobStoreContract.java
@@ -31,7 +31,6 @@ import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.james.metrics.tests.RecordingMetricFactory;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -119,7 +118,6 @@ public interface MetricableBlobStoreContract extends BlobStoreContract {
     }
 
     @Test
-    @Disabled("JAMES-2829 Not supported yet")
     default void deleteShouldPublishDeleteTimerMetrics() {
         BlobId blobId1 = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
         BlobId blobId2 = testee().save(testee().getDefaultBucketName(), BYTES_CONTENT).block();
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
index 2ba4ccd..cd3d2ad 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
@@ -93,4 +93,10 @@ public class CassandraBlobsDAOTest implements MetricableBlobStoreContract {
         assertThat(bytes).hasSameContentAs(new ZeroedInputStream(100_000_000));
     }
 
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
+
 }
\ No newline at end of file
diff --git a/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java b/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
index d28437c..f10e75e 100644
--- a/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
+++ b/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
@@ -27,7 +27,6 @@ import java.util.Optional;
 import javax.inject.Inject;
 
 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;
@@ -121,7 +120,14 @@ public class MemoryBlobStore implements BlobStore {
 
     @Override
     public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
-        throw new NotImplementedException("not implemented");
+        Preconditions.checkNotNull(bucketName);
+        Preconditions.checkNotNull(blobId);
+
+        return Mono.fromRunnable(() -> {
+            synchronized (blobs) {
+                blobs.remove(bucketName, blobId);
+            }
+        });
     }
 
 }
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 721c198..6f8686a 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
@@ -22,12 +22,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.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 {
+public class MemoryBlobStoreTest implements MetricableBlobStoreContract, BucketBlobStoreContract, DeleteBlobStoreContract {
 
     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 0e56285..242e8ce 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
@@ -33,6 +33,7 @@ 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)
@@ -84,4 +85,10 @@ public class ObjectStorageBlobsDAOAWSCryptoTest implements MetricableBlobStoreCo
     public BlobId.Factory blobIdFactory() {
         return BLOB_ID_FACTORY;
     }
+
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
 }
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 8eab612..e17b34a 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
@@ -32,6 +32,7 @@ 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)
@@ -78,5 +79,10 @@ public class ObjectStorageBlobsDAOAWSNamespaceTest implements MetricableBlobStor
         return new HashBlobId.Factory();
     }
 
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
 }
 
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 dae3ff8..c377d32 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
@@ -32,6 +32,7 @@ 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,5 +80,10 @@ public class ObjectStorageBlobsDAOAWSPrefixAndNamespaceTest implements Metricabl
         return new HashBlobId.Factory();
     }
 
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
 }
 
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 e9cd435..8835d0f 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
@@ -31,6 +31,7 @@ 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)
@@ -77,5 +78,10 @@ public class ObjectStorageBlobsDAOAWSPrefixTest implements MetricableBlobStoreCo
         return new HashBlobId.Factory();
     }
 
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
 }
 
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 6fd6a6f..a61618a 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
@@ -31,6 +31,7 @@ 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)
@@ -76,4 +77,10 @@ public class ObjectStorageBlobsDAOAWSTest implements MetricableBlobStoreContract
     public BlobId.Factory blobIdFactory() {
         return BLOB_ID_FACTORY;
     }
+
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
 }
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 2a3b534..b887ad8 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
@@ -46,6 +46,7 @@ import org.jclouds.blobstore.domain.StorageType;
 import org.jclouds.domain.Location;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -205,5 +206,11 @@ public class ObjectStorageBlobsDAOTest implements MetricableBlobStoreContract, B
         Mono<byte[]> resultFuture = testee.readBytes(testee.getDefaultBucketName(), blobId).subscribeOn(Schedulers.elastic());
         assertThat(resultFuture.toFuture()).isNotCompleted();
     }
+
+    @Override
+    @Disabled("JAMES-2829 Not supported yet")
+    public void deleteShouldPublishDeleteTimerMetrics() {
+
+    }
 }
 
diff --git a/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java b/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java
index 7fd0aa6..b822b02 100644
--- a/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java
+++ b/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java
@@ -26,7 +26,6 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-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;
@@ -154,7 +153,14 @@ public class UnionBlobStore implements BlobStore {
     public Mono<Void> deleteBucket(BucketName bucketName) {
         return Mono.defer(() -> currentBlobStore.deleteBucket(bucketName))
             .and(legacyBlobStore.deleteBucket(bucketName))
-            .onErrorResume(this::logAndReturnEmpty);
+            .onErrorResume(this::logDeleteFailureAndReturnEmpty);
+    }
+
+    @Override
+    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+        return Mono.defer(() -> currentBlobStore.delete(bucketName, blobId))
+            .and(legacyBlobStore.delete(bucketName, blobId))
+            .onErrorResume(this::logDeleteFailureAndReturnEmpty);
     }
 
     private InputStream readFallBackIfEmptyResult(BucketName bucketName, BlobId blobId) {
@@ -197,9 +203,9 @@ public class UnionBlobStore implements BlobStore {
         return Mono.empty();
     }
 
-    @Override
-    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
-        throw new NotImplementedException("not implemented");
+    private <T> Mono<T> logDeleteFailureAndReturnEmpty(Throwable throwable) {
+        LOGGER.error("Cannot delete from either legacy or current blob store", throwable);
+        return Mono.empty();
     }
 
     @Override
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 d7ea4e8..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
@@ -561,4 +561,43 @@ class UnionBlobStoreTest implements BlobStoreContract {
         assertThatThrownBy(() -> unionBlobStore.getDefaultBucketName())
             .isInstanceOf(IllegalStateException.class);
     }
+
+    @Test
+    void deleteShouldDeleteBothCurrentAndLegacyBlob() {
+        BlobId legacyBlobId = legacyBlobStore.save(BucketName.DEFAULT, BLOB_CONTENT).block();
+        BlobId currentBlobId = currentBlobStore.save(BucketName.DEFAULT, BLOB_CONTENT).block();
+
+        unionBlobStore.delete(BucketName.DEFAULT, currentBlobId).block();
+
+        assertThatThrownBy(() -> legacyBlobStore.readBytes(BucketName.DEFAULT, legacyBlobId).block())
+            .isInstanceOf(ObjectStoreException.class);
+        assertThatThrownBy(() -> currentBlobStore.readBytes(BucketName.DEFAULT, currentBlobId).block())
+            .isInstanceOf(ObjectStoreException.class);
+    }
+
+    @Test
+    void deleteShouldDeleteCurrentBlobEvenWhenLegacyDoesNotExist() {
+        BlobId currentBlobId = currentBlobStore.save(BucketName.DEFAULT, BLOB_CONTENT).block();
+
+        unionBlobStore.delete(BucketName.DEFAULT, currentBlobId).block();
+
+        assertThatThrownBy(() -> currentBlobStore.readBytes(BucketName.DEFAULT, currentBlobId).block())
+            .isInstanceOf(ObjectStoreException.class);
+    }
+
+    @Test
+    void deleteShouldDeleteLegacyBlobEvenWhenCurrentDoesNotExist() {
+        BlobId legacyBlobId = legacyBlobStore.save(BucketName.DEFAULT, BLOB_CONTENT).block();
+
+        unionBlobStore.delete(BucketName.DEFAULT, legacyBlobId).block();
+
+        assertThatThrownBy(() -> legacyBlobStore.readBytes(BucketName.DEFAULT, legacyBlobId).block())
+            .isInstanceOf(ObjectStoreException.class);
+    }
+
+    @Test
+    void deleteShouldNotThrowWhenCurrentAndLegacyBlobsDoNotExist() {
+        assertThatCode(() -> unionBlobStore.delete(BucketName.DEFAULT, blobIdFactory().randomId()).block())
+            .doesNotThrowAnyException();
+    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 02/06: JAMES-2829 add delete tests methods to a new DeleteBlobStoreContract

Posted by ro...@apache.org.
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 2e17ce27e35838134b95ab14da30bed4625b2a54
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Jul 15 14:37:20 2019 +0700

    JAMES-2829 add delete tests methods to a new DeleteBlobStoreContract
---
 .../james/blob/api/DeleteBlobStoreContract.java    | 165 +++++++++++++++++++++
 1 file changed, 165 insertions(+)

diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
new file mode 100644
index 0000000..1602a6f
--- /dev/null
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
@@ -0,0 +1,165 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
+package org.apache.james.blob.api;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.james.util.concurrency.ConcurrentTestRunner;
+import org.junit.jupiter.api.Test;
+
+import com.google.common.base.Strings;
+
+public interface DeleteBlobStoreContract {
+
+    String SHORT_STRING = "toto";
+    byte[] SHORT_BYTEARRAY = SHORT_STRING.getBytes(StandardCharsets.UTF_8);
+    byte[] ELEVEN_KILOBYTES = Strings.repeat("0123456789\n", 1000).getBytes(StandardCharsets.UTF_8);
+    String TWELVE_MEGABYTES_STRING = Strings.repeat("0123456789\r\n", 1024 * 1024);
+    byte[] TWELVE_MEGABYTES = TWELVE_MEGABYTES_STRING.getBytes(StandardCharsets.UTF_8);
+    BucketName CUSTOM = BucketName.of("custom");
+
+    BlobStore testee();
+
+    BlobId.Factory blobIdFactory();
+
+    @Test
+    default void deleteShouldNotThrowWhenBlobDoesNotExist() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        assertThatCode(() -> testee().delete(defaultBucketName, blobIdFactory().randomId()).block())
+            .doesNotThrowAnyException();
+    }
+
+    @Test
+    default void deleteShouldDeleteExistingBlobData() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        testee().delete(defaultBucketName, blobId).block();
+
+        assertThatThrownBy(() -> testee().read(defaultBucketName, blobId))
+            .isInstanceOf(ObjectStoreException.class);
+    }
+
+    @Test
+    default void deleteShouldBeIdempotent() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        testee().delete(defaultBucketName, blobId).block();
+
+        assertThatCode(() -> testee().delete(defaultBucketName, blobId).block())
+            .doesNotThrowAnyException();
+    }
+
+    @Test
+    default void deleteShouldNotDeleteOtherBlobs() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobIdToDelete = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+        BlobId otherBlobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block();
+
+        testee().delete(defaultBucketName, blobIdToDelete).block();
+
+        InputStream read = testee().read(defaultBucketName, otherBlobId);
+
+        assertThat(read).hasSameContentAs(new ByteArrayInputStream(ELEVEN_KILOBYTES));
+    }
+
+    @Test
+    default void deleteConcurrentlyShouldNotFail() throws Exception {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
+
+        ConcurrentTestRunner.builder()
+            .operation(((threadNumber, step) -> testee().delete(defaultBucketName, blobId).block()))
+            .threadCount(10)
+            .operationCount(10)
+            .runSuccessfullyWithin(Duration.ofMinutes(1));
+    }
+
+    @Test
+    default void deleteShouldThrowWhenNullBucketName() {
+        assertThatThrownBy(() -> testee().delete(null, blobIdFactory().randomId()).block())
+            .isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    default void deleteShouldNotDeleteFromOtherBucket() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId customBlobId = testee().save(CUSTOM, "custom_string").block();
+        BlobId defaultBlobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+
+        testee().delete(CUSTOM, customBlobId).block();
+
+        InputStream read = testee().read(defaultBucketName, defaultBlobId);
+
+        assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY));
+    }
+
+    @Test
+    default void deleteShouldNotDeleteFromOtherBucketWhenSameBlobId() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        testee().save(CUSTOM, SHORT_BYTEARRAY).block();
+        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
+
+        testee().delete(defaultBucketName, blobId).block();
+
+        InputStream read = testee().read(CUSTOM, blobId);
+
+        assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY));
+    }
+
+    @Test
+    default void readShouldNotReadPartiallyWhenDeletingConcurrentlyBigBlob() throws Exception {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
+
+        ConcurrentTestRunner.builder()
+            .operation(((threadNumber, step) -> {
+                try {
+                    InputStream read = testee().read(defaultBucketName, blobId);
+
+                    if (!IOUtils.toString(read, StandardCharsets.UTF_8).equals(TWELVE_MEGABYTES_STRING)) {
+                        throw new RuntimeException("Should not read partial blob when an other thread is deleting it");
+                    }
+                } catch (ObjectStoreException exception) {
+                    // normal behavior here
+                }
+
+                testee().delete(defaultBucketName, blobId).block();
+            }))
+            .threadCount(10)
+            .operationCount(10)
+            .runSuccessfullyWithin(Duration.ofMinutes(1));
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 05/06: JAMES-2829 refactor BlobStoreContract for more clarity

Posted by ro...@apache.org.
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 3a35368f43b5cd36db1376bec4457f858c02824f
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Tue Jul 16 17:32:39 2019 +0700

    JAMES-2829 refactor BlobStoreContract for more clarity
---
 .../apache/james/blob/api/BlobStoreContract.java   | 87 +++++++++++++++-------
 1 file changed, 60 insertions(+), 27 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 07d4588..cd63407 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
@@ -44,134 +44,167 @@ public interface BlobStoreContract {
 
     @Test
     default void saveShouldThrowWhenNullData() {
-        assertThatThrownBy(() -> testee().save(testee().getDefaultBucketName(), (byte[]) null).block())
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        assertThatThrownBy(() -> testee().save(defaultBucketName, (byte[]) null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveShouldThrowWhenNullString() {
-        assertThatThrownBy(() -> testee().save(testee().getDefaultBucketName(), (String) null).block())
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        assertThatThrownBy(() -> testee().save(defaultBucketName, (String) null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveShouldThrowWhenNullInputStream() {
-        assertThatThrownBy(() -> testee().save(testee().getDefaultBucketName(), (InputStream) null).block())
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        assertThatThrownBy(() -> testee().save(defaultBucketName, (InputStream) null).block())
             .isInstanceOf(NullPointerException.class);
     }
 
     @Test
     default void saveShouldSaveEmptyData() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), EMPTY_BYTEARRAY).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
 
-        byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        BlobId blobId = testee().save(defaultBucketName, EMPTY_BYTEARRAY).block();
+
+        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
 
         assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty();
     }
 
     @Test
     default void saveShouldSaveEmptyString() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), new String()).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, new String()).block();
 
-        byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
 
         assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty();
     }
 
     @Test
     default void saveShouldSaveEmptyInputStream() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), new ByteArrayInputStream(EMPTY_BYTEARRAY)).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
 
-        byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        BlobId blobId = testee().save(defaultBucketName, new ByteArrayInputStream(EMPTY_BYTEARRAY)).block();
+
+        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
 
         assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty();
     }
 
     @Test
     default void saveShouldReturnBlobId() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_BYTEARRAY).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
 
         assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66"));
     }
 
     @Test
     default void saveShouldReturnBlobIdOfString() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_STRING).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, SHORT_STRING).block();
 
         assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66"));
     }
 
     @Test
     default void saveShouldReturnBlobIdOfInputStream() {
-        BlobId blobId =
-            testee().save(testee().getDefaultBucketName(), new ByteArrayInputStream(SHORT_BYTEARRAY)).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, new ByteArrayInputStream(SHORT_BYTEARRAY)).block();
 
         assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66"));
     }
 
     @Test
     default void readBytesShouldThrowWhenNoExisting() {
-        assertThatThrownBy(() -> testee().readBytes(testee().getDefaultBucketName(), blobIdFactory().from("unknown")).block())
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        assertThatThrownBy(() -> testee().readBytes(defaultBucketName, blobIdFactory().from("unknown")).block())
             .isExactlyInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void readBytesShouldReturnSavedData() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_BYTEARRAY).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
 
-        byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
 
         assertThat(bytes).isEqualTo(SHORT_BYTEARRAY);
     }
 
     @Test
     default void readBytesShouldReturnLongSavedData() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), ELEVEN_KILOBYTES).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
 
-        byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        BlobId blobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block();
+
+        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
 
         assertThat(bytes).isEqualTo(ELEVEN_KILOBYTES);
     }
 
     @Test
     default void readBytesShouldReturnBigSavedData() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), TWELVE_MEGABYTES).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
 
-        byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block();
+        byte[] bytes = testee().readBytes(defaultBucketName, blobId).block();
 
         assertThat(bytes).isEqualTo(TWELVE_MEGABYTES);
     }
 
     @Test
     default void readShouldThrowWhenNoExistingStream() {
-        assertThatThrownBy(() -> testee().read(testee().getDefaultBucketName(), blobIdFactory().from("unknown")))
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        assertThatThrownBy(() -> testee().read(defaultBucketName, blobIdFactory().from("unknown")))
             .isInstanceOf(ObjectStoreException.class);
     }
 
     @Test
     default void readShouldReturnSavedData() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_BYTEARRAY).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
+        BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block();
 
-        InputStream read = testee().read(testee().getDefaultBucketName(), blobId);
+        InputStream read = testee().read(defaultBucketName, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY));
     }
 
     @Test
     default void readShouldReturnLongSavedData() {
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), ELEVEN_KILOBYTES).block();
+        BucketName defaultBucketName = testee().getDefaultBucketName();
 
-        InputStream read = testee().read(testee().getDefaultBucketName(), blobId);
+        BlobId blobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block();
+
+        InputStream read = testee().read(defaultBucketName, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(ELEVEN_KILOBYTES));
     }
 
     @Test
     default void readShouldReturnBigSavedData() {
+        BucketName defaultBucketName = testee().getDefaultBucketName();
+
         // 12 MB of text
-        BlobId blobId = testee().save(testee().getDefaultBucketName(), TWELVE_MEGABYTES).block();
+        BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block();
 
-        InputStream read = testee().read(testee().getDefaultBucketName(), blobId);
+        InputStream read = testee().read(defaultBucketName, blobId);
 
         assertThat(read).hasSameContentAs(new ByteArrayInputStream(TWELVE_MEGABYTES));
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 01/06: JAMES-2829 add delete skeleton method in BlobStore API

Posted by ro...@apache.org.
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 3df612d2b0a0765aea851e4228575f6d9014be15
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Jul 15 10:50:58 2019 +0700

    JAMES-2829 add delete skeleton method in BlobStore API
---
 .../src/main/java/org/apache/james/blob/api/BlobStore.java     |  2 ++
 .../java/org/apache/james/blob/api/MetricableBlobStore.java    |  6 ++++++
 .../org/apache/james/blob/cassandra/CassandraBlobsDAO.java     |  5 +++++
 .../java/org/apache/james/blob/memory/MemoryBlobStore.java     |  6 ++++++
 .../apache/james/blob/objectstorage/ObjectStorageBlobsDAO.java |  6 ++++++
 .../main/java/org/apache/james/blob/union/UnionBlobStore.java  |  6 ++++++
 .../java/org/apache/james/blob/union/UnionBlobStoreTest.java   | 10 ++++++++++
 7 files changed, 41 insertions(+)

diff --git a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/BlobStore.java b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/BlobStore.java
index 0d1414d..9c4f650 100644
--- a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/BlobStore.java
+++ b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/BlobStore.java
@@ -40,4 +40,6 @@ public interface BlobStore {
     BucketName getDefaultBucketName();
 
     Mono<Void> deleteBucket(BucketName bucketName);
+
+    Mono<Void> delete(BucketName bucketName, BlobId blobId);
 }
diff --git a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java
index 73ccb4d..d673b97 100644
--- a/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java
+++ b/server/blob/blob-api/src/main/java/org/apache/james/blob/api/MetricableBlobStore.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.james.metrics.api.MetricFactory;
 
 import reactor.core.publisher.Mono;
@@ -82,4 +83,9 @@ public class MetricableBlobStore implements BlobStore {
     public BucketName getDefaultBucketName() {
         return blobStoreImpl.getDefaultBucketName();
     }
+
+    @Override
+    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+        throw new NotImplementedException("not implemented");
+    }
 }
diff --git a/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobsDAO.java b/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobsDAO.java
index 923af0d..29cef15 100644
--- a/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobsDAO.java
+++ b/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobsDAO.java
@@ -229,4 +229,9 @@ public class CassandraBlobsDAO implements BlobStore {
     public Mono<Void> deleteBucket(BucketName bucketName) {
         throw new NotImplementedException("not implemented");
     }
+
+    @Override
+    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+        throw new NotImplementedException("not implemented");
+    }
 }
diff --git a/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java b/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
index d6b3a25..d28437c 100644
--- a/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
+++ b/server/blob/blob-memory/src/main/java/org/apache/james/blob/memory/MemoryBlobStore.java
@@ -27,6 +27,7 @@ import java.util.Optional;
 import javax.inject.Inject;
 
 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;
@@ -118,4 +119,9 @@ public class MemoryBlobStore implements BlobStore {
         return defaultBucketName;
     }
 
+    @Override
+    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+        throw new NotImplementedException("not implemented");
+    }
+
 }
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 1ecb646..9beebd6 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
@@ -28,6 +28,7 @@ import java.util.function.Supplier;
 import javax.annotation.PreDestroy;
 
 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;
@@ -201,4 +202,9 @@ public class ObjectStorageBlobsDAO implements BlobStore {
             .doOnNext(blobStore::deleteContainer)
             .then();
     }
+
+    @Override
+    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+        throw new NotImplementedException("not implemented");
+    }
 }
diff --git a/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java b/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java
index 9c765e5..7fd0aa6 100644
--- a/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java
+++ b/server/blob/blob-union/src/main/java/org/apache/james/blob/union/UnionBlobStore.java
@@ -26,6 +26,7 @@ import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+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;
@@ -197,6 +198,11 @@ public class UnionBlobStore implements BlobStore {
     }
 
     @Override
+    public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+        throw new NotImplementedException("not implemented");
+    }
+
+    @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
             .add("currentBlobStore", currentBlobStore)
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 ab197cb..d7ea4e8 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
@@ -92,6 +92,11 @@ class UnionBlobStoreTest implements BlobStoreContract {
         }
 
         @Override
+        public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+            return Mono.error(new RuntimeException("broken everywhere"));
+        }
+
+        @Override
         public String toString() {
             return MoreObjects.toStringHelper(this)
                 .toString();
@@ -136,6 +141,11 @@ class UnionBlobStoreTest implements BlobStoreContract {
         }
 
         @Override
+        public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
+            return Mono.error(new RuntimeException("broken everywhere"));
+        }
+
+        @Override
         public String toString() {
             return MoreObjects.toStringHelper(this)
                 .toString();


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org