MAILBOX-304 Move CassandraMailboxSessionMapperFactory forTest method to a test class
This intends to limit abuses Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d81c3452 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d81c3452 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d81c3452 Branch: refs/heads/master Commit: d81c3452fa4c61b8ae7324d31c6d25c655071da6 Parents: 683e2fa Author: benwa <btell...@linagora.com> Authored: Thu Sep 7 10:26:32 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Thu Sep 7 10:26:32 2017 +0700 ---------------------------------------------------------------------- .../CassandraMailboxSessionMapperFactory.java | 27 -------- .../CassandraMailboxManagerProvider.java | 2 +- .../cassandra/CassandraTestSystemFixture.java | 2 +- ...estCassandraMailboxSessionMapperFactory.java | 68 ++++++++++++++++++++ .../CassandraMailboxManagerAttachmentTest.java | 3 +- .../cassandra/mail/CassandraMapperProvider.java | 3 +- mpt/impl/imap-mailbox/cassandra/pom.xml | 6 ++ .../cassandra/host/CassandraHostSystem.java | 3 +- 8 files changed, 82 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index 164a179..aa7d765 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -22,16 +22,13 @@ package org.apache.james.mailbox.cassandra; import javax.inject.Inject; import org.apache.james.backends.cassandra.init.CassandraConfiguration; -import org.apache.james.backends.cassandra.init.CassandraTypesProvider; import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.MailboxSession; -import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.cassandra.mail.CassandraAnnotationMapper; import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO; import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAO; import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2; import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentMapper; -import org.apache.james.mailbox.cassandra.mail.CassandraBlobsDAO; import org.apache.james.mailbox.cassandra.mail.CassandraDeletedMessageDAO; import org.apache.james.mailbox.cassandra.mail.CassandraFirstUnseenDAO; import org.apache.james.mailbox.cassandra.mail.CassandraIndexTableHandler; @@ -64,30 +61,6 @@ import com.datastax.driver.core.Session; * Cassandra implementation of {@link MailboxSessionMapperFactory} */ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFactory { - - public static CassandraMailboxSessionMapperFactory forTests(Session session, CassandraTypesProvider typesProvider, - CassandraMessageId.Factory factory) { - CassandraBlobsDAO cassandraBlobsDAO = new CassandraBlobsDAO(session); - return new CassandraMailboxSessionMapperFactory( - new CassandraUidProvider(session), - new CassandraModSeqProvider(session), - session, - new CassandraMessageDAO(session, typesProvider, cassandraBlobsDAO), - new CassandraMessageIdDAO(session, factory), - new CassandraMessageIdToImapUidDAO(session, factory), - new CassandraMailboxCounterDAO(session), - new CassandraMailboxRecentsDAO(session), - new CassandraMailboxDAO(session, typesProvider), - new CassandraMailboxPathDAO(session, typesProvider), - new CassandraFirstUnseenDAO(session), - new CassandraApplicableFlagDAO(session), - new CassandraAttachmentDAO(session), - new CassandraAttachmentDAOV2(session, cassandraBlobsDAO), - new CassandraDeletedMessageDAO(session), - CassandraUtils.WITH_DEFAULT_CONFIGURATION, - CassandraConfiguration.DEFAULT_CONFIGURATION); - } - private final Session session; private final CassandraUidProvider uidProvider; private final CassandraModSeqProvider modSeqProvider; http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java index 06c04a9..745d675 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java @@ -41,7 +41,7 @@ public class CassandraMailboxManagerProvider { public static CassandraMailboxManager provideMailboxManager(Session session, CassandraTypesProvider cassandraTypesProvider) { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - CassandraMailboxSessionMapperFactory mapperFactory = CassandraMailboxSessionMapperFactory.forTests( + CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( session, cassandraTypesProvider, messageIdFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java index c8d7580..161c625 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java @@ -44,7 +44,7 @@ public class CassandraTestSystemFixture { public static CassandraMailboxSessionMapperFactory createMapperFactory(CassandraCluster cassandra) { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - return CassandraMailboxSessionMapperFactory.forTests( + return TestCassandraMailboxSessionMapperFactory.forTests( cassandra.getConf(), cassandra.getTypesProvider(), messageIdFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/TestCassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/TestCassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/TestCassandraMailboxSessionMapperFactory.java new file mode 100644 index 0000000..a22d06e --- /dev/null +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/TestCassandraMailboxSessionMapperFactory.java @@ -0,0 +1,68 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.mailbox.cassandra; + +import org.apache.james.backends.cassandra.init.CassandraConfiguration; +import org.apache.james.backends.cassandra.init.CassandraTypesProvider; +import org.apache.james.backends.cassandra.utils.CassandraUtils; +import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; +import org.apache.james.mailbox.cassandra.mail.CassandraApplicableFlagDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentDAOV2; +import org.apache.james.mailbox.cassandra.mail.CassandraBlobsDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraDeletedMessageDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraFirstUnseenDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMailboxCounterDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMailboxDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMailboxPathDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMailboxRecentsDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO; +import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider; +import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider; + +import com.datastax.driver.core.Session; + +public class TestCassandraMailboxSessionMapperFactory { + public static CassandraMailboxSessionMapperFactory forTests(Session session, CassandraTypesProvider typesProvider, + CassandraMessageId.Factory factory) { + CassandraBlobsDAO cassandraBlobsDAO = new CassandraBlobsDAO(session); + return new CassandraMailboxSessionMapperFactory( + new CassandraUidProvider(session), + new CassandraModSeqProvider(session), + session, + new CassandraMessageDAO(session, typesProvider, cassandraBlobsDAO), + new CassandraMessageIdDAO(session, factory), + new CassandraMessageIdToImapUidDAO(session, factory), + new CassandraMailboxCounterDAO(session), + new CassandraMailboxRecentsDAO(session), + new CassandraMailboxDAO(session, typesProvider), + new CassandraMailboxPathDAO(session, typesProvider), + new CassandraFirstUnseenDAO(session), + new CassandraApplicableFlagDAO(session), + new CassandraAttachmentDAO(session), + new CassandraAttachmentDAOV2(session, cassandraBlobsDAO), + new CassandraDeletedMessageDAO(session), + CassandraUtils.WITH_DEFAULT_CONFIGURATION, + CassandraConfiguration.DEFAULT_CONFIGURATION); + } + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java index 2c87057..59cc7ee 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java @@ -28,6 +28,7 @@ import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.cassandra.CassandraMailboxManager; import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; +import org.apache.james.mailbox.cassandra.TestCassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; import org.apache.james.mailbox.cassandra.modules.CassandraApplicableFlagsModule; @@ -91,7 +92,7 @@ public class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManage private void initSystemUnderTest() throws Exception { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - mailboxSessionMapperFactory = CassandraMailboxSessionMapperFactory.forTests( + mailboxSessionMapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( cassandra.getConf(), cassandra.getTypesProvider(), messageIdFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java index 59c1dd1..d00923b 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java @@ -24,6 +24,7 @@ import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; +import org.apache.james.mailbox.cassandra.TestCassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId.Factory; @@ -78,7 +79,7 @@ public class CassandraMapperProvider implements MapperProvider { } private CassandraMailboxSessionMapperFactory createMapperFactory() { - return CassandraMailboxSessionMapperFactory.forTests(cassandra.getConf(), + return TestCassandraMailboxSessionMapperFactory.forTests(cassandra.getConf(), cassandra.getTypesProvider(), new CassandraMessageId.Factory()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mpt/impl/imap-mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml index 4c473f1..bec05c3 100644 --- a/mpt/impl/imap-mailbox/cassandra/pom.xml +++ b/mpt/impl/imap-mailbox/cassandra/pom.xml @@ -47,6 +47,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-james-mailbox-cassandra</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/d81c3452/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java index c8aa4a5..8f2b4c0 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java @@ -27,6 +27,7 @@ import org.apache.james.imap.processor.main.DefaultImapProcessorFactory; import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.cassandra.CassandraMailboxManager; import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory; +import org.apache.james.mailbox.cassandra.TestCassandraMailboxSessionMapperFactory; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; import org.apache.james.mailbox.cassandra.modules.CassandraAnnotationModule; @@ -102,7 +103,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { cassandra = CassandraCluster.create(mailboxModule, cassandraHost, cassandraPort); com.datastax.driver.core.Session session = cassandra.getConf(); CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - CassandraMailboxSessionMapperFactory mapperFactory = CassandraMailboxSessionMapperFactory.forTests( + CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( cassandra.getConf(), cassandra.getTypesProvider(), messageIdFactory); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
