This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4af9ec97185d8832fe6fdc036c8d69d65e08716e Author: Benoit Tellier <[email protected]> AuthorDate: Thu Feb 20 11:01:45 2020 +0700 [REFACTORING] Simplify providing a testing CassandraMailboxManager We no longer need to inject our DAOs --- .../cassandra/CassandraMailboxManagerProvider.java | 26 ++++------------------ .../CassandraMailboxManagerStressTest.java | 3 +-- .../cassandra/CassandraMailboxManagerTest.java | 3 +-- .../cassandra/CassandraTestSystemFixture.java | 5 +---- .../TestCassandraMailboxSessionMapperFactory.java | 12 +++++----- .../CassandraMailboxManagerAttachmentTest.java | 3 +-- .../cassandra/mail/CassandraMapperProvider.java | 3 +-- .../mail/CassandraMessageIdMapperTest.java | 3 +-- .../tools/indexer/CassandraReIndexerImplTest.java | 3 +-- .../cassandra/host/CassandraHostSystem.java | 4 +--- 10 files changed, 17 insertions(+), 48 deletions(-) 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 8e07ab4..1ccb948 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 @@ -19,14 +19,12 @@ package org.apache.james.mailbox.cassandra; -import org.apache.james.backends.cassandra.init.CassandraTypesProvider; -import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; +import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; -import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils; import org.apache.james.mailbox.cassandra.quota.CassandraCurrentQuotaManager; import org.apache.james.mailbox.cassandra.quota.CassandraGlobalMaxQuotaDao; import org.apache.james.mailbox.cassandra.quota.CassandraPerDomainMaxQuotaDao; @@ -56,36 +54,20 @@ import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex; import org.apache.james.metrics.tests.RecordingMetricFactory; import com.datastax.driver.core.Session; -import com.google.inject.Module; public class CassandraMailboxManagerProvider { private static final int LIMIT_ANNOTATIONS = 3; private static final int LIMIT_ANNOTATION_SIZE = 30; - static CassandraMailboxManager provideMailboxManager(Session session, CassandraTypesProvider cassandraTypesProvider, - PreDeletionHooks preDeletionHooks, Module... overriedGuiceModules) { - CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - - CassandraMailboxSessionMapperFactory mapperFactory = GuiceUtils.testInjector(session, - cassandraTypesProvider, - messageIdFactory, - CassandraConfiguration.DEFAULT_CONFIGURATION, - overriedGuiceModules) - .getInstance(CassandraMailboxSessionMapperFactory.class); - - return provideMailboxManager(session, preDeletionHooks, mapperFactory, messageIdFactory); - } - - public static CassandraMailboxManager provideMailboxManager(Session session, CassandraTypesProvider cassandraTypesProvider, + public static CassandraMailboxManager provideMailboxManager(CassandraCluster cassandra, PreDeletionHooks preDeletionHooks) { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( - session, - cassandraTypesProvider, + cassandra, messageIdFactory); - return provideMailboxManager(session, preDeletionHooks, mapperFactory, messageIdFactory); + return provideMailboxManager(cassandra.getConf(), preDeletionHooks, mapperFactory, messageIdFactory); } private static CassandraMailboxManager provideMailboxManager(Session session, diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java index 8709413..6120bbd 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java @@ -47,8 +47,7 @@ class CassandraMailboxManagerStressTest implements MailboxManagerStressContract< @BeforeEach void setUp() { this.mailboxManager = CassandraMailboxManagerProvider.provideMailboxManager( - cassandra.getCassandraCluster().getConf(), - cassandra.getCassandraCluster().getTypesProvider(), + cassandra.getCassandraCluster(), PreDeletionHooks.NO_PRE_DELETION_HOOK); } } diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java index 130cd7f..5cd44e3 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java @@ -33,8 +33,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest<CassandraMai @Override protected CassandraMailboxManager provideMailboxManager() { return CassandraMailboxManagerProvider.provideMailboxManager( - cassandra.getCassandraCluster().getConf(), - cassandra.getCassandraCluster().getTypesProvider(), + cassandra.getCassandraCluster(), new PreDeletionHooks(preDeletionHooks(), new RecordingMetricFactory())); } 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 c3aed62..ec3e121 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 @@ -59,10 +59,7 @@ class CassandraTestSystemFixture { static CassandraMailboxSessionMapperFactory createMapperFactory(CassandraCluster cassandra) { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - return TestCassandraMailboxSessionMapperFactory.forTests( - cassandra.getConf(), - cassandra.getTypesProvider(), - messageIdFactory); + return TestCassandraMailboxSessionMapperFactory.forTests(cassandra, messageIdFactory); } static CassandraMailboxManager createMailboxManager(CassandraMailboxSessionMapperFactory mapperFactory) { 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 index 0c59550..d0fc733 100644 --- 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 @@ -19,24 +19,22 @@ package org.apache.james.mailbox.cassandra; -import org.apache.james.backends.cassandra.init.CassandraTypesProvider; +import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.cassandra.mail.utils.GuiceUtils; -import com.datastax.driver.core.Session; - public class TestCassandraMailboxSessionMapperFactory { - public static CassandraMailboxSessionMapperFactory forTests(Session session, CassandraTypesProvider typesProvider, + public static CassandraMailboxSessionMapperFactory forTests(CassandraCluster cassandra, CassandraMessageId.Factory factory) { - return forTests(session, typesProvider, factory, CassandraConfiguration.DEFAULT_CONFIGURATION); + return forTests(cassandra, factory, CassandraConfiguration.DEFAULT_CONFIGURATION); } - public static CassandraMailboxSessionMapperFactory forTests(Session session, CassandraTypesProvider typesProvider, + public static CassandraMailboxSessionMapperFactory forTests(CassandraCluster cassandra, CassandraMessageId.Factory factory, CassandraConfiguration cassandraConfiguration) { - return GuiceUtils.testInjector(session, typesProvider, factory, cassandraConfiguration) + return GuiceUtils.testInjector(cassandra.getConf(), cassandra.getTypesProvider(), factory, cassandraConfiguration) .getInstance(CassandraMailboxSessionMapperFactory.class); } 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 1775767..05f39ff 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 @@ -71,8 +71,7 @@ class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManagerAttach CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); mailboxSessionMapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( - cassandraCluster.getCassandraCluster().getConf(), - cassandraCluster.getCassandraCluster().getTypesProvider(), + cassandraCluster.getCassandraCluster(), messageIdFactory); Authenticator noAuthenticator = null; Authorizator noAuthorizator = null; 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 8510f27..befae86 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 @@ -82,8 +82,7 @@ public class CassandraMapperProvider implements MapperProvider { } private CassandraMailboxSessionMapperFactory createMapperFactory() { - return TestCassandraMailboxSessionMapperFactory.forTests(cassandra.getConf(), - cassandra.getTypesProvider(), + return TestCassandraMailboxSessionMapperFactory.forTests(cassandra, new CassandraMessageId.Factory()); } diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java index 5176f9d..98ef169 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdMapperTest.java @@ -54,8 +54,7 @@ class CassandraMessageIdMapperTest extends MessageIdMapperTest { void findShouldReturnCorrectElementsWhenChunking() throws Exception { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( - cassandraCluster.getCassandraCluster().getConf(), - cassandraCluster.getCassandraCluster().getTypesProvider(), + cassandraCluster.getCassandraCluster(), messageIdFactory, CassandraConfiguration.builder() .messageReadChunkSize(3) diff --git a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java index d397cef..2362609 100644 --- a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java +++ b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/CassandraReIndexerImplTest.java @@ -64,8 +64,7 @@ public class CassandraReIndexerImplTest { @BeforeEach void setUp(CassandraCluster cassandra) { - mailboxManager = CassandraMailboxManagerProvider.provideMailboxManager(cassandra.getConf(), cassandra.getTypesProvider(), - PreDeletionHooks.NO_PRE_DELETION_HOOK); + mailboxManager = CassandraMailboxManagerProvider.provideMailboxManager(cassandra, PreDeletionHooks.NO_PRE_DELETION_HOOK); MailboxSessionMapperFactory mailboxSessionMapperFactory = mailboxManager.getMapperFactory(); messageSearchIndex = mock(ListeningMessageSearchIndex.class); reIndexer = new ReIndexerImpl(new ReIndexerPerformer(mailboxManager, messageSearchIndex, mailboxSessionMapperFactory), 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 ba3d4a0..6027feb 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 @@ -88,9 +88,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { com.datastax.driver.core.Session session = cassandra.getConf(); CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests( - cassandra.getConf(), - cassandra.getTypesProvider(), - messageIdFactory); + cassandra, messageIdFactory); InVMEventBus eventBus = new InVMEventBus(new InVmEventDelivery(new RecordingMetricFactory())); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
