http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/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 7028b36..a58b348 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,7 +59,6 @@ import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver; public class CassandraTestSystemFixture { public static final int MOD_SEQ = 452; - public static final int MAX_ACL_RETRY = 10; private static CassandraCluster cassandra; public static CassandraMailboxSessionMapperFactory createMapperFactory() { @@ -74,7 +73,7 @@ public class CassandraTestSystemFixture { CassandraMailboxRecentsDAO mailboxRecentsDAO = new CassandraMailboxRecentsDAO(cassandra.getConf()); CassandraApplicableFlagDAO applicableFlagDAO = new CassandraApplicableFlagDAO(cassandra.getConf()); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_ACL_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraFirstUnseenDAO firstUnseenDAO = new CassandraFirstUnseenDAO(cassandra.getConf()); CassandraDeletedMessageDAO deletedMessageDAO = new CassandraDeletedMessageDAO(cassandra.getConf());
http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java index e9b49fc..88ebebc 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java @@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.TreeMap; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.cassandra.modules.CassandraRegistrationModule; @@ -76,6 +77,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest { new CassandraMailboxPathRegisterMapper( cassandra.getConf(), cassandra.getTypesProvider(), + CassandraUtils.DEFAULT_CASSANDRA_UTILS, CASSANDRA_TIME_OUT_IN_S), SCHEDULER_PERIOD_IN_S); registeredDelegatingMailboxListener1 = new RegisteredDelegatingMailboxListener( @@ -90,6 +92,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest { new CassandraMailboxPathRegisterMapper( cassandra.getConf(), cassandra.getTypesProvider(), + CassandraUtils.DEFAULT_CASSANDRA_UTILS, CASSANDRA_TIME_OUT_IN_S), SCHEDULER_PERIOD_IN_S); registeredDelegatingMailboxListener2 = new RegisteredDelegatingMailboxListener( @@ -104,6 +107,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest { new CassandraMailboxPathRegisterMapper( cassandra.getConf(), cassandra.getTypesProvider(), + CassandraUtils.DEFAULT_CASSANDRA_UTILS, CASSANDRA_TIME_OUT_IN_S), SCHEDULER_PERIOD_IN_S); registeredDelegatingMailboxListener3 = new RegisteredDelegatingMailboxListener( http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java index 7cef1bc..8ba28ac 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.cassandra.event.distributed; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.cassandra.modules.CassandraRegistrationModule; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.publisher.Topic; @@ -45,7 +46,10 @@ public class CassandraMailboxPathRegistrerMapperTest { @Before public void setUp() { - mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(), cassandra.getTypesProvider(), CASSANDRA_TIME_OUT_IN_S); + mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(), + cassandra.getTypesProvider(), + CassandraUtils.DEFAULT_CASSANDRA_UTILS, + CASSANDRA_TIME_OUT_IN_S); } @After @@ -106,7 +110,10 @@ public class CassandraMailboxPathRegistrerMapperTest { @Test public void entriesShouldExpire() throws Exception { int verySmallTimeoutInSecond = 1; - mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(), cassandra.getTypesProvider(), verySmallTimeoutInSecond); + mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(), + cassandra.getTypesProvider(), + CassandraUtils.DEFAULT_CASSANDRA_UTILS, + verySmallTimeoutInSecond); mapper.doRegister(MAILBOX_PATH, TOPIC); Thread.sleep(2 * TimeUnit.SECONDS.toMillis(verySmallTimeoutInSecond)); assertThat(mapper.getTopics(MAILBOX_PATH)).isEmpty(); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java index ae68dac..ca9858c 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import org.apache.james.mailbox.cassandra.CassandraId; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; @@ -47,7 +48,6 @@ import com.google.common.base.Throwables; public class CassandraACLMapperTest { public static final CassandraId MAILBOX_ID = CassandraId.of(UUID.fromString("464765a0-e4e7-11e4-aba4-710c1de3782b")); - public static final int MAX_RETRY = 100; private CassandraACLMapper cassandraACLMapper; private CassandraCluster cassandra; private CassandraAsyncExecutor cassandraAsyncExecutor; @@ -58,7 +58,7 @@ public class CassandraACLMapperTest { cassandra = CassandraCluster.create(new CassandraAclModule()); cassandra.ensureAllTables(); cassandraAsyncExecutor = new CassandraAsyncExecutor(cassandra.getConf()); - cassandraACLMapper = new CassandraACLMapper(MAILBOX_ID, cassandra.getConf(), cassandraAsyncExecutor, MAX_RETRY); + cassandraACLMapper = new CassandraACLMapper(MAILBOX_ID, cassandra.getConf(), cassandraAsyncExecutor, CassandraConfiguration.DEFAULT_CONFIGURATION); executor = Executors.newFixedThreadPool(2); } @@ -69,18 +69,6 @@ public class CassandraACLMapperTest { cassandra.close(); } - @Test(expected = IllegalArgumentException.class) - public void creatingACLMapperWithNegativeMaxRetryShouldFail() { - int maxRetry = -1; - new CassandraACLMapper(MAILBOX_ID, cassandra.getConf(), cassandraAsyncExecutor, maxRetry); - } - - @Test(expected = IllegalArgumentException.class) - public void creatingACLMapperWithNullMaxRetryShouldFail() { - int maxRetry = 0; - new CassandraACLMapper(MAILBOX_ID, cassandra.getConf(), cassandraAsyncExecutor, maxRetry); - } - @Test public void retrieveACLWhenPresentInBaseShouldReturnCorrespondingACL() throws Exception { cassandra.getConf().execute( @@ -209,7 +197,7 @@ public class CassandraACLMapperTest { CassandraACLMapper aclMapper = new CassandraACLMapper(MAILBOX_ID, cassandra.getConf(), new CassandraAsyncExecutor(cassandra.getConf()), - MAX_RETRY, + CassandraConfiguration.DEFAULT_CONFIGURATION, runnable); try { aclMapper.updateACL(new SimpleMailboxACL.SimpleMailboxACLCommand(key, MailboxACL.EditMode.ADD, rights)); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java index 3a90d4c..c1f8147 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAOTest.java @@ -40,7 +40,6 @@ import com.github.steveash.guavate.Guavate; public class CassandraMailboxDAOTest { - public static final int MAX_ACL_RETRY = 10; public static final int UID_VALIDITY_1 = 145; public static final int UID_VALIDITY_2 = 147; public static final MailboxPath NEW_MAILBOX_PATH = new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "xyz"); @@ -56,7 +55,7 @@ public class CassandraMailboxDAOTest { cassandra = CassandraCluster.create(new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule())); cassandra.ensureAllTables(); - testee = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_ACL_RETRY); + testee = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); mailbox1 = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "abcd"), UID_VALIDITY_1, CASSANDRA_ID_1); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/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 75d4b4b..722e7f7 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 @@ -74,8 +74,6 @@ public class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManage cassandra.close(); } - public static final int MAX_ACL_RETRY = 10; - private CassandraMailboxSessionMapperFactory mailboxSessionMapperFactory; private CassandraMailboxManager mailboxManager; private CassandraMailboxManager parseFailingMailboxManager; @@ -83,7 +81,7 @@ public class CassandraMailboxManagerAttachmentTest extends AbstractMailboxManage public CassandraMailboxManagerAttachmentTest() throws Exception { CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory(); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_ACL_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraFirstUnseenDAO firstUnseenDAO = new CassandraFirstUnseenDAO(cassandra.getConf()); CassandraDeletedMessageDAO deletedMessageDAO = new CassandraDeletedMessageDAO(cassandra.getConf()); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java index 749242e..bd849e9 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule; @@ -38,7 +39,6 @@ import org.junit.Test; public class CassandraMailboxMapperConcurrencyTest { - public static final int MAX_RETRY = 10; public static final int UID_VALIDITY = 52; public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "name"); public static final int THREAD_COUNT = 10; @@ -51,9 +51,9 @@ public class CassandraMailboxMapperConcurrencyTest { cassandra = CassandraCluster.create(new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule())); cassandra.ensureAllTables(); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); - testee = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, MAX_RETRY); + testee = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, CassandraConfiguration.DEFAULT_CONFIGURATION); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java index 22113d8..dda89ec 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java @@ -26,6 +26,7 @@ import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.mailbox.cassandra.mail.CassandraMailboxPathDAO.CassandraIdAndPath; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; @@ -40,11 +41,8 @@ import org.junit.Test; public class CassandraMailboxMapperTest { - public static final int MAX_RETRY = 10; public static final int UID_VALIDITY = 52; public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "name"); - public static final int THREAD_COUNT = 10; - public static final int OPERATION_COUNT = 10; private CassandraCluster cassandra; private CassandraMailboxPathDAO mailboxPathDAO; private CassandraMailboxMapper testee; @@ -54,9 +52,9 @@ public class CassandraMailboxMapperTest { cassandra = CassandraCluster.create(new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule())); cassandra.ensureAllTables(); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); - testee = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, MAX_RETRY); + testee = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, CassandraConfiguration.DEFAULT_CONFIGURATION); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/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 c16e05d..74602f3 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 @@ -105,7 +105,7 @@ public class CassandraMapperProvider implements MapperProvider { } private CassandraMailboxSessionMapperFactory createMapperFactory() { - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_ACL_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraFirstUnseenDAO firstUnseenDAO = new CassandraFirstUnseenDAO(cassandra.getConf()); CassandraDeletedMessageDAO deletedMessageDAO = new CassandraDeletedMessageDAO(cassandra.getConf()); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java index 81bff9e..8fcca84 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraModSeqProviderTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals; import java.util.stream.LongStream; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule; @@ -39,8 +40,6 @@ import com.github.fge.lambdas.Throwing; public class CassandraModSeqProviderTest { private CassandraCluster cassandra; - - private static final int MAX_RETRY = 100; private CassandraModSeqProvider modSeqProvider; private CassandraMailboxMapper mapper; @@ -55,9 +54,9 @@ public class CassandraModSeqProviderTest { new CassandraModSeqModule())); cassandra.ensureAllTables(); modSeqProvider = new CassandraModSeqProvider(cassandra.getConf()); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); - mapper = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, MAX_RETRY); + mapper = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, CassandraConfiguration.DEFAULT_CONFIGURATION); MailboxPath path = new MailboxPath("gsoc", "ieugen", "Trash"); mailbox = new SimpleMailbox(path, 1234); mapper.save(mailbox); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java index c93a1c4..7e61a92 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidProviderTest.java @@ -24,6 +24,7 @@ import static org.assertj.guava.api.Assertions.assertThat; import java.util.stream.LongStream; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.cassandra.modules.CassandraAclModule; @@ -45,8 +46,6 @@ public class CassandraUidProviderTest { new CassandraMailboxModule(), new CassandraUidModule())); - private static final int MAX_RETRY = 100; - private CassandraUidProvider uidProvider; private CassandraMailboxMapper mapper; private SimpleMailbox mailbox; @@ -55,9 +54,9 @@ public class CassandraUidProviderTest { public void setUpClass() throws Exception { cassandra.ensureAllTables(); uidProvider = new CassandraUidProvider(cassandra.getConf()); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider(), MAX_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(cassandra.getConf(), cassandra.getTypesProvider()); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(cassandra.getConf(), cassandra.getTypesProvider()); - mapper = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, MAX_RETRY); + mapper = new CassandraMailboxMapper(cassandra.getConf(), mailboxDAO, mailboxPathDAO, CassandraConfiguration.DEFAULT_CONFIGURATION); MailboxPath path = new MailboxPath("gsoc", "ieugen", "Trash"); mailbox = new SimpleMailbox(path, 1234); mapper.save(mailbox); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java index 8399756..c194d90 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox.cassandra.user; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.cassandra.modules.CassandraSubscriptionModule; import org.apache.james.mailbox.store.user.SubscriptionMapper; import org.apache.james.mailbox.store.user.SubscriptionMapperTest; @@ -32,7 +33,7 @@ public class CassandraSubscriptionMapperTest extends SubscriptionMapperTest { @Override protected SubscriptionMapper createSubscriptionMapper() { cassandra.ensureAllTables(); - return new CassandraSubscriptionMapper(cassandra.getConf()); + return new CassandraSubscriptionMapper(cassandra.getConf(), CassandraUtils.DEFAULT_CASSANDRA_UTILS); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/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 7f6e645..79932dd 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 @@ -79,7 +79,6 @@ public class CassandraHostSystem extends JamesImapHostSystem { Feature.USER_FLAGS_SUPPORT, Feature.QUOTA_SUPPORT, Feature.ANNOTATION_SUPPORT); - public static final int MAX_ACL_RETRY = 10; private final CassandraMailboxManager mailboxManager; private final CassandraCluster cassandraClusterSingleton; @@ -112,7 +111,7 @@ public class CassandraHostSystem extends JamesImapHostSystem { CassandraMessageIdToImapUidDAO imapUidDAO = new CassandraMessageIdToImapUidDAO(session, messageIdFactory); CassandraMailboxCounterDAO mailboxCounterDAO = new CassandraMailboxCounterDAO(session); CassandraMailboxRecentsDAO mailboxRecentsDAO = new CassandraMailboxRecentsDAO(session); - CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(session, typesProvider, MAX_ACL_RETRY); + CassandraMailboxDAO mailboxDAO = new CassandraMailboxDAO(session, typesProvider); CassandraMailboxPathDAO mailboxPathDAO = new CassandraMailboxPathDAO(session, typesProvider); CassandraFirstUnseenDAO firstUnseenDAO = new CassandraFirstUnseenDAO(session); CassandraApplicableFlagDAO applicableFlagDAO = new CassandraApplicableFlagDAO(session); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java index a771517..d9bc5f9 100644 --- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java @@ -20,6 +20,7 @@ package org.apache.james.mpt.managesieve.cassandra.host; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; +import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mpt.host.JamesManageSieveHostSystem; import org.apache.james.sieve.cassandra.CassandraActiveScriptDAO; import org.apache.james.sieve.cassandra.CassandraSieveDAO; @@ -49,8 +50,7 @@ public class CassandraHostSystem extends JamesManageSieveHostSystem { } protected static UsersRepository createUsersRepository() { - CassandraUsersRepository cassandraUsersRepository = new CassandraUsersRepository(); - cassandraUsersRepository.setSession(CASSANDRA_CLUSTER.getConf()); + CassandraUsersRepository cassandraUsersRepository = new CassandraUsersRepository(CASSANDRA_CLUSTER.getConf(), CassandraUtils.DEFAULT_CASSANDRA_UTILS); cassandraUsersRepository.setEnableVirtualHosting(false); return cassandraUsersRepository; } http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index fc7c3cc..78221b7 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -75,10 +75,6 @@ public class CassandraMailboxModule extends AbstractModule { install(new DefaultEventModule()); install(new CassandraQuotaModule()); - bind(Integer.class) - .annotatedWith(com.google.inject.name.Names.named(CassandraMailboxDAO.MAX_ACL_RETRY)) - .toInstance(CassandraMailboxSessionMapperFactory.DEFAULT_MAX_RETRY); - bind(CassandraMailboxSessionMapperFactory.class).in(Scopes.SINGLETON); bind(CassandraMailboxManager.class).in(Scopes.SINGLETON); bind(NoMailboxPathLocker.class).in(Scopes.SINGLETON); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java index 6208d52..9d5ca75 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraSessionModule.java @@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.james.backends.cassandra.CassandraConfiguration; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.init.CassandraModuleComposite; import org.apache.james.backends.cassandra.init.CassandraZonedDateTimeModule; @@ -37,6 +38,7 @@ import org.apache.james.backends.cassandra.init.ClusterBuilder; import org.apache.james.backends.cassandra.init.ClusterWithKeyspaceCreatedFactory; import org.apache.james.backends.cassandra.init.QueryLoggerConfiguration; import org.apache.james.backends.cassandra.init.SessionWithInitializedTablesFactory; +import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.mailbox.store.BatchSizes; import org.apache.james.util.Host; import org.apache.james.utils.PropertiesProvider; @@ -54,6 +56,7 @@ import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.github.steveash.guavate.Guavate; import com.google.inject.AbstractModule; import com.google.inject.Provides; +import com.google.inject.Scopes; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; import com.nurkiewicz.asyncretry.AsyncRetryExecutor; @@ -77,6 +80,8 @@ public class CassandraSessionModule extends AbstractModule { @Override protected void configure() { bind(ScheduledExecutorService.class).toProvider(ScheduledExecutorServiceProvider.class); + bind(CassandraConfiguration.class).toInstance(CassandraConfiguration.DEFAULT_CONFIGURATION); + bind(CassandraUtils.class).in(Scopes.SINGLETON); Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class); cassandraDataDefinitions.addBinding().to(CassandraZonedDateTimeModule.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java index 10599a8..fbee908 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -import javax.annotation.Resource; import javax.inject.Inject; import org.apache.james.backends.cassandra.utils.CassandraConstants; @@ -39,20 +38,27 @@ import org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; +import com.google.common.annotations.VisibleForTesting; public class CassandraDomainList extends AbstractDomainList { - private Session session; + private final Session session; + private final CassandraUtils cassandraUtils; @Inject - @Resource - public void setSession(Session session) { + public CassandraDomainList(Session session, CassandraUtils cassandraUtils) { this.session = session; + this.cassandraUtils = cassandraUtils; + } + + @VisibleForTesting + CassandraDomainList(Session session) { + this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS); } @Override protected List<String> getDomainListInternal() throws DomainListException { - return CassandraUtils.convertToStream(session.execute(select(CassandraDomainsTable.DOMAIN).from(CassandraDomainsTable.TABLE_NAME))) + return cassandraUtils.convertToStream(session.execute(select(CassandraDomainsTable.DOMAIN).from(CassandraDomainsTable.TABLE_NAME))) .map(row -> row.getString(CassandraDomainsTable.DOMAIN)) .collect(Collectors.toList()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java index e3d8824..f7b9251 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java @@ -55,12 +55,13 @@ public class CassandraUsersRepository extends AbstractUsersRepository { private static final String DEFAULT_ALGO_VALUE = "SHA1"; - private Session session; + private final Session session; + private final CassandraUtils cassandraUtils; @Inject - @Resource - public void setSession(Session session) { + public CassandraUsersRepository(Session session, CassandraUtils cassandraUtils) { this.session = session; + this.cassandraUtils = cassandraUtils; } @Override @@ -132,7 +133,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository { ResultSet result = session.execute( select(REALNAME) .from(TABLE_NAME)); - return CassandraUtils.convertToStream(result) + return cassandraUtils.convertToStream(result) .map(row -> row.getString(REALNAME)) .iterator(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java index 802d92d..411aa1b 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java @@ -30,9 +30,8 @@ public class CassandraDomainListTest extends AbstractDomainListTest { @Override protected DomainList createDomainList() { - CassandraDomainList testee = new CassandraDomainList(); cassandra = CassandraCluster.create(new CassandraDomainListModule()); - testee.setSession(cassandra.getConf()); + CassandraDomainList testee = new CassandraDomainList(cassandra.getConf()); testee.setLog(LoggerFactory.getLogger(getClass())); testee.setDNSService(getDNSServer("localhost")); testee.setAutoDetect(false); http://git-wip-us.apache.org/repos/asf/james-project/blob/0daadc62/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java index f9a3853..5fea737 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java @@ -20,6 +20,7 @@ package org.apache.james.user.cassandra; import org.apache.james.backends.cassandra.CassandraCluster; +import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.user.lib.AbstractUsersRepository; import org.apache.james.user.lib.AbstractUsersRepositoryTest; import org.junit.After; @@ -36,8 +37,6 @@ public class CassandraUsersRepositoryTest extends AbstractUsersRepositoryTest { @Override protected AbstractUsersRepository getUsersRepository() throws Exception { cassandra = CassandraCluster.create(new CassandraUsersRepositoryModule()); - CassandraUsersRepository cassandraUsersRepository = new CassandraUsersRepository(); - cassandraUsersRepository.setSession(cassandra.getConf()); - return cassandraUsersRepository; + return new CassandraUsersRepository(cassandra.getConf(), CassandraUtils.DEFAULT_CASSANDRA_UTILS); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
