Handle null errors.

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

Author: youssef3wi

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

@@ -1005,6 +1005,9 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 			if (query.getExpandWildcards() != null && !query.getExpandWildcards().isEmpty()) {
 				dqb.expandWildcards(expandWildcards(query.getExpandWildcards()));
 			}
+			if (query.getStats() != null && !query.getStats().isEmpty()) {
+				dqb.stats(query.getStats());
+			}
 			dqb.allowNoIndices(query.getAllowNoIndices())
 					.conflicts(query.getConflicts())
 					.ignoreUnavailable(query.getIgnoreUnavailable())
@@ -1013,7 +1016,6 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nul
 					.searchType(searchType(query.getSearchType()))
 					.searchTimeout(time(query.getSearchTimeout()))
 					.slices(query.getSlices())
-					.stats(query.getStats())
 					.terminateAfter(query.getTerminateAfter())
 					.timeout(time(query.getTimeout()))
 					.version(query.getVersion());

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

@@ -140,11 +140,10 @@ public class DeleteQuery extends BaseQuery {
     /**
      * Query that specifies the documents to delete.
      */
-    @Nullable
     private final Query query;
 
-    public static Builder builder() {
-        return new Builder();
+    public static Builder builder(Query query) {
+        return new Builder(query);
     }
 
     public DeleteQuery(Builder builder) {
@@ -252,7 +251,7 @@ public Query getQuery() {
         return query;
     }
 
-    public static final class Builder extends BaseQueryBuilder<DeleteQuery, DeleteQuery.Builder> {
+    public static final class Builder extends BaseQueryBuilder<DeleteQuery, Builder> {
         // For Lucene query
         @Nullable
         private String luceneQuery;
@@ -288,10 +287,10 @@ public static final class Builder extends BaseQueryBuilder<DeleteQuery, DeleteQu
         private Boolean version;
 
         // Body
-        @Nullable
-        private Query query;
+        private final Query query;
 
-        private Builder() {
+        private Builder(Query query) {
+            this.query = query;
         }
 
         /**
@@ -443,15 +442,6 @@ public Builder withVersion(@Nullable Boolean version) {
             return this;
         }
 
-        /**
-         * Query that specifies the documents to delete.
-         */
-        public Builder withQuery(Query query) {
-            this.query = query;
-
-            return this;
-        }
-
         @Override
         public DeleteQuery build() {
             if (luceneQuery == null) {