You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/09/04 12:05:09 UTC

[james-project] 09/13: JAMES-3926 Register SieveQuotaMigration

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 843de4beae4f78be280b161db6da58cc21a3cb8f
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Thu Aug 24 20:40:40 2023 +0700

    JAMES-3926 Register SieveQuotaMigration
---
 .../versions/CassandraSchemaVersionManager.java        |  2 +-
 .../james/modules/webadmin/CassandraRoutesModule.java  |  3 +++
 .../james/sieve/cassandra/FakeSieveQuotaDAO.java       | 18 ++++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionManager.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionManager.java
index dc518119b0..0e3acfbe3c 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionManager.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionManager.java
@@ -36,7 +36,7 @@ import reactor.core.publisher.Mono;
 
 public class CassandraSchemaVersionManager {
     public static final SchemaVersion MIN_VERSION = new SchemaVersion(8);
-    public static final SchemaVersion MAX_VERSION = new SchemaVersion(13);
+    public static final SchemaVersion MAX_VERSION = new SchemaVersion(14);
     public static final SchemaVersion DEFAULT_VERSION = MIN_VERSION;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CassandraSchemaVersionManager.class);
diff --git a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/webadmin/CassandraRoutesModule.java b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/webadmin/CassandraRoutesModule.java
index 867c63996f..b7544a719c 100644
--- a/server/container/guice/cassandra/src/main/java/org/apache/james/modules/webadmin/CassandraRoutesModule.java
+++ b/server/container/guice/cassandra/src/main/java/org/apache/james/modules/webadmin/CassandraRoutesModule.java
@@ -29,6 +29,7 @@ import org.apache.james.mailbox.cassandra.mail.migration.AclV2Migration;
 import org.apache.james.mailbox.cassandra.mail.migration.AttachmentMessageIdMigration;
 import org.apache.james.mailbox.cassandra.mail.migration.MessageDenormalizationMigration;
 import org.apache.james.mailbox.cassandra.mail.migration.MessageV3Migration;
+import org.apache.james.sieve.cassandra.migration.SieveQuotaMigration;
 import org.apache.james.mailbox.cassandra.quota.migration.CassandraCurrentQuotaManagerMigration;
 import org.apache.james.webadmin.Routes;
 import org.apache.james.webadmin.routes.CassandraMailboxMergingRoutes;
@@ -46,6 +47,7 @@ public class CassandraRoutesModule extends AbstractModule {
     private static final SchemaTransition FROM_V10_TO_V11 = SchemaTransition.to(new SchemaVersion(11));
     private static final SchemaTransition FROM_V11_TO_V12 = SchemaTransition.to(new SchemaVersion(12));
     private static final SchemaTransition FROM_V12_TO_V13 = SchemaTransition.to(new SchemaVersion(13));
+    private static final SchemaTransition FROM_V13_TO_V14 = SchemaTransition.to(new SchemaVersion(14));
 
     @Override
     protected void configure() {
@@ -66,6 +68,7 @@ public class CassandraRoutesModule extends AbstractModule {
         allMigrationClazzBinder.addBinding(FROM_V10_TO_V11).to(MessageDenormalizationMigration.class);
         allMigrationClazzBinder.addBinding(FROM_V11_TO_V12).to(AttachmentMessageIdMigration.class);
         allMigrationClazzBinder.addBinding(FROM_V12_TO_V13).to(CassandraCurrentQuotaManagerMigration.class);
+        allMigrationClazzBinder.addBinding(FROM_V13_TO_V14).to(SieveQuotaMigration.class);
 
         bind(SchemaVersion.class)
             .annotatedWith(Names.named(CassandraMigrationService.LATEST_VERSION))
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/FakeSieveQuotaDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/FakeSieveQuotaDAO.java
index 45bdfcd0c6..b2cc604f86 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/FakeSieveQuotaDAO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/FakeSieveQuotaDAO.java
@@ -31,6 +31,8 @@ import org.apache.james.core.quota.QuotaSizeLimit;
 import reactor.core.publisher.Mono;
 
 public class FakeSieveQuotaDAO implements CassandraSieveQuotaDAO {
+    private static final String MESSAGE = "Use quota compatility mode in cassandra.properties for running the 12 -> 13 migration";
+
     @Inject
     public FakeSieveQuotaDAO() {
 
@@ -38,41 +40,41 @@ public class FakeSieveQuotaDAO implements CassandraSieveQuotaDAO {
 
     @Override
     public Mono<Long> spaceUsedBy(Username username) {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Void> updateSpaceUsed(Username username, long spaceUsed) {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Optional<QuotaSizeLimit>> getQuota() {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Void> setQuota(QuotaSizeLimit quota) {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Void> removeQuota() {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Optional<QuotaSizeLimit>> getQuota(Username username) {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Void> setQuota(Username username, QuotaSizeLimit quota) {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 
     @Override
     public Mono<Void> removeQuota(Username username) {
-        return Mono.error(new NotImplementedException());
+        return Mono.error(new NotImplementedException(MESSAGE));
     }
 }


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