From 6150282e1db8d5e717ca29649f87a92fadd8084a Mon Sep 17 00:00:00 2001 From: CodeSmell Date: Mon, 4 Jun 2018 12:14:20 -0400 Subject: [PATCH] DATACASS-555 - Use CqlTemplate.newPreparedStatementCreator for creation of PreparedStatementCreator. Original pull request: #133. --- .../data/cassandra/core/cql/CqlTemplate.java | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java index 032dce418..b99f8c178 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java @@ -69,6 +69,8 @@ import com.datastax.driver.core.exceptions.DriverException; * @author Antoine Toulme * @author John Blum * @author Mark Paluch + * @author Mike Barlotta (CodeSmell) + * * @see PreparedStatementCreator * @see PreparedStatementBinder * @see PreparedStatementCallback @@ -404,7 +406,7 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { @Override public boolean execute(String cql, @Nullable PreparedStatementBinder psb) throws DataAccessException { // noinspection ConstantConditions - return query(new SimplePreparedStatementCreator(cql), psb, ResultSet::wasApplied); + return query(newPreparedStatementCreator(cql), psb, ResultSet::wasApplied); } /* @@ -734,25 +736,4 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { return sessionFactory.getSession(); } - private class SimplePreparedStatementCreator implements PreparedStatementCreator, CqlProvider { - - private final String cql; - - SimplePreparedStatementCreator(String cql) { - - Assert.notNull(cql, "CQL must not be null"); - - this.cql = cql; - } - - @Override - public PreparedStatement createPreparedStatement(Session session) throws DriverException { - return session.prepare(cql); - } - - @Override - public String getCql() { - return cql; - } - } }