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 bt...@apache.org on 2018/07/25 10:08:10 UTC
[08/15] james-project git commit: JAMES-2470 Strong typing for
Cassandra host
JAMES-2470 Strong typing for Cassandra host
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fcf79c0f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fcf79c0f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fcf79c0f
Branch: refs/heads/master
Commit: fcf79c0fc4afb713a9d88c6fbb7b849bae391348
Parents: 61b8caa
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 24 10:49:24 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 16:44:13 2018 +0700
----------------------------------------------------------------------
.../backends/cassandra/CassandraCluster.java | 20 +++-----
.../cassandra/DockerCassandraExtension.java | 31 ++++-------
.../init/CassandraTypeProviderTest.java | 2 +-
.../CassandraGenericEventStoreExtension.java | 2 +-
.../CassandraMailboxManagerStressTest.java | 2 +-
.../cassandra/CassandraMailboxManagerTest.java | 2 +-
.../mail/CassandraApplicableFlagDAOTest.java | 2 +-
.../mail/CassandraMailboxMapperTest.java | 2 +-
.../mail/CassandraMessageMapperTest.java | 2 +-
.../migration/MailboxPathV2MigrationTest.java | 3 +-
.../quota/CassandraCurrentQuotaManagerTest.java | 2 +-
.../user/CassandraSubscriptionMapperTest.java | 2 +-
.../cassandra/host/CassandraHostSystem.java | 9 ++--
.../cassandra/host/CassandraHostSystemRule.java | 2 +-
.../cassandra/CassandraAuthenticateTest.java | 7 +--
.../cassandra/CassandraCapabilityTest.java | 7 +--
.../cassandra/CassandraCheckScriptTest.java | 7 +--
.../cassandra/CassandraDeleteScriptTest.java | 7 +--
.../cassandra/CassandraGetScriptTest.java | 7 +--
.../cassandra/CassandraHaveSpaceTest.java | 7 +--
.../cassandra/CassandraListScriptsTest.java | 7 +--
.../cassandra/CassandraLogoutTest.java | 7 +--
.../managesieve/cassandra/CassandraModule.java | 9 ++--
.../cassandra/CassandraNoopTest.java | 7 +--
.../cassandra/CassandraPutScriptTest.java | 7 +--
.../cassandra/CassandraRenameScriptTest.java | 7 +--
.../cassandra/CassandraSetActiveTest.java | 7 +--
.../cassandra/CassandraStartTlsTest.java | 7 +--
.../cassandra/CassandraUnauthenticatedTest.java | 7 +--
.../cassandra/host/CassandraHostSystem.java | 9 ++--
.../smtp/host/CassandraJamesSmtpHostSystem.java | 12 +++--
.../blob/cassandra/CassandraBlobsDAOTest.java | 2 +-
.../james/modules/CassandraTestModule.java | 54 --------------------
...tSourcingDLPConfigurationStoreExtension.java | 3 +-
.../james/rrt/cassandra/CassandraStepdefs.java | 2 +-
.../CassandraMailRepositoryCountDAOTest.java | 2 +-
.../CassandraMailRepositoryKeysDAOTest.java | 2 +-
.../CassandraMailRepositoryMailDAOTest.java | 2 +-
.../cassandra/CassandraMailRepositoryTest.java | 2 +-
39 files changed, 82 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
index 3d0304b..2db3b16 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.james.backends.cassandra;
-import javax.inject.Inject;
-import javax.inject.Named;
-
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraTableManager;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
@@ -41,25 +38,20 @@ public final class CassandraCluster implements AutoCloseable {
private CassandraTypesProvider typesProvider;
private Cluster cluster;
- public static CassandraCluster create(CassandraModule module, String host, int port) {
- return new CassandraCluster(module, host, port);
- }
-
public static CassandraCluster create(CassandraModule module, Host host) {
- return new CassandraCluster(module, host.getHostName(), host.getPort());
+ return new CassandraCluster(module, host);
}
-
- @Inject
- private CassandraCluster(CassandraModule module, @Named("cassandraHost") String host, @Named("cassandraPort") int port) throws RuntimeException {
+
+ private CassandraCluster(CassandraModule module, Host host) throws RuntimeException {
this.module = module;
try {
cluster = ClusterBuilder.builder()
- .host(host)
- .port(port)
+ .host(host.getHostName())
+ .port(host.getPort())
.build();
session = new SessionWithInitializedTablesFactory(
ClusterConfiguration.builder()
- .host(Host.from(host, port))
+ .host(host)
.keyspace(KEYSPACE)
.replicationFactor(1)
.build(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraExtension.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraExtension.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraExtension.java
index add70c8..7ad686a 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraExtension.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraExtension.java
@@ -19,13 +19,13 @@
package org.apache.james.backends.cassandra;
+import org.apache.james.util.Host;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.ParameterResolver;
-import org.testcontainers.containers.GenericContainer;
public class DockerCassandraExtension implements BeforeAllCallback, AfterAllCallback, ParameterResolver {
@@ -37,13 +37,13 @@ public class DockerCassandraExtension implements BeforeAllCallback, AfterAllCall
}
@Override
- public void beforeAll(ExtensionContext context) throws Exception {
+ public void beforeAll(ExtensionContext context) {
cassandraContainer.start();
- dockerCassandra = DockerCassandra.from(cassandraContainer.getRawContainer());
+ dockerCassandra = new DockerCassandra(cassandraContainer.getHost());
}
@Override
- public void afterAll(ExtensionContext context) throws Exception {
+ public void afterAll(ExtensionContext context) {
cassandraContainer.stop();
}
@@ -62,27 +62,14 @@ public class DockerCassandraExtension implements BeforeAllCallback, AfterAllCall
}
public static class DockerCassandra {
-
- private static final int CASSANDRA_PORT = 9042;
+ private final Host host;
- public static DockerCassandra from(GenericContainer<?> cassandraContainer) {
- return new DockerCassandra(cassandraContainer.getContainerIpAddress(), cassandraContainer.getMappedPort(CASSANDRA_PORT));
+ private DockerCassandra(Host host) {
+ this.host = host;
}
- private final String ip;
- private final int bindingPort;
-
- private DockerCassandra(String ip, int bindingPort) {
- this.ip = ip;
- this.bindingPort = bindingPort;
- }
-
- public String getIp() {
- return ip;
- }
-
- public int getBindingPort() {
- return bindingPort;
+ public Host getHost() {
+ return host;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java
index 4a3212b..1b48b22 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraTypeProviderTest.java
@@ -62,7 +62,7 @@ public class CassandraTypeProviderTest {
.addColumn(PROPERTY, text()))));
}
};
- cassandra = CassandraCluster.create(module, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(module, cassandraServer.getHost());
cassandra.getTypesProvider();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
----------------------------------------------------------------------
diff --git a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
index 59d0248..1db5f09 100644
--- a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
+++ b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/CassandraGenericEventStoreExtension.java
@@ -53,7 +53,7 @@ public class CassandraGenericEventStoreExtension implements BeforeAllCallback, A
dockerCassandraExtension.beforeAll(context);
dockerCassandra = dockerCassandraExtension.getDockerCassandra();
cassandra = CassandraCluster.create(
- new CassandraEventStoreModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ new CassandraEventStoreModule(), dockerCassandra.getHost());
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
index f84be5a..33c263c 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerStressTest.java
@@ -69,7 +69,7 @@ public class CassandraMailboxManagerStressTest extends MailboxManagerStressTest
new CassandraAnnotationModule(),
new CassandraApplicableFlagsModule(),
new CassandraQuotaModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
}
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
index 0995257..9e7e2e0 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerTest.java
@@ -68,7 +68,7 @@ public class CassandraMailboxManagerTest extends MailboxManagerTest {
new CassandraAnnotationModule(),
new CassandraApplicableFlagsModule(),
new CassandraQuotaModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
}
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
index af07d23..87b1701 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAOTest.java
@@ -51,7 +51,7 @@ public class CassandraApplicableFlagDAOTest {
@BeforeClass
public static void setUpClass() {
- cassandra = CassandraCluster.create(new CassandraApplicableFlagsModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraApplicableFlagsModule(), cassandraServer.getHost());
}
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/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 a849645..7e3d439 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
@@ -72,7 +72,7 @@ public class CassandraMailboxMapperTest {
@BeforeClass
public static void setUpClass() {
CassandraModuleComposite modules = new CassandraModuleComposite(new CassandraMailboxModule(), new CassandraAclModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
}
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
index 56cb3ba..f49f6d5 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
@@ -65,7 +65,7 @@ public class CassandraMessageMapperTest extends MessageMapperTest {
new CassandraApplicableFlagsModule(),
new CassandraDeletedMessageModule(),
new CassandraBlobModule());
- cassandra = CassandraCluster.create(modules, cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(modules, cassandraServer.getHost());
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
index 2d64288..f37259d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTest.java
@@ -70,8 +70,7 @@ public class MailboxPathV2MigrationTest {
new CassandraModuleComposite(
new CassandraMailboxModule(),
new CassandraAclModule()),
- cassandraServer.getIp(),
- cassandraServer.getBindingPort());
+ cassandraServer.getHost());
}
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
index 80ed628..004b76d 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/quota/CassandraCurrentQuotaManagerTest.java
@@ -37,7 +37,7 @@ public class CassandraCurrentQuotaManagerTest extends StoreCurrentQuotaManagerTe
@BeforeClass
public static void setUpClass() {
- cassandra = CassandraCluster.create(new CassandraQuotaModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraQuotaModule(), cassandraServer.getHost());
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/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 0b0d817..84a5294 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
@@ -37,7 +37,7 @@ public class CassandraSubscriptionMapperTest extends SubscriptionMapperTest {
@BeforeClass
public static void setUpClass() {
- cassandra = CassandraCluster.create(new CassandraSubscriptionModule(), cassandraServer.getIp(), cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraSubscriptionModule(), cassandraServer.getHost());
}
@Override
protected SubscriptionMapper createSubscriptionMapper() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/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 dbb2006..478ea37 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
@@ -70,6 +70,7 @@ import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.apache.james.mpt.api.ImapFeatures;
import org.apache.james.mpt.api.ImapFeatures.Feature;
import org.apache.james.mpt.host.JamesImapHostSystem;
+import org.apache.james.util.Host;
public class CassandraHostSystem extends JamesImapHostSystem {
@@ -97,21 +98,19 @@ public class CassandraHostSystem extends JamesImapHostSystem {
new CassandraAnnotationModule(),
new CassandraApplicableFlagsModule());
- private final String cassandraHost;
- private final int cassandraPort;
+ private final Host cassandraHost;
private CassandraMailboxManager mailboxManager;
private CassandraCluster cassandra;
private CassandraPerUserMaxQuotaManager perUserMaxQuotaManager;
- public CassandraHostSystem(String cassandraHost, int cassandraPort) {
+ public CassandraHostSystem(Host cassandraHost) {
this.cassandraHost = cassandraHost;
- this.cassandraPort = cassandraPort;
}
@Override
public void beforeTest() throws Exception {
super.beforeTest();
- cassandra = CassandraCluster.create(mailboxModule, cassandraHost, cassandraPort);
+ cassandra = CassandraCluster.create(mailboxModule, cassandraHost);
com.datastax.driver.core.Session session = cassandra.getConf();
CassandraMessageId.Factory messageIdFactory = new CassandraMessageId.Factory();
CassandraMailboxSessionMapperFactory mapperFactory = TestCassandraMailboxSessionMapperFactory.forTests(
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystemRule.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystemRule.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystemRule.java
index 88358b6..f9cbcc5 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystemRule.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystemRule.java
@@ -32,7 +32,7 @@ public class CassandraHostSystemRule extends ExternalResource {
@Override
protected void before() throws Throwable {
- system = new CassandraHostSystem(cassandraServer.getIp(), cassandraServer.getBindingPort());
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
index 38b8af9..7fc1f12 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraAuthenticateTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.AuthenticateTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraAuthenticateTest extends AuthenticateTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraAuthenticateTest extends AuthenticateTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
index e9fc00a..7d26e5e 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCapabilityTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.CapabilityTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraCapabilityTest extends CapabilityTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraCapabilityTest extends CapabilityTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
index ad0362c..334fd8f 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraCheckScriptTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.CheckScriptTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraCheckScriptTest extends CheckScriptTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraCheckScriptTest extends CheckScriptTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
index 27fe710..a6d635b 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraDeleteScriptTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.DeleteScriptTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraDeleteScriptTest extends DeleteScriptTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraDeleteScriptTest extends DeleteScriptTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
index cb2387f..01ee375 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraGetScriptTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.GetScriptTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraGetScriptTest extends GetScriptTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraGetScriptTest extends GetScriptTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
index 13361b3..ec3a602 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraHaveSpaceTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.HaveSpaceTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraHaveSpaceTest extends HaveSpaceTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraHaveSpaceTest extends HaveSpaceTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
index dc8f7c4..0fea827 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraListScriptsTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.ListScriptsTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public abstract class CassandraListScriptsTest extends ListScriptsTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public abstract class CassandraListScriptsTest extends ListScriptsTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
index 3b9058f..87caae7 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraLogoutTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.LogoutTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraLogoutTest extends LogoutTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraLogoutTest extends LogoutTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraModule.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraModule.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraModule.java
index cd0018d..dcc4e21 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraModule.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraModule.java
@@ -21,6 +21,7 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.mpt.host.ManageSieveHostSystem;
import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
+import org.apache.james.util.Host;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@@ -28,12 +29,10 @@ import com.google.inject.Singleton;
public class CassandraModule extends AbstractModule {
- private final String cassandraHost;
- private final int cassandraPort;
+ private final Host cassandraHost;
- public CassandraModule(String cassandraHost, int cassandraPort) {
+ public CassandraModule(Host cassandraHost) {
this.cassandraHost = cassandraHost;
- this.cassandraPort = cassandraPort;
}
@Override
@@ -43,6 +42,6 @@ public class CassandraModule extends AbstractModule {
@Provides
@Singleton
public ManageSieveHostSystem provideHostSystem() throws Exception {
- return new CassandraHostSystem(cassandraHost, cassandraPort);
+ return new CassandraHostSystem(cassandraHost);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
index cf4b4f0..5dff427 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraNoopTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.NoopTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraNoopTest extends NoopTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraNoopTest extends NoopTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
index 6df620a..07b0507 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraPutScriptTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.PutScriptTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraPutScriptTest extends PutScriptTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraPutScriptTest extends PutScriptTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
index 6972ecf..9070ab3 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraRenameScriptTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.RenameScriptTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraRenameScriptTest extends RenameScriptTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraRenameScriptTest extends RenameScriptTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
index 17fa268..702f4e0 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraSetActiveTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.SetActiveTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraSetActiveTest extends SetActiveTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraSetActiveTest extends SetActiveTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
index 94db175..b70ec77 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraStartTlsTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.StartTlsTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraStartTlsTest extends StartTlsTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraStartTlsTest extends StartTlsTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
index 36bfca0..badc1b9 100644
--- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
+++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/CassandraUnauthenticatedTest.java
@@ -21,14 +21,12 @@ package org.apache.james.mpt.managesieve.cassandra;
import org.apache.james.backends.cassandra.DockerCassandraRule;
import org.apache.james.mpt.host.ManageSieveHostSystem;
+import org.apache.james.mpt.managesieve.cassandra.host.CassandraHostSystem;
import org.apache.james.mpt.testsuite.UnauthenticatedTest;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
public class CassandraUnauthenticatedTest extends UnauthenticatedTest {
@ClassRule public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
@@ -38,8 +36,7 @@ public class CassandraUnauthenticatedTest extends UnauthenticatedTest {
@Override
@Before
public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new CassandraModule(cassandraServer.getIp(), cassandraServer.getBindingPort()));
- system = injector.getInstance(ManageSieveHostSystem.class);
+ system = new CassandraHostSystem(cassandraServer.getHost());
system.beforeTest();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/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 4532781..3d5013f 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
@@ -32,16 +32,15 @@ import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.cassandra.CassandraUsersRepository;
import org.apache.james.user.cassandra.CassandraUsersRepositoryModule;
+import org.apache.james.util.Host;
public class CassandraHostSystem extends JamesManageSieveHostSystem {
- private final String cassandraHost;
- private final int cassandraPort;
+ private final Host cassandraHost;
private CassandraCluster cassandra;
- public CassandraHostSystem(String cassandraHost, int cassandraPort) {
+ public CassandraHostSystem(Host cassandraHost) {
this.cassandraHost = cassandraHost;
- this.cassandraPort = cassandraPort;
}
@Override
@@ -49,7 +48,7 @@ public class CassandraHostSystem extends JamesManageSieveHostSystem {
CassandraModuleComposite modules = new CassandraModuleComposite(
new CassandraSieveRepositoryModule(),
new CassandraUsersRepositoryModule());
- cassandra = CassandraCluster.create(modules, cassandraHost, cassandraPort);
+ cassandra = CassandraCluster.create(modules, cassandraHost);
super.beforeTest();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
index 3d2d65b..c640aaa 100644
--- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
+++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -24,9 +24,9 @@ import java.util.Iterator;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.CassandraJamesServerMain;
import org.apache.james.GuiceJamesServer;
+import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.InMemoryDNSService;
-import org.apache.james.modules.CassandraTestModule;
import org.apache.james.modules.protocols.ProtocolHandlerModule;
import org.apache.james.modules.protocols.SMTPServerModule;
import org.apache.james.modules.server.CamelMailetContainerModule;
@@ -120,7 +120,13 @@ public class CassandraJamesSmtpHostSystem extends ExternalSessionFactory impleme
binder -> binder.bind(MailQueueItemDecoratorFactory.class).to(RawMailQueueItemDecoratorFactory.class),
binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class)
.toInstance(DefaultConfigurationBuilder::new))
- .overrideWith(new CassandraTestModule(cassandraHost),
- (binder) -> binder.bind(DNSService.class).toInstance(inMemoryDNSService));
+ .overrideWith(
+ binder -> binder.bind(ClusterConfiguration.class).toInstance(
+ ClusterConfiguration.builder()
+ .host(cassandraHost)
+ .keyspace("testing")
+ .replicationFactor(1)
+ .build()),
+ binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
----------------------------------------------------------------------
diff --git a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
index 6f7ecb4..38202a3 100644
--- a/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
+++ b/server/blob/blob-cassandra/src/test/java/org/apache/james/blob/cassandra/CassandraBlobsDAOTest.java
@@ -51,7 +51,7 @@ public class CassandraBlobsDAOTest implements ObjectStoreContract {
@BeforeAll
static void setUpClass(DockerCassandra dockerCassandra) {
- cassandra = CassandraCluster.create(new CassandraBlobModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraBlobModule(), dockerCassandra.getHost());
}
@BeforeEach
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraTestModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraTestModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraTestModule.java
deleted file mode 100644
index d2a1415..0000000
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraTestModule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.modules;
-
-import javax.inject.Singleton;
-
-import org.apache.james.backends.cassandra.CassandraCluster;
-import org.apache.james.util.Host;
-
-import com.datastax.driver.core.Session;
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.name.Names;
-
-public class CassandraTestModule extends AbstractModule {
- private final Host cassandraHost;
-
- public CassandraTestModule(Host cassandraHost) {
- this.cassandraHost = cassandraHost;
- }
-
- @Override
- protected void configure() {
- install(binder -> binder.bindConstant()
- .annotatedWith(Names.named("cassandraHost"))
- .to(cassandraHost.getHostName()));
- install(binder -> binder.bindConstant()
- .annotatedWith(Names.named("cassandraPort"))
- .to(cassandraHost.getPort()));
- }
-
- @Provides
- @Singleton
- Session provideSession(CassandraCluster initializedCassandra) {
- return initializedCassandra.getConf();
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
index 6d45afd..b10ff03 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java
@@ -51,8 +51,7 @@ public class CassandraEventSourcingDLPConfigurationStoreExtension implements Bef
dockerCassandraExtension.beforeAll(context);
cassandra = CassandraCluster.create(
new CassandraEventStoreModule(),
- dockerCassandraExtension.getDockerCassandra().getIp(),
- dockerCassandraExtension.getDockerCassandra().getBindingPort());
+ dockerCassandraExtension.getDockerCassandra().getHost());
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/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 b62707c..4681a4b 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
@@ -39,7 +39,7 @@ public class CassandraStepdefs {
@Before
public void setup() throws Throwable {
- cassandra = CassandraCluster.create(new CassandraRRTModule(), RewriteTablesTest.cassandraServer.getIp(), RewriteTablesTest.cassandraServer.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraRRTModule(), RewriteTablesTest.cassandraServer.getHost());
mainStepdefs.rewriteTable = getRecipientRewriteTable();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAOTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAOTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAOTest.java
index 7212899..b68b602 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAOTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAOTest.java
@@ -41,7 +41,7 @@ public class CassandraMailRepositoryCountDAOTest {
@BeforeAll
static void setUpClass(DockerCassandraExtension.DockerCassandra dockerCassandra) {
- cassandra = CassandraCluster.create(new CassandraMailRepositoryModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraMailRepositoryModule(), dockerCassandra.getHost());
}
@BeforeEach
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java
index 39aba93..03a905c 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAOTest.java
@@ -47,7 +47,7 @@ public class CassandraMailRepositoryKeysDAOTest {
@BeforeAll
static void setUpClass(DockerCassandraExtension.DockerCassandra dockerCassandra) {
- cassandra = CassandraCluster.create(new CassandraMailRepositoryModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraMailRepositoryModule(), dockerCassandra.getHost());
}
@BeforeEach
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
index 0888706..8bc858e 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java
@@ -52,7 +52,7 @@ public class CassandraMailRepositoryMailDAOTest {
@BeforeAll
static void setUpClass(DockerCassandraExtension.DockerCassandra dockerCassandra) {
- cassandra = CassandraCluster.create(new CassandraMailRepositoryModule(), dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ cassandra = CassandraCluster.create(new CassandraMailRepositoryModule(), dockerCassandra.getHost());
}
@BeforeEach
http://git-wip-us.apache.org/repos/asf/james-project/blob/fcf79c0f/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
index 2d73711..2b21c0d 100644
--- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
+++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryTest.java
@@ -50,7 +50,7 @@ class CassandraMailRepositoryTest implements MailRepositoryContract {
CassandraModuleComposite modules = new CassandraModuleComposite(
new CassandraMailRepositoryModule(),
new CassandraBlobModule());
- cassandra = CassandraCluster.create(modules, dockerCassandra.getIp(), dockerCassandra.getBindingPort());
+ cassandra = CassandraCluster.create(modules, dockerCassandra.getHost());
}
@BeforeEach
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org