james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adup...@apache.org
Subject [11/15] james-project git commit: JAMES-2090 Rename CassandraUtilsDefaultValue
Date Thu, 06 Jul 2017 12:13:17 GMT
JAMES-2090 Rename CassandraUtilsDefaultValue


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c8286d99
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c8286d99
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c8286d99

Branch: refs/heads/master
Commit: c8286d9937d622059fac33805d308d1ab00c564c
Parents: 366023f
Author: benwa <btellier@linagora.com>
Authored: Wed Jul 5 15:55:35 2017 +0700
Committer: benwa <btellier@linagora.com>
Committed: Thu Jul 6 08:48:54 2017 +0700

----------------------------------------------------------------------
 .../apache/james/backends/cassandra/utils/CassandraUtils.java  | 2 +-
 .../cassandra/CassandraMailboxSessionMapperFactory.java        | 2 +-
 .../mailbox/cassandra/mail/CassandraDeletedMessageDAO.java     | 2 +-
 .../james/mailbox/cassandra/mail/CassandraMailboxDAO.java      | 3 +--
 .../james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java  | 2 +-
 .../mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java     | 2 +-
 .../james/mailbox/cassandra/mail/CassandraMessageIdDAO.java    | 2 +-
 .../mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java | 2 +-
 ...asedRegisteredDistributedMailboxDelegatingListenerTest.java | 6 +++---
 .../distributed/CassandraMailboxPathRegistrerMapperTest.java   | 4 ++--
 .../cassandra/user/CassandraSubscriptionMapperTest.java        | 2 +-
 .../mpt/managesieve/cassandra/host/CassandraHostSystem.java    | 2 +-
 .../apache/james/domainlist/cassandra/CassandraDomainList.java | 2 +-
 .../rrt/cassandra/CassandraRecipientRewriteTableTest.java      | 2 +-
 .../java/org/apache/james/rrt/cassandra/CassandraStepdefs.java | 2 +-
 .../james/user/cassandra/CassandraUsersRepositoryTest.java     | 2 +-
 16 files changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java
