Polishing.

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

Author: youssef3wi

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

@@ -973,7 +973,6 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(index, "index must not be null");
 
-		// Old documentDeleteByQueryRequest needs to be refactored.
 		return DeleteByQueryRequest.of(dqb -> {
 			dqb.index(Arrays.asList(index.getIndexNames())) //
 					.query(getQuery(query.getQuery(), clazz))//
@@ -1014,7 +1013,15 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 				if (!sortOptions.isEmpty()) {
 					dqb.sort(
 							sortOptions.stream()
-									.map(sortOption -> sortOption.field().field() + ":" + sortOption.field().order().jsonValue())
+									.map(sortOption -> {
+										String order = "asc";
+										var sortField = sortOption.field();
+										if (sortField.order() != null) {
+											order = sortField.order().jsonValue();
+										}
+
+										return sortField.field() + ":" + order;
+									})
 									.collect(Collectors.toList())
 					);
 				}

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

@@ -20,6 +20,7 @@
 import org.springframework.data.elasticsearch.core.query.types.ConflictsType;
 import org.springframework.data.elasticsearch.core.query.types.OperatorType;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 
 import java.time.Duration;
 import java.util.EnumSet;
@@ -222,7 +223,7 @@ public static Builder builder(Query query) {
         return new Builder(query);
     }
 
-    public DeleteQuery(Builder builder) {
+    private DeleteQuery(Builder builder) {
         this.q = builder.luceneQuery;
         this.analyzeWildcard = builder.analyzeWildcard;
         this.analyzer = builder.analyzer;
@@ -450,6 +451,8 @@ public static final class Builder {
         private final Query query;
 
         private Builder(Query query) {
+            Assert.notNull(query, "query must not be null");
+
             this.query = query;
         }
 

src/main/java/org/springframework/data/elasticsearch/core/query/types/package-info.java

@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.core.query.types;