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

#553 - Adapt Spring Data Cassandra.

Browse Source
This commit is contained in:
Mark Paluch
2020-02-10 15:28:29 +01:00
parent c88ad331c0
commit 523d2c8a56
18 changed files with 72 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraKeyspace.java
View File

@@ -15,18 +15,14 @@
*/
package example.springdata.cassandra.util;
import io.netty.channel.EventLoopGroup;
import java.util.concurrent.TimeUnit;
import java.net.InetSocketAddress;
import org.junit.AssumptionViolatedException;
import org.springframework.data.util.Version;
import org.springframework.util.Assert;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.NettyOptions;
import com.datastax.driver.core.ProtocolOptions;
import com.datastax.driver.core.Session;
import com.datastax.oss.driver.api.core.CqlSession;
/**
* {@link CassandraResource} to require (create or reuse) an Apache Cassandra keyspace and optionally require a specific
@@ -58,8 +54,8 @@ public class CassandraKeyspace extends CassandraResource {
* @return the {@link CassandraKeyspace} rule.
*/
public static CassandraKeyspace onLocalhost() {
return new CassandraKeyspace("localhost", ProtocolOptions.DEFAULT_PORT, "example",
Cassandra.embeddedIfNotRunning("localhost", ProtocolOptions.DEFAULT_PORT), new Version(0, 0, 0));
return new CassandraKeyspace("localhost", 9042, "example", Cassandra.embeddedIfNotRunning("localhost", 9042),
new Version(0, 0, 0));
}
/**
@@ -97,17 +93,8 @@ public class CassandraKeyspace extends CassandraResource {
dependency.before();
Cluster cluster = Cluster.builder().addContactPoint(getHost()).withPort(getPort())
.withNettyOptions(new NettyOptions() {
@Override
public void onClusterClose(EventLoopGroup eventLoopGroup) {
eventLoopGroup.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS).syncUninterruptibly();
}
}).build();
Session session = cluster.newSession();
try {
try (CqlSession session = CqlSession.builder().addContactPoint(new InetSocketAddress(getHost(), getPort()))
.withLocalDatacenter("datacenter1").build()) {
if (requiredVersion != null) {
@@ -122,9 +109,6 @@ public class CassandraKeyspace extends CassandraResource {
session.execute(String.format("CREATE KEYSPACE IF NOT EXISTS %s \n"
+ "WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };", keyspaceName));
} finally {
session.close();
cluster.close();
}
}

12
cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraVersion.java
View File

@@ -15,14 +15,14 @@
*/
package example.springdata.cassandra.util;
import lombok.experimental.UtilityClass;
import org.springframework.data.util.Version;
import org.springframework.util.Assert;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import lombok.experimental.UtilityClass;
import com.datastax.oss.driver.api.core.CqlSession;
import com.datastax.oss.driver.api.core.cql.ResultSet;
import com.datastax.oss.driver.api.core.cql.Row;
/**
* Utility to retrieve the Cassandra release version.
@@ -38,7 +38,7 @@ public class CassandraVersion {
* @param session must not be {@literal null}.
* @return the release {@link Version}.
*/
public static Version getReleaseVersion(Session session) {
public static Version getReleaseVersion(CqlSession session) {
Assert.notNull(session, "Session must not be null");