This is an automated email from the ASF dual-hosted git repository.
aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 092e127f8f324b1f51bce87b58882856c517227b
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Mon Jul 1 14:17:53 2019 +0700
JAMES-2807 Simplify maven structure for the vault
Define the metadata storage API within the vault API.
As the memory implementation is shipped as part of the vault API, include
the memory implementation for metadata storage there too.
---
.../pom.xml | 87 ----------------------
.../deleted-messages-vault-blobstore/pom.xml | 86 ---------------------
mailbox/plugin/deleted-messages-vault/pom.xml | 4 +
.../MemoryDeletedMessageMetadataVault.java | 5 +-
.../metadata}/DeletedMessageMetadataVault.java | 2 +-
.../DeletedMessageWithStorageInformation.java | 4 +-
.../james/vault/metadata}/StorageInformation.java | 2 +-
.../MemoryDeletedMessageMetadataVaultTest.java | 4 +-
.../DeletedMessageMetadataVaultContract.java | 9 ++-
.../DeletedMessageVaultMetadataFixture.java | 2 +-
.../DeletedMessageWithStorageInformationTest.java | 5 +-
.../vault/metadata}/StorageInformationTest.java | 6 +-
mailbox/pom.xml | 2 -
pom.xml | 11 ---
14 files changed, 28 insertions(+), 201 deletions(-)
diff --git a/mailbox/plugin/deleted-messages-vault-blobstore-memory/pom.xml
b/mailbox/plugin/deleted-messages-vault-blobstore-memory/pom.xml
deleted file mode 100644
index faf54ee..0000000
--- a/mailbox/plugin/deleted-messages-vault-blobstore-memory/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>apache-james-mailbox</artifactId>
- <groupId>org.apache.james</groupId>
- <version>3.4.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-
<artifactId>apache-james-mailbox-deleted-messages-vault-blobstore-memory</artifactId>
- <name>Apache James :: Mailbox :: Plugin :: Deleted Messages Vault ::
BlobStore :: Memory</name>
- <description>Memory implementation of the metadata storage API required by
the Deleted Messages Vault implementation on top of BlobStore</description>
-
- <dependencies>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault-blobstore</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault-blobstore</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/mailbox/plugin/deleted-messages-vault-blobstore/pom.xml
b/mailbox/plugin/deleted-messages-vault-blobstore/pom.xml
deleted file mode 100644
index 5575f57..0000000
--- a/mailbox/plugin/deleted-messages-vault-blobstore/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>apache-james-mailbox</artifactId>
- <groupId>org.apache.james</groupId>
- <version>3.4.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-
<artifactId>apache-james-mailbox-deleted-messages-vault-blobstore</artifactId>
- <name>Apache James :: Mailbox :: Plugin :: Deleted Messages Vault ::
BlobStore</name>
- <description>Apache James Mailbox Deleted Messages Vault implementation on
top of BlobStore</description>
-
- <dependencies>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>blob-api</artifactId>
- </dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-launcher</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/mailbox/plugin/deleted-messages-vault/pom.xml
b/mailbox/plugin/deleted-messages-vault/pom.xml
index b8f44b7..f7bff9c 100644
--- a/mailbox/plugin/deleted-messages-vault/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault/pom.xml
@@ -78,6 +78,10 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>blob-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore-memory/src/main/java/org/apache/james/vault/MemoryDeletedMessageMetadataVault.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
similarity index 94%
rename from
mailbox/plugin/deleted-messages-vault-blobstore-memory/src/main/java/org/apache/james/vault/MemoryDeletedMessageMetadataVault.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
index 4bafe68..ccf5fc6 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore-memory/src/main/java/org/apache/james/vault/MemoryDeletedMessageMetadataVault.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVault.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.memory.metadata;
import java.util.HashMap;
import java.util.Map;
@@ -26,6 +26,9 @@ import java.util.Optional;
import org.apache.james.blob.api.BucketName;
import org.apache.james.core.User;
import org.apache.james.mailbox.model.MessageId;
+import org.apache.james.vault.metadata.DeletedMessageMetadataVault;
+import org.apache.james.vault.metadata.DeletedMessageWithStorageInformation;
+import org.apache.james.vault.metadata.StorageInformation;
import org.reactivestreams.Publisher;
import com.google.common.collect.HashBasedTable;
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/DeletedMessageMetadataVault.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
similarity index 97%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/DeletedMessageMetadataVault.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
index 809a34b..25b5a4a 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/DeletedMessageMetadataVault.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataVault.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
import org.apache.james.blob.api.BucketName;
import org.apache.james.core.User;
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/DeletedMessageWithStorageInformation.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageWithStorageInformation.java
similarity index 96%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/DeletedMessageWithStorageInformation.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageWithStorageInformation.java
index 1c17a38..0859431 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/DeletedMessageWithStorageInformation.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/DeletedMessageWithStorageInformation.java
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
import java.util.Objects;
+import org.apache.james.vault.DeletedMessage;
+
import com.google.common.base.Preconditions;
public class DeletedMessageWithStorageInformation {
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/StorageInformation.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/StorageInformation.java
similarity index 98%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/StorageInformation.java
rename to
mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/StorageInformation.java
index 4ebc6ca..7933789 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/main/java/org/apache/james/vault/StorageInformation.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/metadata/StorageInformation.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
import java.util.Objects;
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore-memory/src/test/java/org/apache/james/vault/MemoryDeletedMessageMetadataVaultTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVaultTest.java
similarity index 89%
rename from
mailbox/plugin/deleted-messages-vault-blobstore-memory/src/test/java/org/apache/james/vault/MemoryDeletedMessageMetadataVaultTest.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVaultTest.java
index 5a5cb5a..0176b26 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore-memory/src/test/java/org/apache/james/vault/MemoryDeletedMessageMetadataVaultTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/memory/metadata/MemoryDeletedMessageMetadataVaultTest.java
@@ -17,8 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.memory.metadata;
+import org.apache.james.vault.metadata.DeletedMessageMetadataVault;
+import org.apache.james.vault.metadata.DeletedMessageMetadataVaultContract;
import org.junit.jupiter.api.BeforeEach;
public class MemoryDeletedMessageMetadataVaultTest implements
DeletedMessageMetadataVaultContract {
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageMetadataVaultContract.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
similarity index 95%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageMetadataVaultContract.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
index 714c911..3b85bc5 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageMetadataVaultContract.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageMetadataVaultContract.java
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
import static org.apache.james.vault.DeletedMessageFixture.USER;
-import static
org.apache.james.vault.DeletedMessageVaultMetadataFixture.BLOB_ID_2;
-import static
org.apache.james.vault.DeletedMessageVaultMetadataFixture.BUCKET_NAME;
-import static
org.apache.james.vault.DeletedMessageVaultMetadataFixture.STORAGE_INFORMATION;
+import static
org.apache.james.vault.metadata.DeletedMessageVaultMetadataFixture.BLOB_ID_2;
+import static
org.apache.james.vault.metadata.DeletedMessageVaultMetadataFixture.BUCKET_NAME;
+import static
org.apache.james.vault.metadata.DeletedMessageVaultMetadataFixture.STORAGE_INFORMATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
@@ -30,6 +30,7 @@ import java.util.Optional;
import java.util.stream.Stream;
import org.apache.james.blob.api.BucketName;
+import org.apache.james.vault.DeletedMessageFixture;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageVaultMetadataFixture.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java
similarity index 97%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageVaultMetadataFixture.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java
index 8bc4ec4..684f929 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageVaultMetadataFixture.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageVaultMetadataFixture.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BucketName;
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageWithStorageInformationTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageWithStorageInformationTest.java
similarity index 91%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageWithStorageInformationTest.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageWithStorageInformationTest.java
index a79a67f..d5415f0 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/DeletedMessageWithStorageInformationTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/DeletedMessageWithStorageInformationTest.java
@@ -17,11 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
-import static
org.apache.james.vault.DeletedMessageVaultMetadataFixture.STORAGE_INFORMATION;
+import static
org.apache.james.vault.metadata.DeletedMessageVaultMetadataFixture.STORAGE_INFORMATION;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.apache.james.vault.DeletedMessageFixture;
import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
diff --git
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/StorageInformationTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/StorageInformationTest.java
similarity index 89%
rename from
mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/StorageInformationTest.java
rename to
mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/StorageInformationTest.java
index b55cf55..6642ab8 100644
---
a/mailbox/plugin/deleted-messages-vault-blobstore/src/test/java/org/apache/james/vault/StorageInformationTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/metadata/StorageInformationTest.java
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.vault;
+package org.apache.james.vault.metadata;
-import static
org.apache.james.vault.DeletedMessageVaultMetadataFixture.BLOB_ID;
-import static
org.apache.james.vault.DeletedMessageVaultMetadataFixture.BUCKET_NAME;
+import static
org.apache.james.vault.metadata.DeletedMessageVaultMetadataFixture.BLOB_ID;
+import static
org.apache.james.vault.metadata.DeletedMessageVaultMetadataFixture.BUCKET_NAME;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.jupiter.api.Test;
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index ef22a91..ce5ecca 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -52,8 +52,6 @@
<module>memory</module>
<module>plugin/deleted-messages-vault</module>
- <module>plugin/deleted-messages-vault-blobstore</module>
- <module>plugin/deleted-messages-vault-blobstore-memory</module>
<module>plugin/quota-mailing</module>
<module>plugin/quota-mailing-cassandra</module>
diff --git a/pom.xml b/pom.xml
index de07d51..52b56ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -775,17 +775,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault-blobstore</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
-
<artifactId>apache-james-mailbox-deleted-messages-vault-blobstore</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
