DATAGRAPH-374 - Adapted Parameters changes from Spring Data Commons.

This commit is contained in:
Oliver Gierke
2013-07-30 16:07:53 +02:00
parent b9c0f5fa8c
commit 595c3daf55
3 changed files with 4 additions and 3 deletions

View File

@@ -33,7 +33,7 @@
<project.type>multi</project.type>
<dist.id>spring-data-neo4j</dist.id>
<springdata.commons>1.6.0.M1</springdata.commons>
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
<neo4j.version>1.9</neo4j.version>
<neo4j.spatial.version>0.11-neo4j-1.9</neo4j.spatial.version>

View File

@@ -72,7 +72,7 @@ class CypherGraphRepositoryQuery extends GraphRepositoryQuery {
protected String createQueryWithPagingAndSorting(final ParameterAccessor accessor) {
final GraphQueryMethod queryMethod = getQueryMethod();
final Parameters parameters = queryMethod.getParameters();
final Parameters<?, ?> parameters = queryMethod.getParameters();
String queryString = queryMethod.getQueryString();
if (parameters.hasSortParameter()) {
queryString = addSorting(queryString, accessor.getSort());

View File

@@ -26,6 +26,7 @@ import org.springframework.data.neo4j.support.Neo4jTemplate;
import org.springframework.data.neo4j.support.index.IndexType;
import org.springframework.data.neo4j.support.mapping.Neo4jMappingContext;
import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
import org.springframework.data.repository.query.DefaultParameters;
import org.springframework.data.repository.query.Parameters;
import org.springframework.data.repository.query.ParametersParameterAccessor;
import org.springframework.data.repository.query.parser.Part;
@@ -313,7 +314,7 @@ public class DerivedFinderMethodTests {
private void assertRepositoryQueryMethod(Class<ThingRepository> repositoryClass, String methodName, Object[] paramValues, String expectedQuery, Object...expectedParam) {
Method method = methodFor(repositoryClass, methodName);
DerivedCypherRepositoryQuery derivedCypherRepositoryQuery = new DerivedCypherRepositoryQuery(ctx, new GraphQueryMethod(method, new DefaultRepositoryMetadata(repositoryClass), null, ctx), template);
Parameters parameters = new Parameters(method);
Parameters<?, ?> parameters = new DefaultParameters(method);
ParametersParameterAccessor accessor = new ParametersParameterAccessor(parameters, paramValues);
String query = derivedCypherRepositoryQuery.createQueryWithPagingAndSorting(accessor);
Map<String, Object> params = derivedCypherRepositoryQuery.resolveParams(accessor);