DATACASS-814 - Use CQL in MapPreparedStatementCache.CacheKey instead representation of Object.toString().

We now correctly use the CQL text to cache prepared statements. Previously, we used toString() which was a leftover from the driver migration that now defaults to Object.toString() and so the cache key was not stable.

Original pull request: #180.

Author: aldobongio

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java

@@ -34,6 +34,7 @@
  * {@code cql} text. Statement options (idempotency, timeouts) apply from the statement that was initially prepared.
  *
  * @author Mark Paluch
+ * @author Aldo Bongio
  * @since 2.0
  */
 public class MapPreparedStatementCache implements PreparedStatementCache {
@@ -84,7 +85,7 @@ protected Map<CacheKey, PreparedStatement> getCache() {
 	public PreparedStatement getPreparedStatement(CqlSession session, SimpleStatement statement,
 			Supplier<PreparedStatement> preparer) {
 
-		CacheKey cacheKey = new CacheKey(session, statement.toString());
+		CacheKey cacheKey = new CacheKey(session, statement.getQuery());
 
 		return getCache().computeIfAbsent(cacheKey, key -> preparer.get());
 	}

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreatorUnitTests.java

@@ -39,6 +39,7 @@
  * Unit tests for {@link CachedPreparedStatementCreator}.
  *
  * @author Mark Paluch
+ * @author Aldo Bongio
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -182,4 +183,17 @@ void shouldCacheAdoptDifferencesInCachedPreparedStatements() {
 		verify(session).prepare(firstStatement);
 		verify(session).prepare(secondStatement);
 	}
+
+    @Test // DATACASS-814
+    void shouldUseCqlTextInCacheKey() {
+
+        String cql = "SELECT foo FROM users;";
+
+        MapPreparedStatementCache cache = MapPreparedStatementCache.create();
+        CachedPreparedStatementCreator creator = CachedPreparedStatementCreator.of(cache, cql);
+        creator.createPreparedStatement(session);
+
+        MapPreparedStatementCache.CacheKey cacheKey = cache.getCache().keySet().iterator().next();
+        assertThat(cacheKey.cql).isSameAs(cql);
+    }
 }