DATAES-630_-_Remove_GetResultMapper_and_friends_from_core_package

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java

@@ -19,7 +19,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.data.elasticsearch.core.ResultsMapper;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 
 /**

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

@@ -182,14 +182,14 @@ public interface ElasticsearchOperations {
 	<T> T queryForObject(GetQuery query, Class<T> clazz);
 
 	/**
-	 * Execute the query against elasticsearch and return the first returned object using custom mapper
+	 * Execute the query against elasticsearch and return the first returned object using custom converter
 	 *
 	 * @param query
 	 * @param clazz
-	 * @param mapper
+	 * @param converter
 	 * @return the first matching object
 	 */
-	<T> T queryForObject(GetQuery query, Class<T> clazz, GetResultMapper mapper);
+	<T> T queryForObject(GetQuery query, Class<T> clazz, ElasticsearchConverter converter);
 
 	/**
 	 * Execute the query against elasticsearch and return the first returned object
@@ -219,13 +219,13 @@ public interface ElasticsearchOperations {
 	<T> Page<T> queryForPage(SearchQuery query, Class<T> clazz);
 
 	/**
-	 * Execute the query against elasticsearch and return result as {@link Page} using custom mapper
+	 * Execute the query against elasticsearch and return result as {@link Page} using custom converter
 	 *
 	 * @param query
 	 * @param clazz
 	 * @return
 	 */
-	<T> Page<T> queryForPage(SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
+	<T> Page<T> queryForPage(SearchQuery query, Class<T> clazz, ElasticsearchConverter converter);
 
 	/**
 	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page}
@@ -238,13 +238,13 @@ public interface ElasticsearchOperations {
 
 	/**
 	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page} using custom
-	 * mapper
+	 * converter
 	 *
 	 * @param queries
 	 * @param clazz
 	 * @return
 	 */
-	<T> List<Page<T>> queryForPage(List<SearchQuery> queries, Class<T> clazz, SearchResultMapper mapper);
+	<T> List<Page<T>> queryForPage(List<SearchQuery> queries, Class<T> clazz, ElasticsearchConverter converter);
 
 	/**
 	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page}
@@ -257,13 +257,13 @@ public interface ElasticsearchOperations {
 
 	/**
 	 * Execute the multi-search against elasticsearch and return result as {@link List} of {@link Page} using custom
-	 * mapper
+	 * converter
 	 *
 	 * @param queries
 	 * @param classes
 	 * @return
 	 */
-	List<Page<?>> queryForPage(List<SearchQuery> queries, List<Class<?>> classes, SearchResultMapper mapper);
+	List<Page<?>> queryForPage(List<SearchQuery> queries, List<Class<?>> classes, ElasticsearchConverter converter);
 
 	/**
 	 * Execute the query against elasticsearch and return result as {@link Page}
@@ -284,13 +284,13 @@ public interface ElasticsearchOperations {
 	<T> Page<T> queryForPage(StringQuery query, Class<T> clazz);
 
 	/**
-	 * Execute the query against elasticsearch and return result as {@link Page} using custom mapper
+	 * Execute the query against elasticsearch and return result as {@link Page} using custom converter
 	 *
 	 * @param query
 	 * @param clazz
 	 * @return
 	 */
-	<T> Page<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultMapper mapper);
+	<T> Page<T> queryForPage(StringQuery query, Class<T> clazz, ElasticsearchConverter converter);
 
 	/**
 	 * Executes the given {@link CriteriaQuery} against elasticsearch and return result as {@link CloseableIterator}.
@@ -322,19 +322,19 @@ public interface ElasticsearchOperations {
 
 	/**
 	 * Executes the given {@link SearchQuery} against elasticsearch and return result as {@link CloseableIterator} using
-	 * custom mapper.
+	 * custom converter.
 	 * <p>
 	 * Returns a {@link CloseableIterator} that wraps an Elasticsearch scroll context that needs to be closed in case of
 	 * error.
 	 *
 	 * @param <T> element return type
 	 * @param query
 	 * @param clazz
-	 * @param mapper
+	 * @param converter
 	 * @return
 	 * @since 1.3
 	 */
-	<T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
+	<T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, ElasticsearchConverter converter);
 
 	/**
 	 * Execute the criteria query against elasticsearch and return result as {@link List}
@@ -445,10 +445,10 @@ default List<List<?>> queryForList(List<SearchQuery> queries, List<Class<?>> cla
 	 *
 	 * @param searchQuery
 	 * @param clazz
-	 * @param multiGetResultMapper
+	 * @param converter
 	 * @return
 	 */
