DATAES-14 - Dynamic Search Type Support

added searchType parameter to NativeSearchQueryBuilder

Author: mohsinh

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.highlight.HighlightBuilder;
@@ -49,6 +50,7 @@ public class NativeSearchQueryBuilder {
 	private float minScore;
 	private Collection<String> ids;
 	private String route;
+	private SearchType searchType;
 
 	public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder) {
 		this.queryBuilder = queryBuilder;
@@ -110,6 +112,11 @@ public NativeSearchQueryBuilder withRoute(String route) {
 		return this;
 	}
 
+	public NativeSearchQueryBuilder withSearchType(SearchType searchType) {
+		this.searchType = searchType;
+		return this;
+	}
+
 	public NativeSearchQuery build() {
 		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
 		if (pageable != null) {
@@ -144,6 +151,10 @@ public NativeSearchQuery build() {
 			nativeSearchQuery.setRoute(route);
 		}
 
+		if (searchType != null) {
+			nativeSearchQuery.setSearchType(searchType);
+		}
+
 		return nativeSearchQuery;
 	}
 }

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java

@@ -1147,16 +1147,13 @@ public <T> FacetedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pa
 	public void shouldIndexSampleEntityWithIndexAndTypeAtRuntime() {
 		// given
 		String documentId = randomNumeric(5);
-		SampleEntity sampleEntity = new SampleEntity();
-		sampleEntity.setId(documentId);
-		sampleEntity.setMessage("some message");
-		sampleEntity.setVersion(System.currentTimeMillis());
+		SampleEntity sampleEntity = new SampleEntityBuilder(documentId)
+				.message("some message")
+				.version(System.currentTimeMillis()).build();
 
-		IndexQuery indexQuery = new IndexQuery();
-		indexQuery.setId(documentId);
-		indexQuery.setIndexName(INDEX_NAME);
-		indexQuery.setType(TYPE_NAME);
-		indexQuery.setObject(sampleEntity);
+		IndexQuery indexQuery = new IndexQueryBuilder().withId(documentId)
+				.withIndexName(INDEX_NAME).withType(TYPE_NAME)
+				.withObject(sampleEntity).build();
 
 		elasticsearchTemplate.index(indexQuery);
 		elasticsearchTemplate.refresh(INDEX_NAME, true);