From 319b7ce3d71c57fd42eea7f5423fe7e15d18094e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 23 May 2017 09:23:48 +0200 Subject: [PATCH] DATACASS-343 - Polishing. Remove merge artifacts. --- .../cassandra/repository/query/AbstractCassandraQuery.java | 6 ++---- .../cassandra/repository/query/PartTreeCassandraQuery.java | 6 ------ .../repository/query/ReactivePartTreeCassandraQuery.java | 6 ------ 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java index 00427ddd5..d954492b2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java @@ -170,9 +170,8 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { } /** -<<<<<<< 5cbbf085712acc72951fc9627d0f80c85dbb1505 - * Creates a string query using the given {@link ParameterAccessor} -======= + * Creates a string query using the given {@link ParameterAccessor}. + * * @param resultSet * @param declaredReturnType * @param returnedUnwrappedObjectType @@ -250,7 +249,6 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { /** * Creates a {@link Statement} using the given {@link ParameterAccessor} ->>>>>>> DATACASS-343 - Introduce Query and Update objects. * * @param accessor must not be {@literal null}. */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java index ba37f56a8..3f58f205e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java @@ -70,15 +70,9 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { } /** -<<<<<<< 85e5d32f4c6db62b63513c14864f7625d7813060 * Returns the {@link StatementFactory} used by this query to construct and run Cassandra CQL statements. * * @return the {@link StatementFactory} used by this query to construct and run Cassandra CQL statements. -======= - * Returns the {@link StatementFactory} used by this template to construct and run Cassandra CQL statements. - * - * @return the {@link StatementFactory} used by this template to construct and run Cassandra CQL statements. ->>>>>>> DATACASS-343 - Polish. * @see org.springframework.data.cassandra.core.StatementFactory */ protected StatementFactory getStatementFactory() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java index 81f277faf..84dec193f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java @@ -70,15 +70,9 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue } /** -<<<<<<< 85e5d32f4c6db62b63513c14864f7625d7813060 * Returns the {@link StatementFactory} used by this query to construct and run Cassandra CQL statements. * * @return the {@link StatementFactory} used by this query to construct and run Cassandra CQL statements. -======= - * Returns the {@link StatementFactory} used by this template to construct and run Cassandra CQL statements. - * - * @return the {@link StatementFactory} used by this template to construct and run Cassandra CQL statements. ->>>>>>> DATACASS-343 - Polish. * @see org.springframework.data.cassandra.core.StatementFactory */ protected StatementFactory getStatementFactory() {