Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Use Awaitility to ensure Cassandra connectivity. Start Cassandra container only once.

See #606.
This commit is contained in:
Mark Paluch
2021-04-30 10:45:05 +02:00
parent 01d78baee2
commit 2de6e0383c
5 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraExtension.java
View File

@@ -17,7 +17,9 @@ package example.springdata.cassandra.util;
import java.net.InetSocketAddress;
import java.util.Optional;
import java.util.concurrent.Callable;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.platform.commons.util.AnnotationUtils;
@@ -39,6 +41,8 @@ class CassandraExtension implements BeforeAllCallback {
private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace
.create(CassandraExtension.class);
private static CassandraContainer container;
@Override
public void beforeAll(ExtensionContext context) {
@@ -57,10 +61,22 @@ class CassandraExtension implements BeforeAllCallback {
keyspace.before();
Callable<CqlSession> sessionFactory = () -> CqlSession.builder()
.addContactPoint(new InetSocketAddress(keyspace.host(), keyspace.port())).withLocalDatacenter("datacenter1")
.build();
Awaitility.await().ignoreExceptions().untilAsserted(() -> {
sessionFactory.call().close();
});
var session = store.getOrComputeIfAbsent(CqlSession.class, it -> {
return CqlSession.builder().addContactPoint(new InetSocketAddress(keyspace.host(), keyspace.port()))
.withLocalDatacenter("datacenter1").build();
try {
return sessionFactory.call();
} catch (Exception e) {
throw new IllegalStateException(e);
}
}, CqlSession.class);
session.execute(String.format("CREATE KEYSPACE IF NOT EXISTS %s \n"
@@ -78,7 +94,11 @@ class CassandraExtension implements BeforeAllCallback {
private CassandraContainer<?> runTestcontainer() {
var container = new CassandraContainer<>(getCassandraDockerImageName());
if (container != null) {
return container;
}
container = new CassandraContainer<>(getCassandraDockerImageName());
container.withReuse(true);
container.start();