Use bindMarker for BY_INDEX and BY_NAME IN queries

See spring-projects#1172

Author: samueldlightfoot

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/StatementFactory.java

@@ -69,6 +69,7 @@
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
+import com.datastax.oss.driver.api.querybuilder.BindMarker;
 import com.datastax.oss.driver.api.querybuilder.QueryBuilder;
 import com.datastax.oss.driver.api.querybuilder.condition.Condition;
 import com.datastax.oss.driver.api.querybuilder.condition.ConditionBuilder;
@@ -966,6 +967,11 @@ private static Relation toClause(CriteriaDefinition criteriaDefinition, TermFact
 
 				if (predicate.getValue() instanceof List
 						|| (predicate.getValue() != null && predicate.getValue().getClass().isArray())) {
+					Term term = factory.create(predicate.getValue());
+					if (term instanceof BindMarker) {
+						return column.in((BindMarker) term);
+					}
+
 					return column.in(toLiterals(predicate.getValue()));
 				}
 
@@ -1031,6 +1037,11 @@ private static Condition toCondition(CriteriaDefinition criteriaDefinition, Term
 
 				if (predicate.getValue() instanceof List
 						|| (predicate.getValue() != null && predicate.getValue().getClass().isArray())) {
+					Term term = factory.create(predicate.getValue());
+					if (term instanceof BindMarker) {
+						return column.in((BindMarker) term);
+					}
+
 					return column.in(toLiterals(predicate.getValue()));
 				}
 

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java

@@ -21,7 +21,6 @@
 
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -126,14 +125,6 @@ void setUp() throws Exception {
 				.verifyComplete();
 	}
 
-	@Test
-	void shouldFindByIdIn() {
-		// Statement generated does not use a bind marker for the IN clause (uses hard-coded values, causing issues
-		// with prepared statement generation)
-		List<String> ids = Arrays.asList(dave.getId(), carter.getId());
-		repository.findByIdIn(new HashSet<>(ids)).as(StepVerifier::create).expectNextCount(2).verifyComplete();
-	}
-
 	@Test // DATACASS-335
 	void shouldFindByLastName() {
 		repository.findByLastname(dave.getLastname()).as(StepVerifier::create).expectNextCount(2).verifyComplete();
@@ -241,8 +232,6 @@ void shouldApplyExistsProjection() {
 
 	interface UserRepository extends ReactiveCassandraRepository<User, String> {
 
-		Flux<User> findByIdIn(Set<String> ids);
-
 		Flux<User> findByLastname(String lastname);
 
 		Mono<Slice<User>> findByLastname(String firstname, Pageable pageable);

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQueryUnitTests.java

@@ -159,7 +159,7 @@ void shouldDeriveFieldInCollectionQuery() {
 		String query = deriveQueryFromMethod(Repo.class, "findByFirstnameIn", new Class[] { Collection.class },
 				Arrays.asList("Hank", "Walter")).getQuery();
 
-		assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ('Hank','Walter')");
+		assertThat(query).isEqualTo("SELECT * FROM person WHERE firstname IN ?");
 	}
 
 	@Test // DATACASS-172
@@ -186,7 +186,7 @@ void shouldDeriveUdtInCollectionQuery() {
 		String query = deriveQueryFromMethod(Repo.class, "findByMainAddressIn", new Class[] { Collection.class },
 				Collections.singleton(udtValue)).getQuery();
 
-		assertThat(query).isEqualTo("SELECT * FROM person WHERE mainaddress IN ({city:NULL,country:NULL})");
+		assertThat(query).isEqualTo("SELECT * FROM person WHERE mainaddress IN ?");
 	}
 
 	@Test // DATACASS-343