diff --git a/pom.xml b/pom.xml index ff38b2c9f..da26daee1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-cassandra-parent - 5.0.0-SNAPSHOT + 5.0.0-GH-1566-SNAPSHOT pom Spring Data for Apache Cassandra diff --git a/spring-data-cassandra-distribution/pom.xml b/spring-data-cassandra-distribution/pom.xml index 86394f673..986e4c27b 100644 --- a/spring-data-cassandra-distribution/pom.xml +++ b/spring-data-cassandra-distribution/pom.xml @@ -8,7 +8,7 @@ org.springframework.data spring-data-cassandra-parent - 5.0.0-SNAPSHOT + 5.0.0-GH-1566-SNAPSHOT ../pom.xml diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index 4df9e91f6..eb16ba4ef 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -8,7 +8,7 @@ org.springframework.data spring-data-cassandra-parent - 5.0.0-SNAPSHOT + 5.0.0-GH-1566-SNAPSHOT ../pom.xml @@ -24,6 +24,12 @@ + + org.jspecify + jspecify + 1.0.0 + + org.springframework @@ -50,6 +56,12 @@ spring-tx + + org.springframework + spring-core-test + test + + ${project.groupId} @@ -198,6 +210,13 @@ test + + net.javacrumbs.json-unit + json-unit-assertj + 4.1.0 + test + + edu.umd.cs.mtc multithreadedtc @@ -227,11 +246,6 @@ kotlinx-coroutines-reactor true - - org.jspecify - jspecify - 1.0.0 - io.mockk diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index 2003d3110..88e127e4c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -16,6 +16,7 @@ package org.springframework.data.cassandra.core; import java.util.List; +import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -423,6 +424,27 @@ List doSelect(Query query, Class entityClass, CqlIdentifier tableNa return doQuery(select.build(), rowMapper); } + ResultSet doSelectResultSet(Query query, Class entityClass, CqlIdentifier tableName) { + + CassandraPersistentEntity entity = getRequiredPersistentEntity(entityClass); + + StatementBuilder