Add new Elasticsearch client as an alternative to the existing REST client.

Original Pull Request #2160
Closes #1973

(cherry picked from commit c0b26a5)

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaFilterProcessor.java

@@ -31,6 +31,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.data.elasticsearch.core.convert.GeoConverters;
@@ -67,9 +68,13 @@ public static Optional<Query> createQuery(Criteria criteria) {
 		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {
 
 			if (chainedCriteria.isOr()) {
-				// todo #1973
+				BoolQuery.Builder boolQueryBuilder = QueryBuilders.bool();
+				queriesForEntries(chainedCriteria).forEach(boolQueryBuilder::should);
+				filterQueries.add(new Query(boolQueryBuilder.build()));
 			} else if (chainedCriteria.isNegating()) {
-				// todo #1973
+				Collection<? extends Query> negatingFilters = buildNegatingFilter(criteria.getField().getName(),
+						criteria.getFilterCriteriaEntries());
+				filterQueries.addAll(negatingFilters);
 			} else {
 				filterQueries.addAll(queriesForEntries(chainedCriteria));
 			}
@@ -85,11 +90,28 @@ public static Optional<Query> createQuery(Criteria criteria) {
 				BoolQuery.Builder boolQueryBuilder = QueryBuilders.bool();
 				filterQueries.forEach(boolQueryBuilder::must);
 				BoolQuery boolQuery = boolQueryBuilder.build();
-				return Optional.of(boolQuery._toQuery());
+				return Optional.of(new Query(boolQuery));
 			}
 		}
 	}
 
+	private static Collection<? extends Query> buildNegatingFilter(String fieldName,
+			Set<Criteria.CriteriaEntry> filterCriteriaEntries) {
+
+		List<Query> negationFilters = new ArrayList<>();
+
+		filterCriteriaEntries.forEach(criteriaEntry -> {
+			Optional<Query> query = queryFor(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName);
+
+			if (query.isPresent()) {
+				BoolQuery negatingFilter = QueryBuilders.bool().mustNot(query.get()).build();
+				negationFilters.add(new Query(negatingFilter));
+			}
+		});
+
+		return negationFilters;
+	}
+
 	private static Collection<? extends Query> queriesForEntries(Criteria criteria) {
 
 		Assert.notNull(criteria.getField(), "criteria must have a field");

src/main/java/org/springframework/data/elasticsearch/client/elc/DocumentAdapters.java

@@ -80,8 +80,7 @@ public static SearchDocument from(Hit<?> hit, JsonpMapper jsonpMapper) {
 
 		Explanation explanation = from(hit.explanation());
 
-		// todo #1973 matchedQueries
-		List<String> matchedQueries = null;
+		List<String> matchedQueries = hit.matchedQueries();
 
 		Function<Map<String, JsonData>, EntityAsMap> fromFields = fields -> {
 			StringBuilder sb = new StringBuilder("{");

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchExceptionTranslator.java

@@ -106,7 +106,6 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 	}
 
 	private boolean isSeqNoConflict(Throwable exception) {
-		// todo #1973 check if this works
 		Integer status = null;
 		String message = null;
 

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java

@@ -34,6 +34,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.data.elasticsearch.BulkFailureException;
 import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
 import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
@@ -68,6 +70,8 @@
  */
 public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 
+	private static final Log LOGGER = LogFactory.getLog(ElasticsearchTemplate.class);
+
 	private final ElasticsearchClient client;
 	private final RequestConverter requestConverter;
 	private final ResponseConverter responseConverter;
@@ -249,7 +253,6 @@ public String submitReindex(ReindexRequest reindexRequest) {
 				client -> client.reindex(reindexRequestES));
 
 		if (reindexResponse.task() == null) {
-			// todo #1973 check behaviour and create issue in ES if necessary
 			throw new UnsupportedBackendOperation("ElasticsearchClient did not return a task id on submit request");
 		}
 
@@ -447,9 +450,6 @@ private List<SearchHits<?>> doMultiSearch(List<MultiSearchQueryParameter> multiS
 			MultiSearchQueryParameter queryParameter = queryIterator.next();
 			MultiSearchResponseItem<EntityAsMap> responseItem = responseIterator.next();
 
-			// if responseItem kind is Result then responseItem.value is a MultiSearchItem which is derived from
-			// SearchResponse
-
 			if (responseItem.isResult()) {
 
 				Class clazz = queryParameter.clazz;
@@ -463,7 +463,10 @@ private List<SearchHits<?>> doMultiSearch(List<MultiSearchQueryParameter> multiS
 
 				searchHitsList.add(searchHits);
 			} else {
-				// todo #1973 add failure
+				if (LOGGER.isWarnEnabled()) {
+					LOGGER
+							.warn(String.format("multisearch responsecontains failure: {}", responseItem.failure().error().reason()));
+				}
 			}
 		}
 

src/main/java/org/springframework/data/elasticsearch/client/elc/HighlightQueryBuilder.java

@@ -87,10 +87,6 @@ private void addParameters(HighlightParameters parameters,
 			builder.boundaryScannerLocale(parameters.getBoundaryScannerLocale());
 		}
 
-		if (parameters.getForceSource()) { // default is false
-			// todo #1973 parameter missing in new client
-		}
-
 		if (StringUtils.hasLength(parameters.getFragmenter())) {
 			builder.fragmenter(highlighterFragmenter(parameters.getFragmenter()));
 		}
@@ -111,10 +107,6 @@ private void addParameters(HighlightParameters parameters,
 			builder.order(highlighterOrder(parameters.getOrder()));
 		}
 
-		if (parameters.getPhraseLimit() > -1) {
-			// todo #1973 parameter missing in new client
-		}
-
 		if (parameters.getPreTags().length > 0) {
 			builder.preTags(Arrays.asList(parameters.getPreTags()));
 		}

src/main/java/org/springframework/data/elasticsearch/client/elc/QueryBuilders.java

@@ -17,6 +17,7 @@
 
 import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.LatLonGeoLocation;
+import co.elastic.clients.elasticsearch._types.query_dsl.IdsQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.MatchAllQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.MatchQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
@@ -29,6 +30,7 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.List;
 import java.util.function.Function;
 
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
@@ -45,6 +47,21 @@ public final class QueryBuilders {
 
 	private QueryBuilders() {}
 
+	public static IdsQuery idsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		return IdsQuery.of(i -> i.values(ids));
+	}
+
+	public static Query idsQueryAsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.ids(idsQuery(ids));
+
+		return builder.apply(new Query.Builder()).build();
+	}
 	public static MatchQuery matchQuery(String fieldName, String query, @Nullable Operator operator,
 			@Nullable Float boost) {
 

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java

@@ -177,8 +177,7 @@ public Mono<String> submitReindex(ReindexRequest reindexRequest) {
 		return Mono.from(execute( //
 				(ClientCallback<Publisher<co.elastic.clients.elasticsearch.core.ReindexResponse>>) client -> client
 						.reindex(reindexRequestES)))
-				.flatMap(response -> (response.task() == null) ? Mono.error( // todo #1973 check behaviour and create issue in
-																																			// ES if necessary
+				.flatMap(response -> (response.task() == null) ? Mono.error(
 						new UnsupportedBackendOperation("ElasticsearchClient did not return a task id on submit request"))
 						: Mono.just(response.task()));
 	}
@@ -499,7 +498,7 @@ public Query matchAllQuery() {
 
 	@Override
 	public Query idsQuery(List<String> ids) {
-		throw new UnsupportedOperationException("not implemented");
+		return NativeQuery.builder().withQuery(QueryBuilders.idsQueryAsQuery(ids)).build();
 	}
 
 	/**