Use spring-data classes.

This commit updates the DeleteQuery to use internal classes instead of Elasticsearch classes.

Signed-off-by: Youssef Aouichaoui <youssef3wi@icloud.com>

Author: youssef3wi

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

@@ -977,18 +977,14 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 		return DeleteByQueryRequest.of(dqb -> {
 			dqb.index(Arrays.asList(index.getIndexNames())) //
 					.query(getQuery(query.getQuery(), clazz))//
-					.refresh(deleteByQueryRefresh(refreshPolicy));
-
-			if (query.isLimiting()) {
-				// noinspection ConstantConditions
-				dqb.maxDocs(Long.valueOf(query.getMaxResults()));
-			}
-
-			dqb.scroll(time(query.getScrollTime()))
+					.refresh(deleteByQueryRefresh(refreshPolicy))
+					.requestsPerSecond(query.getRequestsPerSecond())
+                    .maxDocs(query.getMaxDocs())
+					.scroll(time(query.getScroll()))
 					.scrollSize(query.getScrollSize());
 
-			if (query.getRoute() != null) {
-				dqb.routing(query.getRoute());
+			if (query.getRouting() != null) {
+				dqb.routing(query.getRouting());
 			} else if (StringUtils.hasText(routing)) {
 				dqb.routing(routing);
 			}
@@ -997,7 +993,7 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 				dqb.q(query.getQ())
 						.analyzer(query.getAnalyzer())
 						.analyzeWildcard(query.getAnalyzeWildcard())
-						.defaultOperator(query.getDefaultOperator())
+						.defaultOperator(operator(query.getDefaultOperator()))
 						.df(query.getDf())
 						.lenient(query.getLenient());
 			}
@@ -1008,14 +1004,28 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 			if (query.getStats() != null && !query.getStats().isEmpty()) {
 				dqb.stats(query.getStats());
 			}
+			if (query.getSlices() != null) {
+				dqb.slices(sb -> sb.value(query.getSlices()));
+			}
+			if (query.getSort() != null) {
+				ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntity(clazz);
+				List<SortOptions> sortOptions = getSortOptions(query.getSort(), persistentEntity);
+
+				if (!sortOptions.isEmpty()) {
+					dqb.sort(
+							sortOptions.stream()
+									.map(sortOption -> sortOption.field().field() + ":" + sortOption.field().order().jsonValue())
+									.collect(Collectors.toList())
+					);
+				}
+			}
 			dqb.allowNoIndices(query.getAllowNoIndices())
-					.conflicts(query.getConflicts())
+					.conflicts(conflicts(query.getConflicts()))
 					.ignoreUnavailable(query.getIgnoreUnavailable())
 					.preference(query.getPreference())
 					.requestCache(query.getRequestCache())
 					.searchType(searchType(query.getSearchType()))
 					.searchTimeout(time(query.getSearchTimeout()))
-					.slices(query.getSlices())
 					.terminateAfter(query.getTerminateAfter())
 					.timeout(time(query.getTimeout()))
 					.version(query.getVersion());

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

@@ -18,6 +18,7 @@
 import co.elastic.clients.elasticsearch._types.*;
 import co.elastic.clients.elasticsearch._types.mapping.FieldType;
 import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
+import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
 import co.elastic.clients.elasticsearch.core.search.BoundaryScanner;
 import co.elastic.clients.elasticsearch.core.search.HighlighterEncoder;
 import co.elastic.clients.elasticsearch.core.search.HighlighterFragmenter;
@@ -46,6 +47,8 @@
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.RescorerQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
+import org.springframework.data.elasticsearch.core.query.types.ConflictsType;
+import org.springframework.data.elasticsearch.core.query.types.OperatorType;
 import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -500,4 +503,26 @@ static Map<String, JsonData> paramsMap(Map<String, Object> params) {
 		});
 		return mappedParams;
 	}
+
+    /**
+     * Convert a spring-data-elasticsearch operator to an Elasticsearch operator.
+     *
+     * @param operator spring-data-elasticsearch operator.
+     * @return an Elasticsearch Operator.
+     */
+    @Nullable
+    static Operator operator(@Nullable OperatorType operator) {
+        return operator != null ? Operator.valueOf(operator.name()) : null;
+    }
+
+    /**
+     * Convert a spring-data-elasticsearch {@literal conflicts} to an Elasticsearch {@literal conflicts}.
+     *
+     * @param conflicts spring-data-elasticsearch {@literal conflicts}.
+     * @return an Elasticsearch {@literal conflicts}.
+     */
+    @Nullable
+    static Conflicts conflicts(@Nullable ConflictsType conflicts) {
+        return conflicts != null ? Conflicts.valueOf(conflicts.name()) : null;
+    }
 }