MAILBOX-342 CassandraModule.Builder should handle IF NOT EXISTS policy
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7ad4f422 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7ad4f422 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7ad4f422 Branch: refs/heads/master Commit: 7ad4f422e044568c20d6aa1fe94ada4c701d68d2 Parents: 45318db Author: benwa <[email protected]> Authored: Wed Jul 25 10:29:38 2018 +0700 Committer: benwa <[email protected]> Committed: Thu Jul 26 13:47:39 2018 +0700 ---------------------------------------------------------------------- .../james/backends/cassandra/components/CassandraModule.java | 7 +++++-- .../backends/cassandra/init/CassandraZonedDateTimeModule.java | 1 - .../cassandra/versions/CassandraSchemaVersionModule.java | 1 - .../backends/cassandra/init/CassandraTypeProviderTest.java | 4 +--- .../apache/james/backends/cassandra/utils/PaggingTest.java | 1 - .../eventstore/cassandra/CassandraEventStoreModule.java | 1 - .../james/mailbox/cassandra/modules/CassandraAclModule.java | 2 -- .../mailbox/cassandra/modules/CassandraAnnotationModule.java | 1 - .../cassandra/modules/CassandraApplicableFlagsModule.java | 1 - .../mailbox/cassandra/modules/CassandraAttachmentModule.java | 4 ---- .../cassandra/modules/CassandraDeletedMessageModule.java | 1 - .../mailbox/cassandra/modules/CassandraFirstUnseenModule.java | 1 - .../cassandra/modules/CassandraMailboxCounterModule.java | 1 - .../mailbox/cassandra/modules/CassandraMailboxModule.java | 4 ---- .../cassandra/modules/CassandraMailboxRecentsModule.java | 1 - .../mailbox/cassandra/modules/CassandraMessageModule.java | 5 ----- .../mailbox/cassandra/modules/CassandraModSeqModule.java | 1 - .../james/mailbox/cassandra/modules/CassandraQuotaModule.java | 4 ---- .../cassandra/modules/CassandraRegistrationModule.java | 2 -- .../cassandra/modules/CassandraSubscriptionModule.java | 1 - .../james/mailbox/cassandra/modules/CassandraUidModule.java | 1 - .../org/apache/james/blob/cassandra/CassandraBlobModule.java | 2 -- .../james/domainlist/cassandra/CassandraDomainListModule.java | 1 - .../cassandra/CassandraMailRepositoryUrlModule.java | 1 - .../org/apache/james/rrt/cassandra/CassandraRRTModule.java | 1 - .../james/sieve/cassandra/CassandraSieveRepositoryModule.java | 5 ----- .../james/user/cassandra/CassandraUsersRepositoryModule.java | 1 - .../james/jmap/cassandra/access/CassandraAccessModule.java | 1 - .../vacation/CassandraNotificationRegistryModule.java | 1 - .../jmap/cassandra/vacation/CassandraVacationModule.java | 1 - .../cassandra/CassandraMailRepositoryModule.java | 4 ---- 31 files changed, 6 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraModule.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraModule.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraModule.java index a082fc1..63e2f89 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraModule.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraModule.java @@ -95,7 +95,9 @@ public interface CassandraModule { public Builder statement(Function<Create, Statement> createStatement) { return originalBuilderReference.addTable( - new CassandraTable(tableName, createStatement.apply(SchemaBuilder.createTable(tableName)))); + new CassandraTable(tableName, createStatement.apply( + SchemaBuilder.createTable(tableName) + .ifNotExists()))); } } @@ -111,7 +113,8 @@ public interface CassandraModule { public Builder statement(Function<CreateType, CreateType> createStatement) { return originalBuilderReference.addType( new CassandraType(typeName, createStatement.apply( - SchemaBuilder.createType(typeName)))); + SchemaBuilder.createType(typeName) + .ifNotExists()))); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraZonedDateTimeModule.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraZonedDateTimeModule.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraZonedDateTimeModule.java index fe81f81..63c43c7 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraZonedDateTimeModule.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraZonedDateTimeModule.java @@ -31,7 +31,6 @@ public interface CassandraZonedDateTimeModule { CassandraModule MODULE = CassandraModule.type(ZONED_DATE_TIME) .statement(statement -> statement - .ifNotExists() .addColumn(DATE, timestamp()) .addColumn(TIME_ZONE, text())) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionModule.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionModule.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionModule.java index 74d043e..acffb8a 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionModule.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionModule.java @@ -28,7 +28,6 @@ import org.apache.james.backends.cassandra.versions.table.CassandraSchemaVersion public interface CassandraSchemaVersionModule { CassandraModule MODULE = CassandraModule.table(CassandraSchemaVersionTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSchemaVersionTable.KEY, timeuuid()) .addClusteringColumn(CassandraSchemaVersionTable.VALUE, cint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java index 7993251..8de8baa 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java @@ -45,9 +45,7 @@ public class CassandraTypeProviderTest { @Before public void setUp() { module = CassandraModule.type(TYPE_NAME) - .statement(statement -> statement - .ifNotExists() - .addColumn(PROPERTY, text())) + .statement(statement -> statement.addColumn(PROPERTY, text())) .build(); cassandra = CassandraCluster.create(module, cassandraServer.getHost()); cassandra.getTypesProvider(); http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java index 1946928..946c338 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/PaggingTest.java @@ -57,7 +57,6 @@ public class PaggingTest { public static void setUpClass() { CassandraModule modules = CassandraModule.table(TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(ID, DataType.timeuuid()) .addClusteringColumn(CLUSTERING, DataType.bigint())) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreModule.java ---------------------------------------------------------------------- diff --git a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreModule.java b/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreModule.java index 6613654..194a0d4 100644 --- a/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreModule.java +++ b/event-sourcing/event-store-cassandra/src/main/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraEventStoreModule.java @@ -28,7 +28,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraEventStoreModule { CassandraModule MODULE = CassandraModule.table(CassandraEventStoreTable.EVENTS_TABLE) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraEventStoreTable.AGGREGATE_ID, DataType.varchar()) .addClusteringColumn(CassandraEventStoreTable.EVENT_ID, DataType.cint()) .addColumn(CassandraEventStoreTable.EVENT, DataType.text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAclModule.java ---------------------------------------------------------------------- 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 c6da2a5..acb2205 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 @@ -35,7 +35,6 @@ public interface CassandraAclModule { .builder() .table(CassandraACLTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraACLTable.ID, timeuuid()) .addColumn(CassandraACLTable.ACL, text()) .addColumn(CassandraACLTable.VERSION, bigint()) @@ -45,7 +44,6 @@ public interface CassandraAclModule { SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION))) .table(CassandraUserMailboxRightsTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraUserMailboxRightsTable.USER_NAME, text()) .addClusteringColumn(CassandraUserMailboxRightsTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraUserMailboxRightsTable.RIGHTS, text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAnnotationModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAnnotationModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAnnotationModule.java index 032ac3a..88ccdab 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAnnotationModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAnnotationModule.java @@ -31,7 +31,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraAnnotationModule { CassandraModule MODULE = CassandraModule.table(CassandraAnnotationTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraAnnotationTable.MAILBOX_ID, timeuuid()) .addClusteringColumn(CassandraAnnotationTable.KEY, text()) .addColumn(CassandraAnnotationTable.VALUE, text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraApplicableFlagsModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraApplicableFlagsModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraApplicableFlagsModule.java index 11e5538..9dc2721 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraApplicableFlagsModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraApplicableFlagsModule.java @@ -33,7 +33,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraApplicableFlagsModule { CassandraModule MODULE = CassandraModule.table(CassandraApplicableFlagTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraApplicableFlagTable.MAILBOX_ID, timeuuid()) .addColumn(Flag.USER_FLAGS, set(text())) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAttachmentModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAttachmentModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAttachmentModule.java index acee1f1..8a94f1d 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAttachmentModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraAttachmentModule.java @@ -37,7 +37,6 @@ public interface CassandraAttachmentModule { CassandraModule MODULE = CassandraModule.table(CassandraAttachmentTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraAttachmentTable.ID, text()) .addColumn(CassandraAttachmentTable.PAYLOAD, blob()) .addColumn(CassandraAttachmentTable.TYPE, text()) @@ -46,7 +45,6 @@ public interface CassandraAttachmentModule { .comment("Holds attachment for fast attachment retrieval")) .table(CassandraAttachmentV2Table.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraAttachmentV2Table.ID_AS_UUID, uuid()) .addColumn(CassandraAttachmentV2Table.ID, text()) .addColumn(CassandraAttachmentV2Table.BLOB_ID, text()) @@ -60,7 +58,6 @@ public interface CassandraAttachmentModule { "in `blobs` and `blobparts` tables.")) .table(CassandraAttachmentMessageIdTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraAttachmentMessageIdTable.ATTACHMENT_ID_AS_UUID, uuid()) .addColumn(CassandraAttachmentMessageIdTable.ATTACHMENT_ID, text()) .addClusteringColumn(CassandraAttachmentMessageIdTable.MESSAGE_ID, text()) @@ -71,7 +68,6 @@ public interface CassandraAttachmentModule { .comment("Holds ids of messages owning the attachment")) .table(CassandraAttachmentOwnerTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraAttachmentOwnerTable.ID, uuid()) .addClusteringColumn(CassandraAttachmentOwnerTable.OWNER, text()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraDeletedMessageModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraDeletedMessageModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraDeletedMessageModule.java index b2689d9..4997417 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraDeletedMessageModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraDeletedMessageModule.java @@ -32,7 +32,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraDeletedMessageModule { CassandraModule MODULE = CassandraModule.table(TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(MAILBOX_ID, DataType.timeuuid()) .addClusteringColumn(UID, DataType.bigint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraFirstUnseenModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraFirstUnseenModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraFirstUnseenModule.java index aec22b2..75c1595 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraFirstUnseenModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraFirstUnseenModule.java @@ -29,7 +29,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraFirstUnseenModule { CassandraModule MODULE = CassandraModule.table(CassandraFirstUnseenTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraFirstUnseenTable.MAILBOX_ID, DataType.timeuuid()) .addClusteringColumn(CassandraFirstUnseenTable.UID, DataType.bigint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxCounterModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxCounterModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxCounterModule.java index fdeb187..46d3798 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxCounterModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxCounterModule.java @@ -31,7 +31,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraMailboxCounterModule { CassandraModule MODULE = CassandraModule.table(CassandraMailboxCountersTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMailboxCountersTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraMailboxCountersTable.COUNT, counter()) .addColumn(CassandraMailboxCountersTable.UNSEEN, counter()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java index c9e79dd..5e4e663 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java @@ -35,12 +35,10 @@ public interface CassandraMailboxModule { CassandraModule MODULE = CassandraModule.builder() .type(CassandraMailboxTable.MAILBOX_BASE) .statement(statement -> statement - .ifNotExists() .addColumn(CassandraMailboxTable.MailboxBase.NAMESPACE, text()) .addColumn(CassandraMailboxTable.MailboxBase.USER, text())) .table(CassandraMailboxTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMailboxTable.ID, timeuuid()) .addUDTColumn(CassandraMailboxTable.MAILBOX_BASE, SchemaBuilder.frozen(CassandraMailboxTable.MAILBOX_BASE)) .addColumn(CassandraMailboxTable.NAME, text()) @@ -51,7 +49,6 @@ public interface CassandraMailboxModule { SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION))) .table(CassandraMailboxPathTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addUDTPartitionKey(CassandraMailboxPathTable.NAMESPACE_AND_USER, SchemaBuilder.frozen(CassandraMailboxTable.MAILBOX_BASE)) .addClusteringColumn(CassandraMailboxPathTable.MAILBOX_NAME, text()) .addColumn(CassandraMailboxPathTable.MAILBOX_ID, timeuuid()) @@ -62,7 +59,6 @@ public interface CassandraMailboxModule { SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION))) .table(CassandraMailboxPathV2Table.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMailboxPathV2Table.NAMESPACE, text()) .addPartitionKey(CassandraMailboxPathV2Table.USER, text()) .addClusteringColumn(CassandraMailboxPathV2Table.MAILBOX_NAME, text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java index 9193470..b79082c 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java @@ -31,7 +31,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraMailboxRecentsModule { CassandraModule MODULE = CassandraModule.table(CassandraMailboxRecentsTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMailboxRecentsTable.MAILBOX_ID, timeuuid()) .addClusteringColumn(CassandraMailboxRecentsTable.RECENT_MESSAGE_UID, bigint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMessageModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMessageModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMessageModule.java index 856736a..da6dfb0 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMessageModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMessageModule.java @@ -44,7 +44,6 @@ public interface CassandraMessageModule { CassandraModule MODULE = CassandraModule.builder() .table(CassandraMessageIdTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMessageIds.MAILBOX_ID, timeuuid()) .addClusteringColumn(CassandraMessageIds.IMAP_UID, bigint()) .addColumn(CassandraMessageIds.MESSAGE_ID, timeuuid()) @@ -64,7 +63,6 @@ public interface CassandraMessageModule { SchemaBuilder.rows(CACHED_MESSAGE_ID_ROWS))) .table(MessageIdToImapUid.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMessageIds.MESSAGE_ID, timeuuid()) .addClusteringColumn(CassandraMessageIds.MAILBOX_ID, timeuuid()) .addClusteringColumn(CassandraMessageIds.IMAP_UID, bigint()) @@ -84,7 +82,6 @@ public interface CassandraMessageModule { SchemaBuilder.rows(CACHED_IMAP_UID_ROWS))) .table(CassandraMessageV2Table.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMessageIds.MESSAGE_ID, timeuuid()) .addColumn(CassandraMessageV2Table.INTERNAL_DATE, timestamp()) .addColumn(CassandraMessageV2Table.BODY_START_OCTET, cint()) @@ -100,13 +97,11 @@ public interface CassandraMessageModule { "in `blobs` and `blobparts` tables.")) .type(CassandraMessageV2Table.PROPERTIES) .statement(statement -> statement - .ifNotExists() .addColumn(CassandraMessageV2Table.Properties.NAMESPACE, text()) .addColumn(CassandraMessageV2Table.Properties.NAME, text()) .addColumn(CassandraMessageV2Table.Properties.VALUE, text())) .type(CassandraMessageV2Table.ATTACHMENTS) .statement(statement -> statement - .ifNotExists() .addColumn(CassandraMessageV2Table.Attachments.ID, text()) .addColumn(CassandraMessageV2Table.Attachments.NAME, text()) .addColumn(CassandraMessageV2Table.Attachments.CID, text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraModSeqModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraModSeqModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraModSeqModule.java index 2e0169e..b8cd359 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraModSeqModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraModSeqModule.java @@ -31,7 +31,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraModSeqModule { CassandraModule MODULE = CassandraModule.table(CassandraMessageModseqTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMessageModseqTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraMessageModseqTable.NEXT_MODSEQ, bigint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraQuotaModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraQuotaModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraQuotaModule.java index 3f50395..59b8bd0 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraQuotaModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraQuotaModule.java @@ -36,7 +36,6 @@ public interface CassandraQuotaModule { CassandraModule MODULE = CassandraModule.builder() .table(CassandraCurrentQuota.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraCurrentQuota.QUOTA_ROOT, text()) .addColumn(CassandraCurrentQuota.MESSAGE_COUNT, counter()) .addColumn(CassandraCurrentQuota.STORAGE, counter()) @@ -46,7 +45,6 @@ public interface CassandraQuotaModule { SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION))) .table(CassandraMaxQuota.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMaxQuota.QUOTA_ROOT, text()) .addColumn(CassandraMaxQuota.MESSAGE_COUNT, bigint()) .addColumn(CassandraMaxQuota.STORAGE, bigint()) @@ -56,7 +54,6 @@ public interface CassandraQuotaModule { SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION))) .table(CassandraDomainMaxQuota.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraDomainMaxQuota.DOMAIN, text()) .addColumn(CassandraDomainMaxQuota.MESSAGE_COUNT, bigint()) .addColumn(CassandraDomainMaxQuota.STORAGE, bigint()) @@ -66,7 +63,6 @@ public interface CassandraQuotaModule { SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION))) .table(CassandraGlobalMaxQuota.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraGlobalMaxQuota.TYPE, text()) .addColumn(CassandraGlobalMaxQuota.VALUE, bigint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java index 97e6714..94997c1 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraRegistrationModule.java @@ -30,13 +30,11 @@ public interface CassandraRegistrationModule { CassandraModule MODULE = CassandraModule.builder() .type(CassandraMailboxPathRegisterTable.MAILBOX_PATH) .statement(statement -> statement - .ifNotExists() .addColumn(CassandraMailboxPathRegisterTable.MailboxPath.NAMESPACE, text()) .addColumn(CassandraMailboxPathRegisterTable.MailboxPath.NAME, text()) .addColumn(CassandraMailboxPathRegisterTable.MailboxPath.USER, text())) .table(CassandraMailboxPathRegisterTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addUDTPartitionKey(CassandraMailboxPathRegisterTable.MAILBOX_PATH, SchemaBuilder.frozen(CassandraMailboxPathRegisterTable.MAILBOX_PATH)) .addClusteringColumn(CassandraMailboxPathRegisterTable.TOPIC, text()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java index 068da26..e35e373 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java @@ -32,7 +32,6 @@ public interface CassandraSubscriptionModule { CassandraModule MODULE = CassandraModule.table(CassandraSubscriptionTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSubscriptionTable.USER, text()) .addClusteringColumn(CassandraSubscriptionTable.MAILBOX, text()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraUidModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraUidModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraUidModule.java index e32d8f0..efa3bce 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraUidModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraUidModule.java @@ -31,7 +31,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public interface CassandraUidModule { CassandraModule MODULE = CassandraModule.table(CassandraMessageUidTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraMessageUidTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraMessageUidTable.NEXT_UID, bigint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobModule.java ---------------------------------------------------------------------- diff --git a/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobModule.java b/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobModule.java index 9832f11..fb3623a 100644 --- a/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobModule.java +++ b/server/blob/blob-cassandra/src/main/java/org/apache/james/blob/cassandra/CassandraBlobModule.java @@ -28,7 +28,6 @@ public interface CassandraBlobModule { .builder() .table(BlobTable.BlobParts.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(BlobTable.ID, DataType.text()) .addClusteringColumn(BlobTable.BlobParts.CHUNK_NUMBER, DataType.cint()) .addColumn(BlobTable.BlobParts.DATA, DataType.blob()) @@ -37,7 +36,6 @@ public interface CassandraBlobModule { "Messages` headers and bodies are stored, chunked in blobparts.")) .table(BlobTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(BlobTable.ID, DataType.text()) .addClusteringColumn(BlobTable.NUMBER_OF_CHUNK, DataType.cint()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java index cd38715..8d05add 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java @@ -30,7 +30,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraDomainListModule { public static final CassandraModule MODULE = CassandraModule.table(CassandraDomainsTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraDomainsTable.DOMAIN, text()) .withOptions() .comment("Holds domains this James server is operating on.") http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryUrlModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryUrlModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryUrlModule.java index 5f269fd..7523451 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryUrlModule.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryUrlModule.java @@ -29,7 +29,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraMailRepositoryUrlModule { public static final CassandraModule MODULE = CassandraModule.table(UrlsTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(UrlsTable.URL, text()) .withOptions() .comment("Holds the list of available mail repository") http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java index da8cd62..0970ce1 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRRTModule.java @@ -30,7 +30,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraRRTModule { public static final CassandraModule MODULE = CassandraModule.table(CassandraRecipientRewriteTableTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraRecipientRewriteTableTable.USER, text()) .addClusteringColumn(CassandraRecipientRewriteTableTable.DOMAIN, text()) .addClusteringColumn(CassandraRecipientRewriteTableTable.MAPPING, text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryModule.java index ddaccb5..799e972 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryModule.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryModule.java @@ -37,7 +37,6 @@ public interface CassandraSieveRepositoryModule { CassandraModule MODULE = CassandraModule.builder() .table(CassandraSieveTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSieveTable.USER_NAME, text()) .addClusteringColumn(CassandraSieveTable.SCRIPT_NAME, text()) .addColumn(CassandraSieveTable.SCRIPT_CONTENT, text()) @@ -47,28 +46,24 @@ public interface CassandraSieveRepositoryModule { .comment("Holds SIEVE scripts.")) .table(CassandraSieveSpaceTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSieveSpaceTable.USER_NAME, text()) .addColumn(CassandraSieveSpaceTable.SPACE_USED, counter()) .withOptions() .comment("Holds per user current space occupied by SIEVE scripts.")) .table(CassandraSieveQuotaTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSieveQuotaTable.USER_NAME, text()) .addColumn(CassandraSieveQuotaTable.QUOTA, bigint()) .withOptions() .comment("Holds per user size limitations for SIEVE script storage.")) .table(CassandraSieveClusterQuotaTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSieveClusterQuotaTable.NAME, text()) .addColumn(CassandraSieveClusterQuotaTable.VALUE, bigint()) .withOptions() .comment("Holds default size limitations for SIEVE script storage.")) .table(CassandraSieveActiveTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraSieveActiveTable.USER_NAME, text()) .addColumn(CassandraSieveActiveTable.SCRIPT_NAME, text()) .addColumn(CassandraSieveActiveTable.DATE, timestamp()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepositoryModule.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepositoryModule.java index 1bb176d..473cb02 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepositoryModule.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepositoryModule.java @@ -28,7 +28,6 @@ public class CassandraUsersRepositoryModule { public static final CassandraModule MODULE = CassandraModule.table(CassandraUserTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraUserTable.NAME, text()) .addColumn(CassandraUserTable.REALNAME, text()) .addColumn(CassandraUserTable.PASSWORD, text()) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessModule.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessModule.java index 6f706d5..6fe4583 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessModule.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/access/CassandraAccessModule.java @@ -31,7 +31,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraAccessModule { public static final CassandraModule MODULE = CassandraModule.table(CassandraAccessTokenTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraAccessTokenTable.TOKEN, uuid()) .addColumn(CassandraAccessTokenTable.USERNAME, text()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java index 270fa50..0cb2abb 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryModule.java @@ -30,7 +30,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraNotificationRegistryModule { public static final CassandraModule MODULE = CassandraModule.table(CassandraNotificationTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraNotificationTable.ACCOUNT_ID, text()) .addClusteringColumn(CassandraNotificationTable.RECIPIENT_ID, text()) .withOptions() http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationModule.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationModule.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationModule.java index 5fa8567..a55d71a 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationModule.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationModule.java @@ -32,7 +32,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraVacationModule { public static final CassandraModule MODULE = CassandraModule.table(CassandraVacationTable.TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(CassandraVacationTable.ACCOUNT_ID, text()) .addColumn(CassandraVacationTable.IS_ENABLED, cboolean()) .addUDTColumn(CassandraVacationTable.FROM_DATE, SchemaBuilder.frozen(CassandraZonedDateTimeModule.ZONED_DATE_TIME)) http://git-wip-us.apache.org/repos/asf/james-project/blob/7ad4f422/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryModule.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryModule.java index 4d4ed3d..a2b7661 100644 --- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryModule.java +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryModule.java @@ -34,22 +34,18 @@ public interface CassandraMailRepositoryModule { CassandraModule MODULE = CassandraModule.builder() .type(MailRepositoryTable.HEADER_TYPE) .statement(statement -> statement - .ifNotExists() .addColumn(MailRepositoryTable.HEADER_NAME, text()) .addColumn(MailRepositoryTable.HEADER_VALUE, text())) .table(MailRepositoryTable.COUNT_TABLE) .statement(statement -> statement - .ifNotExists() .addPartitionKey(MailRepositoryTable.REPOSITORY_NAME, text()) .addColumn(MailRepositoryTable.COUNT, counter())) .table(MailRepositoryTable.KEYS_TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(MailRepositoryTable.REPOSITORY_NAME, text()) .addClusteringColumn(MailRepositoryTable.MAIL_KEY, text())) .table(MailRepositoryTable.CONTENT_TABLE_NAME) .statement(statement -> statement - .ifNotExists() .addPartitionKey(MailRepositoryTable.REPOSITORY_NAME, text()) .addPartitionKey(MailRepositoryTable.MAIL_KEY, text()) .addColumn(MailRepositoryTable.MESSAGE_SIZE, bigint()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
