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

DATAGRAPH-946 - Fix for parameter position incorrectly being advanced for finder parts that don't have arguments.

Browse Source
This commit is contained in:
Jasper Blues
2017-01-06 07:26:45 +08:00
committed by Mark Angrish
parent 314f07160e
commit cb57c0cc30
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/derived/builder/ExistsFilterBuilder.java
View File

@@ -1,6 +1,5 @@
package org.springframework.data.neo4j.repository.query.derived.builder;
import static org.springframework.data.repository.query.parser.Part.Type.IS_NOT_NULL;
import java.util.ArrayList;
import java.util.List;

24
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/derived/filter/PropertyComparisonAdapter.java
View File

@@ -15,6 +15,7 @@ package org.springframework.data.neo4j.repository.query.derived.filter;
import java.util.Map;
import org.neo4j.ogm.cypher.CaseInsensitiveLikePropertyValueTransformer;
import org.neo4j.ogm.cypher.function.FilterFunction;
import org.neo4j.ogm.cypher.function.PropertyComparison;
import org.springframework.data.neo4j.repository.query.derived.CypherFilter;
@@ -59,7 +60,24 @@ public class PropertyComparisonAdapter implements FunctionAdapter<Object> {
@Override
public int parameterCount() {
return 1;
switch (cypherFilter.getComparisonOperator()) {
case IS_TRUE:
case IS_NULL:
case EXISTS:
return 0;
case EQUALS:
case MATCHES:
case GREATER_THAN:
case GREATER_THAN_EQUAL:
case LESS_THAN:
case LESS_THAN_EQUAL:
case STARTING_WITH:
case ENDING_WITH:
case CONTAINING:
case IN:
default:
return 1;
}
}
@Override
@@ -67,6 +85,8 @@ public class PropertyComparisonAdapter implements FunctionAdapter<Object> {
if (cypherFilter == null) {
throw new IllegalStateException("Can't set value from args when cypherFilter is null.");
}
propertyComparison.setValue(params.get(cypherFilter.getPropertyPosition()));
if (parameterCount() > 0) {
propertyComparison.setValue(params.get(cypherFilter.getPropertyPosition()));
}
}
}