index c224b57..568b2bf 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java
@@ -31,7 +31,7 @@ import com.datastax.driver.core.Row;
 
 public class CassandraUtils {
 
-    public static final CassandraUtils DEFAULT_CASSANDRA_UTILS = new CassandraUtils(CassandraConfiguration.DEFAULT_CONFIGURATION);
+    public static final CassandraUtils WITH_DEFAULT_CONFIGURATION = new CassandraUtils(CassandraConfiguration.DEFAULT_CONFIGURATION);
 
     private final CassandraConfiguration cassandraConfiguration;
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 dc0d622..0168e84 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
@@ -123,7 +123,7 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa
 
         this(uidProvider, modSeqProvider, session, messageDAO, messageIdDAO, imapUidDAO,
mailboxCounterDAO,
              mailboxRecentsDAO, mailboxDAO, mailboxPathDAO, firstUnseenDAO, applicableFlagDAO,
deletedMesageDAO,
-            CassandraUtils.DEFAULT_CASSANDRA_UTILS, CassandraConfiguration.DEFAULT_CONFIGURATION);
+            CassandraUtils.WITH_DEFAULT_CONFIGURATION, CassandraConfiguration.DEFAULT_CONFIGURATION);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java
index c86d1e0..f9a3803 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java
@@ -75,7 +75,7 @@ public class CassandraDeletedMessageDAO {
 
     @VisibleForTesting
     public CassandraDeletedMessageDAO(Session session) {
-        this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        this(session, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     private PreparedStatement prepareAllUidStatement(Session session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
index ca6cfd7..fee0e15 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
@@ -37,7 +37,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import org.apache.james.backends.cassandra.CassandraConfiguration;
 import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
@@ -87,7 +86,7 @@ public class CassandraMailboxDAO {
 
     @VisibleForTesting
     public CassandraMailboxDAO(Session session, CassandraTypesProvider typesProvider) {
-        this(session, typesProvider, CassandraUtils.DEFAULT_CASSANDRA_UTILS, CassandraConfiguration.DEFAULT_CONFIGURATION);
+        this(session, typesProvider, CassandraUtils.WITH_DEFAULT_CONFIGURATION, CassandraConfiguration.DEFAULT_CONFIGURATION);
     }
 
     private PreparedStatement prepareInsert(Session session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
index 15d4a94..3ad6695 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
@@ -107,7 +107,7 @@ public class CassandraMailboxPathDAO {
 
     @VisibleForTesting
     public CassandraMailboxPathDAO(Session session, CassandraTypesProvider typesProvider)
{
-        this(session, typesProvider, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        this(session, typesProvider, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     private PreparedStatement prepareDelete(Session session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java
index f3264f4..738e7ac 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java
@@ -60,7 +60,7 @@ public class CassandraMailboxRecentsDAO {
 
     @VisibleForTesting
     public CassandraMailboxRecentsDAO(Session session) {
-        this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        this(session, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     private PreparedStatement createReadStatement(Session session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
index 6f9c265..f32f0a0 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
@@ -100,7 +100,7 @@ public class CassandraMessageIdDAO {
 
     @VisibleForTesting
     public CassandraMessageIdDAO(Session session, CassandraMessageId.Factory messageIdFactory)
{
-        this(session, messageIdFactory, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        this(session, messageIdFactory, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     private PreparedStatement prepareDelete(Session session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
index 38a02d6..ae1ffc1 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
@@ -92,7 +92,7 @@ public class CassandraMessageIdToImapUidDAO {
 
     @VisibleForTesting
     public CassandraMessageIdToImapUidDAO(Session session, CassandraMessageId.Factory messageIdFactory)
{
-        this(session, messageIdFactory, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        this(session, messageIdFactory, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     private PreparedStatement prepareDelete(Session session) {

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 88ebebc..efefb22 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
@@ -77,7 +77,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest
{
             new CassandraMailboxPathRegisterMapper(
                 cassandra.getConf(),
                 cassandra.getTypesProvider(),
-                CassandraUtils.DEFAULT_CASSANDRA_UTILS,
+                CassandraUtils.WITH_DEFAULT_CONFIGURATION,
                 CASSANDRA_TIME_OUT_IN_S),
             SCHEDULER_PERIOD_IN_S);
         registeredDelegatingMailboxListener1 = new RegisteredDelegatingMailboxListener(
@@ -92,7 +92,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest
{
             new CassandraMailboxPathRegisterMapper(
                 cassandra.getConf(),
                 cassandra.getTypesProvider(),
-                CassandraUtils.DEFAULT_CASSANDRA_UTILS,
+                CassandraUtils.WITH_DEFAULT_CONFIGURATION,
                 CASSANDRA_TIME_OUT_IN_S),
             SCHEDULER_PERIOD_IN_S);
         registeredDelegatingMailboxListener2 = new RegisteredDelegatingMailboxListener(
@@ -107,7 +107,7 @@ public class CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest
{
             new CassandraMailboxPathRegisterMapper(
                 cassandra.getConf(),
                 cassandra.getTypesProvider(),
-                CassandraUtils.DEFAULT_CASSANDRA_UTILS,
+                CassandraUtils.WITH_DEFAULT_CONFIGURATION,
                 CASSANDRA_TIME_OUT_IN_S),
             SCHEDULER_PERIOD_IN_S);
         registeredDelegatingMailboxListener3 = new RegisteredDelegatingMailboxListener(

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 8ba28ac..3e66222 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
@@ -48,7 +48,7 @@ public class CassandraMailboxPathRegistrerMapperTest {
     public void setUp() {
         mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(),
             cassandra.getTypesProvider(),
-            CassandraUtils.DEFAULT_CASSANDRA_UTILS,
+            CassandraUtils.WITH_DEFAULT_CONFIGURATION,
             CASSANDRA_TIME_OUT_IN_S);
     }
 
@@ -112,7 +112,7 @@ public class CassandraMailboxPathRegistrerMapperTest {
         int verySmallTimeoutInSecond = 1;
         mapper = new CassandraMailboxPathRegisterMapper(cassandra.getConf(),
             cassandra.getTypesProvider(),
-            CassandraUtils.DEFAULT_CASSANDRA_UTILS,
+            CassandraUtils.WITH_DEFAULT_CONFIGURATION,
             verySmallTimeoutInSecond);
         mapper.doRegister(MAILBOX_PATH, TOPIC);
         Thread.sleep(2 * TimeUnit.SECONDS.toMillis(verySmallTimeoutInSecond));

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 c194d90..a08b589 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
@@ -33,7 +33,7 @@ public class CassandraSubscriptionMapperTest extends SubscriptionMapperTest
{
     @Override
     protected SubscriptionMapper createSubscriptionMapper() {
         cassandra.ensureAllTables();
-        return new CassandraSubscriptionMapper(cassandra.getConf(), CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        return new CassandraSubscriptionMapper(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 d9bc5f9..3b24879 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
@@ -50,7 +50,7 @@ public class CassandraHostSystem extends JamesManageSieveHostSystem {
     }
 
     protected static UsersRepository createUsersRepository() {
-        CassandraUsersRepository cassandraUsersRepository = new CassandraUsersRepository(CASSANDRA_CLUSTER.getConf(),
CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        CassandraUsersRepository cassandraUsersRepository = new CassandraUsersRepository(CASSANDRA_CLUSTER.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
         cassandraUsersRepository.setEnableVirtualHosting(false);
         return cassandraUsersRepository;
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 c49956c..efbc554 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
@@ -87,7 +87,7 @@ public class CassandraDomainList extends AbstractDomainList {
 
     @VisibleForTesting
     CassandraDomainList(Session session) {
-        this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        this(session, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
index 525eb2a..e55ce6a 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
@@ -51,7 +51,7 @@ public class CassandraRecipientRewriteTableTest extends AbstractRecipientRewrite
 
     @Override
     protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
-        CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(cassandra.getConf(),
CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
         rrt.setLog(LoggerFactory.getLogger("MockLog"));
         rrt.configure(new DefaultConfigurationBuilder());
         return rrt;

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
index 61dc4a8..d6ce16f 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
@@ -52,7 +52,7 @@ public class CassandraStepdefs {
     }
 
     private AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
-        CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(cassandra.getConf(),
CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        CassandraRecipientRewriteTable rrt = new CassandraRecipientRewriteTable(cassandra.getConf(),
CassandraUtils.WITH_DEFAULT_CONFIGURATION);
         rrt.setLog(LoggerFactory.getLogger("MockLog"));
         rrt.configure(new DefaultConfigurationBuilder());
         return rrt;

http://git-wip-us.apache.org/repos/asf/james-project/blob/c8286d99/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 5fea737..326bc6b 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
@@ -37,6 +37,6 @@ public class CassandraUsersRepositoryTest extends AbstractUsersRepositoryTest
{
     @Override
     protected AbstractUsersRepository getUsersRepository() throws Exception {
         cassandra = CassandraCluster.create(new CassandraUsersRepositoryModule());
-        return new CassandraUsersRepository(cassandra.getConf(), CassandraUtils.DEFAULT_CASSANDRA_UTILS);
+        return new CassandraUsersRepository(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION);
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message