Map the request to the correct class for mapping elasticsearch queries.

Signed-off-by: Youssef Aouichaoui <[email protected]>

Author: youssef3wi

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

@@ -37,7 +37,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
@@ -672,18 +671,7 @@ public SqlResponse search(SqlQuery query) {
 				"The Elasticsearch Java Client only supports JSON format.");
 
 		try {
-			QueryResponse response = sqlClient.query(sqb -> {
-				sqb.query(query.getQuery()).catalog(query.getCatalog()).columnar(query.getColumnar()).cursor(query.getCursor())
-						.fetchSize(query.getFetchSize()).fieldMultiValueLeniency(query.getFieldMultiValueLeniency())
-						.indexUsingFrozen(query.getIndexIncludeFrozen()).keepAlive(time(query.getKeepAlive()))
-						.keepOnCompletion(query.getKeepOnCompletion()).pageTimeout(time(query.getPageTimeout()))
-						.requestTimeout(time(query.getRequestTimeout()))
-						.waitForCompletionTimeout(time(query.getWaitForCompletionTimeout()))
-						.filter(requestConverter.getQuery(query.getFilter(), null))
-						.timeZone(Objects.toString(query.getTimeZone(), null)).format(Objects.toString(query.getFormat(), null));
-
-				return sqb;
-			});
+			QueryResponse response = sqlClient.query(requestConverter.sqlQueryRequest(query));
 
 			return responseConverter.sqlResponse(response);
 		} catch (IOException e) {

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

@@ -68,6 +68,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -530,6 +531,22 @@ public co.elastic.clients.elasticsearch.indices.GetTemplateRequest indicesGetTem
 				.of(gtr -> gtr.name(getTemplateRequest.getTemplateName()).flatSettings(true));
 	}
 
+	public co.elastic.clients.elasticsearch.sql.QueryRequest sqlQueryRequest(SqlQuery query) {
+		Assert.notNull(query, "Query must not be null.");
+
+		return co.elastic.clients.elasticsearch.sql.QueryRequest.of(sqb -> {
+			sqb.query(query.getQuery()).catalog(query.getCatalog()).columnar(query.getColumnar()).cursor(query.getCursor())
+					.fetchSize(query.getFetchSize()).fieldMultiValueLeniency(query.getFieldMultiValueLeniency())
+					.indexUsingFrozen(query.getIndexIncludeFrozen()).keepAlive(time(query.getKeepAlive()))
+					.keepOnCompletion(query.getKeepOnCompletion()).pageTimeout(time(query.getPageTimeout()))
+					.requestTimeout(time(query.getRequestTimeout()))
+					.waitForCompletionTimeout(time(query.getWaitForCompletionTimeout())).filter(getQuery(query.getFilter(), null))
+					.timeZone(Objects.toString(query.getTimeZone(), null)).format(Objects.toString(query.getFormat(), null));
+
+			return sqb;
+		});
+	}
+
 	// endregion
 
 	// region documents