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 2020/12/07 03:57:33 UTC
[james-project] 03/13: JAMES-3435 CRDT friendly version of
CassandraACLDAO
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 482319701125f77d2c4377aa6c6386c3f0b998f5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Dec 2 12:19:04 2020 +0700
JAMES-3435 CRDT friendly version of CassandraACLDAO
Relies on CRDT for concurrency handling.
---
.../mailbox/cassandra/mail/CassandraACLDAO.java | 193 +--------------------
...CassandraACLDAO.java => CassandraACLDAOV1.java} | 18 +-
.../mailbox/cassandra/mail/CassandraACLDAOV2.java | 188 ++++++++++++++++++++
.../cassandra/modules/CassandraAclModule.java | 13 ++
.../cassandra/table/CassandraACLV2Table.java | 28 +++
.../cassandra/CassandraMailboxManagerTest.java | 4 +-
.../cassandra/mail/CassandraACLMapperContract.java | 142 +++++++++++++++
...pperTest.java => CassandraACLMapperV1Test.java} | 112 +-----------
.../cassandra/mail/CassandraACLMapperV2Test.java | 128 ++++++++++++++
.../cassandra/mail/CassandraMailboxMapperTest.java | 2 +-
.../mail/migration/MailboxPathV2MigrationTest.java | 4 +-
.../mailbox/cassandra/mail/utils/GuiceUtils.java | 3 +
.../modules/mailbox/CassandraMailboxModule.java | 4 +-
13 files changed, 534 insertions(+), 305 deletions(-)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java
index 73e5c0f..627baec 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java
@@ -19,203 +19,24 @@
package org.apache.james.mailbox.cassandra.mail;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.set;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.update;
+import java.util.function.Supplier;
-import java.io.IOException;
-import java.util.function.Function;
-
-import javax.inject.Inject;
-
-import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
-import org.apache.james.backends.cassandra.init.configuration.CassandraConsistenciesConfiguration;
-import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
import org.apache.james.mailbox.acl.ACLDiff;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
-import org.apache.james.mailbox.cassandra.json.MailboxACLJsonConverter;
-import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
-import org.apache.james.mailbox.cassandra.table.CassandraMailboxTable;
-import org.apache.james.mailbox.exception.UnsupportedRightException;
import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.util.FunctionalUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.datastax.driver.core.ConsistencyLevel;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.core.querybuilder.QueryBuilder;
-import com.fasterxml.jackson.core.JsonProcessingException;
import reactor.core.publisher.Mono;
-public class CassandraACLDAO {
- public static final int INITIAL_VALUE = 0;
- private static final Logger LOG = LoggerFactory.getLogger(CassandraACLDAO.class);
- private static final String OLD_VERSION = "oldVersion";
-
- private final CassandraAsyncExecutor executor;
- private final int maxAclRetry;
- private final PreparedStatement conditionalInsertStatement;
- private final PreparedStatement conditionalUpdateStatement;
- private final PreparedStatement readStatement;
- private final PreparedStatement deleteStatement;
- private final ConsistencyLevel consistencyLevel;
-
- @Inject
- public CassandraACLDAO(Session session,
- CassandraConfiguration cassandraConfiguration,
- CassandraConsistenciesConfiguration consistenciesConfiguration) {
- this.executor = new CassandraAsyncExecutor(session);
- this.maxAclRetry = cassandraConfiguration.getAclMaxRetry();
- this.consistencyLevel = consistenciesConfiguration.getLightweightTransaction();
- this.conditionalInsertStatement = prepareConditionalInsert(session);
- this.conditionalUpdateStatement = prepareConditionalUpdate(session);
- this.readStatement = prepareReadStatement(session);
- this.deleteStatement = prepareDelete(session);
- }
-
- private PreparedStatement prepareDelete(Session session) {
- return session.prepare(
- QueryBuilder.delete().from(CassandraACLTable.TABLE_NAME)
- .where(eq(CassandraACLTable.ID, bindMarker(CassandraACLTable.ID)))
- .ifExists());
- }
-
- private PreparedStatement prepareConditionalInsert(Session session) {
- return session.prepare(
- insertInto(CassandraACLTable.TABLE_NAME)
- .value(CassandraACLTable.ID, bindMarker(CassandraACLTable.ID))
- .value(CassandraACLTable.ACL, bindMarker(CassandraACLTable.ACL))
- .value(CassandraACLTable.VERSION, INITIAL_VALUE)
- .ifNotExists());
- }
-
- private PreparedStatement prepareConditionalUpdate(Session session) {
- return session.prepare(
- update(CassandraACLTable.TABLE_NAME)
- .where(eq(CassandraACLTable.ID, bindMarker(CassandraACLTable.ID)))
- .with(set(CassandraACLTable.ACL, bindMarker(CassandraACLTable.ACL)))
- .and(set(CassandraACLTable.VERSION, bindMarker(CassandraACLTable.VERSION)))
- .onlyIf(eq(CassandraACLTable.VERSION, bindMarker(OLD_VERSION))));
- }
-
- private PreparedStatement prepareReadStatement(Session session) {
- return session.prepare(
- select(CassandraACLTable.ACL, CassandraACLTable.VERSION)
- .from(CassandraACLTable.TABLE_NAME)
- .where(eq(CassandraMailboxTable.ID, bindMarker(CassandraACLTable.ID))));
- }
-
- Mono<MailboxACL> getACL(CassandraId cassandraId) {
- return getStoredACLRow(cassandraId)
- .map(row -> getAcl(cassandraId, row));
- }
-
- private MailboxACL getAcl(CassandraId cassandraId, Row row) {
- String serializedACL = row.getString(CassandraACLTable.ACL);
- return deserializeACL(cassandraId, serializedACL);
- }
-
- public Mono<ACLDiff> updateACL(CassandraId cassandraId, MailboxACL.ACLCommand command) {
- return Mono.fromCallable(() -> MailboxACL.EMPTY.apply(command))
- .flatMap(replacement -> doUpdateAcl(cassandraId, aclWithVersion -> aclWithVersion.apply(command), replacement));
- }
-
- public Mono<ACLDiff> setACL(CassandraId cassandraId, MailboxACL mailboxACL) {
- return doUpdateAcl(cassandraId, acl -> new ACLWithVersion(acl.version, mailboxACL), mailboxACL);
- }
-
- Mono<ACLDiff> doUpdateAcl(CassandraId cassandraId, Function<ACLWithVersion, ACLWithVersion> aclTransformation, MailboxACL replacement) {
- return getAclWithVersion(cassandraId)
- .flatMap(aclWithVersion ->
- updateStoredACL(cassandraId, aclTransformation.apply(aclWithVersion))
- .map(newACL -> ACLDiff.computeDiff(aclWithVersion.mailboxACL, newACL)))
- .switchIfEmpty(insertACL(cassandraId, replacement)
- .map(newACL -> ACLDiff.computeDiff(MailboxACL.EMPTY, newACL)))
- .single()
- .retry(maxAclRetry);
- }
-
- private Mono<Row> getStoredACLRow(CassandraId cassandraId) {
- return executor.executeSingleRow(
- readStatement.bind()
- .setUUID(CassandraACLTable.ID, cassandraId.asUuid())
- .setConsistencyLevel(consistencyLevel));
- }
-
- private Mono<MailboxACL> updateStoredACL(CassandraId cassandraId, ACLWithVersion aclWithVersion) {
- return executor.executeReturnApplied(
- conditionalUpdateStatement.bind()
- .setUUID(CassandraACLTable.ID, cassandraId.asUuid())
- .setString(CassandraACLTable.ACL, convertAclToJson(aclWithVersion.mailboxACL))
- .setLong(CassandraACLTable.VERSION, aclWithVersion.version + 1)
- .setLong(OLD_VERSION, aclWithVersion.version))
- .filter(FunctionalUtils.identityPredicate())
- .map(any -> aclWithVersion.mailboxACL);
- }
+public interface CassandraACLDAO {
+ interface CassandraACLDAOSupplier extends Supplier<CassandraACLDAO> {
- public Mono<Void> delete(CassandraId cassandraId) {
- return executor.executeVoid(
- deleteStatement.bind()
- .setUUID(CassandraACLTable.ID, cassandraId.asUuid()));
}
- private Mono<MailboxACL> insertACL(CassandraId cassandraId, MailboxACL acl) {
- return executor.executeReturnApplied(
- conditionalInsertStatement.bind()
- .setUUID(CassandraACLTable.ID, cassandraId.asUuid())
- .setString(CassandraACLTable.ACL, convertAclToJson(acl)))
- .filter(FunctionalUtils.identityPredicate())
- .map(any -> acl);
- }
+ Mono<Void> delete(CassandraId cassandraId);
- private String convertAclToJson(MailboxACL acl) {
- try {
- return MailboxACLJsonConverter.toJson(acl);
- } catch (JsonProcessingException exception) {
- throw new RuntimeException(exception);
- }
- }
+ Mono<MailboxACL> getACL(CassandraId cassandraId);
- private Mono<ACLWithVersion> getAclWithVersion(CassandraId cassandraId) {
- return getStoredACLRow(cassandraId)
- .map(acl -> new ACLWithVersion(acl.getLong(CassandraACLTable.VERSION),
- deserializeACL(cassandraId, acl.getString(CassandraACLTable.ACL))));
- }
+ Mono<ACLDiff> updateACL(CassandraId cassandraId, MailboxACL.ACLCommand command);
- private MailboxACL deserializeACL(CassandraId cassandraId, String serializedACL) {
- try {
- return MailboxACLJsonConverter.toACL(serializedACL);
- } catch (IOException exception) {
- LOG.error("Unable to read stored ACL. " +
- "We will use empty ACL instead." +
- "Mailbox is {} ." +
- "ACL is {}", cassandraId, serializedACL, exception);
- return MailboxACL.EMPTY;
- }
- }
-
- private static class ACLWithVersion {
- private final long version;
- private final MailboxACL mailboxACL;
-
- public ACLWithVersion(long version, MailboxACL mailboxACL) {
- this.version = version;
- this.mailboxACL = mailboxACL;
- }
-
- public ACLWithVersion apply(MailboxACL.ACLCommand command) {
- try {
- return new ACLWithVersion(version, mailboxACL.apply(command));
- } catch (UnsupportedRightException exception) {
- throw new RuntimeException(exception);
- }
- }
- }
+ Mono<ACLDiff> setACL(CassandraId cassandraId, MailboxACL mailboxACL);
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV1.java
similarity index 94%
copy from mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java
copy to mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV1.java
index 73e5c0f..3bd9c47 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV1.java
@@ -54,9 +54,9 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import reactor.core.publisher.Mono;
-public class CassandraACLDAO {
+public class CassandraACLDAOV1 implements CassandraACLDAO {
public static final int INITIAL_VALUE = 0;
- private static final Logger LOG = LoggerFactory.getLogger(CassandraACLDAO.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CassandraACLDAOV1.class);
private static final String OLD_VERSION = "oldVersion";
private final CassandraAsyncExecutor executor;
@@ -68,9 +68,9 @@ public class CassandraACLDAO {
private final ConsistencyLevel consistencyLevel;
@Inject
- public CassandraACLDAO(Session session,
- CassandraConfiguration cassandraConfiguration,
- CassandraConsistenciesConfiguration consistenciesConfiguration) {
+ public CassandraACLDAOV1(Session session,
+ CassandraConfiguration cassandraConfiguration,
+ CassandraConsistenciesConfiguration consistenciesConfiguration) {
this.executor = new CassandraAsyncExecutor(session);
this.maxAclRetry = cassandraConfiguration.getAclMaxRetry();
this.consistencyLevel = consistenciesConfiguration.getLightweightTransaction();
@@ -112,7 +112,7 @@ public class CassandraACLDAO {
.where(eq(CassandraMailboxTable.ID, bindMarker(CassandraACLTable.ID))));
}
- Mono<MailboxACL> getACL(CassandraId cassandraId) {
+ public Mono<MailboxACL> getACL(CassandraId cassandraId) {
return getStoredACLRow(cassandraId)
.map(row -> getAcl(cassandraId, row));
}
@@ -134,10 +134,10 @@ public class CassandraACLDAO {
Mono<ACLDiff> doUpdateAcl(CassandraId cassandraId, Function<ACLWithVersion, ACLWithVersion> aclTransformation, MailboxACL replacement) {
return getAclWithVersion(cassandraId)
.flatMap(aclWithVersion ->
- updateStoredACL(cassandraId, aclTransformation.apply(aclWithVersion))
- .map(newACL -> ACLDiff.computeDiff(aclWithVersion.mailboxACL, newACL)))
+ updateStoredACL(cassandraId, aclTransformation.apply(aclWithVersion))
+ .map(newACL -> ACLDiff.computeDiff(aclWithVersion.mailboxACL, newACL)))
.switchIfEmpty(insertACL(cassandraId, replacement)
- .map(newACL -> ACLDiff.computeDiff(MailboxACL.EMPTY, newACL)))
+ .map(newACL -> ACLDiff.computeDiff(MailboxACL.EMPTY, newACL)))
.single()
.retry(maxAclRetry);
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java
new file mode 100644
index 0000000..9bc2ad3
--- /dev/null
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraACLDAOV2.java
@@ -0,0 +1,188 @@
+/****************************************************************
+ * 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.mailbox.cassandra.mail;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.addAll;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.removeAll;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.set;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.update;
+
+import javax.inject.Inject;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
+import org.apache.james.mailbox.acl.ACLDiff;
+import org.apache.james.mailbox.cassandra.ids.CassandraId;
+import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
+import org.apache.james.mailbox.cassandra.table.CassandraACLV2Table;
+import org.apache.james.mailbox.model.MailboxACL;
+
+import com.datastax.driver.core.BatchStatement;
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.github.fge.lambdas.Throwing;
+import com.github.steveash.guavate.Guavate;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class CassandraACLDAOV2 implements CassandraACLDAO {
+ private final CassandraAsyncExecutor executor;
+ private final PreparedStatement insertRights;
+ private final PreparedStatement removeRights;
+ private final PreparedStatement replaceRights;
+ private final PreparedStatement delete;
+ private final PreparedStatement read;
+
+ @Inject
+ public CassandraACLDAOV2(Session session) {
+ this.executor = new CassandraAsyncExecutor(session);
+ this.insertRights = prepareInsertRights(session);
+ this.removeRights = prepareRemoveRights(session);
+ this.replaceRights = prepareReplaceRights(session);
+ this.read = prepareRead(session);
+ this.delete = prepareDelete(session);
+ }
+
+ private PreparedStatement prepareDelete(Session session) {
+ return session.prepare(
+ QueryBuilder.delete().from(CassandraACLV2Table.TABLE_NAME)
+ .where(eq(CassandraACLV2Table.ID, bindMarker(CassandraACLV2Table.ID))));
+ }
+
+ private PreparedStatement prepareInsertRights(Session session) {
+ return session.prepare(
+ update(CassandraACLV2Table.TABLE_NAME)
+ .with(addAll(CassandraACLV2Table.RIGHTS, bindMarker(CassandraACLV2Table.RIGHTS)))
+ .where(eq(CassandraACLV2Table.ID, bindMarker(CassandraACLV2Table.ID)))
+ .and(eq(CassandraACLV2Table.KEY, bindMarker(CassandraACLV2Table.KEY))));
+ }
+
+ private PreparedStatement prepareReplaceRights(Session session) {
+ return session.prepare(
+ update(CassandraACLV2Table.TABLE_NAME)
+ .with(set(CassandraACLV2Table.RIGHTS, bindMarker(CassandraACLV2Table.RIGHTS)))
+ .where(eq(CassandraACLV2Table.ID, bindMarker(CassandraACLV2Table.ID)))
+ .and(eq(CassandraACLV2Table.KEY, bindMarker(CassandraACLV2Table.KEY))));
+ }
+
+ private PreparedStatement prepareRemoveRights(Session session) {
+ return session.prepare(
+ update(CassandraACLV2Table.TABLE_NAME)
+ .with(removeAll(CassandraACLV2Table.RIGHTS, bindMarker(CassandraACLV2Table.RIGHTS)))
+ .where(eq(CassandraACLV2Table.ID, bindMarker(CassandraACLV2Table.ID)))
+ .and(eq(CassandraACLV2Table.KEY, bindMarker(CassandraACLV2Table.KEY))));
+ }
+
+ private PreparedStatement prepareRead(Session session) {
+ return session.prepare(
+ select()
+ .from(CassandraACLV2Table.TABLE_NAME)
+ .where(eq(CassandraACLV2Table.ID, bindMarker(CassandraACLV2Table.ID))));
+ }
+
+ public Mono<Void> delete(CassandraId cassandraId) {
+ return executor.executeVoid(
+ delete.bind()
+ .setUUID(CassandraACLTable.ID, cassandraId.asUuid()));
+ }
+
+ public Mono<MailboxACL> getACL(CassandraId cassandraId) {
+ return executor.executeRows(
+ read.bind()
+ .setUUID(CassandraACLTable.ID, cassandraId.asUuid()))
+ .map(Throwing.function(row -> {
+ MailboxACL.EntryKey entryKey = MailboxACL.EntryKey.deserialize(row.getString(CassandraACLV2Table.KEY));
+ MailboxACL.Rfc4314Rights rights = row.getSet(CassandraACLV2Table.RIGHTS, String.class)
+ .stream()
+ .map(Throwing.function(MailboxACL.Rfc4314Rights::deserialize))
+ .reduce(MailboxACL.NO_RIGHTS, Throwing.binaryOperator(MailboxACL.Rfc4314Rights::union));
+ return new MailboxACL(ImmutableMap.of(entryKey, rights));
+ }))
+ .reduce(Throwing.biFunction(MailboxACL::union));
+ }
+
+ public Mono<ACLDiff> updateACL(CassandraId cassandraId, MailboxACL.ACLCommand command) {
+ return getACL(cassandraId)
+ .switchIfEmpty(Mono.just(new MailboxACL()))
+ .flatMap(before -> doUpdateACL(cassandraId, command)
+ .then(getACL(cassandraId)
+ .switchIfEmpty(Mono.just(new MailboxACL()))
+ .map(after -> ACLDiff.computeDiff(before, after))));
+ }
+
+ public Mono<ACLDiff> setACL(CassandraId cassandraId, MailboxACL mailboxACL) {
+ return getACL(cassandraId)
+ .flatMap(oldACL -> delete(cassandraId)
+ .then(Flux.fromIterable(mailboxACL.getEntries().entrySet())
+ .concatMap(entry -> doSetACL(cassandraId, mailboxACL))
+ .then())
+ .thenReturn(ACLDiff.computeDiff(oldACL, mailboxACL)));
+ }
+
+ private Mono<Void> doUpdateACL(CassandraId cassandraId, MailboxACL.ACLCommand command) {
+ ImmutableSet<String> rightStrings = asStringSet(command.getRights());
+ switch (command.getEditMode()) {
+ case ADD:
+ return executor.executeVoid(insertRights.bind()
+ .setUUID(CassandraACLV2Table.ID, cassandraId.asUuid())
+ .setString(CassandraACLV2Table.KEY, command.getEntryKey().serialize())
+ .setSet(CassandraACLV2Table.RIGHTS, ImmutableSet.copyOf(rightStrings), String.class));
+ case REMOVE:
+ return executor.executeVoid(removeRights.bind()
+ .setUUID(CassandraACLV2Table.ID, cassandraId.asUuid())
+ .setString(CassandraACLV2Table.KEY, command.getEntryKey().serialize())
+ .setSet(CassandraACLV2Table.RIGHTS, ImmutableSet.copyOf(rightStrings), String.class));
+ case REPLACE:
+ return executor.executeVoid(replaceRights.bind()
+ .setUUID(CassandraACLV2Table.ID, cassandraId.asUuid())
+ .setString(CassandraACLV2Table.KEY, command.getEntryKey().serialize())
+ .setSet(CassandraACLV2Table.RIGHTS, rightStrings, String.class));
+ default:
+ throw new NotImplementedException(command.getEditMode() + "is not supported");
+ }
+ }
+
+ private ImmutableSet<String> asStringSet(MailboxACL.Rfc4314Rights rights) {
+ return rights.list()
+ .stream()
+ .map(MailboxACL.Right::asCharacter)
+ .map(String::valueOf)
+ .collect(Guavate.toImmutableSet());
+ }
+
+ private Mono<Void> doSetACL(CassandraId cassandraId, MailboxACL mailboxACL) {
+ BatchStatement batchStatement = new BatchStatement();
+ mailboxACL.getEntries().entrySet()
+ .stream().map(entry -> replaceRights.bind()
+ .setUUID(CassandraACLV2Table.ID, cassandraId.asUuid())
+ .setString(CassandraACLV2Table.KEY, entry.getKey().serialize())
+ .setSet(CassandraACLV2Table.RIGHTS, asStringSet(entry.getValue()), String.class))
+ .forEach(batchStatement::add);
+
+ return executor.executeVoid(batchStatement);
+ }
+}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAclModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAclModule.java
index abdecab..8f05801 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAclModule.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAclModule.java
@@ -20,12 +20,14 @@
package org.apache.james.mailbox.cassandra.modules;
import static com.datastax.driver.core.DataType.bigint;
+import static com.datastax.driver.core.DataType.set;
import static com.datastax.driver.core.DataType.text;
import static com.datastax.driver.core.DataType.timeuuid;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.utils.CassandraConstants;
import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
+import org.apache.james.mailbox.cassandra.table.CassandraACLV2Table;
import org.apache.james.mailbox.cassandra.table.CassandraUserMailboxRightsTable;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
@@ -42,6 +44,17 @@ public interface CassandraAclModule {
.addPartitionKey(CassandraACLTable.ID, timeuuid())
.addColumn(CassandraACLTable.ACL, text())
.addColumn(CassandraACLTable.VERSION, bigint()))
+
+ .table(CassandraACLV2Table.TABLE_NAME)
+ .comment("Holds mailbox ACLs. This table do not rely on a JSON representation nor on LWT, contrary to the acl table it replaces.")
+ .options(options -> options
+ .caching(SchemaBuilder.KeyCaching.ALL,
+ SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))
+ .statement(statement -> statement
+ .addPartitionKey(CassandraACLV2Table.ID, timeuuid())
+ .addClusteringColumn(CassandraACLV2Table.KEY, text())
+ .addColumn(CassandraACLV2Table.RIGHTS, set(text())))
+
.table(CassandraUserMailboxRightsTable.TABLE_NAME)
.comment("Denormalisation table. Allow to retrieve non personal mailboxIds a user has right on")
.options(options -> options
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraACLV2Table.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraACLV2Table.java
new file mode 100644
index 0000000..94d1ea1
--- /dev/null
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraACLV2Table.java
@@ -0,0 +1,28 @@
+/****************************************************************
+ * 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.mailbox.cassandra.table;
+
+public interface CassandraACLV2Table {
+ String TABLE_NAME = "aclv2";
+
+ String ID = "id";
+ String KEY = "key";
+ String RIGHTS = "rights";
+}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index 919f9a7..cd710d9 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -44,7 +44,7 @@ import org.apache.james.mailbox.MessageManager.AppendResult;
import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.cassandra.mail.CassandraACLDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraACLDAOV1;
import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper;
import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2;
@@ -790,7 +790,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai
private CassandraACLMapper aclMapper(CassandraCluster cassandraCluster) {
return new CassandraACLMapper(
rightsDAO(cassandraCluster),
- new CassandraACLDAO(cassandraCluster.getConf(),
+ new CassandraACLDAOV1(cassandraCluster.getConf(),
CassandraConfiguration.DEFAULT_CONFIGURATION,
cassandra.getCassandraConsistenciesConfiguration()));
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperContract.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperContract.java
new file mode 100644
index 0000000..975bafc
--- /dev/null
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperContract.java
@@ -0,0 +1,142 @@
+/****************************************************************
+ * 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.mailbox.cassandra.mail;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.mailbox.cassandra.ids.CassandraId;
+import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.util.concurrent.NamedThreadFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+abstract class CassandraACLMapperContract {
+ static final CassandraId MAILBOX_ID = CassandraId.of(UUID.fromString("464765a0-e4e7-11e4-aba4-710c1de3782b"));
+
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraAclModule.MODULE);
+
+ ExecutorService executor;
+
+ abstract CassandraACLMapper cassandraACLMapper();
+
+ @BeforeEach
+ void setUpExecutor() {
+ ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass());
+ executor = Executors.newFixedThreadPool(2, threadFactory);
+ }
+
+
+ @AfterEach
+ void tearDownExecutor() {
+ executor.shutdownNow();
+ }
+
+ @Test
+ void retrieveACLWhenNoACLStoredShouldReturnEmptyACL() {
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).blockOptional()).isEmpty();
+ }
+
+ @Test
+ void deleteShouldRemoveACL() throws Exception {
+ MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+
+ cassandraACLMapper().updateACL(MAILBOX_ID,
+ MailboxACL.command().key(key).rights(rights).asAddition());
+
+ cassandraACLMapper().delete(MAILBOX_ID).block();
+
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).blockOptional()).isEmpty();
+ }
+
+ @Test
+ void deleteShouldNotThrowWhenDoesNotExist() {
+ assertThatCode(() -> cassandraACLMapper().delete(MAILBOX_ID).block())
+ .doesNotThrowAnyException();
+ }
+
+ @Test
+ void addACLWhenNoneStoredShouldReturnUpdatedACL() throws Exception {
+ MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+
+ cassandraACLMapper().updateACL(MAILBOX_ID,
+ MailboxACL.command().key(key).rights(rights).asAddition()).block();
+
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).block())
+ .isEqualTo(new MailboxACL().union(key, rights));
+ }
+
+ @Test
+ void modifyACLWhenStoredShouldReturnUpdatedACL() throws MailboxException {
+ MailboxACL.EntryKey keyBob = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(keyBob).rights(rights).asAddition()).block();
+ MailboxACL.EntryKey keyAlice = new MailboxACL.EntryKey("alice", MailboxACL.NameType.user, false);
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(keyAlice).rights(rights).asAddition()).block();
+
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).block())
+ .isEqualTo(new MailboxACL().union(keyBob, rights).union(keyAlice, rights));
+ }
+
+ @Test
+ void removeWhenStoredShouldReturnUpdatedACL() throws MailboxException {
+ MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asAddition()).block();
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asRemoval()).block();
+
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).blockOptional().orElse(MailboxACL.EMPTY)).isEqualTo(MailboxACL.EMPTY);
+ }
+
+ @Test
+ void replaceForSingleKeyWithNullRightsWhenSingleKeyStoredShouldReturnEmptyACL() throws MailboxException {
+ MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asAddition()).block();
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(key).noRights().asReplacement()).block();
+
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).blockOptional().orElse(MailboxACL.EMPTY)).isEqualTo(MailboxACL.EMPTY);
+ }
+
+ @Test
+ void replaceWhenNotStoredShouldUpdateACLEntry() throws MailboxException {
+ MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+
+ cassandraACLMapper().updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asReplacement()).block();
+
+ assertThat(cassandraACLMapper().getACL(MAILBOX_ID).block()).isEqualTo(new MailboxACL().union(key, rights));
+ }
+}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV1Test.java
similarity index 59%
rename from mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
rename to mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV1Test.java
index 0dfd6bc..e55e158 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV1Test.java
@@ -21,14 +21,10 @@ package org.apache.james.mailbox.cassandra.mail;
import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
import static org.apache.james.backends.cassandra.Scenario.Builder.awaitOn;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -36,40 +32,31 @@ import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.Scenario.Barrier;
import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.backends.cassandra.init.configuration.CassandraConsistenciesConfiguration;
import org.apache.james.backends.cassandra.utils.CassandraUtils;
-import org.apache.james.mailbox.cassandra.ids.CassandraId;
-import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils;
import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxACL;
-import org.apache.james.util.concurrent.NamedThreadFactory;
-import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-class CassandraACLMapperTest {
-
- private static final CassandraId MAILBOX_ID = CassandraId.of(UUID.fromString("464765a0-e4e7-11e4-aba4-710c1de3782b"));
-
+class CassandraACLMapperV1Test extends CassandraACLMapperContract {
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraAclModule.MODULE);
private CassandraACLMapper cassandraACLMapper;
- private ExecutorService executor;
@BeforeEach
void setUp(CassandraCluster cassandra) {
- cassandraACLMapper = GuiceUtils.testInjector(cassandra)
- .getInstance(CassandraACLMapper.class);
- ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass());
- executor = Executors.newFixedThreadPool(2, threadFactory);
+ cassandraACLMapper = new CassandraACLMapper(
+ new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
+ new CassandraACLDAOV1(cassandra.getConf(), CassandraConfiguration.DEFAULT_CONFIGURATION, CassandraConsistenciesConfiguration.DEFAULT));
}
- @AfterEach
- void tearDown() {
- executor.shutdownNow();
+ @Override
+ CassandraACLMapper cassandraACLMapper() {
+ return cassandraACLMapper;
}
@Test
@@ -84,87 +71,6 @@ class CassandraACLMapperTest {
}
@Test
- void retrieveACLWhenNoACLStoredShouldReturnEmptyACL() {
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).blockOptional()).isEmpty();
- }
-
- @Test
- void deleteShouldRemoveACL() throws Exception {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
-
- cassandraACLMapper.updateACL(MAILBOX_ID,
- MailboxACL.command().key(key).rights(rights).asAddition());
-
- cassandraACLMapper.delete(MAILBOX_ID).block();
-
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).blockOptional()).isEmpty();
- }
-
- @Test
- void deleteShouldNotThrowWhenDoesNotExist() {
- assertThatCode(() -> cassandraACLMapper.delete(MAILBOX_ID).block())
- .doesNotThrowAnyException();
- }
-
- @Test
- void addACLWhenNoneStoredShouldReturnUpdatedACL() throws Exception {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
-
- cassandraACLMapper.updateACL(MAILBOX_ID,
- MailboxACL.command().key(key).rights(rights).asAddition()).block();
-
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block())
- .isEqualTo(new MailboxACL().union(key, rights));
- }
-
- @Test
- void modifyACLWhenStoredShouldReturnUpdatedACL() throws MailboxException {
- MailboxACL.EntryKey keyBob = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
-
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(keyBob).rights(rights).asAddition()).block();
- MailboxACL.EntryKey keyAlice = new MailboxACL.EntryKey("alice", MailboxACL.NameType.user, false);
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(keyAlice).rights(rights).asAddition()).block();
-
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block())
- .isEqualTo(new MailboxACL().union(keyBob, rights).union(keyAlice, rights));
- }
-
- @Test
- void removeWhenStoredShouldReturnUpdatedACL() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
-
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asAddition()).block();
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asRemoval()).block();
-
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block()).isEqualTo(MailboxACL.EMPTY);
- }
-
- @Test
- void replaceForSingleKeyWithNullRightsWhenSingleKeyStoredShouldReturnEmptyACL() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
-
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asAddition()).block();
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(key).noRights().asReplacement()).block();
-
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block()).isEqualTo(MailboxACL.EMPTY);
- }
-
- @Test
- void replaceWhenNotStoredShouldUpdateACLEntry() throws MailboxException {
- MailboxACL.EntryKey key = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
- MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
-
- cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asReplacement()).block();
-
- assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block()).isEqualTo(new MailboxACL().union(key, rights));
- }
-
- @Test
void updateInvalidACLShouldBeBasedOnEmptyACL(CassandraCluster cassandra) throws Exception {
cassandra.getConf().execute(
insertInto(CassandraACLTable.TABLE_NAME)
@@ -241,7 +147,7 @@ class CassandraACLMapperTest {
return executor.submit(() -> {
CassandraACLMapper aclMapper = new CassandraACLMapper(
new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
- new CassandraACLDAO(cassandra.getConf(),
+ new CassandraACLDAOV1(cassandra.getConf(),
CassandraConfiguration.DEFAULT_CONFIGURATION,
cassandraCluster.getCassandraConsistenciesConfiguration()));
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java
new file mode 100644
index 0000000..434c367
--- /dev/null
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperV2Test.java
@@ -0,0 +1,128 @@
+/****************************************************************
+ * 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.mailbox.cassandra.mail;
+
+import static org.apache.james.backends.cassandra.Scenario.Builder.awaitOn;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.apache.james.backends.cassandra.CassandraCluster;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
+import org.apache.james.backends.cassandra.Scenario.Barrier;
+import org.apache.james.backends.cassandra.utils.CassandraUtils;
+import org.apache.james.mailbox.cassandra.modules.CassandraAclModule;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class CassandraACLMapperV2Test extends CassandraACLMapperContract {
+ @RegisterExtension
+ static CassandraClusterExtension cassandraCluster = new CassandraClusterExtension(CassandraAclModule.MODULE);
+
+ private CassandraACLMapper cassandraACLMapper;
+
+ @BeforeEach
+ void setUp(CassandraCluster cassandra) {
+ cassandra.getConf().printStatements();
+ cassandraACLMapper = new CassandraACLMapper(
+ new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
+ new CassandraACLDAOV2(cassandra.getConf()));
+ }
+
+ @Override
+ CassandraACLMapper cassandraACLMapper() {
+ return cassandraACLMapper;
+ }
+
+ @Test
+ void twoConcurrentUpdatesWhenNoACLStoredShouldReturnACLWithTwoEntries(CassandraCluster cassandra) throws Exception {
+ Barrier barrier = new Barrier(2);
+ cassandra.getConf()
+ .registerScenario(awaitOn(barrier)
+ .thenExecuteNormally()
+ .times(2)
+ .whenQueryStartsWith("SELECT * FROM aclv2 WHERE id=:id;"));
+
+ MailboxACL.EntryKey keyBob = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+ MailboxACL.EntryKey keyAlice = new MailboxACL.EntryKey("alice", MailboxACL.NameType.user, false);
+ Future<Boolean> future1 = performACLUpdateInExecutor(cassandra, executor, keyBob, rights);
+ Future<Boolean> future2 = performACLUpdateInExecutor(cassandra, executor, keyAlice, rights);
+
+ barrier.awaitCaller();
+ barrier.releaseCaller();
+
+ awaitAll(future1, future2);
+
+ assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block())
+ .isEqualTo(new MailboxACL().union(keyBob, rights).union(keyAlice, rights));
+ }
+
+ @Test
+ void twoConcurrentUpdatesWhenStoredShouldReturnACLWithTwoEntries(CassandraCluster cassandra) throws Exception {
+ MailboxACL.EntryKey keyBenwa = new MailboxACL.EntryKey("benwa", MailboxACL.NameType.user, false);
+ MailboxACL.Rfc4314Rights rights = new MailboxACL.Rfc4314Rights(MailboxACL.Right.Read);
+ cassandraACLMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(keyBenwa).rights(rights).asAddition()).block();
+
+ Barrier barrier = new Barrier(2);
+ cassandra.getConf()
+ .registerScenario(awaitOn(barrier)
+ .thenExecuteNormally()
+ .times(2)
+ .whenQueryStartsWith("SELECT * FROM aclv2 WHERE id=:id;"));
+
+ MailboxACL.EntryKey keyBob = new MailboxACL.EntryKey("bob", MailboxACL.NameType.user, false);
+ MailboxACL.EntryKey keyAlice = new MailboxACL.EntryKey("alice", MailboxACL.NameType.user, false);
+ Future<Boolean> future1 = performACLUpdateInExecutor(cassandra, executor, keyBob, rights);
+ Future<Boolean> future2 = performACLUpdateInExecutor(cassandra, executor, keyAlice, rights);
+
+ barrier.awaitCaller();
+ barrier.releaseCaller();
+
+ awaitAll(future1, future2);
+
+ assertThat(cassandraACLMapper.getACL(MAILBOX_ID).block())
+ .isEqualTo(new MailboxACL().union(keyBob, rights).union(keyAlice, rights).union(keyBenwa, rights));
+ }
+
+ private void awaitAll(Future<?>... futures)
+ throws InterruptedException, ExecutionException, TimeoutException {
+ for (Future<?> future : futures) {
+ future.get(10L, TimeUnit.SECONDS);
+ }
+ }
+
+ private Future<Boolean> performACLUpdateInExecutor(CassandraCluster cassandra, ExecutorService executor, MailboxACL.EntryKey key, MailboxACL.Rfc4314Rights rights) {
+ return executor.submit(() -> {
+ CassandraACLMapper aclMapper = new CassandraACLMapper(
+ new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
+ new CassandraACLDAOV2(cassandra.getConf()));
+
+ aclMapper.updateACL(MAILBOX_ID, MailboxACL.command().key(key).rights(rights).asAddition()).block();
+ return true;
+ });
+ }
+
+}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 5df1a7b..f5c2f6b 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -103,7 +103,7 @@ class CassandraMailboxMapperTest {
CassandraUserMailboxRightsDAO userMailboxRightsDAO = new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
CassandraACLMapper aclMapper = new CassandraACLMapper(
new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION),
- new CassandraACLDAO(cassandra.getConf(),
+ new CassandraACLDAOV1(cassandra.getConf(),
CassandraConfiguration.DEFAULT_CONFIGURATION,
cassandraCluster.getCassandraConsistenciesConfiguration()));
versionDAO = new CassandraSchemaVersionDAO(cassandra.getConf());
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
index 9979833..7ab3f53 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionManage
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.core.Username;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
-import org.apache.james.mailbox.cassandra.mail.CassandraACLDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraACLDAOV1;
import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper;
import org.apache.james.mailbox.cassandra.mail.CassandraIdAndPath;
import org.apache.james.mailbox.cassandra.mail.CassandraMailboxDAO;
@@ -101,7 +101,7 @@ class MailboxPathV2MigrationTest {
userMailboxRightsDAO,
new CassandraACLMapper(
userMailboxRightsDAO,
- new CassandraACLDAO(
+ new CassandraACLDAOV1(
cassandra.getConf(),
CassandraConfiguration.DEFAULT_CONFIGURATION,
cassandraCluster.getCassandraConsistenciesConfiguration())),
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
index a6d8883..6dc6dab 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
@@ -28,6 +28,8 @@ import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.cassandra.CassandraBlobStoreFactory;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
+import org.apache.james.mailbox.cassandra.mail.CassandraACLDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraACLDAOV1;
import org.apache.james.mailbox.model.MessageId;
import com.datastax.driver.core.Session;
@@ -57,6 +59,7 @@ public class GuiceUtils {
CassandraMessageId.Factory messageIdFactory,
CassandraConfiguration configuration) {
return Modules.combine(
+ binder -> binder.bind(CassandraACLDAO.class).to(CassandraACLDAOV1.class),
binder -> binder.bind(MessageId.Factory.class).toInstance(messageIdFactory),
binder -> binder.bind(BlobId.Factory.class).toInstance(new HashBlobId.Factory()),
binder -> binder.bind(BlobStore.class).toProvider(() -> CassandraBlobStoreFactory.forTesting(session).passthrough()),
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
index 9427145..0afa4fb 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
@@ -41,7 +41,7 @@ import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory;
import org.apache.james.mailbox.cassandra.DeleteMessageListener;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.cassandra.mail.CassandraACLDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraACLDAOV1;
import org.apache.james.mailbox.cassandra.mail.CassandraACLMapper;
import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2;
@@ -122,7 +122,7 @@ public class CassandraMailboxModule extends AbstractModule {
bind(CassandraFirstUnseenDAO.class).in(Scopes.SINGLETON);
bind(CassandraMailboxCounterDAO.class).in(Scopes.SINGLETON);
bind(CassandraMailboxDAO.class).in(Scopes.SINGLETON);
- bind(CassandraACLDAO.class).in(Scopes.SINGLETON);
+ bind(CassandraACLDAOV1.class).in(Scopes.SINGLETON);
bind(CassandraMailboxPathDAOImpl.class).in(Scopes.SINGLETON);
bind(CassandraMailboxPathV2DAO.class).in(Scopes.SINGLETON);
bind(CassandraMailboxPathV3DAO.class).in(Scopes.SINGLETON);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org