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

DATACASS-117 - Polish.

Browse Source
This commit is contained in:
John Blum
2016-10-18 22:14:04 -07:00
parent 1bc460ca0a
commit aee38017ba
6 changed files with 170 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParameterAccessor.java
View File

@@ -54,7 +54,7 @@ public interface CassandraParameterAccessor extends ParameterAccessor {
/**
* The actual parameter type (after unwrapping).
*
*
* @param index the parameter index
* @return the parameter type, never {@literal null}.
*/
@@ -63,7 +63,7 @@ public interface CassandraParameterAccessor extends ParameterAccessor {
/**
* Returns the raw parameter values of the underlying query method.
*
* @return
* @return the raw parameter values passed to the underlying query method.
* @since 1.5
*/
Object[] getValues();

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

@@ -26,10 +26,12 @@ import org.springframework.data.repository.query.ParametersParameterAccessor;
import com.datastax.driver.core.DataType;
/**
* Cassandra-specific {@link ParameterAccessor} exposing a Cassandra {@link DataType types} that are supported by the
* driver and parameter type.
* Cassandra-specific {@link ParameterAccessor} exposing Cassandra {@link DataType types}
* that are supported by the driver and parameter type.
*
* @author Mark Paluch
* @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor
* @see org.springframework.data.repository.query.ParametersParameterAccessor
*/
public class CassandraParametersParameterAccessor extends ParametersParameterAccessor
implements CassandraParameterAccessor {

7
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java
View File

@@ -51,9 +51,7 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
private final CassandraConverter converter;
private final CassandraParameterAccessor delegate;
ConvertingParameterAccessor(CassandraConverter converter,
CassandraParameterAccessor delegate) {
ConvertingParameterAccessor(CassandraConverter converter, CassandraParameterAccessor delegate) {
this.converter = converter;
this.delegate = delegate;
}
@@ -210,7 +208,6 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
DataType dataType = mappingContext.getDataType(property);
if (property.isCollectionLike() && !typeInformation.isCollectionLike()) {
if (dataType instanceof CollectionType) {
CollectionType collectionType = (CollectionType) dataType;
@@ -221,7 +218,6 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
}
if (!property.isCollectionLike() && typeInformation.isCollectionLike()) {
if (typeInformation.isAssignableFrom(SET)) {
return DataType.set(dataType);
}
@@ -230,7 +226,6 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
}
if (property.isMap()) {
if (dataType instanceof CollectionType) {
CollectionType collectionType = (CollectionType) dataType;

59
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ExpressionEvaluatingParameterBinder.java
View File

@@ -30,7 +30,7 @@ import org.springframework.util.CollectionUtils;
/**
* {@link ExpressionEvaluatingParameterBinder} allows to evaluate, convert and bind parameters to placeholders within a
* {@link String}.
*
*
* @author Mark Paluch
* @since 1.5
*/
@@ -41,15 +41,15 @@ class ExpressionEvaluatingParameterBinder {
/**
* Creates new {@link ExpressionEvaluatingParameterBinder}
*
*
* @param expressionParser must not be {@literal null}.
* @param evaluationContextProvider must not be {@literal null}.
*/
public ExpressionEvaluatingParameterBinder(SpelExpressionParser expressionParser,
EvaluationContextProvider evaluationContextProvider) {
Assert.notNull(expressionParser, "ExpressionParser must not be null!");
Assert.notNull(evaluationContextProvider, "EvaluationContextProvider must not be null!");
Assert.notNull(expressionParser, "ExpressionParser must not be null");
Assert.notNull(evaluationContextProvider, "EvaluationContextProvider must not be null");
this.expressionParser = expressionParser;
this.evaluationContextProvider = evaluationContextProvider;
@@ -58,13 +58,12 @@ class ExpressionEvaluatingParameterBinder {
/**
* Bind values provided by {@link CassandraParameterAccessor} to placeholders in {@link BindingContext} while
* considering potential conversions and parameter types.
*
* @param raw can be {@literal null} or empty.
* @param accessor must not be {@literal null}.
*
* @param parameterAccessor must not be {@literal null}.
* @param bindingContext must not be {@literal null}.
* @return {@literal null} if given {@code raw} value is empty.
*/
public List<Object> bind(CassandraParameterAccessor accessor, BindingContext bindingContext) {
public List<Object> bind(CassandraParameterAccessor parameterAccessor, BindingContext bindingContext) {
if (!bindingContext.hasBindings()) {
return Collections.emptyList();
@@ -73,7 +72,7 @@ class ExpressionEvaluatingParameterBinder {
List<Object> parameters = new ArrayList<Object>(bindingContext.getBindings().size());
for (ParameterBinding binding : bindingContext.getBindings()) {
parameters.add(getParameterValueForBinding(accessor, bindingContext.getParameters(), binding));
parameters.add(getParameterValueForBinding(parameterAccessor, bindingContext.getParameters(), binding));
}
return parameters;
@@ -81,21 +80,22 @@ class ExpressionEvaluatingParameterBinder {
/**
* Returns the value to be used for the given {@link ParameterBinding}.
*
* @param accessor must not be {@literal null}.
*
* @param parameterAccessor must not be {@literal null}.
* @param parameters must not be {@literal null}.
* @param binding must not be {@literal null}.
* @return
* @return the value used for the given {@link ParameterBinding}.
*/
private Object getParameterValueForBinding(CassandraParameterAccessor accessor, CassandraParameters parameters,
ParameterBinding binding) {
private Object getParameterValueForBinding(CassandraParameterAccessor parameterAccessor,
CassandraParameters parameters, ParameterBinding binding) {
if (binding.isExpression()) {
return evaluateExpression(binding.getExpression(), parameters, accessor.getValues());
return evaluateExpression(binding.getExpression(), parameters, parameterAccessor.getValues());
}
return binding.isNamed() ? accessor.getBindableValue(getParameterIndex(parameters, binding.getParameterName()))
: accessor.getBindableValue(binding.getParameterIndex());
return binding.isNamed()
? parameterAccessor.getBindableValue(getParameterIndex(parameters, binding.getParameterName()))
: parameterAccessor.getBindableValue(binding.getParameterIndex());
}
private int getParameterIndex(CassandraParameters parameters, String parameterName) {
@@ -107,18 +107,19 @@ class ExpressionEvaluatingParameterBinder {
}
throw new IllegalArgumentException(
String.format("Invalid parameter name! Cannot resolve parameter [%s]", parameterName));
String.format("Invalid parameter name; Cannot resolve parameter [%s]", parameterName));
}
/**
* Evaluates the given {@code expressionString}.
*
*
* @param expressionString must not be {@literal null} or empty.
* @param parameters must not be {@literal null}.
* @param parameterValues must not be {@literal null}.
* @return
* @return the value of the {@code expressionString} evaluation.
*/
private Object evaluateExpression(String expressionString, CassandraParameters parameters, Object[] parameterValues) {
private Object evaluateExpression(String expressionString, CassandraParameters parameters,
Object[] parameterValues) {
EvaluationContext evaluationContext = evaluationContextProvider.getEvaluationContext(parameters, parameterValues);
Expression expression = expressionParser.parseExpression(expressionString);
@@ -137,9 +138,10 @@ class ExpressionEvaluatingParameterBinder {
/**
* Creates new {@link BindingContext}.
*
* @param queryMethod
* @param bindings
*
* @param queryMethod {@link CassandraQueryMethod} on which the parameters are evaluated.
* @param bindings {@link List} of {@link ParameterBinding} containing name or position (index)
* information pertaining to the parameter in the referenced {@code queryMethod}.
*/
public BindingContext(CassandraQueryMethod queryMethod, List<ParameterBinding> bindings) {
@@ -156,7 +158,7 @@ class ExpressionEvaluatingParameterBinder {
/**
* Get unmodifiable list of {@link ParameterBinding}s.
*
*
* @return never {@literal null}.
*/
public List<ParameterBinding> getBindings() {
@@ -165,8 +167,8 @@ class ExpressionEvaluatingParameterBinder {
/**
* Get the associated {@link CassandraParameters}.
*
* @return
*
* @return the {@link CassandraParameters} associated with the {@link CassandraQueryMethod}.
*/
public CassandraParameters getParameters() {
return queryMethod.getParameters();
@@ -175,11 +177,10 @@ class ExpressionEvaluatingParameterBinder {
/**
* Get the {@link CassandraQueryMethod}.
*
* @return
* @return the {@link CassandraQueryMethod} used in the expression evaluation context.
*/
public CassandraQueryMethod getQueryMethod() {
return queryMethod;
}
}
}

214
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/StringBasedCassandraQuery.java
View File

@@ -54,19 +54,23 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
private static final Logger LOG = LoggerFactory.getLogger(StringBasedCassandraQuery.class);
private static final ParameterBindingParser BINDING_PARSER = ParameterBindingParser.INSTANCE;
private final String query;
private final List<ParameterBinding> queryParameterBindings;
private final ExpressionEvaluatingParameterBinder parameterBinder;
private final CodecRegistry codecRegistry;
private final ExpressionEvaluatingParameterBinder parameterBinder;
private final List<ParameterBinding> queryParameterBindings;
private final String query;
/**
* Creates a new {@link StringBasedCassandraQuery} for the given {@link CassandraQueryMethod},
* {@link CassandraOperations}, {@link SpelExpressionParser}, and {@link EvaluationContextProvider}.
*
* @param queryMethod
* @param operations
* @param expressionParser
* @param evaluationContextProvider
* @param queryMethod {@link CassandraQueryMethod} on which this query is based.
* @param operations {@link CassandraOperations} used to perform data access in Cassandra.
* @param expressionParser {@link SpelExpressionParser} used to parse expressions in the query.
* @param evaluationContextProvider {@link EvaluationContextProvider} used to access the potentially shared
* {@link org.springframework.expression.spel.support.StandardEvaluationContext}.
*/
public StringBasedCassandraQuery(CassandraQueryMethod queryMethod, CassandraOperations operations,
SpelExpressionParser expressionParser, EvaluationContextProvider evaluationContextProvider) {
@@ -100,10 +104,10 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
* @see org.springframework.data.cassandra.repository.query.AbstractCassandraQuery#createQuery(org.springframework.data.cassandra.repository.query.CassandraParameterAccessor)
*/
@Override
public String createQuery(CassandraParameterAccessor accessor) {
public String createQuery(CassandraParameterAccessor parameterAccessor) {
try {
List<Object> arguments = this.parameterBinder.bind(accessor,
List<Object> arguments = this.parameterBinder.bind(parameterAccessor,
new BindingContext(getQueryMethod(), queryParameterBindings));
String boundQuery = bind(query, arguments);
@@ -143,86 +147,94 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
StringBuilder result = new StringBuilder();
int startIndex = 0;
int currentPos = 0;
int currentPosition = 0;
int parameterIndex = 0;
Matcher matcher = ARGUMENT_PLACEHOLDER_PATTERN.matcher(input);
while (currentPos < input.length()) {
while (currentPosition < input.length()) {
if (!matcher.find()) {
break;
}
int exprStart = matcher.start();
result.append(input.subSequence(startIndex, exprStart));
int exprStart = matcher.start();
result.append(input.subSequence(startIndex, exprStart));
result = appendValue(parameters.get(parameterIndex++), codecRegistry, result);
currentPos = matcher.end();
startIndex = currentPos;
currentPosition = matcher.end();
startIndex = currentPosition;
}
return result.append(input.subSequence(currentPos, input.length())).toString();
return result.append(input.subSequence(currentPosition, input.length())).toString();
}
static StringBuilder appendValue(Object value, CodecRegistry codecRegistry, StringBuilder sb) {
static StringBuilder appendValue(Object value, CodecRegistry codecRegistry, StringBuilder builder) {
if (value == null) {
sb.append("null");
builder.append("null");
} else if (value instanceof BindMarker) {
sb.append(value);
builder.append(value);
} else if (value instanceof List && isSerializable(value)) {
// bind variables are not supported inside collection literals
appendList((List<?>) value, codecRegistry, sb);
appendList((List<?>) value, codecRegistry, builder);
} else if (value instanceof Set && isSerializable(value)) {
// bind variables are not supported inside collection literals
appendSet((Set<?>) value, codecRegistry, sb);
appendSet((Set<?>) value, codecRegistry, builder);
} else if (value instanceof Map && isSerializable(value)) {
// bind variables are not supported inside collection literals
appendMap((Map<?, ?>) value, codecRegistry, sb);
appendMap((Map<?, ?>) value, codecRegistry, builder);
} else if (isSerializable(value)) {
TypeCodec<Object> codec = codecRegistry.codecFor(value);
sb.append(codec.format(value));
builder.append(codec.format(value));
} else {
throw new IllegalArgumentException(String.format("Argument value [%s] is not serializable", value.toString()));
}
return sb;
return builder;
}
private static StringBuilder appendList(List<?> l, CodecRegistry codecRegistry, StringBuilder sb) {
for (int i = 0; i < l.size(); i++) {
if (i > 0)
sb.append(',');
appendValue(l.get(i), codecRegistry, sb);
private static StringBuilder appendList(List<?> list, CodecRegistry codecRegistry, StringBuilder builder) {
for (int index = 0, size = list.size(); index < size; index++) {
builder.append(index > 0 ? "," : "");
appendValue(list.get(index), codecRegistry, builder);
}
return sb;
return builder;
}
private static StringBuilder appendSet(Set<?> s, CodecRegistry codecRegistry, StringBuilder sb) {
private static StringBuilder appendSet(Set<?> set, CodecRegistry codecRegistry, StringBuilder builder) {
boolean first = true;
for (Object elt : s) {
if (first)
first = false;
else
sb.append(',');
appendValue(elt, codecRegistry, sb);
for (Object element : set) {
builder.append(first ? "" : ",");
appendValue(element, codecRegistry, builder);
first = false;
}
return sb;
return builder;
}
private static StringBuilder appendMap(Map<?, ?> m, CodecRegistry codecRegistry, StringBuilder sb) {
sb.append('{');
private static StringBuilder appendMap(Map<?, ?> map, CodecRegistry codecRegistry, StringBuilder builder) {
builder.append('{');
boolean first = true;
for (Map.Entry<?, ?> entry : m.entrySet()) {
if (first)
first = false;
else
sb.append(',');
appendValue(entry.getKey(), codecRegistry, sb);
sb.append(':');
appendValue(entry.getValue(), codecRegistry, sb);
for (Map.Entry<?, ?> entry : map.entrySet()) {
builder.append(first ? "" : ",");
appendValue(entry.getKey(), codecRegistry, builder);
builder.append(':');
appendValue(entry.getValue(), codecRegistry, builder);
first = false;
}
sb.append('}');
return sb;
builder.append('}');
return builder;
}
/**
@@ -236,30 +248,52 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
* @return true if the value is serializable, false otherwise.
*/
static boolean isSerializable(Object value) {
if (containsSpecialValue(value))
if (containsSpecialValue(value)) {
return false;
if (value instanceof Collection)
for (Object elt : (Collection) value)
if (!isSerializable(elt))
}
if (value instanceof Collection) {
for (Object element : (Collection) value) {
if (!isSerializable(element)) {
return false;
if (value instanceof Map)
for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet())
if (!isSerializable(entry.getKey()) || !isSerializable(entry.getValue()))
}
}
}
if (value instanceof Map) {
for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
if (!isSerializable(entry.getKey()) || !isSerializable(entry.getValue())) {
return false;
}
}
}
return true;
}
static boolean containsSpecialValue(Object value) {
if (value instanceof BindMarker)
if (value instanceof BindMarker) {
return true;
if (value instanceof Collection)
for (Object elt : (Collection) value)
if (containsSpecialValue(elt))
}
if (value instanceof Collection) {
for (Object element : (Collection) value) {
if (containsSpecialValue(element)) {
return true;
if (value instanceof Map)
for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet())
if (containsSpecialValue(entry.getKey()) || containsSpecialValue(entry.getValue()))
}
}
}
if (value instanceof Map) {
for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
if (containsSpecialValue(entry.getKey()) || containsSpecialValue(entry.getValue())) {
return true;
}
}
}
return false;
}
}
@@ -287,15 +321,16 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
*
* @param input can be {@literal null} or empty.
* @param bindings must not be {@literal null}.
* @return
* @return a list of {@link ParameterBinding}s found in the given {@code input}.
*/
public String parseAndCollectParameterBindingsFromQueryIntoBindings(String input, List<ParameterBinding> bindings) {
public String parseAndCollectParameterBindingsFromQueryIntoBindings(String input,
List<ParameterBinding> bindings) {
if (!StringUtils.hasText(input)) {
return input;
}
Assert.notNull(bindings, "Parameter bindings must not be null!");
Assert.notNull(bindings, "Parameter bindings must not be null");
return transformQueryAndCollectExpressionParametersIntoBindings(input, bindings);
}
@@ -306,11 +341,11 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
StringBuilder result = new StringBuilder();
int startIndex = 0;
int currentPos = 0;
int currentPosition = 0;
while (currentPos < input.length()) {
while (currentPosition < input.length()) {
Matcher matcher = findNextBindingOrExpression(input, currentPos);
Matcher matcher = findNextBindingOrExpression(input, currentPosition);
// no expression parameter found
if (matcher == null) {
@@ -318,20 +353,20 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
}
int exprStart = matcher.start();
currentPos = exprStart;
currentPosition = exprStart;
if (matcher.pattern() == NAME_BASED_EXPRESSION_PATTERN || matcher.pattern() == INDEX_BASED_EXPRESSION_PATTERN) {
// eat parameter expression
int curlyBraceOpenCnt = 1;
currentPos += 3;
int curlyBraceOpenCount = 1;
currentPosition += 3;
while (curlyBraceOpenCnt > 0 && currentPos < input.length()) {
switch (input.charAt(currentPos++)) {
while (curlyBraceOpenCount > 0 && currentPosition < input.length()) {
switch (input.charAt(currentPosition++)) {
case CURRLY_BRACE_OPEN:
curlyBraceOpenCnt++;
curlyBraceOpenCount++;
break;
case CURRLY_BRACE_CLOSE:
curlyBraceOpenCnt--;
curlyBraceOpenCount--;
break;
default:
}
@@ -345,44 +380,41 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
result.append(ARGUMENT_PLACEHOLDER);
if (matcher.pattern() == NAME_BASED_EXPRESSION_PATTERN || matcher.pattern() == INDEX_BASED_EXPRESSION_PATTERN) {
bindings.add(ParameterBinding.expression(input.substring(exprStart + 3, currentPos - 1), true));
bindings.add(ParameterBinding.expression(input.substring(exprStart + 3, currentPosition - 1), true));
} else {
if (matcher.pattern() == INDEX_PARAMETER_BINDING_PATTERN) {
bindings.add(ParameterBinding.indexed(Integer.parseInt(matcher.group(1))));
} else {
bindings.add(ParameterBinding.named(matcher.group(1)));
}
currentPos = matcher.end();
currentPosition = matcher.end();
}
startIndex = currentPos;
startIndex = currentPosition;
}
return result.append(input.subSequence(currentPos, input.length())).toString();
return result.append(input.subSequence(currentPosition, input.length())).toString();
}
private static Matcher findNextBindingOrExpression(String input, int position) {
List<Matcher> matchers = new ArrayList<Matcher>();
matchers.add(INDEX_PARAMETER_BINDING_PATTERN.matcher(input));
matchers.add(NAMED_PARAMETER_BINDING_PATTERN.matcher(input));
matchers.add(INDEX_BASED_EXPRESSION_PATTERN.matcher(input));
matchers.add(NAME_BASED_EXPRESSION_PATTERN.matcher(input));
TreeMap<Integer, Matcher> matcherMap = new TreeMap<Integer, Matcher>();
for (Matcher matcher : matchers) {
if (matcher.find(position)) {
matcherMap.put(matcher.start(), matcher);
}
}
if (matcherMap.isEmpty()) {
return null;
}
return matcherMap.values().iterator().next();
return (matcherMap.isEmpty() ? null : matcherMap.values().iterator().next());
}
}
@@ -393,8 +425,8 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
*/
static class ParameterBinding {
private final int parameterIndex;
private final boolean quoted;
private final int parameterIndex;
private final String expression;
private final String parameterName;
@@ -418,7 +450,7 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
}
public boolean isNamed() {
return parameterName != null;
return (parameterName != null);
}
public int getParameterIndex() {
@@ -426,7 +458,7 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
}
public String getParameter() {
return "?" + (isExpression() ? "expr" : "") + parameterIndex;
return ("?" + (isExpression() ? "expr" : "") + parameterIndex);
}
public String getExpression() {
@@ -434,7 +466,7 @@ public class StringBasedCassandraQuery extends AbstractCassandraQuery {
}
public boolean isExpression() {
return this.expression != null;
return (this.expression != null);
}
public String getParameterName() {

16
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java
View File

@@ -52,8 +52,8 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
private static final SpelExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
private final CassandraOperations operations;
private final CassandraMappingContext mappingContext;
private final CassandraOperations operations;
/**
* Creates a new {@link CassandraRepositoryFactory} with the given {@link CassandraOperations}.
@@ -84,7 +84,9 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
@Override
protected Object getTargetRepository(RepositoryInformation information) {
CassandraEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
CassandraEntityInformation<?, Serializable> entityInformation =
getEntityInformation(information.getDomainType());
return getTargetRepositoryViaReflection(information, entityInformation, operations);
}
@@ -99,8 +101,8 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
CassandraPersistentEntity<?> entity = mappingContext.getPersistentEntity(domainClass);
if (entity == null) {
throw new MappingException(
String.format("Could not lookup mapping metadata for domain class %s!", domainClass.getName()));
throw new MappingException(String.format("Could not lookup mapping metadata for domain class %s",
domainClass.getName()));
}
return new MappingCassandraEntityInformation<T, ID>((CassandraPersistentEntity<T>) entity,
@@ -127,12 +129,13 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
private class CassandraQueryLookupStrategy implements QueryLookupStrategy {
private final CassandraOperations operations;
private final EvaluationContextProvider evaluationContextProvider;
private final CassandraMappingContext mappingContext;
private final CassandraOperations operations;
public CassandraQueryLookupStrategy(CassandraOperations operations,
EvaluationContextProvider evaluationContextProvider, CassandraMappingContext mappingContext) {
this.operations = operations;
this.evaluationContextProvider = evaluationContextProvider;
this.mappingContext = mappingContext;
@@ -154,7 +157,8 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport {
return new StringBasedCassandraQuery(namedQuery, queryMethod, operations, EXPRESSION_PARSER,
evaluationContextProvider);
} else if (queryMethod.hasAnnotatedQuery()) {
return new StringBasedCassandraQuery(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
return new StringBasedCassandraQuery(queryMethod, operations, EXPRESSION_PARSER,
evaluationContextProvider);
} else {
return new PartTreeCassandraQuery(queryMethod, operations);
}