Skip to content

Commit 7168c34

Browse files
committed
DATAES-969 - Use ResultProcessor in ElasticsearchPartQuery to build PartTree.
Original PR: #546 (cherry picked from commit d036693)
1 parent fd118e6 commit 7168c34

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
4949

5050
public ElasticsearchPartQuery(ElasticsearchQueryMethod method, ElasticsearchOperations elasticsearchOperations) {
5151
super(method, elasticsearchOperations);
52-
this.tree = new PartTree(method.getName(), method.getEntityInformation().getJavaType());
52+
this.tree = new PartTree(queryMethod.getName(), queryMethod.getResultProcessor().getReturnedType().getDomainType());
5353
this.elasticsearchConverter = elasticsearchOperations.getElasticsearchConverter();
5454
this.mappingContext = elasticsearchConverter.getMappingContext();
5555
}
5656

5757
@Override
5858
public Object execute(Object[] parameters) {
59-
Class<?> clazz = queryMethod.getEntityInformation().getJavaType();
59+
Class<?> clazz = queryMethod.getResultProcessor().getReturnedType().getDomainType();
6060
ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
6161

6262
CriteriaQuery query = createQuery(accessor);

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod, Elasticsea
7171

7272
@Override
7373
public Object execute(Object[] parameters) {
74-
Class<?> clazz = queryMethod.getEntityInformation().getJavaType();
74+
Class<?> clazz = queryMethod.getResultProcessor().getReturnedType().getDomainType();
7575
ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
7676

7777
StringQuery stringQuery = createQuery(accessor);

0 commit comments

Comments
 (0)