From 054c02bd414ac1b674829a997c4625b9f445121f Mon Sep 17 00:00:00 2001 From: Mathias Teier Date: Tue, 27 Aug 2019 12:11:46 +0200 Subject: [PATCH] DATAES-643: Added searchType to prepareSearch() in RestTemplate (#310) Original PR: #310 --- .../data/elasticsearch/core/ElasticsearchRestTemplate.java | 5 +++++ .../elasticsearch/core/ReactiveElasticsearchTemplate.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java index dcc2cee4e..fb3c0977a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java @@ -140,6 +140,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Martin Choraine * @author Farid Azaza * @author Peter-Josef Meisch + * @author Mathias Teier */ public class ElasticsearchRestTemplate implements ElasticsearchOperations, EsClient, ApplicationContextAware { @@ -1328,6 +1329,10 @@ public class ElasticsearchRestTemplate request.preference(query.getPreference()); } + if (query.getSearchType() != null) { + request.searchType(query.getSearchType()); + } + request.source(sourceBuilder); return request; } diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java index c7ed0c1e5..eabe68f2f 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java @@ -78,6 +78,7 @@ import org.springframework.util.Assert; * @author Farid Azaza * @author Martin Choraine * @author Peter-Josef Meisch + * @author Mathias Teier * @since 3.2 */ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations { @@ -283,6 +284,10 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera request.preference(query.getPreference()); } + if (query.getSearchType() != null) { + request.searchType(query.getSearchType()); + } + Pageable pageable = query.getPageable(); if (pageable.isPaged()) {