Skip to content

Commit

Permalink
JAMES-2090 Rename CassandraUtilsDefaultValue
Browse files Browse the repository at this point in the history
  • Loading branch information
@chibenwa
chibenwa committed Jul 6, 2017
1 parent 366023f commit c8286d9
Show file tree
Hide file tree
Showing 16 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ...mon/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java
View file
Expand Up @@ -31,7 +31,7 @@

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;

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
View file
Expand Up @@ -123,7 +123,7 @@ public CassandraMailboxSessionMapperFactory(

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
Expand Down
2 changes: 1 addition & 1 deletion ...dra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java
View file
Expand Up @@ -75,7 +75,7 @@ public CassandraDeletedMessageDAO(Session session, CassandraUtils cassandraUtils

@VisibleForTesting
public CassandraDeletedMessageDAO(Session session) {
this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
this(session, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
}

private PreparedStatement prepareAllUidStatement(Session session) {
Expand Down
3 changes: 1 addition & 2 deletions .../cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java
View file
Expand Up @@ -37,7 +37,6 @@
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;
Expand Down Expand Up @@ -87,7 +86,7 @@ public CassandraMailboxDAO(Session session, CassandraTypesProvider typesProvider

@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) {
Expand Down
2 changes: 1 addition & 1 deletion ...sandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAO.java
View file
Expand Up @@ -107,7 +107,7 @@ public CassandraMailboxPathDAO(Session session, CassandraTypesProvider typesProv

@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) {
Expand Down
2 changes: 1 addition & 1 deletion ...dra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java
View file
Expand Up @@ -60,7 +60,7 @@ public CassandraMailboxRecentsDAO(Session session, CassandraUtils cassandraUtils

@VisibleForTesting
public CassandraMailboxRecentsDAO(Session session) {
this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
this(session, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
}

private PreparedStatement createReadStatement(Session session) {
Expand Down
2 changes: 1 addition & 1 deletion ...assandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
View file
Expand Up @@ -100,7 +100,7 @@ public CassandraMessageIdDAO(Session session, CassandraMessageId.Factory message

@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) {
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
View file
Expand Up @@ -92,7 +92,7 @@ public CassandraMessageIdToImapUidDAO(Session session, CassandraMessageId.Factor

@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) {
Expand Down
6 changes: 3 additions & 3 deletions ...a/event/distributed/CassandraBasedRegisteredDistributedMailboxDelegatingListenerTest.java
View file
Expand Up @@ -77,7 +77,7 @@ public void setUp() throws Exception {
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(
Expand All @@ -92,7 +92,7 @@ public void setUp() throws Exception {
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(
Expand All @@ -107,7 +107,7 @@ public void setUp() throws Exception {
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(
Expand Down
4 changes: 2 additions & 2 deletions ...he/james/mailbox/cassandra/event/distributed/CassandraMailboxPathRegistrerMapperTest.java
View file
Expand Up @@ -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);
}

Expand Down Expand Up @@ -112,7 +112,7 @@ public void entriesShouldExpire() throws Exception {
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));
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ra/src/test/java/org/apache/james/mpt/managesieve/cassandra/host/CassandraHostSystem.java
View file
Expand Up @@ -50,7 +50,7 @@ protected static SieveRepository createSieveRepository() throws Exception {
}

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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ta-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java
View file
Expand Up @@ -87,7 +87,7 @@ private PreparedStatement prepareReadAllStatement(Session session) {

@VisibleForTesting
CassandraDomainList(Session session) {
this(session, CassandraUtils.DEFAULT_CASSANDRA_UTILS);
this(session, CassandraUtils.WITH_DEFAULT_CONFIGURATION);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ndra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableTest.java
View file
Expand Up @@ -51,7 +51,7 @@ public void tearDown() throws Exception {

@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;
Expand Down
2 changes: 1 addition & 1 deletion ...r/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java
View file
Expand Up @@ -52,7 +52,7 @@ public void tearDown() {
}

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;
Expand Down
2 changes: 1 addition & 1 deletion ...cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
View file
Expand Up @@ -37,6 +37,6 @@ public void tearDown() {
@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);
}
}

0 comments on commit c8286d9

Please sign in to comment.