DATAES-14 - added option to choose different search types per query

Author: akonczak

src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java

@@ -555,7 +555,7 @@ private SearchRequestBuilder prepareSearch(Query query) {
 
 		int startRecord = 0;
 		SearchRequestBuilder searchRequestBuilder = client.prepareSearch(toArray(query.getIndices()))
-				.setSearchType(DFS_QUERY_THEN_FETCH).setTypes(toArray(query.getTypes()));
+				.setSearchType(query.getSearchType()).setTypes(toArray(query.getTypes()));
 
 		if (query.getPageable() != null) {
 			startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();

src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java

@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.elasticsearch.action.search.SearchType;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.Assert;
@@ -41,6 +42,7 @@ abstract class AbstractQuery implements Query {
 	protected float minScore;
 	protected Collection<String> ids;
 	protected String route;
+	protected SearchType searchType = SearchType.DFS_QUERY_THEN_FETCH;
 
 	@Override
 	public Sort getSort() {
@@ -127,4 +129,12 @@ public String getRoute() {
 	public void setRoute(String route) {
 		this.route = route;
 	}
+
+	public void setSearchType(SearchType searchType) {
+		this.searchType = searchType;
+	}
+
+	public SearchType getSearchType() {
+		return searchType;
+	}
 }

src/main/java/org/springframework/data/elasticsearch/core/query/Query.java

@@ -18,6 +18,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.elasticsearch.action.search.SearchType;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -130,4 +131,11 @@ public interface Query {
 	 * @return
 	 */
 	String getRoute();
+
+
+	/**
+	 * Type of search
+	 * @return
+	 */
+	SearchType getSearchType();
 }