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 2022/06/25 04:49:17 UTC
[james-project] 10/18: JAMES-3774 Migrate mailbox/plugin/deleted-messages-vault-cassandra to Cassandra driver 4
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 d85ba7492afc5f9ba892f3eba07570d0f9e5d0ab
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Jun 6 15:59:53 2022 +0700
JAMES-3774 Migrate mailbox/plugin/deleted-messages-vault-cassandra to Cassandra driver 4
---
.../metadata/DeletedMessageMetadataModule.java | 37 ++++++++--------
.../apache/james/vault/metadata/MetadataDAO.java | 50 ++++++++++++----------
.../vault/metadata/StorageInformationDAO.java | 40 +++++++++--------
.../james/vault/metadata/UserPerBucketDAO.java | 39 +++++++++--------
.../CassandraDeletedMessageMetadataVaultTest.java | 24 +++++------
5 files changed, 99 insertions(+), 91 deletions(-)
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataModule.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataModule.java
index 58cf5b06ea..fe1604ef99 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataModule.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/DeletedMessageMetadataModule.java
@@ -19,11 +19,10 @@
package org.apache.james.vault.metadata;
-import static com.datastax.driver.core.DataType.text;
-
import org.apache.james.backends.cassandra.components.CassandraModule;
-import com.datastax.driver.core.schemabuilder.SchemaBuilder;
+import com.datastax.oss.driver.api.core.type.DataTypes;
+import com.datastax.oss.driver.api.querybuilder.SchemaBuilder;
public interface DeletedMessageMetadataModule {
@@ -59,30 +58,30 @@ public interface DeletedMessageMetadataModule {
.table(StorageInformationTable.TABLE)
.comment("Holds storage information for deleted messages in the BlobStore based DeletedMessages vault")
.options(options -> options
- .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.noRows()))
- .statement(statement -> statement
- .addPartitionKey(StorageInformationTable.OWNER, text())
- .addPartitionKey(StorageInformationTable.MESSAGE_ID, text())
- .addColumn(StorageInformationTable.BUCKET_NAME, text())
- .addColumn(StorageInformationTable.BLOB_ID, text()))
+ .withCaching(true, SchemaBuilder.RowsPerPartition.NONE))
+ .statement(statement -> types -> statement
+ .withPartitionKey(StorageInformationTable.OWNER, DataTypes.TEXT)
+ .withPartitionKey(StorageInformationTable.MESSAGE_ID, DataTypes.TEXT)
+ .withColumn(StorageInformationTable.BUCKET_NAME, DataTypes.TEXT)
+ .withColumn(StorageInformationTable.BLOB_ID, DataTypes.TEXT))
.table(UserPerBucketTable.TABLE)
.comment("Holds user list having deletedMessages stored in a given bucket in the BlobStore based DeletedMessages vault")
.options(options -> options
- .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.noRows()))
- .statement(statement -> statement
- .addPartitionKey(UserPerBucketTable.BUCKET_NAME, text())
- .addClusteringColumn(UserPerBucketTable.USER, text()))
+ .withCaching(true, SchemaBuilder.RowsPerPartition.NONE))
+ .statement(statement -> types -> statement
+ .withPartitionKey(UserPerBucketTable.BUCKET_NAME, DataTypes.TEXT)
+ .withClusteringColumn(UserPerBucketTable.USER, DataTypes.TEXT))
.table(DeletedMessageMetadataTable.TABLE)
.comment("Holds storage information for deleted messages in the BlobStore based DeletedMessages vault")
.options(options -> options
- .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.noRows()))
- .statement(statement -> statement
- .addPartitionKey(DeletedMessageMetadataTable.BUCKET_NAME, text())
- .addPartitionKey(DeletedMessageMetadataTable.OWNER, text())
- .addClusteringColumn(DeletedMessageMetadataTable.MESSAGE_ID, text())
- .addColumn(DeletedMessageMetadataTable.PAYLOAD, text()))
+ .withCaching(true, SchemaBuilder.RowsPerPartition.NONE))
+ .statement(statement -> types -> statement
+ .withPartitionKey(DeletedMessageMetadataTable.BUCKET_NAME, DataTypes.TEXT)
+ .withPartitionKey(DeletedMessageMetadataTable.OWNER, DataTypes.TEXT)
+ .withClusteringColumn(DeletedMessageMetadataTable.MESSAGE_ID, DataTypes.TEXT)
+ .withColumn(DeletedMessageMetadataTable.PAYLOAD, DataTypes.TEXT))
.build();
}
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java
index f03fd4ed86..b16b2143bf 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/MetadataDAO.java
@@ -19,11 +19,10 @@
package org.apache.james.vault.metadata;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.delete;
-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.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
import static org.apache.james.util.ReactorUtils.publishIfPresent;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.DeletedMessageMetadataTable.BUCKET_NAME;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.DeletedMessageMetadataTable.MESSAGE_ID;
@@ -38,8 +37,8 @@ import org.apache.james.blob.api.BucketName;
import org.apache.james.core.Username;
import org.apache.james.mailbox.model.MessageId;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.Session;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -55,7 +54,7 @@ public class MetadataDAO {
private final MetadataSerializer metadataSerializer;
@Inject
- MetadataDAO(Session session, MessageId.Factory messageIdFactory, MetadataSerializer metadataSerializer) {
+ MetadataDAO(CqlSession session, MessageId.Factory messageIdFactory, MetadataSerializer metadataSerializer) {
this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session);
this.addStatement = prepareAdd(session);
this.removeStatement = prepareRemove(session);
@@ -66,31 +65,36 @@ public class MetadataDAO {
this.metadataSerializer = metadataSerializer;
}
- private PreparedStatement prepareRead(Session session, String fieldName) {
- return session.prepare(select(fieldName).from(TABLE)
- .where(eq(BUCKET_NAME, bindMarker(BUCKET_NAME)))
- .and(eq(OWNER, bindMarker(OWNER))));
+ private PreparedStatement prepareRead(CqlSession session, String fieldName) {
+ return session.prepare(selectFrom(TABLE)
+ .columns(fieldName)
+ .whereColumn(BUCKET_NAME).isEqualTo(bindMarker(BUCKET_NAME))
+ .whereColumn(OWNER).isEqualTo(bindMarker(OWNER))
+ .build());
}
- private PreparedStatement prepareAdd(Session session) {
+ private PreparedStatement prepareAdd(CqlSession session) {
return session.prepare(insertInto(TABLE)
.value(BUCKET_NAME, bindMarker(BUCKET_NAME))
.value(OWNER, bindMarker(OWNER))
.value(MESSAGE_ID, bindMarker(MESSAGE_ID))
- .value(PAYLOAD, bindMarker(PAYLOAD)));
+ .value(PAYLOAD, bindMarker(PAYLOAD))
+ .build());
}
- private PreparedStatement prepareRemove(Session session) {
- return session.prepare(delete().from(TABLE)
- .where(eq(OWNER, bindMarker(OWNER)))
- .and(eq(BUCKET_NAME, bindMarker(BUCKET_NAME)))
- .and(eq(MESSAGE_ID, bindMarker(MESSAGE_ID))));
+ private PreparedStatement prepareRemove(CqlSession session) {
+ return session.prepare(deleteFrom(TABLE)
+ .whereColumn(BUCKET_NAME).isEqualTo(bindMarker(BUCKET_NAME))
+ .whereColumn(OWNER).isEqualTo(bindMarker(OWNER))
+ .whereColumn(MESSAGE_ID).isEqualTo(bindMarker(MESSAGE_ID))
+ .build());
}
- private PreparedStatement prepareRemoveAll(Session session) {
- return session.prepare(delete().from(TABLE)
- .where(eq(OWNER, bindMarker(OWNER)))
- .and(eq(BUCKET_NAME, bindMarker(BUCKET_NAME))));
+ private PreparedStatement prepareRemoveAll(CqlSession session) {
+ return session.prepare(deleteFrom(TABLE)
+ .whereColumn(BUCKET_NAME).isEqualTo(bindMarker(BUCKET_NAME))
+ .whereColumn(OWNER).isEqualTo(bindMarker(OWNER))
+ .build());
}
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java
index 07ae377acb..24106bab5c 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/StorageInformationDAO.java
@@ -19,11 +19,10 @@
package org.apache.james.vault.metadata;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.delete;
-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.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.StorageInformationTable.BLOB_ID;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.StorageInformationTable.BUCKET_NAME;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.StorageInformationTable.MESSAGE_ID;
@@ -38,8 +37,8 @@ import org.apache.james.blob.api.BucketName;
import org.apache.james.core.Username;
import org.apache.james.mailbox.model.MessageId;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.Session;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
import reactor.core.publisher.Mono;
@@ -51,7 +50,7 @@ public class StorageInformationDAO {
private final BlobId.Factory blobIdFactory;
@Inject
- StorageInformationDAO(Session session, BlobId.Factory blobIdFactory) {
+ StorageInformationDAO(CqlSession session, BlobId.Factory blobIdFactory) {
this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session);
this.addStatement = prepareAdd(session);
this.removeStatement = prepareRemove(session);
@@ -59,25 +58,28 @@ public class StorageInformationDAO {
this.blobIdFactory = blobIdFactory;
}
- private PreparedStatement prepareRead(Session session) {
- return session.prepare(select(BUCKET_NAME, BLOB_ID)
- .from(TABLE)
- .where(eq(OWNER, bindMarker(OWNER)))
- .and(eq(MESSAGE_ID, bindMarker(MESSAGE_ID))));
+ private PreparedStatement prepareRead(CqlSession session) {
+ return session.prepare(selectFrom(TABLE)
+ .columns(BUCKET_NAME, BLOB_ID)
+ .whereColumn(OWNER).isEqualTo(bindMarker(OWNER))
+ .whereColumn(MESSAGE_ID).isEqualTo(bindMarker(MESSAGE_ID))
+ .build());
}
- private PreparedStatement prepareRemove(Session session) {
- return session.prepare(delete().from(TABLE)
- .where(eq(OWNER, bindMarker(OWNER)))
- .and(eq(MESSAGE_ID, bindMarker(MESSAGE_ID))));
+ private PreparedStatement prepareRemove(CqlSession session) {
+ return session.prepare(deleteFrom(TABLE)
+ .whereColumn(OWNER).isEqualTo(bindMarker(OWNER))
+ .whereColumn(MESSAGE_ID).isEqualTo(bindMarker(MESSAGE_ID))
+ .build());
}
- private PreparedStatement prepareAdd(Session session) {
+ private PreparedStatement prepareAdd(CqlSession session) {
return session.prepare(insertInto(TABLE)
.value(OWNER, bindMarker(OWNER))
.value(MESSAGE_ID, bindMarker(MESSAGE_ID))
.value(BUCKET_NAME, bindMarker(BUCKET_NAME))
- .value(BLOB_ID, bindMarker(BLOB_ID)));
+ .value(BLOB_ID, bindMarker(BLOB_ID))
+ .build());
}
Mono<Void> referenceStorageInformation(Username username, MessageId messageId, StorageInformation storageInformation) {
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java
index 231e9bb8dc..bafdc27eb5 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/UserPerBucketDAO.java
@@ -19,11 +19,10 @@
package org.apache.james.vault.metadata;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.delete;
-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.oss.driver.api.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.insertInto;
+import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.selectFrom;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.UserPerBucketTable.BUCKET_NAME;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.UserPerBucketTable.TABLE;
import static org.apache.james.vault.metadata.DeletedMessageMetadataModule.UserPerBucketTable.USER;
@@ -34,8 +33,8 @@ import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
import org.apache.james.blob.api.BucketName;
import org.apache.james.core.Username;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.Session;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -48,7 +47,7 @@ public class UserPerBucketDAO {
private final PreparedStatement listBucketsStatement;
@Inject
- UserPerBucketDAO(Session session) {
+ UserPerBucketDAO(CqlSession session) {
cassandraAsyncExecutor = new CassandraAsyncExecutor(session);
addStatement = prepareAddUser(session);
removeStatement = prepareRemoveBucket(session);
@@ -56,24 +55,28 @@ public class UserPerBucketDAO {
listBucketsStatement = prepareListBuckets(session);
}
- private PreparedStatement prepareAddUser(Session session) {
+ private PreparedStatement prepareAddUser(CqlSession session) {
return session.prepare(insertInto(TABLE)
.value(BUCKET_NAME, bindMarker(BUCKET_NAME))
- .value(USER, bindMarker(USER)));
+ .value(USER, bindMarker(USER))
+ .build());
}
- private PreparedStatement prepareRemoveBucket(Session session) {
- return session.prepare(delete().from(TABLE)
- .where(eq(BUCKET_NAME, bindMarker(BUCKET_NAME))));
+ private PreparedStatement prepareRemoveBucket(CqlSession session) {
+ return session.prepare(deleteFrom(TABLE)
+ .whereColumn(BUCKET_NAME).isEqualTo(bindMarker(BUCKET_NAME))
+ .build());
}
- private PreparedStatement prepareListUser(Session session) {
- return session.prepare(select(USER).from(TABLE)
- .where(eq(BUCKET_NAME, bindMarker(BUCKET_NAME))));
+ private PreparedStatement prepareListUser(CqlSession session) {
+ return session.prepare(selectFrom(TABLE)
+ .column(USER)
+ .whereColumn(BUCKET_NAME).isEqualTo(bindMarker(BUCKET_NAME))
+ .build());
}
- private PreparedStatement prepareListBuckets(Session session) {
- return session.prepare(select(BUCKET_NAME).from(TABLE).perPartitionLimit(1));
+ private PreparedStatement prepareListBuckets(CqlSession session) {
+ return session.prepare(selectFrom(TABLE).column(BUCKET_NAME).perPartitionLimit(1).build());
}
Flux<Username> retrieveUsers(BucketName bucketName) {
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java
index 2ab2832071..13a44d2f7a 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/src/test/java/org/apache/james/vault/metadata/CassandraDeletedMessageMetadataVaultTest.java
@@ -79,7 +79,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO storageInformation (owner,messageId,bucketName,blobId) VALUES (:owner,:messageId,:bucketName,:blobId);"));
+ .whenQueryStartsWith("INSERT INTO storageinformation (owner,messageid,bucketname,blobid)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -96,7 +96,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO deletedMessageMetadata (bucketName,owner,messageId,payload) VALUES (:bucketName,:owner,:messageId,:payload);"));
+ .whenQueryStartsWith("INSERT INTO deletedmessagemetadata (bucketname,owner,messageid,payload)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -113,7 +113,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -130,7 +130,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -151,7 +151,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -172,7 +172,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -193,7 +193,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -216,7 +216,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -238,7 +238,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("INSERT INTO userPerBucket (bucketName,user) VALUES (:bucketName,:user);"));
+ .whenQueryStartsWith("INSERT INTO userperbucket (bucketName,user)"));
try {
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -262,7 +262,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("DELETE FROM userPerBucket WHERE bucketName=:bucketName;"));
+ .whenQueryStartsWith("DELETE FROM userperbucket WHERE bucketname=:bucketname"));
Mono.from(testee.store(DELETED_MESSAGE)).block();
try {
@@ -282,7 +282,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("DELETE FROM deletedMessageMetadata WHERE owner=:owner AND bucketName=:bucketName;"));
+ .whenQueryStartsWith("DELETE FROM deletedmessagemetadata WHERE owner=:owner AND bucketname=:bucketname"));
Mono.from(testee.store(DELETED_MESSAGE)).block();
@@ -303,7 +303,7 @@ public class CassandraDeletedMessageMetadataVaultTest implements DeletedMessageM
cassandra.getConf()
.registerScenario(fail()
.times(1)
- .whenQueryStartsWith("DELETE FROM storageInformation WHERE owner=:owner AND messageId=:messageId;"));
+ .whenQueryStartsWith("DELETE FROM storageinformation WHERE owner=:owner AND messageid=:messageid"));
Mono.from(testee.store(DELETED_MESSAGE)).block();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org