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

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

commit fa4f4fc730e9c74a7b84e22ecc93752ca394f04f
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Thu Aug 24 20:48:29 2023 +0700

    JAMES-3926 Mark older sieve quota datamodel as deprecated
---
 .../apache/james/sieve/cassandra/CassandraSieveQuotaDAOV1.java    | 1 +
 .../apache/james/sieve/cassandra/CassandraSieveQuotaModule.java   | 8 +++-----
 .../sieve/cassandra/tables/CassandraSieveClusterQuotaTable.java   | 1 +
 .../james/sieve/cassandra/tables/CassandraSieveQuotaTable.java    | 1 +
 .../james/sieve/cassandra/tables/CassandraSieveSpaceTable.java    | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOV1.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOV1.java
index d47ce9d3e1..29bfb6e3f6 100644
--- 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOV1.java
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOV1.java
@@ -41,6 +41,7 @@ import com.datastax.oss.driver.api.core.cql.PreparedStatement;
 
 import reactor.core.publisher.Mono;
 
+@Deprecated() // To be removed after release 3.9.0
 public class CassandraSieveQuotaDAOV1 implements CassandraSieveQuotaDAO {
 
     private final CassandraAsyncExecutor cassandraAsyncExecutor;
diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaModule.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaModule.java
index 17f6a0eeb5..0e2ee63a55 100644
--- 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaModule.java
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaModule.java
@@ -19,17 +19,15 @@
 
 package org.apache.james.sieve.cassandra;
 
-
-import com.datastax.oss.driver.api.core.type.DataTypes;
 import org.apache.james.backends.cassandra.components.CassandraModule;
-import org.apache.james.sieve.cassandra.tables.CassandraSieveActiveTable;
 import org.apache.james.sieve.cassandra.tables.CassandraSieveClusterQuotaTable;
 import org.apache.james.sieve.cassandra.tables.CassandraSieveQuotaTable;
 import org.apache.james.sieve.cassandra.tables.CassandraSieveSpaceTable;
-import org.apache.james.sieve.cassandra.tables.CassandraSieveTable;
 
-public interface CassandraSieveQuotaModule {
+import com.datastax.oss.driver.api.core.type.DataTypes;
 
+@Deprecated() // To be removed after release 3.9.0
+public interface CassandraSieveQuotaModule {
     CassandraModule MODULE = CassandraModule.builder()
 
         .table(CassandraSieveSpaceTable.TABLE_NAME)
diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveClusterQuotaTable.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveClusterQuotaTable.java
index f07c97761b..79ca1b79f3 100644
--- 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveClusterQuotaTable.java
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveClusterQuotaTable.java
@@ -21,6 +21,7 @@ package org.apache.james.sieve.cassandra.tables;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 
+@Deprecated() // To be removed after release 3.9.0
 public interface CassandraSieveClusterQuotaTable {
     String TABLE_NAME = "sieve_cluster_quota";
 
diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveQuotaTable.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveQuotaTable.java
index 803163c46a..3482a666e7 100644
--- 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveQuotaTable.java
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveQuotaTable.java
@@ -21,6 +21,7 @@ package org.apache.james.sieve.cassandra.tables;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 
+@Deprecated() // To be removed after release 3.9.0
 public interface CassandraSieveQuotaTable {
     String TABLE_NAME = "sieve_quota";
 
diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveSpaceTable.java
 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveSpaceTable.java
index d35ec7118a..7b18a3c18e 100644
--- 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveSpaceTable.java
+++ 
b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/tables/CassandraSieveSpaceTable.java
@@ -21,6 +21,7 @@ package org.apache.james.sieve.cassandra.tables;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 
+@Deprecated() // To be removed after release 3.9.0
 public interface CassandraSieveSpaceTable {
     String TABLE_NAME = "sieve_space";
 


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org

Reply via email to