JAMES-1968 Removing cassandra index creation capability
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c8914865 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c8914865 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c8914865 Branch: refs/heads/master Commit: c891486586bce209deaae767c3453c1fc8f6176f Parents: f28cc42 Author: benwa <btell...@linagora.com> Authored: Thu Mar 16 22:20:45 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Mar 22 07:11:14 2017 +0700 ---------------------------------------------------------------------- .../cassandra/components/CassandraIndex.java | 38 -------------------- .../cassandra/components/CassandraModule.java | 2 -- .../init/CassandraModuleComposite.java | 10 ------ .../cassandra/init/CassandraTableManager.java | 2 -- .../init/CassandraZonedDateTimeModule.java | 8 ----- .../init/CassandraTypeProviderTest.java | 5 --- .../backends/cassandra/utils/PaggingTest.java | 6 ---- .../cassandra/modules/CassandraAclModule.java | 23 +++++------- .../modules/CassandraAnnotationModule.java | 8 ----- .../modules/CassandraApplicableFlagsModule.java | 8 ----- .../modules/CassandraAttachmentModule.java | 8 ----- .../modules/CassandraDeletedMessageModule.java | 25 +++++-------- .../modules/CassandraFirstUnseenModule.java | 8 ----- .../modules/CassandraMailboxCounterModule.java | 8 ----- .../modules/CassandraMailboxModule.java | 8 ----- .../modules/CassandraMailboxRecentsModule.java | 8 ----- .../modules/CassandraMessageModule.java | 13 +------ .../modules/CassandraModSeqModule.java | 8 ----- .../cassandra/modules/CassandraQuotaModule.java | 28 ++++++--------- .../modules/CassandraRegistrationModule.java | 11 +----- .../modules/CassandraSubscriptionModule.java | 18 +++------- .../cassandra/modules/CassandraUidModule.java | 8 ----- .../cassandra/CassandraDomainListModule.java | 8 ----- .../james/rrt/cassandra/CassandraRRTModule.java | 11 +----- .../CassandraSieveRepositoryModule.java | 8 ----- .../CassandraUsersRepositoryModule.java | 8 ----- .../cassandra/access/CassandraAccessModule.java | 8 ----- .../CassandraNotificationRegistryModule.java | 8 ----- .../vacation/CassandraVacationModule.java | 8 ----- 29 files changed, 35 insertions(+), 285 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraIndex.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraIndex.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraIndex.java deleted file mode 100644 index ed967c6..0000000 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/components/CassandraIndex.java +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************** - * 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.backends.cassandra.components; - -import com.datastax.driver.core.schemabuilder.SchemaStatement; - -public class CassandraIndex { - - public final static String INDEX_PREFIX = "INDEX_"; - - private final SchemaStatement createIndexStatement; - - public CassandraIndex(SchemaStatement createIndexStatement) { - this.createIndexStatement = createIndexStatement; - } - - public SchemaStatement getCreateIndexStatement() { - return createIndexStatement; - } - -} http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 6a1dc67..3655b5a 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 @@ -25,8 +25,6 @@ public interface CassandraModule { List<CassandraTable> moduleTables(); - List<CassandraIndex> moduleIndex(); - List<CassandraType> moduleTypes(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java index e46d7b7..38265b0 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java @@ -22,7 +22,6 @@ package org.apache.james.backends.cassandra.init; import java.util.Arrays; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -33,16 +32,12 @@ import com.google.common.collect.ImmutableList; public class CassandraModuleComposite implements CassandraModule { private final ImmutableList<CassandraTable> tables; - private final ImmutableList<CassandraIndex> index; private final ImmutableList<CassandraType> types; public CassandraModuleComposite(CassandraModule... modules) { tables = Arrays.stream(modules) .flatMap(module -> module.moduleTables().stream()) .collect(Guavate.toImmutableList()); - index = Arrays.stream(modules) - .flatMap(module -> module.moduleIndex().stream()) - .collect(Guavate.toImmutableList()); types = Arrays.stream(modules) .flatMap(module -> module.moduleTypes().stream()) .collect(Guavate.toImmutableList()); @@ -54,11 +49,6 @@ public class CassandraModuleComposite implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java index 4dad62d..95db5d9 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java @@ -36,8 +36,6 @@ public class CassandraTableManager { public CassandraTableManager ensureAllTables() { module.moduleTables() .forEach(table -> session.execute(table.getCreateStatement())); - module.moduleIndex() - .forEach(index -> session.execute(index.getCreateIndexStatement())); return this; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 3a6c949..0ef3461 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 @@ -25,7 +25,6 @@ import static com.datastax.driver.core.DataType.timestamp; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -39,12 +38,10 @@ public class CassandraZonedDateTimeModule implements CassandraModule { public static final String TIME_ZONE = "timeZone"; private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraZonedDateTimeModule() { tables = Collections.emptyList(); - index = Collections.emptyList(); types = Collections.singletonList( new CassandraType(ZONED_DATE_TIME, SchemaBuilder.createType(ZONED_DATE_TIME) @@ -59,11 +56,6 @@ public class CassandraZonedDateTimeModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 c930b3e..67fe7ee 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 @@ -29,7 +29,6 @@ import static org.assertj.core.api.Assertions.fail; import com.datastax.driver.core.schemabuilder.SchemaBuilder; import com.google.common.collect.ImmutableList; import org.apache.james.backends.cassandra.CassandraCluster; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -52,10 +51,6 @@ public class CassandraTypeProviderTest { return ImmutableList.of(); } - @Override public List<CassandraIndex> moduleIndex() { - return ImmutableList.of(); - } - @Override public List<CassandraType> moduleTypes() { return ImmutableList.copyOf( Arrays.asList(new CassandraType(TYPE_NAME, SchemaBuilder.createType(TYPE_NAME) http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 a643818..a9fc183 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 @@ -29,7 +29,6 @@ import java.util.UUID; import java.util.stream.IntStream; import org.apache.james.backends.cassandra.CassandraCluster; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -65,11 +64,6 @@ public class PaggingTest { } @Override - public List<CassandraIndex> moduleIndex() { - return ImmutableList.of(); - } - - @Override public List<CassandraType> moduleTypes() { return ImmutableList.of(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 1f96adc..71527a2 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 @@ -19,24 +19,23 @@ package org.apache.james.mailbox.cassandra.modules; -import com.datastax.driver.core.schemabuilder.SchemaBuilder; -import org.apache.james.backends.cassandra.components.CassandraIndex; +import static com.datastax.driver.core.DataType.bigint; +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; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; import org.apache.james.mailbox.cassandra.table.CassandraACLTable; -import java.util.Collections; -import java.util.List; - -import static com.datastax.driver.core.DataType.bigint; -import static com.datastax.driver.core.DataType.text; -import static com.datastax.driver.core.DataType.timeuuid; +import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraAclModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraAclModule() { @@ -47,7 +46,6 @@ public class CassandraAclModule implements CassandraModule { .addPartitionKey(CassandraACLTable.ID, timeuuid()) .addColumn(CassandraACLTable.ACL, text()) .addColumn(CassandraACLTable.VERSION, bigint()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -57,11 +55,6 @@ public class CassandraAclModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 443a065..0dbe487 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 @@ -25,7 +25,6 @@ import static com.datastax.driver.core.DataType.timeuuid; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -35,7 +34,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraAnnotationModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraAnnotationModule() { @@ -46,7 +44,6 @@ public class CassandraAnnotationModule implements CassandraModule { .addPartitionKey(CassandraAnnotationTable.MAILBOX_ID, timeuuid()) .addClusteringColumn(CassandraAnnotationTable.KEY, text()) .addColumn(CassandraAnnotationTable.VALUE, text()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -56,11 +53,6 @@ public class CassandraAnnotationModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 5ec8023..57d6f24 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 @@ -27,7 +27,6 @@ import static com.datastax.driver.core.DataType.timeuuid; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -39,7 +38,6 @@ import com.google.common.collect.ImmutableList; public class CassandraApplicableFlagsModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraApplicableFlagsModule() { @@ -54,7 +52,6 @@ public class CassandraApplicableFlagsModule implements CassandraModule { .addColumn(Flag.FLAGGED, cboolean()) .addColumn(Flag.SEEN, cboolean()) .addColumn(Flag.USER_FLAGS, set(text())))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -64,11 +61,6 @@ public class CassandraApplicableFlagsModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 0108161..f1e75f2 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 @@ -26,7 +26,6 @@ import static com.datastax.driver.core.DataType.text; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -37,7 +36,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraAttachmentModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraAttachmentModule() { @@ -49,7 +47,6 @@ public class CassandraAttachmentModule implements CassandraModule { .addColumn(CassandraAttachmentTable.PAYLOAD, blob()) .addColumn(CassandraAttachmentTable.TYPE, text()) .addColumn(CassandraAttachmentTable.SIZE, bigint()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -59,11 +56,6 @@ public class CassandraAttachmentModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 100f248..c9a156f 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 @@ -19,24 +19,23 @@ package org.apache.james.mailbox.cassandra.modules; -import com.datastax.driver.core.DataType; -import com.datastax.driver.core.schemabuilder.SchemaBuilder; -import com.google.common.collect.ImmutableList; -import org.apache.james.backends.cassandra.components.CassandraIndex; +import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.MAILBOX_ID; +import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.TABLE_NAME; +import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.UID; + +import java.util.List; + import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; -import java.util.List; - -import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.MAILBOX_ID; -import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.TABLE_NAME; -import static org.apache.james.mailbox.cassandra.table.CassandraDeletedMessageTable.UID; +import com.datastax.driver.core.DataType; +import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraDeletedMessageModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraDeletedMessageModule() { @@ -45,7 +44,6 @@ public class CassandraDeletedMessageModule implements CassandraModule { .ifNotExists() .addPartitionKey(MAILBOX_ID, DataType.timeuuid()) .addClusteringColumn(UID, DataType.bigint()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -55,11 +53,6 @@ public class CassandraDeletedMessageModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 27d9cc7..1e3d1b8 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 @@ -21,7 +21,6 @@ package org.apache.james.mailbox.cassandra.modules; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -34,7 +33,6 @@ import com.google.common.collect.ImmutableList; public class CassandraFirstUnseenModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraFirstUnseenModule() { @@ -45,7 +43,6 @@ public class CassandraFirstUnseenModule implements CassandraModule { .addClusteringColumn(CassandraFirstUnseenTable.UID, DataType.bigint()) .withOptions() .clusteringOrder(CassandraFirstUnseenTable.UID, SchemaBuilder.Direction.ASC))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -55,11 +52,6 @@ public class CassandraFirstUnseenModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 642ac02..9ecba5a 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 @@ -25,7 +25,6 @@ import static com.datastax.driver.core.DataType.timeuuid; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -36,7 +35,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraMailboxCounterModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraMailboxCounterModule() { @@ -47,7 +45,6 @@ public class CassandraMailboxCounterModule implements CassandraModule { .addPartitionKey(CassandraMailboxCountersTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraMailboxCountersTable.COUNT, counter()) .addColumn(CassandraMailboxCountersTable.UNSEEN, counter()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -57,11 +54,6 @@ public class CassandraMailboxCounterModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 80ec6a1..e26e54c 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 @@ -25,7 +25,6 @@ import static com.datastax.driver.core.DataType.timeuuid; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -38,7 +37,6 @@ import com.google.common.collect.ImmutableList; public class CassandraMailboxModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraMailboxModule() { @@ -56,7 +54,6 @@ public class CassandraMailboxModule implements CassandraModule { .addUDTPartitionKey(CassandraMailboxPathTable.NAMESPACE_AND_USER, SchemaBuilder.frozen(CassandraMailboxTable.MAILBOX_BASE)) .addClusteringColumn(CassandraMailboxPathTable.MAILBOX_NAME, text()) .addColumn(CassandraMailboxPathTable.MAILBOX_ID, timeuuid()))); - index = ImmutableList.of(); types = ImmutableList.of( new CassandraType(CassandraMailboxTable.MAILBOX_BASE, SchemaBuilder.createType(CassandraMailboxTable.MAILBOX_BASE) @@ -71,11 +68,6 @@ public class CassandraMailboxModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 14f00c7..d2a41d1 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 @@ -25,7 +25,6 @@ import static com.datastax.driver.core.DataType.timeuuid; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -36,7 +35,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraMailboxRecentsModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraMailboxRecentsModule() { @@ -46,7 +44,6 @@ public class CassandraMailboxRecentsModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraMailboxRecentsTable.MAILBOX_ID, timeuuid()) .addClusteringColumn(CassandraMailboxRecentsTable.RECENT_MESSAGE_UID, bigint()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -56,11 +53,6 @@ public class CassandraMailboxRecentsModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 a0ddb90..8654913 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 @@ -28,11 +28,8 @@ import static com.datastax.driver.core.DataType.text; import static com.datastax.driver.core.DataType.timestamp; 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.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -48,7 +45,6 @@ import com.google.common.collect.ImmutableList; public class CassandraMessageModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraMessageModule() { @@ -83,7 +79,6 @@ public class CassandraMessageModule implements CassandraModule { .addColumn(Flag.SEEN, cboolean()) .addColumn(Flag.USER, cboolean()) .addColumn(Flag.USER_FLAGS, set(text()))), - new CassandraTable(CassandraMessageTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMessageTable.TABLE_NAME) .ifNotExists() @@ -97,8 +92,7 @@ public class CassandraMessageModule implements CassandraModule { .addColumn(CassandraMessageTable.HEADER_CONTENT, blob()) .addUDTListColumn(CassandraMessageTable.ATTACHMENTS, SchemaBuilder.frozen(CassandraMessageTable.ATTACHMENTS)) .addUDTListColumn(CassandraMessageTable.PROPERTIES, SchemaBuilder.frozen(CassandraMessageTable.PROPERTIES)))); - index = Collections.emptyList(); - types = Arrays.asList( + types = ImmutableList.of( new CassandraType(CassandraMessageTable.PROPERTIES, SchemaBuilder.createType(CassandraMessageTable.PROPERTIES) .ifNotExists() @@ -120,11 +114,6 @@ public class CassandraMessageModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 76b6f14..3b90f16 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 @@ -26,7 +26,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -37,7 +36,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraModSeqModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraModSeqModule() { @@ -47,7 +45,6 @@ public class CassandraModSeqModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraMessageModseqTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraMessageModseqTable.NEXT_MODSEQ, bigint()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -57,11 +54,6 @@ public class CassandraModSeqModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 02a6c3f..44fa861 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 @@ -19,8 +19,12 @@ package org.apache.james.mailbox.cassandra.modules; -import com.datastax.driver.core.schemabuilder.SchemaBuilder; -import org.apache.james.backends.cassandra.components.CassandraIndex; +import static com.datastax.driver.core.DataType.bigint; +import static com.datastax.driver.core.DataType.counter; +import static com.datastax.driver.core.DataType.text; + +import java.util.List; + import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -28,22 +32,16 @@ import org.apache.james.mailbox.cassandra.table.CassandraCurrentQuota; import org.apache.james.mailbox.cassandra.table.CassandraDefaultMaxQuota; import org.apache.james.mailbox.cassandra.table.CassandraMaxQuota; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static com.datastax.driver.core.DataType.bigint; -import static com.datastax.driver.core.DataType.counter; -import static com.datastax.driver.core.DataType.text; +import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraQuotaModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraQuotaModule() { - tables = Arrays.asList( + tables = ImmutableList.of( new CassandraTable(CassandraCurrentQuota.TABLE_NAME, SchemaBuilder.createTable(CassandraCurrentQuota.TABLE_NAME) .ifNotExists() @@ -61,8 +59,7 @@ public class CassandraQuotaModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraDefaultMaxQuota.TYPE, text()) .addColumn(CassandraDefaultMaxQuota.VALUE, bigint()))); - index = Collections.emptyList(); - types = Collections.emptyList(); + types = ImmutableList.of(); } @Override @@ -71,11 +68,6 @@ public class CassandraQuotaModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 804bb22..ee674d9 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 @@ -24,7 +24,6 @@ import static com.datastax.driver.core.DataType.text; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -35,7 +34,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraRegistrationModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraRegistrationModule() { @@ -44,9 +42,7 @@ public class CassandraRegistrationModule implements CassandraModule { SchemaBuilder.createTable(CassandraMailboxPathRegisterTable.TABLE_NAME) .ifNotExists() .addUDTPartitionKey(CassandraMailboxPathRegisterTable.MAILBOX_PATH, SchemaBuilder.frozen(CassandraMailboxPathRegisterTable.MAILBOX_PATH)) - .addClusteringColumn(CassandraMailboxPathRegisterTable.TOPIC, text()))); - index = Collections.emptyList(); - types = Collections.singletonList( + .addClusteringColumn(CassandraMailboxPathRegisterTable.TOPIC, text())));types = Collections.singletonList( new CassandraType(CassandraMailboxPathRegisterTable.MAILBOX_PATH, SchemaBuilder.createType(CassandraMailboxPathRegisterTable.MAILBOX_PATH) .ifNotExists() @@ -61,11 +57,6 @@ public class CassandraRegistrationModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 4b5f597..23773a2 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 @@ -19,23 +19,21 @@ package org.apache.james.mailbox.cassandra.modules; -import com.datastax.driver.core.schemabuilder.SchemaBuilder; -import com.google.common.collect.ImmutableList; +import static com.datastax.driver.core.DataType.text; + +import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; import org.apache.james.mailbox.cassandra.table.CassandraSubscriptionTable; -import java.util.List; - -import static com.datastax.driver.core.DataType.text; +import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; public class CassandraSubscriptionModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraSubscriptionModule() { @@ -45,7 +43,6 @@ public class CassandraSubscriptionModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraSubscriptionTable.USER, text()) .addClusteringColumn(CassandraSubscriptionTable.MAILBOX, text()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -55,11 +52,6 @@ public class CassandraSubscriptionModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 4b5dd4d..54d922b 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 @@ -26,7 +26,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -37,7 +36,6 @@ import com.datastax.driver.core.schemabuilder.SchemaBuilder; public class CassandraUidModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraUidModule() { @@ -47,7 +45,6 @@ public class CassandraUidModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraMessageUidTable.MAILBOX_ID, timeuuid()) .addColumn(CassandraMessageUidTable.NEXT_UID, bigint()))); - index = Collections.emptyList(); types = Collections.emptyList(); } @@ -57,11 +54,6 @@ public class CassandraUidModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 181c5ba..cc59ad5 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 @@ -23,7 +23,6 @@ import static com.datastax.driver.core.DataType.text; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -34,7 +33,6 @@ import com.google.common.collect.ImmutableList; public class CassandraDomainListModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraDomainListModule() { @@ -43,7 +41,6 @@ public class CassandraDomainListModule implements CassandraModule { SchemaBuilder.createTable(CassandraDomainsTable.TABLE_NAME) .ifNotExists() .addPartitionKey(CassandraDomainsTable.DOMAIN, text()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -53,11 +50,6 @@ public class CassandraDomainListModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 f137241..cf681f1 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 @@ -21,10 +21,8 @@ package org.apache.james.rrt.cassandra; import static com.datastax.driver.core.DataType.text; -import java.util.Arrays; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -36,7 +34,6 @@ import com.google.common.collect.ImmutableList; public class CassandraRRTModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraRRTModule() { @@ -47,8 +44,7 @@ public class CassandraRRTModule implements CassandraModule { .addPartitionKey(CassandraRecipientRewriteTableTable.USER, text()) .addClusteringColumn(CassandraRecipientRewriteTableTable.DOMAIN, text()) .addClusteringColumn(CassandraRecipientRewriteTableTable.MAPPING, text()))); - index = Arrays.asList(); - types = Arrays.asList(); + types = ImmutableList.of(); } @Override @@ -57,11 +53,6 @@ public class CassandraRRTModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 b837030..8e50433 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 @@ -27,7 +27,6 @@ import static com.datastax.driver.core.DataType.timestamp; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -43,7 +42,6 @@ import com.google.common.collect.ImmutableList; public class CassandraSieveRepositoryModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraSieveRepositoryModule() { @@ -77,7 +75,6 @@ public class CassandraSieveRepositoryModule implements CassandraModule { .addPartitionKey(CassandraSieveActiveTable.USER_NAME, text()) .addColumn(CassandraSieveActiveTable.SCRIPT_NAME, text()) .addColumn(CassandraSieveActiveTable.DATE, timestamp()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -87,11 +84,6 @@ public class CassandraSieveRepositoryModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 a66d2bd..74a3469 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 @@ -23,7 +23,6 @@ import static com.datastax.driver.core.DataType.text; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -35,7 +34,6 @@ import com.google.common.collect.ImmutableList; public class CassandraUsersRepositoryModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraUsersRepositoryModule() { @@ -48,7 +46,6 @@ public class CassandraUsersRepositoryModule implements CassandraModule { .addColumn(CassandraUserTable.PASSWORD, text()) .addColumn(CassandraUserTable.ALGORITHM, text())) ); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -58,11 +55,6 @@ public class CassandraUsersRepositoryModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 8125ef2..33439af 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 @@ -24,7 +24,6 @@ import static com.datastax.driver.core.DataType.uuid; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -36,7 +35,6 @@ import com.google.common.collect.ImmutableList; public class CassandraAccessModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraAccessModule() { @@ -46,7 +44,6 @@ public class CassandraAccessModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraAccessTokenTable.TOKEN, uuid()) .addColumn(CassandraAccessTokenTable.USERNAME, text()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -56,11 +53,6 @@ public class CassandraAccessModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 aeb03d6..8023829 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 @@ -23,7 +23,6 @@ import static com.datastax.driver.core.DataType.text; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -35,7 +34,6 @@ import com.google.common.collect.ImmutableList; public class CassandraNotificationRegistryModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraNotificationRegistryModule() { @@ -45,7 +43,6 @@ public class CassandraNotificationRegistryModule implements CassandraModule { .ifNotExists() .addPartitionKey(CassandraNotificationTable.ACCOUNT_ID, text()) .addClusteringColumn(CassandraNotificationTable.RECIPIENT_ID, text()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -55,11 +52,6 @@ public class CassandraNotificationRegistryModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } http://git-wip-us.apache.org/repos/asf/james-project/blob/c8914865/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 2a0395b..48d3f1d 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 @@ -24,7 +24,6 @@ import static com.datastax.driver.core.DataType.text; import java.util.List; -import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; @@ -37,7 +36,6 @@ import com.google.common.collect.ImmutableList; public class CassandraVacationModule implements CassandraModule { private final List<CassandraTable> tables; - private final List<CassandraIndex> index; private final List<CassandraType> types; public CassandraVacationModule() { @@ -52,7 +50,6 @@ public class CassandraVacationModule implements CassandraModule { .addColumn(CassandraVacationTable.TEXT, text()) .addColumn(CassandraVacationTable.SUBJECT, text()) .addColumn(CassandraVacationTable.HTML, text()))); - index = ImmutableList.of(); types = ImmutableList.of(); } @@ -62,11 +59,6 @@ public class CassandraVacationModule implements CassandraModule { } @Override - public List<CassandraIndex> moduleIndex() { - return index; - } - - @Override public List<CassandraType> moduleTypes() { return types; } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
