Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-343 - Polishing.

Browse Source 
Remove merge artifacts.
This commit is contained in:
Mark Paluch
2017-05-23 09:23:48 +02:00
parent 2f4767d80f
commit 319b7ce3d7
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java
View File

@@ -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}.
*/

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java
View File

@@ -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() {

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java
View File

@@ -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() {