From 7168c34ee694181a079673621926ef00bb4a7ff1 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 7 Nov 2020 18:14:43 +0100 Subject: [PATCH] DATAES-969 - Use ResultProcessor in ElasticsearchPartQuery to build PartTree. Original PR: #546 (cherry picked from commit d036693f0510748537c682a5ede99c23938b5250) --- .../repository/query/ElasticsearchPartQuery.java | 4 ++-- .../repository/query/ElasticsearchStringQuery.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java index 647941885..4202aa259 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java @@ -49,14 +49,14 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery public ElasticsearchPartQuery(ElasticsearchQueryMethod method, ElasticsearchOperations elasticsearchOperations) { super(method, elasticsearchOperations); - this.tree = new PartTree(method.getName(), method.getEntityInformation().getJavaType()); + this.tree = new PartTree(queryMethod.getName(), queryMethod.getResultProcessor().getReturnedType().getDomainType()); this.elasticsearchConverter = elasticsearchOperations.getElasticsearchConverter(); this.mappingContext = elasticsearchConverter.getMappingContext(); } @Override public Object execute(Object[] parameters) { - Class clazz = queryMethod.getEntityInformation().getJavaType(); + Class clazz = queryMethod.getResultProcessor().getReturnedType().getDomainType(); ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters); CriteriaQuery query = createQuery(accessor); diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java index db1905dfd..85dc7ec79 100644 --- a/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java +++ b/src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java @@ -71,7 +71,7 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue @Override public Object execute(Object[] parameters) { - Class clazz = queryMethod.getEntityInformation().getJavaType(); + Class clazz = queryMethod.getResultProcessor().getReturnedType().getDomainType(); ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters); StringQuery stringQuery = createQuery(accessor);