DATAES-631 - Refactored count methods in ElasticsearchRestTemplate.

Author: sothawo

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

@@ -24,16 +24,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.query.AliasQuery;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.elasticsearch.core.query.DeleteQuery;
-import org.springframework.data.elasticsearch.core.query.GetQuery;
-import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
-import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.util.CloseableIterator;
 import org.springframework.lang.Nullable;
 
@@ -339,39 +330,20 @@ default List<List<?>> queryForList(List<SearchQuery> queries, List<Class<?>> cla
 	 * @param clazz
 	 * @return
 	 */
-	<T> long count(CriteriaQuery query, Class<T> clazz);
+	<T> long count(Query query, Class<T> clazz);
 
 	/**
 	 * return number of elements found by given query
 	 *
 	 * @param query
 	 * @return
 	 */
-	default <T> long count(CriteriaQuery query) {
+	default <T> long count(Query query) {
 		return count(query, null);
 	}
 
 	/**
-	 * return number of elements found by given query
-	 *
-	 * @param query
-	 * @param clazz
-	 * @return
-	 */
-	<T> long count(SearchQuery query, Class<T> clazz);
-
-	/**
-	 * return number of elements found by given query
-	 *
-	 * @param query
-	 * @return
-	 */
-	default <T> long count(SearchQuery query) {
-		return count(query, null);
-	}
-
-	/**
-	 * Execute a multiGet against elasticsearch for the given ids
+	 * /** Execute a multiGet against elasticsearch for the given ids
 	 *
 	 * @param searchQuery
 	 * @param clazz

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

@@ -513,31 +513,14 @@ private <T> CloseableIterator<T> doStream(long scrollTimeInMillis, ScrolledPage<
 	}
 
 	@Override
-	public <T> long count(CriteriaQuery criteriaQuery, Class<T> clazz) {
-		QueryBuilder elasticsearchQuery = new CriteriaQueryProcessor().createQueryFromCriteria(criteriaQuery.getCriteria());
-		QueryBuilder elasticsearchFilter = new CriteriaFilterProcessor()
-				.createFilterFromCriteria(criteriaQuery.getCriteria());
-
-		if (elasticsearchFilter == null) {
-			return doCount(prepareCount(criteriaQuery, clazz), elasticsearchQuery);
-		} else {
-			// filter could not be set into CountRequestBuilder, convert request into search request
-			return doCount(prepareSearch(criteriaQuery, clazz), elasticsearchQuery, elasticsearchFilter);
-		}
-	}
+	public <T> long count(Query query, Class<T> clazz) {
+		SearchRequest searchRequest = mapQuery(query, clazz);
+		searchRequest.source().size(0);
 
-	@Override
-	public <T> long count(SearchQuery searchQuery, Class<T> clazz) {
-		QueryBuilder elasticsearchQuery = searchQuery.getQuery();
-		QueryBuilder elasticsearchFilter = searchQuery.getFilter();
-
-		if (elasticsearchFilter == null) {
-//			return doCount(prepareCount(searchQuery, clazz),
-//			elasticsearchQuery);
-			return doCount(prepareSearch(searchQuery, clazz), elasticsearchQuery, elasticsearchFilter);
-		} else {
-			// filter could not be set into CountRequestBuilder, convert request into search request
-			return doCount(prepareSearch(searchQuery, clazz), elasticsearchQuery, elasticsearchFilter);
+		try {
+			return SearchHitsUtil.getTotalCount(client.search(searchRequest, RequestOptions.DEFAULT).getHits());
+		} catch (IOException e) {
+			throw new ElasticsearchException("Error for search request: " + searchRequest.toString(), e);
 		}
 	}
 
@@ -559,55 +542,17 @@ private <T> SearchRequest mapQuery(Query query, Class<T> clazz) {
 
 		SearchRequest searchRequest = prepareSearch(query, clazz);
 
-		return searchRequest;
-	}
-
-	private long doCount(SearchRequest countRequest, QueryBuilder elasticsearchQuery) {
-		SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
-		if (elasticsearchQuery != null) {
-			sourceBuilder.query(elasticsearchQuery);
-		}
-		countRequest.source(sourceBuilder);
-
-		try {
-			return SearchHitsUtil.getTotalCount(client.search(countRequest, RequestOptions.DEFAULT).getHits());
-		} catch (IOException e) {
-			throw new ElasticsearchException("Error while searching for request: " + countRequest.toString(), e);
-		}
-	}
-
-	private long doCount(SearchRequest searchRequest, QueryBuilder elasticsearchQuery, QueryBuilder elasticsearchFilter) {
 		if (elasticsearchQuery != null) {
 			searchRequest.source().query(elasticsearchQuery);
 		} else {
 			searchRequest.source().query(QueryBuilders.matchAllQuery());
 		}
+
 		if (elasticsearchFilter != null) {
 			searchRequest.source().postFilter(elasticsearchFilter);
 		}
 
-		try {
-			return SearchHitsUtil.getTotalCount(client.search(searchRequest, RequestOptions.DEFAULT).getHits());
-		} catch (IOException e) {
-			throw new ElasticsearchException("Error for search request: " + searchRequest.toString(), e);
-		}
-	}
-
-	private <T> SearchRequest prepareCount(Query query, Class<T> clazz) {
-		String[] indexName = !isEmpty(query.getIndices())
-				? query.getIndices().toArray(new String[query.getIndices().size()])
-				: retrieveIndexNameFromPersistentEntity(clazz);
-		String[] types = !isEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()])
-				: retrieveTypeFromPersistentEntity(clazz);
-
-		Assert.notNull(indexName, "No index defined for Query");
-
-		SearchRequest countRequestBuilder = new SearchRequest(indexName);
-
-		if (types != null) {
-			countRequestBuilder.types(types);
-		}
-		return countRequestBuilder;
+		return searchRequest;
 	}
 
 	@Override
@@ -1258,6 +1203,7 @@ private <T> SearchRequest prepareSearch(SearchQuery query, Class<T> clazz) {
 
 	private SearchRequest prepareSearch(Query query, Optional<QueryBuilder> builder, @Nullable Class<?> clazz) {
 		Assert.notNull(query.getIndices(), "No index defined for Query");
+		Assert.notEmpty(query.getIndices(), "No index defined for Query");
 		Assert.notNull(query.getTypes(), "No type defined for Query");
 
 		int startRecord = 0;

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

@@ -421,16 +421,7 @@ private <T> CloseableIterator<T> doStream(long scrollTimeInMillis, ScrolledPage<
 	}
 
 	@Override
-	public <T> long count(CriteriaQuery criteriaQuery, Class<T> clazz) {
-		return doCount(criteriaQuery, clazz);
-	}
-
-	@Override
-	public <T> long count(SearchQuery searchQuery, Class<T> clazz) {
-		return doCount(searchQuery, clazz);
-	}
-
-	private <T> long doCount(Query query, Class<T> clazz) {
+	public <T> long count(Query query, Class<T> clazz) {
 		SearchRequestBuilder searchRequestBuilder = mapQuery(query, clazz);
 		searchRequestBuilder.setSize(0);