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 2020/03/02 03:16:06 UTC
[james-project] 09/29: JAMES-3061 Simplify CassandraCluster
resources cleanup
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f743a4b1a64162920ea1e16091ecced1fe719d2b
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Mon Feb 24 18:21:29 2020 +0700
JAMES-3061 Simplify CassandraCluster resources cleanup
---
...ventSourcingDLPConfigurationStoreExtension.java | 22 ++++++++--------------
.../cassandra/CassandraDomainListTest.java | 3 +--
.../CassandraRecipientRewriteTableV6Test.java | 3 +--
.../CassandraRecipientRewriteTableV7Test.java | 3 +--
.../cassandra/CassandraSieveRepositoryTest.java | 3 +--
.../access/CassandraAccessTokenRepositoryTest.java | 3 +--
.../CassandraNotificationRegistryTest.java | 3 +--
.../vacation/CassandraVacationRepositoryTest.java | 3 +--
8 files changed, 15 insertions(+), 28 deletions(-)
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 1dedaf4..c128d12 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
@@ -19,8 +19,7 @@
package org.apache.james.dlp.eventsourcing.cassandra;
-import org.apache.james.backends.cassandra.CassandraCluster;
-import org.apache.james.backends.cassandra.DockerCassandraExtension;
+import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.dlp.api.DLPConfigurationStore;
import org.apache.james.dlp.eventsourcing.EventSourcingDLPConfigurationStore;
import org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStore;
@@ -37,35 +36,30 @@ import org.junit.jupiter.api.extension.ParameterResolver;
public class CassandraEventSourcingDLPConfigurationStoreExtension implements BeforeAllCallback, AfterAllCallback, AfterEachCallback, ParameterResolver {
- private final DockerCassandraExtension dockerCassandraExtension;
- private CassandraCluster cassandra;
+ private final CassandraClusterExtension cassandraExtension;
public CassandraEventSourcingDLPConfigurationStoreExtension() {
- dockerCassandraExtension = new DockerCassandraExtension();
+ cassandraExtension = new CassandraClusterExtension(CassandraEventStoreModule.MODULE());
}
@Override
public void beforeAll(ExtensionContext context) throws Exception {
- dockerCassandraExtension.beforeAll(context);
- cassandra = CassandraCluster.create(
- CassandraEventStoreModule.MODULE(),
- dockerCassandraExtension.getDockerCassandra().getHost());
+ cassandraExtension.beforeAll(context);
}
@Override
public void afterEach(ExtensionContext context) {
- cassandra.clearTables();
+ cassandraExtension.afterEach(context);
}
@Override
public void afterAll(ExtensionContext context) throws Exception {
- cassandra.closeCluster();
- dockerCassandraExtension.afterAll(context);
+ cassandraExtension.afterAll(context);
}
@Override
public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
- return (parameterContext.getParameter().getType() == DLPConfigurationStore.class);
+ return parameterContext.getParameter().getType() == DLPConfigurationStore.class;
}
@Override
@@ -75,7 +69,7 @@ public class CassandraEventSourcingDLPConfigurationStoreExtension implements Bef
.withoutNestedType();
EventStoreDao eventStoreDao = new EventStoreDao(
- cassandra.getConf(),
+ cassandraExtension.getCassandraCluster().getConf(),
jsonEventSerializer);
return new EventSourcingDLPConfigurationStore(new CassandraEventStore(eventStoreDao));
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
index 88c63e5..9e869fb 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
@@ -43,8 +43,7 @@ public class CassandraDomainListTest extends AbstractDomainListTest {
@After
public void tearDown() {
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java
index 41386ef..9412389 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java
@@ -56,8 +56,7 @@ public class CassandraRecipientRewriteTableV6Test extends AbstractRecipientRewri
@After
public void tearDown() throws Exception {
super.tearDown();
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
index 381809f..0523ed6 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java
@@ -56,8 +56,7 @@ public class CassandraRecipientRewriteTableV7Test extends AbstractRecipientRewri
@After
public void tearDown() throws Exception {
super.tearDown();
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
index c44616f..c28d7ba 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
@@ -43,8 +43,7 @@ public class CassandraSieveRepositoryTest extends AbstractSieveRepositoryTest {
@After
public void tearDown() {
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
index 8051eae..5e2c7b3 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/access/CassandraAccessTokenRepositoryTest.java
@@ -43,8 +43,7 @@ public class CassandraAccessTokenRepositoryTest extends AccessTokenRepositoryTes
@After
public void tearDown() {
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
index fc38096..d22d048 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryTest.java
@@ -44,8 +44,7 @@ public class CassandraNotificationRegistryTest extends AbstractNotificationRegis
@After
public void tearDown() {
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
index 19d4cf9..c45e956 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepositoryTest.java
@@ -51,8 +51,7 @@ public class CassandraVacationRepositoryTest extends AbstractVacationRepositoryT
@After
public void tearDown() {
- cassandra.clearTables();
- cassandra.closeCluster();
+ cassandra.close();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org