From 9d73a0db5c4c71a4f1335f2403dbc470bd22693e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 25 Jul 2017 14:02:56 +0200 Subject: [PATCH] DATACASS-479 - Polishing. Use domain type via ResultProcessor as input type for PartTree instead of EntityInformation. --- .../repository/query/PartTreeCassandraQuery.java | 13 ++++++------- .../query/ReactivePartTreeCassandraQuery.java | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) 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 5202bfd06..ae2de194d 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 @@ -55,7 +55,7 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { super(queryMethod, operations); - this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType()); + this.tree = new PartTree(queryMethod.getName(), queryMethod.getResultProcessor().getReturnedType().getDomainType()); this.mappingContext = operations.getConverter().getMappingContext(); this.statementFactory = new StatementFactory(new UpdateMapper(operations.getConverter())); } @@ -97,8 +97,7 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { @Override protected Statement createQuery(CassandraParameterAccessor parameterAccessor) { - CassandraQueryCreator queryCreator = - new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); + CassandraQueryCreator queryCreator = new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); Query query = queryCreator.createQuery(); @@ -108,14 +107,14 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { query = query.limit(getTree().getMaxResults()); } - if (getQueryMethod().getQueryAnnotation() - .map(org.springframework.data.cassandra.repository.Query::allowFiltering).orElse(false)) { + if (getQueryMethod().getQueryAnnotation().map(org.springframework.data.cassandra.repository.Query::allowFiltering) + .orElse(false)) { query = query.withAllowFiltering(); } - CassandraPersistentEntity persistentEntity = - getMappingContext().getRequiredPersistentEntity(getQueryMethod().getDomainClass()); + CassandraPersistentEntity persistentEntity = getMappingContext() + .getRequiredPersistentEntity(getQueryMethod().getDomainClass()); return getStatementFactory().select(query, persistentEntity); 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 403ea29aa..a34e864d6 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 @@ -55,7 +55,7 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue super(queryMethod, operations); - this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType()); + this.tree = new PartTree(queryMethod.getName(), queryMethod.getResultProcessor().getReturnedType().getDomainType()); this.mappingContext = operations.getConverter().getMappingContext(); this.statementFactory = new StatementFactory(new UpdateMapper(operations.getConverter())); } @@ -97,8 +97,7 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue @Override protected Statement createQuery(CassandraParameterAccessor parameterAccessor) { - CassandraQueryCreator queryCreator = - new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); + CassandraQueryCreator queryCreator = new CassandraQueryCreator(getTree(), parameterAccessor, getMappingContext()); Query query = queryCreator.createQuery(); @@ -108,14 +107,14 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue query = query.limit(getTree().getMaxResults()); } - if (getQueryMethod().getQueryAnnotation() - .map(org.springframework.data.cassandra.repository.Query::allowFiltering).orElse(false)) { + if (getQueryMethod().getQueryAnnotation().map(org.springframework.data.cassandra.repository.Query::allowFiltering) + .orElse(false)) { query = query.withAllowFiltering(); } - CassandraPersistentEntity persistentEntity = - getMappingContext().getRequiredPersistentEntity(getQueryMethod().getDomainClass()); + CassandraPersistentEntity persistentEntity = getMappingContext() + .getRequiredPersistentEntity(getQueryMethod().getDomainClass()); return getStatementFactory().select(query, persistentEntity);