-	<T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper multiGetResultMapper);
+	<T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, ElasticsearchConverter converter);
 
 	/**
 	 * Index an object. Will do save or update
@@ -618,11 +618,11 @@ default void bulkUpdate(List<UpdateQuery> queries) {
 	 * @param query The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
 	 *          {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
-	 * @param mapper Custom impl to map result to entities
+	 * @param converter Custom impl to map result to entities
 	 * @return The scan id for input query.
 	 */
 	<T> ScrolledPage<T> startScroll(long scrollTimeInMillis, SearchQuery query, Class<T> clazz,
-			SearchResultMapper mapper);
+			ElasticsearchConverter converter);
 
 	/**
 	 * Returns scrolled page for given query
@@ -641,16 +641,16 @@ <T> ScrolledPage<T> startScroll(long scrollTimeInMillis, SearchQuery query, Clas
 	 * @param criteriaQuery The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
 	 *          {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
-	 * @param mapper Custom impl to map result to entities
+	 * @param converter Custom impl to map result to entities
 	 * @return The scan id for input query.
 	 */
 	<T> ScrolledPage<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz,
-			SearchResultMapper mapper);
+                                    ElasticsearchConverter converter);
 
 	<T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz);
 
 	<T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz,
-			SearchResultMapper mapper);
+                                       ElasticsearchConverter converter);
 
 	/**
 	 * Clears the search contexts associated with specified scroll ids.

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

@@ -90,6 +90,7 @@
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -323,14 +324,14 @@ public <T> T queryForObject(GetQuery query, Class<T> clazz) {
 	}
 
 	@Override
-	public <T> T queryForObject(GetQuery query, Class<T> clazz, GetResultMapper mapper) {
+	public <T> T queryForObject(GetQuery query, Class<T> clazz, ElasticsearchConverter converter) {
 		ElasticsearchPersistentEntity<T> persistentEntity = getPersistentEntityFor(clazz);
 		GetRequest request = new GetRequest(persistentEntity.getIndexName(), persistentEntity.getIndexType(),
 				query.getId());
 		GetResponse response;
 		try {
 			response = client.get(request, RequestOptions.DEFAULT);
-			return mapper.mapResult(response, clazz);
+			return converter.mapResult(response, clazz);
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error while getting for request: " + request.toString(), e);
 		}
@@ -359,9 +360,9 @@ public <T> AggregatedPage<T> queryForPage(SearchQuery query, Class<T> clazz) {
 	}
 
 	@Override
-	public <T> AggregatedPage<T> queryForPage(SearchQuery query, Class<T> clazz, SearchResultMapper mapper) {
+	public <T> AggregatedPage<T> queryForPage(SearchQuery query, Class<T> clazz, ElasticsearchConverter converter) {
 		SearchResponse response = doSearch(prepareSearch(query, clazz), query);
-		return mapper.mapResults(response, clazz, query.getPageable());
+		return converter.mapResults(response, clazz, query.getPageable());
 	}
 
 	@Override
@@ -370,24 +371,24 @@ public <T> List<Page<T>> queryForPage(List<SearchQuery> queries, Class<T> clazz)
 	}
 
 	private <T> List<Page<T>> doMultiSearch(List<SearchQuery> queries, Class<T> clazz, MultiSearchRequest request,
-			SearchResultMapper resultsMapper) {
+			ElasticsearchConverter converter) {
 		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
 		List<Page<T>> res = new ArrayList<>(queries.size());
 		int c = 0;
 		for (SearchQuery query : queries) {
-			res.add(resultsMapper.mapResults(items[c++].getResponse(), clazz, query.getPageable()));
+			res.add(converter.mapResults(items[c++].getResponse(), clazz, query.getPageable()));
 		}
 		return res;
 	}
 
 	private List<Page<?>> doMultiSearch(List<SearchQuery> queries, List<Class<?>> classes, MultiSearchRequest request,
-			SearchResultMapper resultsMapper) {
+			ElasticsearchConverter converter) {
 		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
 		List<Page<?>> res = new ArrayList<>(queries.size());
 		int c = 0;
 		Iterator<Class<?>> it = classes.iterator();
 		for (SearchQuery query : queries) {
-			res.add(resultsMapper.mapResults(items[c++].getResponse(), it.next(), query.getPageable()));
+			res.add(converter.mapResults(items[c++].getResponse(), it.next(), query.getPageable()));
 		}
 		return res;
 	}
@@ -405,12 +406,12 @@ private MultiSearchResponse.Item[] getMultiSearchResult(MultiSearchRequest reque
 	}
 
 	@Override
-	public <T> List<Page<T>> queryForPage(List<SearchQuery> queries, Class<T> clazz, SearchResultMapper mapper) {
+	public <T> List<Page<T>> queryForPage(List<SearchQuery> queries, Class<T> clazz, ElasticsearchConverter converter) {
 		MultiSearchRequest request = new MultiSearchRequest();
 		for (SearchQuery query : queries) {
 			request.add(prepareSearch(prepareSearch(query, clazz), query));
 		}
-		return doMultiSearch(queries, clazz, request, mapper);
+		return doMultiSearch(queries, clazz, request, converter);
 	}
 
 	@Override
@@ -419,13 +420,13 @@ public List<Page<?>> queryForPage(List<SearchQuery> queries, List<Class<?>> clas
 	}
 
 	@Override
-	public List<Page<?>> queryForPage(List<SearchQuery> queries, List<Class<?>> classes, SearchResultMapper mapper) {
+	public List<Page<?>> queryForPage(List<SearchQuery> queries, List<Class<?>> classes, ElasticsearchConverter converter) {
 		MultiSearchRequest request = new MultiSearchRequest();
 		Iterator<Class<?>> it = classes.iterator();
 		for (SearchQuery query : queries) {
 			request.add(prepareSearch(prepareSearch(query, it.next()), query));
 		}
-		return doMultiSearch(queries, classes, request, mapper);
+		return doMultiSearch(queries, classes, request, converter);
 	}
 
 	@Override
@@ -508,7 +509,7 @@ public <T> Page<T> queryForPage(StringQuery query, Class<T> clazz) {
 	}
 
 	@Override
-	public <T> Page<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultMapper mapper) {
+	public <T> Page<T> queryForPage(StringQuery query, Class<T> clazz, ElasticsearchConverter converter) {
 		SearchRequest request = prepareSearch(query, clazz);
 		request.source().query((wrapperQuery(query.getSource())));
 		SearchResponse response;
@@ -517,7 +518,7 @@ public <T> Page<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultM
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request: " + request.toString(), e);
 		}
-		return mapper.mapResults(response, clazz, query.getPageable());
+		return converter.mapResults(response, clazz, query.getPageable());
 	}
 
 	@Override
@@ -532,14 +533,14 @@ public <T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz) {
 	}
 
 	@Override
-	public <T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, SearchResultMapper mapper) {
+	public <T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, ElasticsearchConverter converter) {
 		long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
-		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz, mapper), clazz, mapper);
+		return doStream(scrollTimeInMillis, startScroll(scrollTimeInMillis, query, clazz, converter), clazz, converter);
 	}
 
 	private <T> CloseableIterator<T> doStream(long scrollTimeInMillis, ScrolledPage<T> page, Class<T> clazz,
-			SearchResultMapper mapper) {
-		return StreamQueries.streamResults(page, scrollId -> continueScroll(scrollId, scrollTimeInMillis, clazz, mapper),
+			ElasticsearchConverter converter) {
+		return StreamQueries.streamResults(page, scrollId -> continueScroll(scrollId, scrollTimeInMillis, clazz, converter),
 				this::clearScroll);
 	}
 
@@ -669,8 +670,8 @@ private <T> MultiGetResponse getMultiResponse(Query searchQuery, Class<T> clazz)
 	}
 
 	@Override
-	public <T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, MultiGetResultMapper getResultMapper) {
-		return getResultMapper.mapResults(getMultiResponse(searchQuery, clazz), clazz);
+	public <T> List<T> multiGet(SearchQuery searchQuery, Class<T> clazz, ElasticsearchConverter converter) {
+		return converter.mapResults(getMultiResponse(searchQuery, clazz), clazz);
 	}
 
 	@Override
@@ -1038,16 +1039,16 @@ public <T> ScrolledPage<T> startScroll(long scrollTimeInMillis, CriteriaQuery cr
 
 	@Override
 	public <T> ScrolledPage<T> startScroll(long scrollTimeInMillis, SearchQuery searchQuery, Class<T> clazz,
-			SearchResultMapper mapper) {
+			ElasticsearchConverter converter) {
 		SearchResponse response = doScroll(prepareScroll(searchQuery, scrollTimeInMillis, clazz), searchQuery);
-		return mapper.mapResults(response, clazz, null);
+		return converter.mapResults(response, clazz, null);
 	}
 
 	@Override
 	public <T> ScrolledPage<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz,
-			SearchResultMapper mapper) {
+			ElasticsearchConverter converter) {
 		SearchResponse response = doScroll(prepareScroll(criteriaQuery, scrollTimeInMillis, clazz), criteriaQuery);
-		return mapper.mapResults(response, clazz, null);
+		return converter.mapResults(response, clazz, null);
 	}
 
 	@Override
@@ -1065,7 +1066,7 @@ public <T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scroll
 
 	@Override
 	public <T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz,
-			SearchResultMapper mapper) {
+			ElasticsearchConverter converter) {
 		SearchScrollRequest request = new SearchScrollRequest(scrollId);
 		request.scroll(TimeValue.timeValueMillis(scrollTimeInMillis));
 		SearchResponse response;
@@ -1074,7 +1075,7 @@ public <T> ScrolledPage<T> continueScroll(@Nullable String scrollId, long scroll
 		} catch (IOException e) {
 			throw new ElasticsearchException("Error for search request with scroll: " + request.toString(), e);
 		}
-		return mapper.mapResults(response, clazz, Pageable.unpaged());
+		return converter.mapResults(response, clazz, Pageable.unpaged());
 	}
 
 	@Override
@@ -1592,10 +1593,6 @@ private static MoreLikeThisQueryBuilder.Item[] toArray(MoreLikeThisQueryBuilder.
 		return values;
 	}
 
-	protected ResultsMapper getResultsMapper() {
-		return elasticsearchConverter;
-	}
-
 	@Deprecated
 	public static String readFileFromClasspath(String url) {
 		return ResourceUtil.readFileFromClasspath(url);