MAILBOX-295 Mailbox Cassandra modules should use immutableList
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/eea69036 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/eea69036 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/eea69036 Branch: refs/heads/master Commit: eea690360a7786f1009751d6403241c58300ac53 Parents: 432e123 Author: benwa <[email protected]> Authored: Thu May 18 17:54:00 2017 +0700 Committer: benwa <[email protected]> Committed: Fri May 19 17:30:34 2017 +0700 ---------------------------------------------------------------------- .../james/mailbox/cassandra/modules/CassandraAclModule.java | 5 +++-- .../mailbox/cassandra/modules/CassandraAnnotationModule.java | 5 +++-- .../cassandra/modules/CassandraApplicableFlagsModule.java | 3 +-- .../mailbox/cassandra/modules/CassandraAttachmentModule.java | 6 +++--- .../cassandra/modules/CassandraMailboxCounterModule.java | 6 +++--- .../cassandra/modules/CassandraMailboxRecentsModule.java | 6 +++--- .../mailbox/cassandra/modules/CassandraModSeqModule.java | 7 +++---- .../cassandra/modules/CassandraRegistrationModule.java | 6 +++--- .../james/mailbox/cassandra/modules/CassandraUidModule.java | 7 +++---- 9 files changed, 25 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 e788b7e..dd0d757 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 @@ -33,6 +33,7 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.mailbox.cassandra.table.CassandraACLTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraAclModule implements CassandraModule { @@ -40,7 +41,7 @@ public class CassandraAclModule implements CassandraModule { private final List<CassandraType> types; public CassandraAclModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraACLTable.TABLE_NAME, SchemaBuilder.createTable(CassandraACLTable.TABLE_NAME) .ifNotExists() @@ -50,7 +51,7 @@ public class CassandraAclModule implements CassandraModule { .withOptions() .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 91740a2..dbab40e 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 @@ -32,13 +32,14 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.mailbox.cassandra.table.CassandraAnnotationTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraAnnotationModule implements CassandraModule { private final List<CassandraTable> tables; private final List<CassandraType> types; public CassandraAnnotationModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraAnnotationTable.TABLE_NAME, SchemaBuilder.createTable(CassandraAnnotationTable.TABLE_NAME) .ifNotExists() @@ -49,7 +50,7 @@ public class CassandraAnnotationModule implements CassandraModule { .compactionOptions(SchemaBuilder.leveledStrategy()) .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 0ad45c7..5d1c183 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 @@ -24,7 +24,6 @@ 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 java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -57,7 +56,7 @@ public class CassandraApplicableFlagsModule implements CassandraModule { .compactionOptions(SchemaBuilder.leveledStrategy()) .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 f1e75f2..6c9f2bd 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 @@ -23,7 +23,6 @@ import static com.datastax.driver.core.DataType.bigint; import static com.datastax.driver.core.DataType.blob; import static com.datastax.driver.core.DataType.text; -import java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -32,6 +31,7 @@ import org.apache.james.backends.cassandra.components.CassandraType; import org.apache.james.mailbox.cassandra.table.CassandraAttachmentTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraAttachmentModule implements CassandraModule { @@ -39,7 +39,7 @@ public class CassandraAttachmentModule implements CassandraModule { private final List<CassandraType> types; public CassandraAttachmentModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraAttachmentTable.TABLE_NAME, SchemaBuilder.createTable(CassandraAttachmentTable.TABLE_NAME) .ifNotExists() @@ -47,7 +47,7 @@ public class CassandraAttachmentModule implements CassandraModule { .addColumn(CassandraAttachmentTable.PAYLOAD, blob()) .addColumn(CassandraAttachmentTable.TYPE, text()) .addColumn(CassandraAttachmentTable.SIZE, bigint()))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 548bd8a..3fad014 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 @@ -22,7 +22,6 @@ package org.apache.james.mailbox.cassandra.modules; import static com.datastax.driver.core.DataType.counter; import static com.datastax.driver.core.DataType.timeuuid; -import java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -32,6 +31,7 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.mailbox.cassandra.table.CassandraMailboxCountersTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraMailboxCounterModule implements CassandraModule { @@ -39,7 +39,7 @@ public class CassandraMailboxCounterModule implements CassandraModule { private final List<CassandraType> types; public CassandraMailboxCounterModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraMailboxCountersTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMailboxCountersTable.TABLE_NAME) .ifNotExists() @@ -50,7 +50,7 @@ public class CassandraMailboxCounterModule implements CassandraModule { .compactionOptions(SchemaBuilder.leveledStrategy()) .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 65412c2..2f860e0 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 @@ -22,7 +22,6 @@ package org.apache.james.mailbox.cassandra.modules; import static com.datastax.driver.core.DataType.bigint; import static com.datastax.driver.core.DataType.timeuuid; -import java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -32,6 +31,7 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.mailbox.cassandra.table.CassandraMailboxRecentsTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraMailboxRecentsModule implements CassandraModule { @@ -39,7 +39,7 @@ public class CassandraMailboxRecentsModule implements CassandraModule { private final List<CassandraType> types; public CassandraMailboxRecentsModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraMailboxRecentsTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMailboxRecentsTable.TABLE_NAME) .ifNotExists() @@ -49,7 +49,7 @@ public class CassandraMailboxRecentsModule implements CassandraModule { .compactionOptions(SchemaBuilder.leveledStrategy()) .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 9588642..66e4e63 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 @@ -22,8 +22,6 @@ package org.apache.james.mailbox.cassandra.modules; import static com.datastax.driver.core.DataType.bigint; import static com.datastax.driver.core.DataType.timeuuid; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -33,6 +31,7 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.mailbox.cassandra.table.CassandraMessageModseqTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraModSeqModule implements CassandraModule { @@ -40,7 +39,7 @@ public class CassandraModSeqModule implements CassandraModule { private final List<CassandraType> types; public CassandraModSeqModule() { - tables = Arrays.asList( + tables = ImmutableList.of( new CassandraTable(CassandraMessageModseqTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMessageModseqTable.TABLE_NAME) .ifNotExists() @@ -50,7 +49,7 @@ public class CassandraModSeqModule implements CassandraModule { .compactionOptions(SchemaBuilder.leveledStrategy()) .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 2c05ca3..bb91fd4 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 @@ -21,7 +21,6 @@ package org.apache.james.mailbox.cassandra.modules; import static com.datastax.driver.core.DataType.text; -import java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -30,6 +29,7 @@ import org.apache.james.backends.cassandra.components.CassandraType; import org.apache.james.mailbox.cassandra.table.CassandraMailboxPathRegisterTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraRegistrationModule implements CassandraModule { @@ -37,7 +37,7 @@ public class CassandraRegistrationModule implements CassandraModule { private final List<CassandraType> types; public CassandraRegistrationModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraMailboxPathRegisterTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMailboxPathRegisterTable.TABLE_NAME) .ifNotExists() @@ -45,7 +45,7 @@ public class CassandraRegistrationModule implements CassandraModule { .addClusteringColumn(CassandraMailboxPathRegisterTable.TOPIC, text()) .withOptions() .compactionOptions(SchemaBuilder.dateTieredStrategy()))); - types = Collections.singletonList( + types = ImmutableList.of( new CassandraType(CassandraMailboxPathRegisterTable.MAILBOX_PATH, SchemaBuilder.createType(CassandraMailboxPathRegisterTable.MAILBOX_PATH) .ifNotExists() http://git-wip-us.apache.org/repos/asf/james-project/blob/eea69036/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 2df0029..2e43884 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 @@ -22,8 +22,6 @@ package org.apache.james.mailbox.cassandra.modules; import static com.datastax.driver.core.DataType.bigint; import static com.datastax.driver.core.DataType.timeuuid; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -33,6 +31,7 @@ import org.apache.james.backends.cassandra.utils.CassandraConstants; import org.apache.james.mailbox.cassandra.table.CassandraMessageUidTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraUidModule implements CassandraModule { @@ -40,7 +39,7 @@ public class CassandraUidModule implements CassandraModule { private final List<CassandraType> types; public CassandraUidModule() { - tables = Arrays.asList( + tables = ImmutableList.of( new CassandraTable(CassandraMessageUidTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMessageUidTable.TABLE_NAME) .ifNotExists() @@ -50,7 +49,7 @@ public class CassandraUidModule implements CassandraModule { .compactionOptions(SchemaBuilder.leveledStrategy()) .caching(SchemaBuilder.KeyCaching.ALL, SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
