You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2015/11/02 15:45:27 UTC
svn commit: r1712019 - in /james/project/trunk:
backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/
backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/
mailbox/cassandra/src/test/java/org/apache/ja...
Author: matthieu
Date: Mon Nov 2 14:45:26 2015
New Revision: 1712019
URL: http://svn.apache.org/viewvc?rev=1712019&view=rev
Log:
JAMES-1586 Cassandra may be initialized with different modules when testing
Contributed by Antoine Duprat
Added:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
- copied, changed from r1712017, james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterSingleton.java
Removed:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterSingleton.java
Modified:
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactoryTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidAndModSeqProviderTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
james/project/trunk/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
Copied: james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java (from r1712017, james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterSingleton.java)
URL: http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java?p2=james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java&p1=james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterSingleton.java&r1=1712017&r2=1712019&rev=1712019&view=diff
==============================================================================
--- james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterSingleton.java (original)
+++ james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java Mon Nov 2 14:45:26 2015
@@ -18,10 +18,8 @@
****************************************************************/
package org.apache.james.backends.cassandra;
-import com.datastax.driver.core.exceptions.NoHostAvailableException;
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Session;
-import com.google.common.base.Throwables;
+import java.util.Optional;
+
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraTableManager;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
@@ -30,12 +28,13 @@ import org.apache.james.backends.cassand
import org.apache.james.backends.cassandra.init.SessionWithInitializedTablesFactory;
import org.apache.james.backends.cassandra.utils.FunctionRunnerWithRetry;
import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.Optional;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.exceptions.NoHostAvailableException;
+import com.google.common.base.Throwables;
-public final class CassandraClusterSingleton {
+public final class CassandraCluster {
private static final String CLUSTER_IP = "localhost";
private static final int CLUSTER_PORT_TEST = 9142;
private static final String KEYSPACE_NAME = "apache_james";
@@ -44,26 +43,20 @@ public final class CassandraClusterSingl
private static final long SLEEP_BEFORE_RETRY = 200;
private static final int MAX_RETRY = 200;
- private static final Logger LOG = LoggerFactory.getLogger(CassandraClusterSingleton.class);
- private static CassandraClusterSingleton cluster = null;
private final CassandraModule module;
private Session session;
private CassandraTypesProvider typesProvider;
- public static synchronized CassandraClusterSingleton create(CassandraModule module) throws RuntimeException {
- LOG.info("Retrieving cluster instance.");
- if (cluster == null) {
- cluster = new CassandraClusterSingleton(module);
- }
- return cluster;
+ public static CassandraCluster create(CassandraModule module) throws RuntimeException {
+ return new CassandraCluster(module);
}
- private CassandraClusterSingleton(CassandraModule module) throws RuntimeException {
+ private CassandraCluster(CassandraModule module) throws RuntimeException {
this.module = module;
try {
EmbeddedCassandraServerHelper.startEmbeddedCassandra();
session = new FunctionRunnerWithRetry(MAX_RETRY)
- .executeAndRetrieveObject(CassandraClusterSingleton.this::tryInitializeSession);
+ .executeAndRetrieveObject(CassandraCluster.this::tryInitializeSession);
typesProvider = new CassandraTypesProvider(module, session);
} catch(Exception exception) {
Throwables.propagate(exception);
Modified: james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java (original)
+++ james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java Mon Nov 2 14:45:26 2015
@@ -28,7 +28,7 @@ import static org.assertj.core.api.Asser
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.google.common.collect.ImmutableList;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+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;
@@ -42,7 +42,7 @@ public class CassandraTypeProviderTest {
private static final String TYPE_NAME = "typename";
private static final String PROPERTY = "property";
- private CassandraClusterSingleton cassandra;
+ private CassandraCluster cassandra;
private CassandraModule module;
@Before
@@ -63,7 +63,7 @@ public class CassandraTypeProviderTest {
.addColumn(PROPERTY, text()))));
}
};
- cassandra = CassandraClusterSingleton.create(module);
+ cassandra = CassandraCluster.create(module);
cassandra.getTypesProvider();
cassandra.ensureAllTables();
}
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java Mon Nov 2 14:45:26 2015
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.mailbox.cassandra;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.AbstractMailboxManagerTest;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
*/
public class CassandraMailboxManagerTest extends AbstractMailboxManagerTest {
- private static final CassandraClusterSingleton CASSANDRA = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ private static final CassandraCluster CASSANDRA = CassandraCluster.create(new CassandraMailboxModule());
/**
* Setup the mailboxManager.
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactoryTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactoryTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactoryTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactoryTest.java Mon Nov 2 14:45:26 2015
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class CassandraMailboxSessionMapperFactoryTest {
- private static final CassandraClusterSingleton CLUSTER = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ private static final CassandraCluster CLUSTER = CassandraCluster.create(new CassandraMailboxModule());
private final static Logger LOG = LoggerFactory.getLogger(CassandraMailboxSessionMapperFactoryTest.class);
@Before
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraSubscriptionManagerTest.java Mon Nov 2 14:45:26 2015
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.cassandra;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.AbstractSubscriptionManagerTest;
import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
@@ -30,7 +30,7 @@ import org.apache.james.mailbox.cassandr
*/
public class CassandraSubscriptionManagerTest extends AbstractSubscriptionManagerTest {
- private static final CassandraClusterSingleton cassandra = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ private static final CassandraCluster cassandra = CassandraCluster.create(new CassandraMailboxModule());
@Override
public SubscriptionManager createSubscriptionManager() {
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraACLMapperTest.java Mon Nov 2 14:45:26 2015
@@ -30,7 +30,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.cassandra.CassandraId;
import org.apache.james.mailbox.cassandra.CassandraMailboxModule;
import org.apache.james.mailbox.cassandra.table.CassandraACLTable;
@@ -48,7 +48,7 @@ import com.google.common.base.Throwables
public class CassandraACLMapperTest {
private CassandraACLMapper cassandraACLMapper;
- private CassandraClusterSingleton cassandra;
+ private CassandraCluster cassandra;
private SimpleMailbox<CassandraId> mailbox;
private int uidValidity;
private int maxRetry;
@@ -56,7 +56,7 @@ public class CassandraACLMapperTest {
@Before
public void setUp() {
- cassandra = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ cassandra = CassandraCluster.create(new CassandraMailboxModule());
cassandra.ensureAllTables();
uidValidity = 10;
mailbox = new SimpleMailbox<>(new MailboxPath("#private", "benwa@linagora.com", "INBOX"), uidValidity);
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMapperProvider.java Mon Nov 2 14:45:26 2015
@@ -1,6 +1,6 @@
package org.apache.james.mailbox.cassandra.mail;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.cassandra.CassandraId;
import org.apache.james.mailbox.cassandra.CassandraMailboxModule;
import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory;
@@ -12,7 +12,7 @@ import org.apache.james.mailbox.store.ma
public class CassandraMapperProvider implements MapperProvider<CassandraId> {
- private static final CassandraClusterSingleton cassandra = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ private static final CassandraCluster cassandra = CassandraCluster.create(new CassandraMailboxModule());
@Override
public MailboxMapper<CassandraId> createMailboxMapper() throws MailboxException {
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidAndModSeqProviderTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidAndModSeqProviderTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidAndModSeqProviderTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraUidAndModSeqProviderTest.java Mon Nov 2 14:45:26 2015
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.Atomi
import java.util.function.LongConsumer;
import java.util.stream.LongStream;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.cassandra.CassandraId;
import org.apache.james.mailbox.cassandra.CassandraMailboxModule;
import org.apache.james.mailbox.exception.MailboxException;
@@ -45,7 +45,7 @@ import com.google.common.base.Throwables
*/
public class CassandraUidAndModSeqProviderTest {
- private static final CassandraClusterSingleton CASSANDRA = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ private static final CassandraCluster CASSANDRA = CassandraCluster.create(new CassandraMailboxModule());
private static final int NAMESPACES = 5;
private static final int USERS = 5;
private static final int MAILBOX_NO = 5;
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java Mon Nov 2 14:45:26 2015
@@ -21,7 +21,7 @@ package org.apache.james.mailbox.cassand
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.cassandra.CassandraMailboxModule;
import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.store.quota.QuotaRootImpl;
@@ -33,12 +33,12 @@ public class CassandraCurrentQuotaManage
private static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("value");
- private CassandraClusterSingleton cassandra;
+ private CassandraCluster cassandra;
private CassandraCurrentQuotaManager currentQuotaManager;
@Before
public void setUp() {
- cassandra = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ cassandra = CassandraCluster.create(new CassandraMailboxModule());
cassandra.ensureAllTables();
currentQuotaManager = new CassandraCurrentQuotaManager(cassandra.getConf());
}
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraPerUserMaxQuotaManagerTest.java Mon Nov 2 14:45:26 2015
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.cassandra.quota;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.cassandra.CassandraMailboxModule;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.store.quota.GenericMaxQuotaManagerTest;
@@ -27,11 +27,11 @@ import org.junit.After;
public class CassandraPerUserMaxQuotaManagerTest extends GenericMaxQuotaManagerTest {
- private CassandraClusterSingleton cassandra;
+ private CassandraCluster cassandra;
@Override
protected MaxQuotaManager provideMaxQuotaManager() {
- cassandra = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ cassandra = CassandraCluster.create(new CassandraMailboxModule());
cassandra.ensureAllTables();
return new CassandraPerUserMaxQuotaManager(cassandra.getConf());
}
Modified: james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java (original)
+++ james/project/trunk/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java Mon Nov 2 14:45:26 2015
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.mailbox.cassandra.CassandraMailboxModule;
import org.apache.james.mailbox.store.user.model.Subscription;
import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription;
@@ -46,7 +46,7 @@ import com.datastax.driver.core.Session;
public class CassandraSubscriptionMapperTest {
private static final Logger LOG = LoggerFactory.getLogger(CassandraSubscriptionMapperTest.class);
- private static final CassandraClusterSingleton CLUSTER = CassandraClusterSingleton.create(new CassandraMailboxModule());
+ private static final CassandraCluster CLUSTER = CassandraCluster.create(new CassandraMailboxModule());
private static Session session;
private static CassandraSubscriptionMapper mapper;
private static Map<String, List<SimpleSubscription>> subscriptionList;
Modified: james/project/trunk/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java (original)
+++ james/project/trunk/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java Mon Nov 2 14:45:26 2015
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.mpt.imapmailbox.cassandra.host;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
@@ -52,11 +52,11 @@ public class CassandraHostSystem extends
private final CassandraMailboxManager mailboxManager;
private final MockAuthenticator userManager;
private final CassandraModule mailboxModule;
- private CassandraClusterSingleton cassandraClusterSingleton;
+ private CassandraCluster cassandraClusterSingleton;
public CassandraHostSystem() throws Exception {
mailboxModule = new CassandraMailboxModule();
- cassandraClusterSingleton = CassandraClusterSingleton.create(mailboxModule);
+ cassandraClusterSingleton = CassandraCluster.create(mailboxModule);
userManager = new MockAuthenticator();
com.datastax.driver.core.Session session = cassandraClusterSingleton.getConf();
CassandraModSeqProvider modSeqProvider = new CassandraModSeqProvider(session);
Modified: james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java (original)
+++ james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java Mon Nov 2 14:45:26 2015
@@ -19,7 +19,7 @@
package org.apache.james.rrt.cassandra;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
@@ -30,12 +30,12 @@ import cucumber.api.java.Before;
public class CassandraRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest {
- private CassandraClusterSingleton cassandra;
+ private CassandraCluster cassandra;
@Before
@Override
public void setUp() throws Exception {
- cassandra = CassandraClusterSingleton.create(new CassandraRRTModule());
+ cassandra = CassandraCluster.create(new CassandraRRTModule());
cassandra.ensureAllTables();
super.setUp();
}
Modified: james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java?rev=1712019&r1=1712018&r2=1712019&view=diff
==============================================================================
--- james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java (original)
+++ james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java Mon Nov 2 14:45:26 2015
@@ -19,7 +19,7 @@
package org.apache.james.rrt.cassandra;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.backends.cassandra.CassandraClusterSingleton;
+import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.RewriteTablesStepdefs;
import org.slf4j.LoggerFactory;
@@ -29,7 +29,7 @@ import cucumber.api.java.Before;
public class CassandraStepdefs {
- private CassandraClusterSingleton cassandra;
+ private CassandraCluster cassandra;
private RewriteTablesStepdefs mainStepdefs;
@@ -39,7 +39,7 @@ public class CassandraStepdefs {
@Before
public void setup() throws Throwable {
- cassandra = CassandraClusterSingleton.create(new CassandraRRTModule());
+ cassandra = CassandraCluster.create(new CassandraRRTModule());
cassandra.ensureAllTables();
mainStepdefs.rewriteTable = getRecipientRewriteTable();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org