From 3a9a959918fc3d14a0b197cd5bfffdb723ad9b2f Mon Sep 17 00:00:00 2001
From: HAN SEUNGWOO <tuguri8@gmail.com>
Date: Wed, 4 Sep 2024 03:09:26 +0900
Subject: [PATCH] Set refresh on DeleteByQueryRequest by DeleteQuery.

Original Pull Request #2976
Closes #2973

(cherry picked from commit b1b232d354374d4003a1d640e1aec96bf0a6d687)
---
 .../client/elc/RequestConverter.java            |  3 +++
 .../client/elc/RequestConverterTest.java        | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
index e6f0a12a3..2e7771929 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
@@ -1021,6 +1021,9 @@ class RequestConverter extends AbstractQueryProcessor {
 									.collect(Collectors.toList()));
 				}
 			}
+			if (query.getRefresh() != null) {
+				dqb.refresh(query.getRefresh());
+			}
 			dqb.allowNoIndices(query.getAllowNoIndices())
 					.conflicts(conflicts(query.getConflicts()))
 					.ignoreUnavailable(query.getIgnoreUnavailable())
diff --git a/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java b/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java
index 5036f92c9..4f12438cd 100644
--- a/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java
+++ b/src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java
@@ -30,12 +30,16 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.elasticsearch.core.query.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.DocValueField;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.lang.Nullable;
 
 /**
  * @author Peter-Josef Meisch
+ * @author Han Seungwoo
  */
 class RequestConverterTest {
 
@@ -72,6 +76,19 @@ class RequestConverterTest {
 		assertThat(fieldAndFormats.get(1).format()).isEqualTo("format2");
 	}
 
+	@Test // #2973
+	@DisplayName("should set refresh based on deleteRequest")
+	void refreshSetByDeleteRequest() {
+		var query = new CriteriaQuery(new Criteria("text").contains("test"));
+		var deleteQuery = DeleteQuery.builder(query).withRefresh(true).build();
+
+		var deleteByQueryRequest = requestConverter.documentDeleteByQueryRequest(deleteQuery, null, SampleEntity.class,
+			IndexCoordinates.of("foo"),
+			null);
+
+		assertThat(deleteByQueryRequest.refresh()).isTrue();
+	}
+
 	@Document(indexName = "does-not-matter")
 	static class SampleEntity {
 		@Nullable