Release version 5.5.1 (2025.0.1).

See #3114

.gitignore

@@ -33,3 +33,4 @@ node
 package-lock.json
 
 .mvn/.develocity
+/src/test/resources/testcontainers-local.properties

.mvn/extensions.xml

@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>io.spring.develocity.conventions</groupId>
 		<artifactId>develocity-conventions-maven-extension</artifactId>
-		<version>0.0.19</version>
+		<version>0.0.22</version>
 	</extension>
 </extensions>

.mvn/jvm.config

@@ -0,0 +1,14 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens=java.base/java.text=ALL-UNNAMED
+--add-opens=java.desktop/java.awt.font=ALL-UNNAMED

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/3.4.x", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/3.5.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {

README.adoc

@@ -62,7 +62,7 @@ public class MyService {
 
 === Using the RestClient
 
-Please check the [official documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration).
+Please check the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration[official documentation].
 
 === Maven configuration
 
@@ -168,7 +168,7 @@ Building the documentation builds also the project without running tests.
  $ ./mvnw clean install -Pantora
 ----
 
-The generated documentation is available from `target/antora/site/index.html`.
+The generated documentation is available from `target/site/index.html`.
 
 == Examples
 

ci/pipeline.properties

@@ -1,24 +1,20 @@
 # Java versions
-java.main.tag=17.0.13_11-jdk-focal
-java.next.tag=23.0.1_11-jdk-noble
+java.main.tag=17.0.15_6-jdk-focal
+java.next.tag=24.0.1_9-jdk-noble
 
 # Docker container images - standard
 docker.java.main.image=library/eclipse-temurin:${java.main.tag}
 docker.java.next.image=library/eclipse-temurin:${java.next.tag}
 
 # Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.25
-docker.mongodb.5.0.version=5.0.21
-docker.mongodb.6.0.version=6.0.10
-docker.mongodb.7.0.version=7.0.2
-docker.mongodb.8.0.version=8.0.0
+docker.mongodb.6.0.version=6.0.23
+docker.mongodb.7.0.version=7.0.20
+docker.mongodb.8.0.version=8.0.9
 
 # Supported versions of Redis
 docker.redis.6.version=6.2.13
 docker.redis.7.version=7.2.4
-
-# Supported versions of Cassandra
-docker.cassandra.3.version=3.11.16
+docker.valkey.8.version=8.1.1
 
 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.4.2</version>
+	<version>5.5.1</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.4.2</version>
+		<version>3.5.1</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,10 +18,10 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<springdata.commons>3.4.2</springdata.commons>
+		<springdata.commons>3.5.1</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>8.15.5</elasticsearch-java>
+		<elasticsearch-java>8.18.1</elasticsearch-java>
 
 		<hoverfly>0.19.0</hoverfly>
 		<log4j>2.23.1</log4j>
@@ -132,6 +132,18 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-client</artifactId>
+			<version>${elasticsearch-java}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<!-- Jackson JSON Mapper -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

src/main/antora/antora-playbook.yml

@@ -17,7 +17,7 @@ content:
     - url: https://github.com/spring-projects/spring-data-commons
       # Refname matching:
       # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
-      branches: [ main, 3.2.x ]
+      branches: [ main, 3.4.x, 3.3.x ]
       start_path: src/main/antora
 asciidoc:
   attributes:

src/main/antora/modules/ROOT/nav.adoc

@@ -11,6 +11,7 @@
 *** xref:migration-guides/migration-guide-5.1-5.2.adoc[]
 *** xref:migration-guides/migration-guide-5.2-5.3.adoc[]
 *** xref:migration-guides/migration-guide-5.3-5.4.adoc[]
+*** xref:migration-guides/migration-guide-5.4-5.5.adoc[]
 
 
 * xref:elasticsearch.adoc[]

src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc

@@ -1,9 +1,12 @@
 [[new-features]]
 = What's new
 
-[[new-features.5-4-1]]
-== New in Spring Data Elasticsearch 5.4.1
-* Upgrade to Elasticsearch 8.15.5.
+[[new-features.5-5-0]]
+== New in Spring Data Elasticsearch 5.5
+
+* Upgrade to Elasticsearch 8.18.1.
+* Add support for the `@SearchTemplateQuery` annotation on repository methods.
+* Scripted field properties of type collection can be populated from scripts returning arrays.
 
 [[new-features.5-4-0]]
 == New in Spring Data Elasticsearch 5.4

src/main/antora/modules/ROOT/pages/elasticsearch/misc.adoc

@@ -365,6 +365,8 @@ operations.putScript(                            <.>
 
 To use a search template in a search query, Spring Data Elasticsearch provides the `SearchTemplateQuery`, an implementation of the `org.springframework.data.elasticsearch.core.query.Query` interface.
 
+NOTE: Although `SearchTemplateQuery` is an implementation of the `Query` interface, not all of the functionality provided by the base class is available for a `SearchTemplateQuery` like setting a `Pageable` or a `Sort`. Values for this functionality must be added to the stored script like shown in the following example for paging parameters. If these values are set on the `Query` object, they will be ignored.
+
 In the following code, we will add a call using a search template query to a custom repository implementation (see
 xref:repositories/custom-implementations.adoc[]) as an example how this can be integrated into a repository call.
 
@@ -449,4 +451,3 @@ var query = Query.findAll().addSort(Sort.by(order));
 About the filter query: It is not possible to use a `CriteriaQuery` here, as this query would be converted into a Elasticsearch nested query which does not work in the filter context. So only `StringQuery` or `NativeQuery` can be used here. When using one of these, like the term query above, the Elasticsearch field names must be used, so take care, when these are redefined with the `@Field(name="...")` definition.
 
 For the definition of the order path and the nested paths, the Java entity property names should be used.
-

src/main/antora/modules/ROOT/pages/elasticsearch/repositories/elasticsearch-repository-queries.adoc

@@ -10,7 +10,9 @@ The Elasticsearch module supports all basic query building feature as string que
 === Declared queries
 
 Deriving the query from the method name is not always sufficient and/or may result in unreadable method names.
-In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using @Query Annotation] ).
+In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using the @Query Annotation] ).
+
+Another possibility is the use of a search-template, (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-searchtemplate-query[Using the @SearchTemplateQuery Annotation] ).
 
 [[elasticsearch.query-methods.criterions]]
 == Query creation
@@ -312,11 +314,13 @@ Repository methods can be defined to have the following return types for returni
 * `SearchPage<T>`
 
 [[elasticsearch.query-methods.at-query]]
-== Using @Query Annotation
+== Using the @Query Annotation
 
 .Declare query on the method using the `@Query` annotation.
 ====
-The arguments passed to the method can be inserted into placeholders in the query string. The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
+The arguments passed to the method can be inserted into placeholders in the query string.
+The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
+
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -341,15 +345,20 @@ It will be sent to Easticsearch as value of the query element; if for example th
 }
 ----
 ====
+
 .`@Query` annotation on a method taking a Collection argument
 ====
 A repository method such as
+
 [source,java]
 ----
 @Query("{\"ids\": {\"values\": ?0 }}")
 List<SampleEntity> getByIds(Collection<String> ids);
 ----
-would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents. So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
+
+would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents.
+So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
+
 [source,json]
 ----
 {
@@ -369,7 +378,6 @@ would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/qu
 ====
 https://docs.spring.io/spring-framework/reference/core/expressions.html[SpEL expression] is also supported when defining query in `@Query`.
 
-
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -411,6 +419,7 @@ If for example the function is called with the parameter _John_, it would produc
 .accessing parameter property.
 ====
 Supposing that we have the following class as query parameter type:
+
 [source,java]
 ----
 public record QueryParameter(String value) {
@@ -444,7 +453,9 @@ We can pass `new QueryParameter("John")` as the parameter now, and it will produ
 
 .accessing bean property.
 ====
-https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access. Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
+https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access.
+Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
+
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -493,6 +504,7 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
 NOTE: collection values should not be quoted when declaring the elasticsearch json query.
 
 A collection of `names` like `List.of("name1", "name2")` will produce the following terms query:
+
 [source,json]
 ----
 {
@@ -532,6 +544,7 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
     Page<Book> findByName(Collection<QueryParameter> parameters, Pageable pageable);
 }
 ----
+
 This will extract all the `value` property values as a new `Collection` from `QueryParameter` collection, thus takes the same effect as above.
 ====
 
@@ -560,3 +573,20 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
 ----
 
 ====
+
+[[elasticsearch.query-methods.at-searchtemplate-query]]
+== Using the @SearchTemplateQuery Annotation
+
+When using Elasticsearch search templates - (see xref:elasticsearch/misc.adoc#elasticsearch.misc.searchtemplates [Search Template support]) it is possible to specify that a repository method should use a template by adding the `@SearchTemplateQuery` annotation to that method.
+
+Let's assume that there is a search template stored with the name "book-by-title" and this template need a parameter named "title", then a repository method using that search template can be defined like this:
+
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @SearchTemplateQuery(id = "book-by-title")
+    SearchHits<Book> findByTitle(String title);
+}
+----
+
+The parameters of the repository method are sent to the seacrh template as key/value pairs where the key is the parameter name and the value is taken from the actual value when the method is invoked.

src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc

@@ -6,9 +6,10 @@ The following table shows the Elasticsearch and Spring versions that are used by
 [cols="^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2024.1  | 5.4.x | 8.15.5 | 6.2.x
-| 2024.0  | 5.3.1 | 8.13.4 | 6.1.x
-| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x
+| 2025.0 | 5.5.x | 8.18.1 | 6.2.x
+| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
+| 2024.0 | 5.3.xfootnote:oom[Out of maintenance] | 8.13.4 | 6.1.x
+| 2023.1 (Vaughan) | 5.2.xfootnote:oom[] | 8.11.1 | 6.1.x
 | 2023.0 (Ullmann) | 5.1.xfootnote:oom[] | 8.7.1 | 6.0.x
 | 2022.0 (Turing) | 5.0.xfootnote:oom[] | 8.5.3 | 6.0.x
 | 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x

src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.4-5.5.adoc

@@ -0,0 +1,30 @@
+[[elasticsearch-migration-guide-5.4-5.5]]
+= Upgrading from 5.4.x to 5.5.x
+
+This section describes breaking changes from version 5.4.x to 5.5.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.4-5.5.breaking-changes]]
+== Breaking Changes
+
+[[elasticsearch-migration-guide-5.4-5.5.deprecations]]
+== Deprecations
+
+Some classes that probably are not used by a library user have been renamed, the classes with the old names are still there, but are deprecated:
+
+|===
+|old name|new name
+
+|ElasticsearchPartQuery|RepositoryPartQuery
+|ElasticsearchStringQuery|RepositoryStringQuery
+|ReactiveElasticsearchStringQuery|ReactiveRepositoryStringQuery
+|===
+
+=== Removals
+
+The following methods that had been deprecated since release 5.3 have been removed:
+```
+DocumentOperations.delete(Query, Class<?>)
+DocumentOperations.delete(Query, Class<?>, IndexCoordinates)
+ReactiveDocumentOperations.delete(Query, Class<?>)
+ReactiveDocumentOperations.delete(Query, Class<?>, IndexCoordinates)
+```

src/main/java/org/springframework/data/elasticsearch/annotations/SearchTemplateQuery.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import org.springframework.data.annotation.QueryAnnotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to mark a repository method as a search template method. The annotation defines the search template id,
+ * the parameters for the search template are taken from the method's arguments.
+ *
+ * @author P.J. Meisch (pj.meisch@sothawo.com)
+ * @since 5.5
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Documented
+@QueryAnnotation
+public @interface SearchTemplateQuery {
+    /**
+     * The id of the search template. Must not be empt or null.
+     */
+    String id();
+}

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

@@ -18,6 +18,8 @@ package org.springframework.data.elasticsearch.client.elc;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.transport.ElasticsearchTransport;
 
+import java.io.IOException;
+
 import org.elasticsearch.client.RestClient;
 import org.springframework.util.Assert;
 
@@ -36,7 +38,10 @@ public class AutoCloseableElasticsearchClient extends ElasticsearchClient implem
 	}
 
 	@Override
-	public void close() throws Exception {
-		transport.close();
+	public void close() throws IOException {
+		// since Elasticsearch 8.16 the ElasticsearchClient implements (through ApiClient) the Closeable interface and
+		// handles closing of the underlying transport. We now just call the base class, but keep this as we
+		// have been implementing AutoCloseable since 4.4 and won't change that to a mere Closeable
+		super.close();
 	}
 }

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

@@ -329,7 +329,7 @@ public final class ElasticsearchClients {
 		Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
 
 		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
-				: new RestClientOptions(RequestOptions.DEFAULT).toBuilder();
+				: new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder();
 
 		RestClientOptions.Builder restClientOptionsBuilder = getRestClientOptionsBuilder(transportOptions);
 

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

@@ -135,6 +135,6 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
 	 * @return the options that should be added to every request. Must not be {@literal null}
 	 */
 	public TransportOptions transportOptions() {
-		return new RestClientOptions(RequestOptions.DEFAULT);
+		return new RestClientOptions(RequestOptions.DEFAULT, false);
 	}
 }

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

@@ -181,19 +181,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		return delete(query, clazz, getIndexCoordinatesFor(clazz));
 	}
 
-	@Override
-	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
-
-		Assert.notNull(query, "query must not be null");
-
-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
-				clazz, index, getRefreshPolicy());
-
-		DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));
-
-		return responseConverter.byQueryResponse(response);
-	}
-
 	@Override
 	public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinates index) {
 		Assert.notNull(query, "query must not be null");

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

@@ -27,6 +27,7 @@ import co.elastic.clients.transport.endpoints.EndpointWithResponseMapperAttr;
 import co.elastic.clients.util.ObjectBuilder;
 import reactor.core.publisher.Mono;
 
+import java.io.IOException;
 import java.util.function.Function;
 
 import org.springframework.lang.Nullable;
@@ -56,8 +57,11 @@ public class ReactiveElasticsearchClient extends ApiClient<ElasticsearchTranspor
 	}
 
 	@Override
-	public void close() throws Exception {
-		transport.close();
+	public void close() throws IOException {
+		// since Elasticsearch 8.16 the ElasticsearchClient implements (through ApiClient) the Closeable interface and
+		// handles closing of the underlying transport. We now just call the base class, but keep this as we
+		// have been implementing AutoCloseable since 4.4 and won't change that to a mere Closeable
+		super.close();
 	}
 
 	// region child clients
@@ -127,7 +131,8 @@ public class ReactiveElasticsearchClient extends ApiClient<ElasticsearchTranspor
 		// java.lang.Class<TDocument>)
 		// noinspection unchecked
 		JsonEndpoint<GetRequest, GetResponse<T>, ErrorResponse> endpoint = (JsonEndpoint<GetRequest, GetResponse<T>, ErrorResponse>) GetRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint, "co.elastic.clients:Deserializer:_global.get.Response.TDocument",
+		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
+				"co.elastic.clients:Deserializer:_global.get.Response.TDocument",
 				getDeserializer(tClass));
 
 		return Mono.fromFuture(transport.performRequestAsync(request, endpoint, transportOptions));
@@ -172,7 +177,8 @@ public class ReactiveElasticsearchClient extends ApiClient<ElasticsearchTranspor
 
 		// noinspection unchecked
 		JsonEndpoint<MgetRequest, MgetResponse<T>, ErrorResponse> endpoint = (JsonEndpoint<MgetRequest, MgetResponse<T>, ErrorResponse>) MgetRequest._ENDPOINT;
-		endpoint = new EndpointWithResponseMapperAttr<>(endpoint, "co.elastic.clients:Deserializer:_global.mget.Response.TDocument",
+		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
+				"co.elastic.clients:Deserializer:_global.mget.Response.TDocument",
 				this.getDeserializer(clazz));
 
 		return Mono.fromFuture(transport.performRequestAsync(request, endpoint, transportOptions));

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

@@ -125,6 +125,6 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
 	 * @return the options that should be added to every request. Must not be {@literal null}
 	 */
 	public TransportOptions transportOptions() {
-		return new RestClientOptions(RequestOptions.DEFAULT).toBuilder().build();
+		return new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder().build();
 	}
 }

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

@@ -167,16 +167,6 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 				.onErrorReturn(NoSuchIndexException.class, false);
 	}
 
-	@Override
-	public Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index) {
-
-		Assert.notNull(query, "query must not be null");
-
-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
-				entityType, index, getRefreshPolicy());
-		return Mono.from(execute(client -> client.deleteByQuery(request))).map(responseConverter::byQueryResponse);
-	}
-
 	@Override
 	public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType, IndexCoordinates index) {
 		Assert.notNull(query, "query must not be null");

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

@@ -51,9 +51,11 @@ import co.elastic.clients.elasticsearch.indices.*;
 import co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest;
 import co.elastic.clients.elasticsearch.indices.ExistsRequest;
 import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
+import co.elastic.clients.elasticsearch.sql.query.SqlFormat;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.util.NamedValue;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonParser;
 
@@ -71,6 +73,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -533,17 +536,22 @@ class RequestConverter extends AbstractQueryProcessor {
 	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("json");
-
-			return sqb;
-		});
+		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(SqlFormat.Json));
 	}
 
 	// endregion
@@ -1287,11 +1295,15 @@ class RequestConverter extends AbstractQueryProcessor {
 									.timeout(timeStringMs(query.getTimeout())) //
 							;
 
-							if (query.getPageable().isPaged()) {
-								bb //
-										.from((int) query.getPageable().getOffset()) //
-										.size(query.getPageable().getPageSize());
-							}
+							var offset = query.getPageable().isPaged() ? query.getPageable().getOffset() : 0;
+							var pageSize = query.getPageable().isPaged() ? query.getPageable().getPageSize()
+									: INDEX_MAX_RESULT_WINDOW;
+							// if we have both a page size and a max results, we take the min, this is necessary for
+							// searchForStream to work correctly (#3098) as there the page size defines what is
+							// returned in a single request, and the max result determines the total number of
+							// documents returned
+							var size = query.isLimiting() ? Math.min(pageSize, query.getMaxResults()) : pageSize;
+							bb.from((int) offset).size(size);
 
 							if (!isEmpty(query.getFields())) {
 								bb.fields(fb -> {
@@ -1304,10 +1316,6 @@ class RequestConverter extends AbstractQueryProcessor {
 								bb.storedFields(query.getStoredFields());
 							}
 
-							if (query.isLimiting()) {
-								bb.size(query.getMaxResults());
-							}
-
 							if (query.getMinScore() > 0) {
 								bb.minScore((double) query.getMinScore());
 							}
@@ -1359,9 +1367,14 @@ class RequestConverter extends AbstractQueryProcessor {
 							}
 
 							if (!isEmpty(query.getIndicesBoost())) {
-								bb.indicesBoost(query.getIndicesBoost().stream()
-										.map(indexBoost -> Map.of(indexBoost.getIndexName(), (double) indexBoost.getBoost()))
-										.collect(Collectors.toList()));
+								Stream<NamedValue<Double>> namedValueStream = query.getIndicesBoost().stream()
+										.map(indexBoost -> {
+											var namedValue = new NamedValue(indexBoost.getIndexName(),
+													Float.valueOf(indexBoost.getBoost()).doubleValue());
+											return namedValue;
+										});
+								List<NamedValue<Double>> namedValueList = namedValueStream.collect(Collectors.toList());
+								bb.indicesBoost(namedValueList);
 							}
 
 							query.getScriptedFields().forEach(scriptedField -> bb.scriptFields(scriptedField.getFieldName(),
@@ -1460,13 +1473,14 @@ class RequestConverter extends AbstractQueryProcessor {
 			builder.seqNoPrimaryTerm(true);
 		}
 
-		if (query.getPageable().isPaged()) {
-			builder //
-					.from((int) query.getPageable().getOffset()) //
-					.size(query.getPageable().getPageSize());
-		} else {
-			builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
-		}
+		var offset = query.getPageable().isPaged() ? query.getPageable().getOffset() : 0;
+		var pageSize = query.getPageable().isPaged() ? query.getPageable().getPageSize() : INDEX_MAX_RESULT_WINDOW;
+		// if we have both a page size and a max results, we take the min, this is necessary for
+		// searchForStream to work correctly (#3098) as there the page size defines what is
+		// returned in a single request, and the max result determines the total number of
+		// documents returned
+		var size = query.isLimiting() ? Math.min(pageSize, query.getMaxResults()) : pageSize;
+		builder.from((int) offset).size(size);
 
 		if (!isEmpty(query.getFields())) {
 			var fieldAndFormats = query.getFields().stream().map(field -> FieldAndFormat.of(b -> b.field(field))).toList();
@@ -1481,10 +1495,6 @@ class RequestConverter extends AbstractQueryProcessor {
 			addIndicesOptions(builder, query.getIndicesOptions());
 		}
 
-		if (query.isLimiting()) {
-			builder.size(query.getMaxResults());
-		}
-
 		if (query.getMinScore() > 0) {
 			builder.minScore((double) query.getMinScore());
 		}
@@ -1570,9 +1580,14 @@ class RequestConverter extends AbstractQueryProcessor {
 		}
 
 		if (!isEmpty(query.getIndicesBoost())) {
-			builder.indicesBoost(query.getIndicesBoost().stream()
-					.map(indexBoost -> Map.of(indexBoost.getIndexName(), (double) indexBoost.getBoost()))
-					.collect(Collectors.toList()));
+			Stream<NamedValue<Double>> namedValueStream = query.getIndicesBoost().stream()
+					.map(indexBoost -> {
+						var namedValue = new NamedValue(indexBoost.getIndexName(),
+								Float.valueOf(indexBoost.getBoost()).doubleValue());
+						return namedValue;
+					});
+			List<NamedValue<Double>> namedValueList = namedValueStream.collect(Collectors.toList());
+			builder.indicesBoost(namedValueList);
 		}
 
 		if (!isEmpty(query.getDocValueFields())) {
@@ -2014,9 +2029,12 @@ class RequestConverter extends AbstractQueryProcessor {
 	private SourceConfig getSourceConfig(Query query) {
 
 		if (query.getSourceFilter() != null) {
-			return SourceConfig.of(s -> s //
-					.filter(sfb -> {
-						SourceFilter sourceFilter = query.getSourceFilter();
+			return SourceConfig.of(s -> {
+				SourceFilter sourceFilter = query.getSourceFilter();
+				if (sourceFilter.fetchSource() != null) {
+					s.fetch(sourceFilter.fetchSource());
+				} else {
+					s.filter(sfb -> {
 						String[] includes = sourceFilter.getIncludes();
 						String[] excludes = sourceFilter.getExcludes();
 
@@ -2029,7 +2047,10 @@ class RequestConverter extends AbstractQueryProcessor {
 						}
 
 						return sfb;
-					}));
+					});
+				}
+				return s;
+			});
 		} else {
 			return null;
 		}

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

@@ -92,7 +92,7 @@ class ResponseConverter {
 		return ClusterHealth.builder() //
 				.withActivePrimaryShards(healthResponse.activePrimaryShards()) //
 				.withActiveShards(healthResponse.activeShards()) //
-				.withActiveShardsPercent(Double.parseDouble(healthResponse.activeShardsPercentAsNumber()))//
+				.withActiveShardsPercent(healthResponse.activeShardsPercentAsNumber())//
 				.withClusterName(healthResponse.clusterName()) //
 				.withDelayedUnassignedShards(healthResponse.delayedUnassignedShards()) //
 				.withInitializingShards(healthResponse.initializingShards()) //
@@ -400,7 +400,6 @@ class ResponseConverter {
 	private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
 		return ReindexResponse.Failure.builder() //
 				.withIndex(failure.index()) //
-				.withType(failure.type()) //
 				.withId(failure.id()) //
 				.withStatus(failure.status())//
 				.withErrorCause(toErrorCause(failure.cause())) //
@@ -411,7 +410,6 @@ class ResponseConverter {
 	private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
 		return ByQueryResponse.Failure.builder() //
 				.withIndex(failure.index()) //
-				.withType(failure.type()) //
 				.withId(failure.id()) //
 				.withStatus(failure.status())//
 				.withErrorCause(toErrorCause(failure.cause())).build();
@@ -500,6 +498,10 @@ class ResponseConverter {
 			builder.withDeleted(response.deleted());
 		}
 
+		if(response.updated() != null) {
+			builder.withUpdated(response.updated());
+		}
+
 		if (response.batches() != null) {
 			builder.withBatches(Math.toIntExact(response.batches()));
 		}

src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java

@@ -298,12 +298,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		return this.delete(id, getIndexCoordinatesFor(entityType));
 	}
 
-	@Override
-	@Deprecated
-	public ByQueryResponse delete(Query query, Class<?> clazz) {
-		return delete(query, clazz, getIndexCoordinatesFor(clazz));
-	}
-
 	@Override
 	public String delete(Object entity) {
 		return delete(entity, getIndexCoordinatesFor(entity.getClass()));

src/main/java/org/springframework/data/elasticsearch/core/AbstractReactiveElasticsearchTemplate.java

@@ -233,6 +233,7 @@ abstract public class AbstractReactiveElasticsearchTemplate
 					.subscribe(new Subscriber<>() {
 						@Nullable private Subscription subscription = null;
 						private final AtomicBoolean upstreamComplete = new AtomicBoolean(false);
+						private final AtomicBoolean onNextHasBeenCalled = new AtomicBoolean(false);
 
 						@Override
 						public void onSubscribe(Subscription subscription) {
@@ -242,6 +243,7 @@ abstract public class AbstractReactiveElasticsearchTemplate
 
 						@Override
 						public void onNext(List<T> entityList) {
+							onNextHasBeenCalled.set(true);
 							saveAll(entityList, index)
 									.map(sink::tryEmitNext)
 									.doOnComplete(() -> {
@@ -267,6 +269,10 @@ abstract public class AbstractReactiveElasticsearchTemplate
 						@Override
 						public void onComplete() {
 							upstreamComplete.set(true);
+							if (!onNextHasBeenCalled.get()) {
+								// this happens when an empty flux is saved
+								sink.tryEmitComplete();
+							}
 						}
 					});
 			return sink.asFlux();
@@ -408,12 +414,6 @@ abstract public class AbstractReactiveElasticsearchTemplate
 
 	abstract protected Mono<String> doDeleteById(String id, @Nullable String routing, IndexCoordinates index);
 
-	@Override
-	@Deprecated
-	public Mono<ByQueryResponse> delete(Query query, Class<?> entityType) {
-		return delete(query, entityType, getIndexCoordinatesFor(entityType));
-	}
-
 	@Override
 	public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType) {
 		return delete(query, entityType, getIndexCoordinatesFor(entityType));

src/main/java/org/springframework/data/elasticsearch/core/DocumentOperations.java

@@ -272,19 +272,6 @@ public interface DocumentOperations {
 	 */
 	String delete(Object entity, IndexCoordinates index);
 
-	/**
-	 * Delete all records matching the query.
-	 *
-	 * @param query query defining the objects
-	 * @param clazz The entity class, must be annotated with
-	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
-	 * @return response with detailed information
-	 * @since 4.1
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
-	 */
-	@Deprecated
-	ByQueryResponse delete(Query query, Class<?> clazz);
-
 	/**
 	 * Delete all records matching the query.
 	 *
@@ -296,19 +283,6 @@ public interface DocumentOperations {
 	 */
 	ByQueryResponse delete(DeleteQuery query, Class<?> clazz);
 
-	/**
-	 * Delete all records matching the query.
-	 *
-	 * @param query query defining the objects
-	 * @param clazz The entity class, must be annotated with
-	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
-	 * @param index the index from which to delete
-	 * @return response with detailed information
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index);
-
 	/**
 	 * Delete all records matching the query.
 	 *

src/main/java/org/springframework/data/elasticsearch/core/ReactiveDocumentOperations.java

@@ -326,17 +326,6 @@ public interface ReactiveDocumentOperations {
 	 */
 	Mono<String> delete(String id, Class<?> entityType);
 
-	/**
-	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @return a {@link Mono} emitting the number of the removed documents.
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
-	 */
-	@Deprecated
-	Mono<ByQueryResponse> delete(Query query, Class<?> entityType);
-
 	/**
 	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
 	 *
@@ -347,18 +336,6 @@ public interface ReactiveDocumentOperations {
 	 */
 	Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType);
 
-	/**
-	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param entityType must not be {@literal null}.
-	 * @param index the target index, must not be {@literal null}
-	 * @return a {@link Mono} emitting the number of the removed documents.
-	 * @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
-	 */
-	@Deprecated
-	Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index);
-
 	/**
 	 * Delete the documents matching the given {@link Query} extracting index from entity metadata.
 	 *

src/main/java/org/springframework/data/elasticsearch/core/convert/DateFormatter.java

@@ -19,14 +19,14 @@ import java.time.temporal.TemporalAccessor;
 
 /**
  * Interface to convert from and to {@link TemporalAccessor}s.
- * 
+ *
  * @author Peter-Josef Meisch
  * @since 4.2
  */
 public interface DateFormatter {
 	/**
 	 * Formats a {@link TemporalAccessor} into a String.
-	 * 
+	 *
 	 * @param accessor must not be {@literal null}
 	 * @return the formatted String
 	 */
@@ -34,7 +34,7 @@ public interface DateFormatter {
 
 	/**
 	 * Parses a String into a {@link TemporalAccessor}.
-	 * 
+	 *
 	 * @param input the String to parse, must not be {@literal null}
 	 * @param type the class of T
 	 * @param <T> the {@link TemporalAccessor} implementation

src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

@@ -38,6 +38,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.core.env.EnvironmentCapable;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.ScriptedField;
 import org.springframework.data.elasticsearch.core.document.Document;
@@ -50,6 +51,7 @@ import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
 import org.springframework.data.elasticsearch.core.query.Field;
+import org.springframework.data.elasticsearch.core.query.Order;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
 import org.springframework.data.elasticsearch.core.query.SourceFilter;
@@ -392,7 +394,7 @@ public class MappingElasticsearchConverter
 				}
 
 				if (source instanceof SearchDocument searchDocument) {
-					populateScriptFields(targetEntity, result, searchDocument);
+					populateScriptedFields(targetEntity, result, searchDocument);
 				}
 				return result;
 			} catch (ConversionException e) {
@@ -650,7 +652,16 @@ public class MappingElasticsearchConverter
 			return conversionService.convert(value, target);
 		}
 
-		private <T> void populateScriptFields(ElasticsearchPersistentEntity<?> entity, T result,
+		/**
+		 * Checks if any of the properties of the entity is annotated with
+		 *
+		 * @{@link ScriptedField}. If so, the value of this property is set from the returned fields in the document.
+		 * @param entity the entity to defining the persistent property
+		 * @param result the rsult to populate
+		 * @param searchDocument the search result caontaining the fields
+		 * @param <T> the result type
+		 */
+		private <T> void populateScriptedFields(ElasticsearchPersistentEntity<?> entity, T result,
 				SearchDocument searchDocument) {
 			Map<String, List<Object>> fields = searchDocument.getFields();
 			entity.doWithProperties((SimplePropertyHandler) property -> {
@@ -659,8 +670,13 @@ public class MappingElasticsearchConverter
 					// noinspection ConstantConditions
 					String name = scriptedField.name().isEmpty() ? property.getName() : scriptedField.name();
 					if (fields.containsKey(name)) {
-						Object value = searchDocument.getFieldValue(name);
-						entity.getPropertyAccessor(result).setProperty(property, value);
+						if (property.isCollectionLike()) {
+							List<Object> values = searchDocument.getFieldValues(name);
+							entity.getPropertyAccessor(result).setProperty(property, values);
+						} else {
+							Object value = searchDocument.getFieldValue(name);
+							entity.getPropertyAccessor(result).setProperty(property, value);
+						}
 					}
 				}
 			});
@@ -1231,7 +1247,7 @@ public class MappingElasticsearchConverter
 			return;
 		}
 
-		updatePropertiesInFieldsAndSourceFilter(query, domainClass);
+		updatePropertiesInFieldsSortAndSourceFilter(query, domainClass);
 
 		if (query instanceof CriteriaQuery criteriaQuery) {
 			updatePropertiesInCriteriaQuery(criteriaQuery, domainClass);
@@ -1242,7 +1258,14 @@ public class MappingElasticsearchConverter
 		}
 	}
 
-	private void updatePropertiesInFieldsAndSourceFilter(Query query, Class<?> domainClass) {
+	/**
+	 * replaces the names of fields in the query, the sort or soucre filters with the field names used in Elasticsearch
+	 * when they are defined on the ElasticsearchProperties
+	 *
+	 * @param query the query to process
+	 * @param domainClass the domain class (persistent entity)
+	 */
+	private void updatePropertiesInFieldsSortAndSourceFilter(Query query, Class<?> domainClass) {
 
 		ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(domainClass);
 
@@ -1250,12 +1273,12 @@ public class MappingElasticsearchConverter
 			List<String> fields = query.getFields();
 
 			if (!fields.isEmpty()) {
-				query.setFields(updateFieldNames(fields, persistentEntity));
+				query.setFields(propertyToFieldNames(fields, persistentEntity));
 			}
 
 			List<String> storedFields = query.getStoredFields();
 			if (!CollectionUtils.isEmpty(storedFields)) {
-				query.setStoredFields(updateFieldNames(storedFields, persistentEntity));
+				query.setStoredFields(propertyToFieldNames(storedFields, persistentEntity));
 			}
 
 			SourceFilter sourceFilter = query.getSourceFilter();
@@ -1266,37 +1289,60 @@ public class MappingElasticsearchConverter
 				String[] excludes = null;
 
 				if (sourceFilter.getIncludes() != null) {
-					includes = updateFieldNames(Arrays.asList(sourceFilter.getIncludes()), persistentEntity)
+					includes = propertyToFieldNames(Arrays.asList(sourceFilter.getIncludes()), persistentEntity)
 							.toArray(new String[] {});
 				}
 
 				if (sourceFilter.getExcludes() != null) {
-					excludes = updateFieldNames(Arrays.asList(sourceFilter.getExcludes()), persistentEntity)
+					excludes = propertyToFieldNames(Arrays.asList(sourceFilter.getExcludes()), persistentEntity)
 							.toArray(new String[] {});
 				}
 
-				query.addSourceFilter(new FetchSourceFilter(includes, excludes));
+				query.addSourceFilter(new FetchSourceFilter(sourceFilter.fetchSource(), includes, excludes));
+			}
+
+			if (query.getSort() != null) {
+				var sort = query.getSort();
+				// stream the orders and map them to a new order with the changed names,
+				// then replace the existing sort with a new sort containing the new orders.
+				var newOrders = sort.stream().map(order -> {
+					var fieldNames = updateFieldNames(order.getProperty(), persistentEntity);
+
+					if (order instanceof Order springDataElasticsearchOrder) {
+						return springDataElasticsearchOrder.withProperty(fieldNames);
+					} else {
+						return new Sort.Order(order.getDirection(),
+								fieldNames,
+								order.isIgnoreCase(),
+								order.getNullHandling());
+					}
+				}).toList();
+
+				if (query instanceof BaseQuery baseQuery) {
+					baseQuery.setSort(Sort.by(newOrders));
+				}
 			}
 		}
 	}
 
 	/**
-	 * relaces the fieldName with the property name of a property of the persistentEntity with the corresponding
-	 * fieldname. If no such property exists, the original fieldName is kept.
+	 * replaces property name of a property of the persistentEntity with the corresponding fieldname. If no such property
+	 * exists, the original fieldName is kept.
 	 *
-	 * @param fieldNames list of fieldnames
+	 * @param propertyNames list of fieldnames
 	 * @param persistentEntity the persistent entity to check
 	 * @return an updated list of field names
 	 */
-	private List<String> updateFieldNames(List<String> fieldNames, ElasticsearchPersistentEntity<?> persistentEntity) {
-		return fieldNames.stream().map(fieldName -> updateFieldName(persistentEntity, fieldName))
+	private List<String> propertyToFieldNames(List<String> propertyNames,
+			ElasticsearchPersistentEntity<?> persistentEntity) {
+		return propertyNames.stream().map(propertyName -> propertyToFieldName(persistentEntity, propertyName))
 				.collect(Collectors.toList());
 	}
 
 	@NotNull
-	private String updateFieldName(ElasticsearchPersistentEntity<?> persistentEntity, String fieldName) {
-		ElasticsearchPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(fieldName);
-		return persistentProperty != null ? persistentProperty.getFieldName() : fieldName;
+	private String propertyToFieldName(ElasticsearchPersistentEntity<?> persistentEntity, String propertyName) {
+		ElasticsearchPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(propertyName);
+		return persistentProperty != null ? persistentProperty.getFieldName() : propertyName;
 	}
 
 	private void updatePropertiesInCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass) {
@@ -1326,15 +1372,85 @@ public class MappingElasticsearchConverter
 			return;
 		}
 
-		String[] fieldNames = field.getName().split("\\.");
+		var propertyNamesUpdate = updatePropertyNames(persistentEntity, field.getName());
+
+		var fieldNames = propertyNamesUpdate.names();
+		field.setName(String.join(".", fieldNames));
+
+		if (propertyNamesUpdate.propertyCount() > 1 && propertyNamesUpdate.nestedProperty()) {
+			List<String> propertyNames = Arrays.asList(fieldNames);
+			field.setPath(String.join(".", propertyNames.subList(0, propertyNamesUpdate.propertyCount - 1)));
+		}
+
+		if (propertyNamesUpdate.persistentProperty != null) {
+
+			if (propertyNamesUpdate.persistentProperty.hasPropertyValueConverter()) {
+				PropertyValueConverter propertyValueConverter = Objects
+						.requireNonNull(propertyNamesUpdate.persistentProperty.getPropertyValueConverter());
+				criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> {
+
+					if (criteriaEntry.getKey().hasValue()) {
+						Object value = criteriaEntry.getValue();
+
+						if (value.getClass().isArray()) {
+							Object[] objects = (Object[]) value;
+
+							for (int i = 0; i < objects.length; i++) {
+								objects[i] = propertyValueConverter.write(objects[i]);
+							}
+						} else {
+							criteriaEntry.setValue(propertyValueConverter.write(value));
+						}
+					}
+				});
+			}
+
+			org.springframework.data.elasticsearch.annotations.Field fieldAnnotation = propertyNamesUpdate.persistentProperty
+					.findAnnotation(org.springframework.data.elasticsearch.annotations.Field.class);
+
+			if (fieldAnnotation != null) {
+				field.setFieldType(fieldAnnotation.type());
+			}
+		}
+	}
+
+	static record PropertyNamesUpdate(
+			String[] names,
+			Boolean nestedProperty,
+			Integer propertyCount,
+			ElasticsearchPersistentProperty persistentProperty) {
+	}
+
+	@Override
+	public String updateFieldNames(String propertyPath, ElasticsearchPersistentEntity<?> persistentEntity) {
+
+		Assert.notNull(propertyPath, "propertyPath must not be null");
+		Assert.notNull(persistentEntity, "persistentEntity must not be null");
+
+		var propertyNamesUpdate = updatePropertyNames(persistentEntity, propertyPath);
+		return String.join(".", propertyNamesUpdate.names());
+	}
+
+	/**
+	 * Parse a propertyPath and replace the path values with the field names from a persistentEntity. path entries not
+	 * found in the entity are kept as they are.
+	 *
+	 * @return the eventually modified names, a flag if a nested entity was encountered the number of processed
+	 *         propertiesand the last processed PersistentProperty.
+	 */
+	PropertyNamesUpdate updatePropertyNames(ElasticsearchPersistentEntity<?> persistentEntity, String propertyPath) {
+
+		String[] propertyNames = propertyPath.split("\\.");
+		String[] fieldNames = Arrays.copyOf(propertyNames, propertyNames.length);
 
 		ElasticsearchPersistentEntity<?> currentEntity = persistentEntity;
 		ElasticsearchPersistentProperty persistentProperty = null;
+
 		int propertyCount = 0;
 		boolean isNested = false;
 
-		for (int i = 0; i < fieldNames.length; i++) {
-			persistentProperty = currentEntity.getPersistentProperty(fieldNames[i]);
+		for (int i = 0; i < propertyNames.length; i++) {
+			persistentProperty = currentEntity.getPersistentProperty(propertyNames[i]);
 
 			if (persistentProperty != null) {
 				propertyCount++;
@@ -1361,77 +1477,8 @@ public class MappingElasticsearchConverter
 			}
 		}
 
-		field.setName(String.join(".", fieldNames));
-
-		if (propertyCount > 1 && isNested) {
-			List<String> propertyNames = Arrays.asList(fieldNames);
-			field.setPath(String.join(".", propertyNames.subList(0, propertyCount - 1)));
-		}
-
-		if (persistentProperty != null) {
-
-			if (persistentProperty.hasPropertyValueConverter()) {
-				PropertyValueConverter propertyValueConverter = Objects
-						.requireNonNull(persistentProperty.getPropertyValueConverter());
-				criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> {
-
-					if (criteriaEntry.getKey().hasValue()) {
-						Object value = criteriaEntry.getValue();
-
-						if (value.getClass().isArray()) {
-							Object[] objects = (Object[]) value;
-
-							for (int i = 0; i < objects.length; i++) {
-								objects[i] = propertyValueConverter.write(objects[i]);
-							}
-						} else {
-							criteriaEntry.setValue(propertyValueConverter.write(value));
-						}
-					}
-				});
-			}
-
-			org.springframework.data.elasticsearch.annotations.Field fieldAnnotation = persistentProperty
-					.findAnnotation(org.springframework.data.elasticsearch.annotations.Field.class);
-
-			if (fieldAnnotation != null) {
-				field.setFieldType(fieldAnnotation.type());
-			}
-		}
+		return new PropertyNamesUpdate(fieldNames, isNested, propertyCount, persistentProperty);
 	}
-
-	@Override
-	public String updateFieldNames(String propertyPath, ElasticsearchPersistentEntity<?> persistentEntity) {
-
-		Assert.notNull(propertyPath, "propertyPath must not be null");
-		Assert.notNull(persistentEntity, "persistentEntity must not be null");
-
-		var properties = propertyPath.split("\\.", 2);
-
-		if (properties.length > 0) {
-			var propertyName = properties[0];
-			var fieldName = updateFieldName(persistentEntity, propertyName);
-
-			if (properties.length > 1) {
-				var persistentProperty = persistentEntity.getPersistentProperty(propertyName);
-
-				if (persistentProperty != null) {
-					ElasticsearchPersistentEntity<?> nestedPersistentEntity = mappingContext
-							.getPersistentEntity(persistentProperty);
-					if (nestedPersistentEntity != null) {
-						return fieldName + '.' + updateFieldNames(properties[1], nestedPersistentEntity);
-					} else {
-						return fieldName;
-					}
-				}
-			}
-			return fieldName;
-		} else {
-			return propertyPath;
-		}
-
-	}
-
 	// endregion
 
 	@SuppressWarnings("ClassCanBeRecord")

src/main/java/org/springframework/data/elasticsearch/core/document/SearchDocument.java

@@ -57,6 +57,20 @@ public interface SearchDocument extends Document {
 		return (V) values.get(0);
 	}
 
+	/**
+	 * @param name the field name
+	 * @param <V> the type of elements
+	 * @return the values of the given field.
+	 */
+	@Nullable
+	default <V> List<V> getFieldValues(final String name) {
+		List<Object> values = getFields().get(name);
+		if (values == null) {
+			return null;
+		}
+		return (List<V>) values;
+	}
+
 	/**
 	 * @return the sort values for the search hit
 	 */

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoJson.java

@@ -21,7 +21,7 @@ import org.springframework.data.elasticsearch.core.document.Document;
 
 /**
  * Interface definition for structures defined in <a href="https://geojson.org">GeoJSON</a>
- * format. copied from Spring  Data Mongodb
+ * format. copied from Spring Data Mongodb
  *
  * @author Christoph Strobl
  * @since 1.7

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoJsonLineString.java

@@ -69,7 +69,7 @@ public class GeoJsonLineString implements GeoJson<Iterable<Point>> {
 		Assert.notNull(second, "Second point must not be null!");
 		Assert.notNull(others, "Additional points must not be null!");
 
-		List<Point> points = new ArrayList<>();
+		List<Point> points = new ArrayList<>(2 + others.length);
 		points.add(first);
 		points.add(second);
 		points.addAll(Arrays.asList(others));
@@ -103,7 +103,7 @@ public class GeoJsonLineString implements GeoJson<Iterable<Point>> {
 		Assert.notNull(second, "Second point must not be null!");
 		Assert.notNull(others, "Additional points must not be null!");
 
-		List<Point> points = new ArrayList<>();
+		List<Point> points = new ArrayList<>(2 + others.length);
 		points.add(GeoPoint.toPoint(first));
 		points.add(GeoPoint.toPoint(second));
 		points.addAll(Arrays.stream(others).map(GeoPoint::toPoint).collect(Collectors.toList()));

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoJsonMultiPoint.java

@@ -69,7 +69,7 @@ public class GeoJsonMultiPoint implements GeoJson<Iterable<Point>> {
 		Assert.notNull(second, "Second point must not be null!");
 		Assert.notNull(others, "Additional points must not be null!");
 
-		List<Point> points = new ArrayList<>();
+		List<Point> points = new ArrayList<>(2 + others.length);
 		points.add(first);
 		points.add(second);
 		points.addAll(Arrays.asList(others));
@@ -103,7 +103,7 @@ public class GeoJsonMultiPoint implements GeoJson<Iterable<Point>> {
 		Assert.notNull(second, "Second point must not be null!");
 		Assert.notNull(others, "Additional points must not be null!");
 
-		List<Point> points = new ArrayList<>();
+		List<Point> points = new ArrayList<>(2 + others.length);
 		points.add(GeoPoint.toPoint(first));
 		points.add(GeoPoint.toPoint(second));
 		points.addAll(Arrays.stream(others).map(GeoPoint::toPoint).collect(Collectors.toList()));

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoJsonPolygon.java

@@ -189,7 +189,13 @@ public class GeoJsonPolygon implements GeoJson<Iterable<GeoJsonLineString>> {
 	@SafeVarargs
 	private static <T> List<T> asList(T first, T second, T third, T fourth, T... others) {
 
-		ArrayList<T> result = new ArrayList<>(3 + others.length);
+		Assert.notNull(first, "First element must not be null!");
+		Assert.notNull(second, "Second element must not be null!");
+		Assert.notNull(third, "Third element must not be null!");
+		Assert.notNull(fourth, "Fourth element must not be null!");
+		Assert.notNull(others, "Additional elements must not be null!");
+
+		ArrayList<T> result = new ArrayList<>(4 + others.length);
 
 		result.add(first);
 		result.add(second);

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

@@ -167,7 +167,6 @@ public class ByQueryResponse {
 	public static class Failure {
 
 		@Nullable private final String index;
-		@Nullable private final String type;
 		@Nullable private final String id;
 		@Nullable private final Exception cause;
 		@Nullable private final Integer status;
@@ -176,11 +175,10 @@ public class ByQueryResponse {
 		@Nullable private final Boolean aborted;
 		@Nullable private final ElasticsearchErrorCause elasticsearchErrorCause;
 
-		private Failure(@Nullable String index, @Nullable String type, @Nullable String id, @Nullable Exception cause,
+		private Failure(@Nullable String index, @Nullable String id, @Nullable Exception cause,
 				@Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted,
 				@Nullable ElasticsearchErrorCause elasticsearchErrorCause) {
 			this.index = index;
-			this.type = type;
 			this.id = id;
 			this.cause = cause;
 			this.status = status;
@@ -195,11 +193,6 @@ public class ByQueryResponse {
 			return index;
 		}
 
-		@Nullable
-		public String getType() {
-			return type;
-		}
-
 		@Nullable
 		public String getId() {
 			return id;
@@ -250,7 +243,6 @@ public class ByQueryResponse {
 		 */
 		public static final class FailureBuilder {
 			@Nullable private String index;
-			@Nullable private String type;
 			@Nullable private String id;
 			@Nullable private Exception cause;
 			@Nullable private Integer status;
@@ -266,11 +258,6 @@ public class ByQueryResponse {
 				return this;
 			}
 
-			public FailureBuilder withType(String type) {
-				this.type = type;
-				return this;
-			}
-
 			public FailureBuilder withId(String id) {
 				this.id = id;
 				return this;
@@ -307,7 +294,7 @@ public class ByQueryResponse {
 			}
 
 			public Failure build() {
-				return new Failure(index, type, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
+				return new Failure(index, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
 			}
 		}
 	}

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

@@ -22,6 +22,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
@@ -859,6 +860,7 @@ public class Criteria {
 
 	// endregion
 
+	// region equals/hashcode
 	@Override
 	public boolean equals(Object o) {
 		if (this == o)
@@ -874,6 +876,8 @@ public class Criteria {
 			return false;
 		if (!Objects.equals(field, criteria.field))
 			return false;
+		if (!criteriaChain.filter(this).equals(criteria.criteriaChain.filter(criteria)))
+			return false;
 		if (!queryCriteriaEntries.equals(criteria.queryCriteriaEntries))
 			return false;
 		if (!filterCriteriaEntries.equals(criteria.filterCriteriaEntries))
@@ -886,11 +890,16 @@ public class Criteria {
 		int result = field != null ? field.hashCode() : 0;
 		result = 31 * result + (boost != +0.0f ? Float.floatToIntBits(boost) : 0);
 		result = 31 * result + (negating ? 1 : 0);
+		// the criteriaChain contains "this" object, so we need to filter it out
+		// to avoid a stackoverflow here, because the hashcode implementation
+		// uses the element's hashcodes
+		result = 31 * result + criteriaChain.filter(this).hashCode();
 		result = 31 * result + queryCriteriaEntries.hashCode();
 		result = 31 * result + filterCriteriaEntries.hashCode();
 		result = 31 * result + subCriteria.hashCode();
 		return result;
 	}
+	// endregion
 
 	@Override
 	public String toString() {
@@ -938,7 +947,17 @@ public class Criteria {
 	 *
 	 * @since 4.1
 	 */
-	public static class CriteriaChain extends LinkedList<Criteria> {}
+	public static class CriteriaChain extends LinkedList<Criteria> {
+		/**
+		 * return a copy of this list with the given element filtered out.
+		 *
+		 * @param criteria the element to filter
+		 * @return the filtered list
+		 */
+		List<Criteria> filter(Criteria criteria) {
+			return this.stream().filter(c -> c != criteria).collect(Collectors.toList());
+		}
+	}
 
 	/**
 	 * Operator to join the entries of the criteria chain

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

@@ -28,14 +28,16 @@ import org.springframework.util.Assert;
  */
 public class FetchSourceFilter implements SourceFilter {
 
+	@Nullable private final Boolean fetchSource;
 	@Nullable private final String[] includes;
 	@Nullable private final String[] excludes;
 
 	/**
 	 * @since 5.2
 	 */
-	public static SourceFilter of(@Nullable final String[] includes, @Nullable final String[] excludes) {
-		return new FetchSourceFilter(includes, excludes);
+	public static SourceFilter of(@Nullable Boolean fetchSource, @Nullable final String[] includes,
+			@Nullable final String[] excludes) {
+		return new FetchSourceFilter(fetchSource, includes, excludes);
 	}
 
 	/**
@@ -48,11 +50,18 @@ public class FetchSourceFilter implements SourceFilter {
 		return builderFunction.apply(new FetchSourceFilterBuilder()).build();
 	}
 
-	public FetchSourceFilter(@Nullable final String[] includes, @Nullable final String[] excludes) {
+	public FetchSourceFilter(@Nullable Boolean fetchSource, @Nullable final String[] includes,
+			@Nullable final String[] excludes) {
+		this.fetchSource = fetchSource;
 		this.includes = includes;
 		this.excludes = excludes;
 	}
 
+	@Override
+	public Boolean fetchSource() {
+		return fetchSource;
+	}
+
 	@Override
 	public String[] getIncludes() {
 		return includes;

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

@@ -25,6 +25,7 @@ import org.springframework.lang.Nullable;
  */
 public class FetchSourceFilterBuilder {
 
+	@Nullable private Boolean fetchSource;
 	@Nullable private String[] includes;
 	@Nullable private String[] excludes;
 
@@ -38,12 +39,17 @@ public class FetchSourceFilterBuilder {
 		return this;
 	}
 
+	public FetchSourceFilterBuilder withFetchSource(Boolean fetchSource) {
+		this.fetchSource = fetchSource;
+		return this;
+	}
+
 	public SourceFilter build() {
 		if (includes == null)
 			includes = new String[0];
 		if (excludes == null)
 			excludes = new String[0];
 
-		return new FetchSourceFilter(includes, excludes);
+		return new FetchSourceFilter(fetchSource, includes, excludes);
 	}
 }

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

@@ -54,6 +54,13 @@ public class IndexQuery {
 		this.indexName = indexName;
 	}
 
+	/**
+	 * @since 5.5
+	 */
+	public static IndexQueryBuilder builder() {
+		return new IndexQueryBuilder();
+	}
+
 	@Nullable
 	public String getId() {
 		return id;

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

@@ -15,22 +15,22 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import org.springframework.lang.Nullable;
-
 import java.util.Map;
 
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.lang.Nullable;
+
 /**
  * @author Peter-Josef Meisch
  * @since 5.1
  */
 public class SearchTemplateQueryBuilder extends BaseQueryBuilder<SearchTemplateQuery, SearchTemplateQueryBuilder> {
 
-	@Nullable
-	private String id;
+	@Nullable private String id;
 	@Nullable String source;
 
-	@Nullable
-	Map<String, Object> params;
+	@Nullable Map<String, Object> params;
 
 	@Nullable
 	public String getId() {
@@ -62,6 +62,18 @@ public class SearchTemplateQueryBuilder extends BaseQueryBuilder<SearchTemplateQ
 		return this;
 	}
 
+	@Override
+	public SearchTemplateQueryBuilder withSort(Sort sort) {
+		throw new IllegalArgumentException(
+				"sort is not supported in a searchtemplate query. Sort values must be defined in the stored template");
+	}
+
+	@Override
+	public SearchTemplateQueryBuilder withPageable(Pageable pageable) {
+		throw new IllegalArgumentException(
+				"paging is not supported in a searchtemplate query. from and size values must be defined in the stored template");
+	}
+
 	@Override
 	public SearchTemplateQuery build() {
 		return new SearchTemplateQuery(this);

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

@@ -20,7 +20,7 @@ import org.springframework.lang.Nullable;
 
 /**
  * SourceFilter for providing includes and excludes. Using these helps in reducing the amount of data that is returned
- * from Elasticsearch especially when the stored docuements are large and only some fields from these documents are
+ * from Elasticsearch especially when the stored documents are large and only some fields from these documents are
  * needed. If the SourceFilter includes the name of a property that has a different name mapped in Elasticsearch (see
  * {@link Field#name()} this will automatically be mapped.
  *
@@ -40,4 +40,15 @@ public interface SourceFilter {
 	 */
 	@Nullable
 	String[] getExcludes();
+
+	/**
+	 * Flag to set the _source parameter in a query to true or false. If this is not null, the values returned from
+	 * getIncludes() and getExcludes() are ignored
+	 *
+	 * @since 5.5
+	 */
+	@Nullable
+	default Boolean fetchSource() {
+		return null;
+	}
 }

src/main/java/org/springframework/data/elasticsearch/core/query/highlight/HighlightCommonParameters.java

@@ -80,6 +80,10 @@ public abstract class HighlightCommonParameters {
 		return boundaryScannerLocale;
 	}
 
+	/**
+	 * @deprecated the underlying functionality is deprecated since Elasticsearch 8.8.
+	 */
+	@Deprecated(since = "5.5")
 	public boolean getForceSource() {
 		return forceSource;
 	}
@@ -173,6 +177,10 @@ public abstract class HighlightCommonParameters {
 			return (SELF) this;
 		}
 
+		/**
+		 * @deprecated the underlying functionality is deprecated since Elasticsearch 8.8.
+		 */
+		@Deprecated(since = "5.5")
 		public SELF withForceSource(boolean forceSource) {
 			this.forceSource = forceSource;
 			return (SELF) this;

src/main/java/org/springframework/data/elasticsearch/core/reindex/ReindexResponse.java

@@ -187,7 +187,6 @@ public class ReindexResponse {
 	public static class Failure {
 
 		@Nullable private final String index;
-		@Nullable private final String type;
 		@Nullable private final String id;
 		@Nullable private final Exception cause;
 		@Nullable private final Integer status;
@@ -196,11 +195,10 @@ public class ReindexResponse {
 		@Nullable private final Boolean aborted;
 		@Nullable private final ElasticsearchErrorCause elasticsearchErrorCause;
 
-		private Failure(@Nullable String index, @Nullable String type, @Nullable String id, @Nullable Exception cause,
+		private Failure(@Nullable String index, @Nullable String id, @Nullable Exception cause,
 				@Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted,
 				@Nullable ElasticsearchErrorCause elasticsearchErrorCause) {
 			this.index = index;
-			this.type = type;
 			this.id = id;
 			this.cause = cause;
 			this.status = status;
@@ -215,11 +213,6 @@ public class ReindexResponse {
 			return index;
 		}
 
-		@Nullable
-		public String getType() {
-			return type;
-		}
-
 		@Nullable
 		public String getId() {
 			return id;
@@ -269,7 +262,6 @@ public class ReindexResponse {
 		 */
 		public static final class FailureBuilder {
 			@Nullable private String index;
-			@Nullable private String type;
 			@Nullable private String id;
 			@Nullable private Exception cause;
 			@Nullable private Integer status;
@@ -285,11 +277,6 @@ public class ReindexResponse {
 				return this;
 			}
 
-			public Failure.FailureBuilder withType(String type) {
-				this.type = type;
-				return this;
-			}
-
 			public Failure.FailureBuilder withId(String id) {
 				this.id = id;
 				return this;
@@ -326,7 +313,7 @@ public class ReindexResponse {
 			}
 
 			public Failure build() {
-				return new Failure(index, type, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
+				return new Failure(index, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
 			}
 		}
 	}

src/main/java/org/springframework/data/elasticsearch/repository/query/AbstractElasticsearchRepositoryQuery.java

@@ -24,9 +24,10 @@ import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BaseQuery;
 import org.springframework.data.elasticsearch.core.query.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.core.query.SearchTemplateQuery;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.util.StreamUtils;
@@ -49,11 +50,11 @@ public abstract class AbstractElasticsearchRepositoryQuery implements Repository
 	protected ElasticsearchQueryMethod queryMethod;
 	protected final ElasticsearchOperations elasticsearchOperations;
 	protected final ElasticsearchConverter elasticsearchConverter;
-	protected final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	protected final ValueEvaluationContextProvider evaluationContextProvider;
 
 	public AbstractElasticsearchRepositoryQuery(ElasticsearchQueryMethod queryMethod,
 			ElasticsearchOperations elasticsearchOperations,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueEvaluationContextProvider evaluationContextProvider) {
 
 		Assert.notNull(queryMethod, "queryMethod must not be null");
 		Assert.notNull(elasticsearchOperations, "elasticsearchOperations must not be null");
@@ -114,11 +115,15 @@ public abstract class AbstractElasticsearchRepositoryQuery implements Repository
 					: PageRequest.of(0, DEFAULT_STREAM_BATCH_SIZE));
 			result = StreamUtils.createStreamFromIterator(elasticsearchOperations.searchForStream(query, clazz, index));
 		} else if (queryMethod.isCollectionQuery()) {
-			if (parameterAccessor.getPageable().isUnpaged()) {
-				int itemCount = (int) elasticsearchOperations.count(query, clazz, index);
-				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
+			if (query instanceof SearchTemplateQuery) {
+				// we cannot get a count here, from and size would be in the template
 			} else {
-				query.setPageable(parameterAccessor.getPageable());
+				if (parameterAccessor.getPageable().isUnpaged()) {
+					int itemCount = (int) elasticsearchOperations.count(query, clazz, index);
+					query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
+				} else {
+					query.setPageable(parameterAccessor.getPageable());
+				}
 			}
 			result = elasticsearchOperations.search(query, clazz, index);
 		} else {
@@ -137,7 +142,8 @@ public abstract class AbstractElasticsearchRepositoryQuery implements Repository
 		var query = createQuery(parameterAccessor);
 		Assert.notNull(query, "unsupported query");
 
-		queryMethod.addMethodParameter(query, parameterAccessor, elasticsearchOperations.getElasticsearchConverter(),
+		queryMethod.addSpecialMethodParameters(query, parameterAccessor,
+				elasticsearchOperations.getElasticsearchConverter(),
 				evaluationContextProvider);
 
 		return query;

src/main/java/org/springframework/data/elasticsearch/repository/query/AbstractReactiveElasticsearchRepositoryQuery.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
+import org.springframework.data.expression.ValueEvaluationContextProvider;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -52,11 +53,11 @@ abstract class AbstractReactiveElasticsearchRepositoryQuery implements Repositor
 
 	protected final ReactiveElasticsearchQueryMethod queryMethod;
 	private final ReactiveElasticsearchOperations elasticsearchOperations;
-	protected final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	protected final ValueEvaluationContextProvider evaluationContextProvider;
 
 	AbstractReactiveElasticsearchRepositoryQuery(ReactiveElasticsearchQueryMethod queryMethod,
 			ReactiveElasticsearchOperations elasticsearchOperations,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+												 ValueEvaluationContextProvider evaluationContextProvider) {
 
 		Assert.notNull(queryMethod, "queryMethod must not be null");
 		Assert.notNull(elasticsearchOperations, "elasticsearchOperations must not be null");
@@ -105,7 +106,7 @@ abstract class AbstractReactiveElasticsearchRepositoryQuery implements Repositor
 		var query = createQuery(parameterAccessor);
 		Assert.notNull(query, "unsupported query");
 
-		queryMethod.addMethodParameter(query, parameterAccessor, elasticsearchOperations.getElasticsearchConverter(),
+		queryMethod.addSpecialMethodParameters(query, parameterAccessor, elasticsearchOperations.getElasticsearchConverter(),
 				evaluationContextProvider);
 
 		String indexName = queryMethod.getEntityInformation().getIndexName();

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java

@@ -16,12 +16,7 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.elasticsearch.core.query.BaseQuery;
-import org.springframework.data.elasticsearch.repository.query.parser.ElasticsearchQueryCreator;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 
 /**
  * ElasticsearchPartQuery
@@ -33,42 +28,12 @@ import org.springframework.data.repository.query.parser.PartTree;
  * @author Rasmus Faber-Espensen
  * @author Peter-Josef Meisch
  * @author Haibo Liu
+ * @deprecated since 5.5, use {@link RepositoryPartQuery} instead
  */
-public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery {
-
-	private final PartTree tree;
-	private final MappingContext<?, ElasticsearchPersistentProperty> mappingContext;
-
+@Deprecated(forRemoval = true)
+public class ElasticsearchPartQuery extends RepositoryPartQuery {
 	public ElasticsearchPartQuery(ElasticsearchQueryMethod method, ElasticsearchOperations elasticsearchOperations,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		super(method, elasticsearchOperations, evaluationContextProvider);
-		this.tree = new PartTree(queryMethod.getName(), queryMethod.getResultProcessor().getReturnedType().getDomainType());
-		this.mappingContext = elasticsearchConverter.getMappingContext();
-	}
-
-	@Override
-	public boolean isCountQuery() {
-		return tree.isCountProjection();
-	}
-
-	@Override
-	protected boolean isDeleteQuery() {
-		return tree.isDelete();
-	}
-
-	@Override
-	protected boolean isExistsQuery() {
-		return tree.isExistsProjection();
-	}
-
-	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor accessor) {
-
-		BaseQuery query = new ElasticsearchQueryCreator(tree, accessor, mappingContext).createQuery();
-
-		if (tree.getMaxResults() != null) {
-			query.setMaxResults(tree.getMaxResults());
-		}
-
-		return query;
+			ValueExpressionDelegate valueExpressionDelegate) {
+		super(method, elasticsearchOperations, valueExpressionDelegate);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java

@@ -28,6 +28,7 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.annotations.Highlight;
 import org.springframework.data.elasticsearch.annotations.Query;
+import org.springframework.data.elasticsearch.annotations.SearchTemplateQuery;
 import org.springframework.data.elasticsearch.annotations.SourceFilters;
 import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.SearchHits;
@@ -43,6 +44,7 @@ import org.springframework.data.elasticsearch.core.query.RuntimeField;
 import org.springframework.data.elasticsearch.core.query.ScriptedField;
 import org.springframework.data.elasticsearch.core.query.SourceFilter;
 import org.springframework.data.elasticsearch.repository.support.QueryStringProcessor;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
@@ -84,6 +86,7 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 	@Nullable private final Query queryAnnotation;
 	@Nullable private final Highlight highlightAnnotation;
 	@Nullable private final SourceFilters sourceFilters;
+	@Nullable private final SearchTemplateQuery searchTemplateQueryAnnotation;
 
 	public ElasticsearchQueryMethod(Method method, RepositoryMetadata repositoryMetadata, ProjectionFactory factory,
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
@@ -98,17 +101,11 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 		this.highlightAnnotation = AnnotatedElementUtils.findMergedAnnotation(method, Highlight.class);
 		this.sourceFilters = AnnotatedElementUtils.findMergedAnnotation(method, SourceFilters.class);
 		this.unwrappedReturnType = potentiallyUnwrapReturnTypeFor(repositoryMetadata, method);
+		this.searchTemplateQueryAnnotation = AnnotatedElementUtils.findMergedAnnotation(method, SearchTemplateQuery.class);
 
 		verifyCountQueryTypes();
 	}
 
-	@SuppressWarnings("removal")
-	@Override
-	@Deprecated
-	protected Parameters<?, ?> createParameters(Method method, TypeInformation<?> domainType) {
-		return new ElasticsearchParameters(ParametersSource.of(method));
-	}
-
 	@Override
 	protected Parameters<?, ?> createParameters(ParametersSource parametersSource) {
 		return new ElasticsearchParameters(parametersSource);
@@ -125,12 +122,16 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 		}
 	}
 
+	/**
+	 * @return if the method is annotated with the {@link Query} annotation.
+	 */
 	public boolean hasAnnotatedQuery() {
 		return this.queryAnnotation != null;
 	}
 
 	/**
-	 * @return the query String. Must not be {@literal null} when {@link #hasAnnotatedQuery()} returns true
+	 * @return the query String defined in the {@link Query} annotation. Must not be {@literal null} when
+	 *         {@link #hasAnnotatedQuery()} returns true.
 	 */
 	@Nullable
 	public String getAnnotatedQuery() {
@@ -158,6 +159,27 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 		return new HighlightQuery(highlightConverter.convert(highlightAnnotation), getDomainClass());
 	}
 
+	/**
+	 * @return if the method is annotated with the {@link SearchTemplateQuery} annotation.
+	 * @since 5.5
+	 */
+	public boolean hasAnnotatedSearchTemplateQuery() {
+		return this.searchTemplateQueryAnnotation != null;
+	}
+
+	/**
+	 * @return the {@link SearchTemplateQuery} annotation
+	 * @throws IllegalArgumentException if no {@link SearchTemplateQuery} annotation is present on the method
+	 * @since 5.5
+	 */
+	public SearchTemplateQuery getAnnotatedSearchTemplateQuery() {
+
+		Assert.isTrue(hasAnnotatedSearchTemplateQuery(), "no SearchTemplateQuery annotation present on " + getName());
+		Assert.notNull(searchTemplateQueryAnnotation, "highlsearchTemplateQueryAnnotationightAnnotation must not be null");
+
+		return searchTemplateQueryAnnotation;
+	}
+
 	/**
 	 * @return the {@link ElasticsearchEntityMetadata} for the query methods {@link #getReturnedObjectType() return type}.
 	 * @since 3.2
@@ -281,7 +303,7 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 
 	/**
 	 * @return {@literal true} if the method is annotated with
-	 *         {@link org.springframework.data.elasticsearch.annotations.CountQuery} or with {@link Query}(count =true)
+	 *         {@link org.springframework.data.elasticsearch.annotations.CountQuery} or with {@link Query}(count = true)
 	 * @since 4.2
 	 */
 	public boolean hasCountQueryAnnotation() {
@@ -303,7 +325,7 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 	@Nullable
 	SourceFilter getSourceFilter(ElasticsearchParametersParameterAccessor parameterAccessor,
 			ElasticsearchConverter converter,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueEvaluationContextProvider evaluationContextProvider) {
 
 		if (sourceFilters == null || (sourceFilters.includes().length == 0 && sourceFilters.excludes().length == 0)) {
 			return null;
@@ -326,7 +348,7 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 	}
 
 	private String[] mapParameters(String[] source, ElasticsearchParametersParameterAccessor parameterAccessor,
-			ConversionService conversionService, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ConversionService conversionService, ValueEvaluationContextProvider evaluationContextProvider) {
 
 		List<String> fieldNames = new ArrayList<>();
 
@@ -377,9 +399,9 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 		}
 	}
 
-	void addMethodParameter(BaseQuery query, ElasticsearchParametersParameterAccessor parameterAccessor,
-			ElasticsearchConverter elasticsearchConverter,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+	void addSpecialMethodParameters(BaseQuery query, ElasticsearchParametersParameterAccessor parameterAccessor,
+									ElasticsearchConverter elasticsearchConverter,
+									ValueEvaluationContextProvider evaluationContextProvider) {
 
 		if (hasAnnotatedHighlight()) {
 			var highlightQuery = getAnnotatedHighlightQuery(new HighlightConverter(parameterAccessor,

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java

@@ -15,13 +15,8 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
-import org.springframework.core.convert.ConversionService;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.query.BaseQuery;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.data.elasticsearch.repository.support.QueryStringProcessor;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.util.Assert;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 
 /**
  * ElasticsearchStringQuery
@@ -32,43 +27,12 @@ import org.springframework.util.Assert;
  * @author Taylor Ono
  * @author Peter-Josef Meisch
  * @author Haibo Liu
+ * @deprecated since 5.5, use {@link RepositoryStringQuery}
  */
-public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQuery {
-
-	private final String queryString;
-
+@Deprecated(since = "5.5", forRemoval = true)
+public class ElasticsearchStringQuery extends RepositoryStringQuery {
 	public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod, ElasticsearchOperations elasticsearchOperations,
-			String queryString, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		super(queryMethod, elasticsearchOperations, evaluationContextProvider);
-
-		Assert.notNull(queryString, "Query cannot be empty");
-		Assert.notNull(evaluationContextProvider, "ExpressionEvaluationContextProvider must not be null");
-
-		this.queryString = queryString;
+			String queryString, ValueExpressionDelegate valueExpressionDelegate) {
+		super(queryMethod, elasticsearchOperations, queryString, valueExpressionDelegate);
 	}
-
-	@Override
-	public boolean isCountQuery() {
-		return queryMethod.hasCountQueryAnnotation();
-	}
-
-	@Override
-	protected boolean isDeleteQuery() {
-		return false;
-	}
-
-	@Override
-	protected boolean isExistsQuery() {
-		return false;
-	}
-
-	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor parameterAccessor) {
-		ConversionService conversionService = elasticsearchOperations.getElasticsearchConverter().getConversionService();
-		var processed = new QueryStringProcessor(queryString, queryMethod, conversionService, evaluationContextProvider)
-				.createQuery(parameterAccessor);
-
-		return new StringQuery(processed)
-				.addSort(parameterAccessor.getSort());
-	}
-
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/HighlightConverter.java

@@ -25,8 +25,8 @@ import org.springframework.data.elasticsearch.core.query.highlight.Highlight;
 import org.springframework.data.elasticsearch.core.query.highlight.HighlightField;
 import org.springframework.data.elasticsearch.core.query.highlight.HighlightParameters;
 import org.springframework.data.elasticsearch.repository.support.QueryStringProcessor;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.util.Assert;
 
 /**
@@ -38,13 +38,13 @@ public class HighlightConverter {
 
 	private final ElasticsearchParametersParameterAccessor parameterAccessor;
 	private final ConversionService conversionService;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	private final ValueEvaluationContextProvider evaluationContextProvider;
 	private final QueryMethod queryMethod;
 
 	HighlightConverter(ElasticsearchParametersParameterAccessor parameterAccessor,
-					   ConversionService conversionService,
-					   QueryMethodEvaluationContextProvider evaluationContextProvider,
-					   QueryMethod queryMethod) {
+			ConversionService conversionService,
+			ValueEvaluationContextProvider evaluationContextProvider,
+			QueryMethod queryMethod) {
 
 		Assert.notNull(parameterAccessor, "parameterAccessor must not be null");
 		Assert.notNull(conversionService, "conversionService must not be null");

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchQueryMethod.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
-import static org.springframework.data.repository.util.ClassUtils.*;
-
 import reactor.core.publisher.Mono;
 
 import java.lang.reflect.Method;
@@ -36,6 +34,7 @@ import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
 import org.springframework.data.util.Lazy;
 import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.util.ReflectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
 
@@ -55,7 +54,7 @@ public class ReactiveElasticsearchQueryMethod extends ElasticsearchQueryMethod {
 
 		super(method, metadata, factory, mappingContext);
 
-		if (hasParameterOfType(method, Pageable.class)) {
+		if (ReflectionUtils.hasParameterOfType(method, Pageable.class)) {
 
 			TypeInformation<?> returnType = TypeInformation.fromReturnTypeOf(method);
 			boolean multiWrapper = ReactiveWrappers.isMultiValueType(returnType.getType());
@@ -75,7 +74,7 @@ public class ReactiveElasticsearchQueryMethod extends ElasticsearchQueryMethod {
 						method));
 			}
 
-			if (hasParameterOfType(method, Sort.class)) {
+			if (ReflectionUtils.hasParameterOfType(method, Sort.class)) {
 				throw new IllegalStateException(String.format("Method must not have Pageable *and* Sort parameter. "
 						+ "Use sorting capabilities on Pageable instead! Offending method: %s", method));
 			}

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchStringQuery.java

@@ -15,68 +15,26 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
-import org.springframework.core.convert.ConversionService;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.query.BaseQuery;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.data.elasticsearch.repository.support.QueryStringProcessor;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.util.Assert;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 
 /**
  * @author Christoph Strobl
  * @author Taylor Ono
  * @author Haibo Liu
  * @since 3.2
+ * @deprecated since 5.5, use {@link ReactiveRepositoryStringQuery}
  */
-public class ReactiveElasticsearchStringQuery extends AbstractReactiveElasticsearchRepositoryQuery {
-
-	private final String query;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+@Deprecated(since = "5.5", forRemoval = true)
+public class ReactiveElasticsearchStringQuery extends ReactiveRepositoryStringQuery {
 
 	public ReactiveElasticsearchStringQuery(ReactiveElasticsearchQueryMethod queryMethod,
-			ReactiveElasticsearchOperations operations, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-
-		this(queryMethod.getAnnotatedQuery(), queryMethod, operations, evaluationContextProvider);
+			ReactiveElasticsearchOperations operations, ValueExpressionDelegate valueExpressionDelegate) {
+		super(queryMethod, operations, valueExpressionDelegate);
 	}
 
 	public ReactiveElasticsearchStringQuery(String query, ReactiveElasticsearchQueryMethod queryMethod,
-			ReactiveElasticsearchOperations operations, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		super(queryMethod, operations, evaluationContextProvider);
-
-		Assert.notNull(query, "query must not be null");
-		Assert.notNull(evaluationContextProvider, "evaluationContextProvider must not be null");
-
-		this.query = query;
-		this.evaluationContextProvider = evaluationContextProvider;
-	}
-
-	@Override
-	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor parameterAccessor) {
-		ConversionService conversionService = getElasticsearchOperations().getElasticsearchConverter()
-				.getConversionService();
-		String processed = new QueryStringProcessor(query, queryMethod, conversionService, evaluationContextProvider)
-				.createQuery(parameterAccessor);
-		return new StringQuery(processed);
-	}
-
-	@Override
-	boolean isCountQuery() {
-		return queryMethod.hasCountQueryAnnotation();
-	}
-
-	@Override
-	boolean isDeleteQuery() {
-		return false;
-	}
-
-	@Override
-	boolean isExistsQuery() {
-		return false;
-	}
-
-	@Override
-	boolean isLimiting() {
-		return false;
+			ReactiveElasticsearchOperations operations, ValueExpressionDelegate valueExpressionDelegate) {
+		super(query, queryMethod, operations, valueExpressionDelegate);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactivePartTreeElasticsearchQuery.java

@@ -19,8 +19,8 @@ import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperatio
 import org.springframework.data.elasticsearch.core.query.BaseQuery;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.elasticsearch.repository.query.parser.ElasticsearchQueryCreator;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.ResultProcessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.PartTree;
 
 /**
@@ -35,8 +35,9 @@ public class ReactivePartTreeElasticsearchQuery extends AbstractReactiveElastics
 
 	public ReactivePartTreeElasticsearchQuery(ReactiveElasticsearchQueryMethod queryMethod,
 			ReactiveElasticsearchOperations elasticsearchOperations,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		super(queryMethod, elasticsearchOperations, evaluationContextProvider);
+			ValueExpressionDelegate valueExpressionDelegate) {
+		super(queryMethod, elasticsearchOperations,
+				valueExpressionDelegate.createValueContextProvider(queryMethod.getParameters()));
 
 		ResultProcessor processor = queryMethod.getResultProcessor();
 		this.tree = new PartTree(queryMethod.getName(), processor.getReturnedType().getDomainType());

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveRepositorySearchTemplateQuery.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.query.BaseQuery;
+import org.springframework.data.elasticsearch.core.query.SearchTemplateQuery;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.util.Assert;
+
+/**
+ * A reactive repository query that uses a search template already stored in Elasticsearch.
+ *
+ * @author P.J. Meisch (pj.meisch@sothawo.com)
+ * @since 5.5
+ */
+public class ReactiveRepositorySearchTemplateQuery extends AbstractReactiveElasticsearchRepositoryQuery {
+
+	private String id;
+	private Map<String, Object> params;
+
+	public ReactiveRepositorySearchTemplateQuery(ReactiveElasticsearchQueryMethod queryMethod,
+			ReactiveElasticsearchOperations elasticsearchOperations,
+			ValueExpressionDelegate valueExpressionDelegate,
+			String id) {
+		super(queryMethod, elasticsearchOperations,
+				valueExpressionDelegate.createValueContextProvider(queryMethod.getParameters()));
+		Assert.hasLength(id, "id must not be null or empty");
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public Map<String, Object> getParams() {
+		return params;
+	}
+
+	@Override
+	public boolean isCountQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isDeleteQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isExistsQuery() {
+		return false;
+	}
+
+	@Override
+	boolean isLimiting() {
+		return false;
+	}
+
+	@Override
+	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor parameterAccessor) {
+
+		var searchTemplateParameters = new LinkedHashMap<String, Object>();
+		var values = parameterAccessor.getValues();
+
+		parameterAccessor.getParameters().forEach(parameter -> {
+			if (!parameter.isSpecialParameter() && parameter.getName().isPresent() && parameter.getIndex() <= values.length) {
+				searchTemplateParameters.put(parameter.getName().get(), values[parameter.getIndex()]);
+			}
+		});
+
+		return SearchTemplateQuery.builder()
+				.withId(id)
+				.withParams(searchTemplateParameters)
+				.build();
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveRepositoryStringQuery.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2019-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import org.springframework.core.convert.ConversionService;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.query.BaseQuery;
+import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.elasticsearch.repository.support.QueryStringProcessor;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.util.Assert;
+
+/**
+ * Was originally named ReactiveElasticsearchStringQuery.
+ *
+ * @author Christoph Strobl
+ * @author Taylor Ono
+ * @author Haibo Liu
+ * @since 3.2
+ */
+public class ReactiveRepositoryStringQuery extends AbstractReactiveElasticsearchRepositoryQuery {
+
+	private final String query;
+
+	public ReactiveRepositoryStringQuery(ReactiveElasticsearchQueryMethod queryMethod,
+			ReactiveElasticsearchOperations operations, ValueExpressionDelegate valueExpressionDelegate) {
+
+		this(queryMethod.getAnnotatedQuery(), queryMethod, operations, valueExpressionDelegate);
+	}
+
+	public ReactiveRepositoryStringQuery(String query, ReactiveElasticsearchQueryMethod queryMethod,
+			ReactiveElasticsearchOperations operations, ValueExpressionDelegate valueExpressionDelegate) {
+		super(queryMethod, operations, valueExpressionDelegate.createValueContextProvider(queryMethod.getParameters()));
+
+		Assert.notNull(query, "query must not be null");
+
+		this.query = query;
+	}
+
+	@Override
+	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor parameterAccessor) {
+		ConversionService conversionService = getElasticsearchOperations().getElasticsearchConverter()
+				.getConversionService();
+		String processed = new QueryStringProcessor(query, queryMethod, conversionService, evaluationContextProvider)
+				.createQuery(parameterAccessor);
+		return new StringQuery(processed);
+	}
+
+	@Override
+	boolean isCountQuery() {
+		return queryMethod.hasCountQueryAnnotation();
+	}
+
+	@Override
+	boolean isDeleteQuery() {
+		return false;
+	}
+
+	@Override
+	boolean isExistsQuery() {
+		return false;
+	}
+
+	@Override
+	boolean isLimiting() {
+		return false;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/query/RepositoryPartQuery.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2013-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.elasticsearch.core.query.BaseQuery;
+import org.springframework.data.elasticsearch.repository.query.parser.ElasticsearchQueryCreator;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.repository.query.parser.PartTree;
+
+/**
+ * A repository query that is built from the the method name in the repository definition. Was originally named
+ * ElasticsearchPartQuery.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Kevin Leturc
+ * @author Mark Paluch
+ * @author Rasmus Faber-Espensen
+ * @author Peter-Josef Meisch
+ * @author Haibo Liu
+ */
+public class RepositoryPartQuery extends AbstractElasticsearchRepositoryQuery {
+
+	private final PartTree tree;
+	private final MappingContext<?, ElasticsearchPersistentProperty> mappingContext;
+
+	public RepositoryPartQuery(ElasticsearchQueryMethod method, ElasticsearchOperations elasticsearchOperations,
+			ValueExpressionDelegate valueExpressionDelegate) {
+		super(method, elasticsearchOperations,
+				valueExpressionDelegate.createValueContextProvider(method.getParameters()));
+		this.tree = new PartTree(queryMethod.getName(), queryMethod.getResultProcessor().getReturnedType().getDomainType());
+		this.mappingContext = elasticsearchConverter.getMappingContext();
+	}
+
+	@Override
+	public boolean isCountQuery() {
+		return tree.isCountProjection();
+	}
+
+	@Override
+	protected boolean isDeleteQuery() {
+		return tree.isDelete();
+	}
+
+	@Override
+	protected boolean isExistsQuery() {
+		return tree.isExistsProjection();
+	}
+
+	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor accessor) {
+
+		BaseQuery query = new ElasticsearchQueryCreator(tree, accessor, mappingContext).createQuery();
+
+		if (tree.getMaxResults() != null) {
+			query.setMaxResults(tree.getMaxResults());
+		}
+
+		return query;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/query/RepositorySearchTemplateQuery.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.query.BaseQuery;
+import org.springframework.data.elasticsearch.core.query.SearchTemplateQuery;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.util.Assert;
+
+/**
+ * A repository query that uses a search template already stored in Elasticsearch.
+ *
+ * @author P.J. Meisch (pj.meisch@sothawo.com)
+ * @since 5.5
+ */
+public class RepositorySearchTemplateQuery extends AbstractElasticsearchRepositoryQuery {
+
+	private String id;
+	private Map<String, Object> params;
+
+	public RepositorySearchTemplateQuery(ElasticsearchQueryMethod queryMethod,
+			ElasticsearchOperations elasticsearchOperations, ValueExpressionDelegate valueExpressionDelegate,
+			String id) {
+		super(queryMethod, elasticsearchOperations,
+				valueExpressionDelegate.createValueContextProvider(queryMethod.getParameters()));
+		Assert.hasLength(id, "id must not be null or empty");
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public Map<String, Object> getParams() {
+		return params;
+	}
+
+	@Override
+	public boolean isCountQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isDeleteQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isExistsQuery() {
+		return false;
+	}
+
+	@Override
+	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor parameterAccessor) {
+
+		var searchTemplateParameters = new LinkedHashMap<String, Object>();
+		var values = parameterAccessor.getValues();
+
+		parameterAccessor.getParameters().forEach(parameter -> {
+			if (!parameter.isSpecialParameter() && parameter.getName().isPresent() && parameter.getIndex() <= values.length) {
+				searchTemplateParameters.put(parameter.getName().get(), values[parameter.getIndex()]);
+			}
+		});
+
+		return SearchTemplateQuery.builder()
+				.withId(id)
+				.withParams(searchTemplateParameters)
+				.build();
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/query/RepositoryStringQuery.java

@@ -0,0 +1,57 @@
+package org.springframework.data.elasticsearch.repository.query;
+
+import org.springframework.core.convert.ConversionService;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.query.BaseQuery;
+import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.elasticsearch.repository.support.QueryStringProcessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.util.Assert;
+
+/**
+ * A repository query that is defined by a String containing the query. Was originally named ElasticsearchStringQuery.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mark Paluch
+ * @author Taylor Ono
+ * @author Peter-Josef Meisch
+ * @author Haibo Liu
+ */
+public class RepositoryStringQuery extends AbstractElasticsearchRepositoryQuery {
+	private final String queryString;
+
+	public RepositoryStringQuery(ElasticsearchQueryMethod queryMethod, ElasticsearchOperations elasticsearchOperations,
+			String queryString, ValueExpressionDelegate valueExpressionDelegate) {
+		super(queryMethod, elasticsearchOperations,
+				valueExpressionDelegate.createValueContextProvider(queryMethod.getParameters()));
+
+		Assert.notNull(queryString, "Query cannot be empty");
+
+		this.queryString = queryString;
+	}
+
+	@Override
+	public boolean isCountQuery() {
+		return queryMethod.hasCountQueryAnnotation();
+	}
+
+	@Override
+	protected boolean isDeleteQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isExistsQuery() {
+		return false;
+	}
+
+	protected BaseQuery createQuery(ElasticsearchParametersParameterAccessor parameterAccessor) {
+		ConversionService conversionService = elasticsearchOperations.getElasticsearchConverter().getConversionService();
+		var processed = new QueryStringProcessor(queryString, queryMethod, conversionService, evaluationContextProvider)
+				.createQuery(parameterAccessor);
+
+		return new StringQuery(processed)
+				.addSort(parameterAccessor.getSort());
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactory.java

@@ -22,9 +22,10 @@ import java.util.Optional;
 
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.elasticsearch.repository.query.ElasticsearchPartQuery;
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchQueryMethod;
-import org.springframework.data.elasticsearch.repository.query.ElasticsearchStringQuery;
+import org.springframework.data.elasticsearch.repository.query.RepositoryPartQuery;
+import org.springframework.data.elasticsearch.repository.query.RepositorySearchTemplateQuery;
+import org.springframework.data.elasticsearch.repository.query.RepositoryStringQuery;
 import org.springframework.data.elasticsearch.repository.support.querybyexample.QueryByExampleElasticsearchExecutor;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
@@ -37,8 +38,8 @@ import org.springframework.data.repository.core.support.RepositoryFragment;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -96,16 +97,16 @@ public class ElasticsearchRepositoryFactory extends RepositoryFactorySupport {
 
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		return Optional.of(new ElasticsearchQueryLookupStrategy(evaluationContextProvider));
+			ValueExpressionDelegate valueExpressionDelegate) {
+		return Optional.of(new ElasticsearchQueryLookupStrategy(valueExpressionDelegate));
 	}
 
 	private class ElasticsearchQueryLookupStrategy implements QueryLookupStrategy {
 
-		private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+		private final ValueExpressionDelegate valueExpressionDelegate;
 
-		ElasticsearchQueryLookupStrategy(QueryMethodEvaluationContextProvider evaluationContextProvider) {
-			this.evaluationContextProvider = evaluationContextProvider;
+		ElasticsearchQueryLookupStrategy(ValueExpressionDelegate valueExpressionDelegate) {
+			this.valueExpressionDelegate = valueExpressionDelegate;
 		}
 
 		/*
@@ -122,13 +123,17 @@ public class ElasticsearchRepositoryFactory extends RepositoryFactorySupport {
 
 			if (namedQueries.hasQuery(namedQueryName)) {
 				String namedQuery = namedQueries.getQuery(namedQueryName);
-				return new ElasticsearchStringQuery(queryMethod, elasticsearchOperations, namedQuery,
-						evaluationContextProvider);
+				return new RepositoryStringQuery(queryMethod, elasticsearchOperations, namedQuery,
+						valueExpressionDelegate);
 			} else if (queryMethod.hasAnnotatedQuery()) {
-				return new ElasticsearchStringQuery(queryMethod, elasticsearchOperations, queryMethod.getAnnotatedQuery(),
-						evaluationContextProvider);
+				return new RepositoryStringQuery(queryMethod, elasticsearchOperations, queryMethod.getAnnotatedQuery(),
+						valueExpressionDelegate);
+			} else if (queryMethod.hasAnnotatedSearchTemplateQuery()) {
+				var searchTemplateQuery = queryMethod.getAnnotatedSearchTemplateQuery();
+				return new RepositorySearchTemplateQuery(queryMethod, elasticsearchOperations, valueExpressionDelegate,
+						searchTemplateQuery.id());
 			}
-			return new ElasticsearchPartQuery(queryMethod, elasticsearchOperations, evaluationContextProvider);
+			return new RepositoryPartQuery(queryMethod, elasticsearchOperations, valueExpressionDelegate);
 		}
 	}
 

src/main/java/org/springframework/data/elasticsearch/repository/support/QueryStringProcessor.java

@@ -18,6 +18,7 @@ package org.springframework.data.elasticsearch.repository.support;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchParametersParameterAccessor;
 import org.springframework.data.elasticsearch.repository.support.spel.QueryStringSpELEvaluator;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.util.Assert;
@@ -34,10 +35,10 @@ public class QueryStringProcessor {
 	private final String query;
 	private final QueryMethod queryMethod;
 	private final ConversionService conversionService;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	private final ValueEvaluationContextProvider evaluationContextProvider;
 
 	public QueryStringProcessor(String query, QueryMethod queryMethod, ConversionService conversionService,
-								QueryMethodEvaluationContextProvider evaluationContextProvider) {
+								ValueEvaluationContextProvider evaluationContextProvider) {
 
 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(queryMethod, "queryMethod must not be null");

src/main/java/org/springframework/data/elasticsearch/repository/support/ReactiveElasticsearchRepositoryFactory.java

@@ -23,8 +23,9 @@ import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperatio
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.repository.query.ReactiveElasticsearchQueryMethod;
-import org.springframework.data.elasticsearch.repository.query.ReactiveElasticsearchStringQuery;
 import org.springframework.data.elasticsearch.repository.query.ReactivePartTreeElasticsearchQuery;
+import org.springframework.data.elasticsearch.repository.query.ReactiveRepositorySearchTemplateQuery;
+import org.springframework.data.elasticsearch.repository.query.ReactiveRepositoryStringQuery;
 import org.springframework.data.elasticsearch.repository.support.querybyexample.ReactiveQueryByExampleElasticsearchExecutor;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.projection.ProjectionFactory;
@@ -36,9 +37,9 @@ import org.springframework.data.repository.core.support.RepositoryComposition;
 import org.springframework.data.repository.core.support.RepositoryFragment;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor;
 import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -92,14 +93,10 @@ public class ReactiveElasticsearchRepositoryFactory extends ReactiveRepositoryFa
 		return getTargetRepositoryViaReflection(information, entityInformation, operations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider)
-	 */
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		return Optional.of(new ElasticsearchQueryLookupStrategy(operations, evaluationContextProvider, mappingContext));
+			ValueExpressionDelegate valueExpressionDelegate) {
+		return Optional.of(new ElasticsearchQueryLookupStrategy(operations, valueExpressionDelegate, mappingContext));
 	}
 
 	/*
@@ -130,19 +127,19 @@ public class ReactiveElasticsearchRepositoryFactory extends ReactiveRepositoryFa
 	private static class ElasticsearchQueryLookupStrategy implements QueryLookupStrategy {
 
 		private final ReactiveElasticsearchOperations operations;
-		private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+		private final ValueExpressionDelegate valueExpressionDelegate;
 		private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
 
 		public ElasticsearchQueryLookupStrategy(ReactiveElasticsearchOperations operations,
-				QueryMethodEvaluationContextProvider evaluationContextProvider,
+				ValueExpressionDelegate valueExpressionDelegate,
 				MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
 
 			Assert.notNull(operations, "operations must not be null");
-			Assert.notNull(evaluationContextProvider, "evaluationContextProvider must not be null");
+			Assert.notNull(valueExpressionDelegate, "evaluationContextProvider must not be null");
 			Assert.notNull(mappingContext, "mappingContext must not be null");
 
 			this.operations = operations;
-			this.evaluationContextProvider = evaluationContextProvider;
+			this.valueExpressionDelegate = valueExpressionDelegate;
 			this.mappingContext = mappingContext;
 		}
 
@@ -161,12 +158,16 @@ public class ReactiveElasticsearchRepositoryFactory extends ReactiveRepositoryFa
 			if (namedQueries.hasQuery(namedQueryName)) {
 				String namedQuery = namedQueries.getQuery(namedQueryName);
 
-				return new ReactiveElasticsearchStringQuery(namedQuery, queryMethod, operations,
-						evaluationContextProvider);
+				return new ReactiveRepositoryStringQuery(namedQuery, queryMethod, operations,
+						valueExpressionDelegate);
 			} else if (queryMethod.hasAnnotatedQuery()) {
-				return new ReactiveElasticsearchStringQuery(queryMethod, operations, evaluationContextProvider);
+				return new ReactiveRepositoryStringQuery(queryMethod, operations, valueExpressionDelegate);
+			} else if (queryMethod.hasAnnotatedSearchTemplateQuery()) {
+				var searchTemplateQuery = queryMethod.getAnnotatedSearchTemplateQuery();
+				return new ReactiveRepositorySearchTemplateQuery(queryMethod, operations, valueExpressionDelegate,
+						searchTemplateQuery.id());
 			} else {
-				return new ReactivePartTreeElasticsearchQuery(queryMethod, operations, evaluationContextProvider);
+				return new ReactivePartTreeElasticsearchQuery(queryMethod, operations, valueExpressionDelegate);
 			}
 		}
 	}

src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java

@@ -384,7 +384,7 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
 	public void deleteAll() {
 
 		executeAndRefresh((OperationsCallback<Void>) operations -> {
-			operations.delete(Query.findAll(), entityClass, getIndexCoordinates());
+			operations.delete(DeleteQuery.builder(Query.findAll()).build(), entityClass, getIndexCoordinates());
 			return null;
 		});
 	}

src/main/java/org/springframework/data/elasticsearch/repository/support/spel/QueryStringSpELEvaluator.java

@@ -24,8 +24,8 @@ import org.springframework.data.elasticsearch.repository.query.ElasticsearchPara
 import org.springframework.data.elasticsearch.repository.support.value.ElasticsearchCollectionValueToStringConverter;
 import org.springframework.data.elasticsearch.repository.support.value.ElasticsearchQueryValueConversionService;
 import org.springframework.data.elasticsearch.repository.support.value.ElasticsearchStringValueToStringConverter;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParserContext;
@@ -53,11 +53,11 @@ public class QueryStringSpELEvaluator {
 	private final String queryString;
 	private final ElasticsearchParametersParameterAccessor parameterAccessor;
 	private final QueryMethod queryMethod;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	private final ValueEvaluationContextProvider evaluationContextProvider;
 	private final TypeConverter elasticsearchSpELTypeConverter;
 
 	public QueryStringSpELEvaluator(String queryString, ElasticsearchParametersParameterAccessor parameterAccessor,
-			QueryMethod queryMethod, QueryMethodEvaluationContextProvider evaluationContextProvider,
+			QueryMethod queryMethod, ValueEvaluationContextProvider evaluationContextProvider,
 			ConversionService conversionService) {
 
 		Assert.notNull(queryString, "queryString must not be null");
@@ -83,8 +83,8 @@ public class QueryStringSpELEvaluator {
 		Expression expr = getQueryExpression(queryString);
 
 		if (expr != null) {
-			EvaluationContext context = evaluationContextProvider.getEvaluationContext(parameterAccessor.getParameters(),
-					parameterAccessor.getValues());
+			EvaluationContext context = evaluationContextProvider.getEvaluationContext(parameterAccessor.getValues())
+					.getRequiredEvaluationContext();
 
 			if (context instanceof StandardEvaluationContext standardEvaluationContext) {
 				standardEvaluationContext.setTypeConverter(elasticsearchSpELTypeConverter);

src/main/kotlin/org/springframework/data/elasticsearch/core/SearchOperationsExtensions.kt

@@ -33,11 +33,11 @@ inline fun <reified T : Any> SearchOperations.searchOne(query: Query): SearchHit
 inline fun <reified T : Any> SearchOperations.searchOne(query: Query, index: IndexCoordinates): SearchHit<T>? =
     searchOne(query, T::class.java, index)
 
-inline fun <reified T : Any> SearchOperations.multiSearch(queries: List<out Query>): List<SearchHits<T>> =
+inline fun <reified T : Any> SearchOperations.multiSearch(queries: List<Query>): List<SearchHits<T>> =
     multiSearch(queries, T::class.java)
 
 inline fun <reified T : Any> SearchOperations.multiSearch(
-    queries: List<out Query>,
+    queries: List<Query>,
     index: IndexCoordinates
 ): List<SearchHits<T>> =
     multiSearch(queries, T::class.java, index)

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 5.4.2 (2024.1.2)
+Spring Data Elasticsearch 5.5.1 (2025.0.1)
 Copyright (c) [2013-2022] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -25,5 +25,8 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+
+
 
 

src/test/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryMappingUnitTests.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.client.elc;
 
+import static org.assertj.core.api.Assertions.*;
 import static org.skyscreamer.jsonassert.JSONAssert.*;
 import static org.springframework.data.elasticsearch.client.elc.JsonUtils.*;
 
@@ -22,6 +23,7 @@ import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -445,6 +447,108 @@ public class CriteriaQueryMappingUnitTests {
 		softly.assertAll();
 	}
 
+	// the following test failed because of a wrong implementation in Criteria
+	// equals and hscode methods.
+	@Test // #3083
+	@DisplayName("should map correct subcriteria")
+	void shouldMapCorrectSubcriteria() throws JSONException {
+		Criteria criteria = new Criteria("first").is("hello");
+
+		List<Criteria> criterias = new ArrayList<>();
+		criterias.add(new Criteria().or("second").exists());
+
+		List<Criteria> subCriterias = new ArrayList<>();
+		subCriterias.add(new Criteria("third").exists()
+				.and(new Criteria("fourth").is("ciao")));
+		subCriterias.add(new Criteria("third").exists()
+				.and(new Criteria("fourth").is("hi")));
+
+		Criteria result = Criteria.or();
+
+		for (Criteria c : criterias) {
+			result = result.or(c);
+		}
+
+		for (Criteria c : subCriterias) {
+			result = result.subCriteria(c);
+		}
+		criteria = criteria.subCriteria(result);
+		CriteriaQuery criteriaQuery = new CriteriaQuery(criteria);
+
+		String expected = """
+                {
+                  "bool": {
+                    "must": [
+                      {
+                        "query_string": {
+                          "default_operator": "and",
+                          "fields": [
+                            "first"
+                          ],
+                          "query": "hello"
+                        }
+                      },
+                      {
+                        "bool": {
+                          "should": [
+                            {
+                              "exists": {
+                                "field": "second"
+                              }
+                            },
+                            {
+                              "bool": {
+                                "must": [
+                                  {
+                                    "exists": {
+                                      "field": "third"
+                                    }
+                                  },
+                                  {
+                                    "query_string": {
+                                      "default_operator": "and",
+                                      "fields": [
+                                        "fourth"
+                                      ],
+                                      "query": "ciao"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "bool": {
+                                "must": [
+                                  {
+                                    "exists": {
+                                      "field": "third"
+                                    }
+                                  },
+                                  {
+                                    "query_string": {
+                                      "default_operator": "and",
+                                      "fields": [
+                                        "fourth"
+                                      ],
+                                      "query": "hi"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    ]
+                  }
+                }
+                """;
+
+		mappingElasticsearchConverter.updateQuery(criteriaQuery, Person.class);
+		var queryString = queryToJson(CriteriaQueryProcessor.createQuery(criteriaQuery.getCriteria()), mapper);
+
+		assertEquals(expected, queryString, false);
+	}
 	// endregion
 	// region helper functions
 

src/test/java/org/springframework/data/elasticsearch/client/elc/DevTests.java

@@ -77,7 +77,7 @@ public class DevTests {
 	private static final SimpleElasticsearchMappingContext mappingContext = new SimpleElasticsearchMappingContext();
 	private static final MappingElasticsearchConverter converter = new MappingElasticsearchConverter(mappingContext);
 
-	private final TransportOptions transportOptions = new RestClientOptions(RequestOptions.DEFAULT).toBuilder()
+	private final TransportOptions transportOptions = new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder()
 			.addHeader("X-SpringDataElasticsearch-AlwaysThere", "true").setParameter("pretty", "true").build();
 
 	private final JsonpMapper jsonpMapper = new JacksonJsonpMapper();

src/test/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchPartQueryELCIntegrationTests.java

@@ -21,7 +21,7 @@ import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.ElasticsearchPartQueryIntegrationTests;
+import org.springframework.data.elasticsearch.core.query.RepositoryPartQueryIntegrationTests;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
 
@@ -29,7 +29,7 @@ import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplat
  * @author Peter-Josef Meisch
  * @since 4.4
  */
-public class ElasticsearchPartQueryELCIntegrationTests extends ElasticsearchPartQueryIntegrationTests {
+public class ElasticsearchPartQueryELCIntegrationTests extends RepositoryPartQueryIntegrationTests {
 
 	@Configuration
 	@Import({ ElasticsearchTemplateConfiguration.class })

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java

@@ -1636,7 +1636,9 @@ public abstract class ElasticsearchIntegrationTests {
 				.withParams(Collections.singletonMap("newMessage", messageAfterUpdate)).withAbortOnVersionConflict(true)
 				.build();
 
-		operations.updateByQuery(updateQuery, IndexCoordinates.of(indexNameProvider.indexName()));
+		var byQueryResponse = operations.updateByQuery(updateQuery, IndexCoordinates.of(indexNameProvider.indexName()));
+
+		assertThat(byQueryResponse.getUpdated()).isEqualTo(1);
 
 		SampleEntity indexedEntity = operations.get(documentId, SampleEntity.class,
 				IndexCoordinates.of(indexNameProvider.indexName()));

src/test/java/org/springframework/data/elasticsearch/core/SourceFilterIntegrationTests.java

@@ -30,6 +30,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
 import org.springframework.data.elasticsearch.core.query.FetchSourceFilterBuilder;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.SourceFilter;
@@ -186,6 +187,38 @@ public abstract class SourceFilterIntegrationTests {
 		assertThat(entity.getField3()).isNull();
 	}
 
+	@Test // #3009
+	@DisplayName("should not return any fields when source is set to false")
+	void shouldNotReturnAnyFieldsWhenSourceIsSetToFalse() {
+
+		Query query = Query.findAll();
+		query.addSourceFilter(FetchSourceFilter.of(b -> b.withFetchSource(false)));
+
+		SearchHits<Entity> entities = operations.search(query, Entity.class);
+
+		assertThat(entities).hasSize(1);
+		Entity entity = entities.getSearchHit(0).getContent();
+		assertThat(entity.getField1()).isNull();
+		assertThat(entity.getField2()).isNull();
+		assertThat(entity.getField3()).isNull();
+	}
+
+	@Test // #3009
+	@DisplayName("should return all fields when source is set to true")
+	void shouldReturnAllFieldsWhenSourceIsSetToTrue() {
+
+		Query query = Query.findAll();
+        query.addSourceFilter(FetchSourceFilter.of(b -> b.withFetchSource(true)));
+
+		SearchHits<Entity> entities = operations.search(query, Entity.class);
+
+		assertThat(entities).hasSize(1);
+		Entity entity = entities.getSearchHit(0).getContent();
+		assertThat(entity.getField1()).isNotNull();
+		assertThat(entity.getField2()).isNotNull();
+		assertThat(entity.getField3()).isNotNull();
+	}
+
 	@Document(indexName = "#{@indexNameProvider.indexName()}")
 	public static class Entity {
 		@Nullable

src/test/java/org/springframework/data/elasticsearch/core/query/RepositoryPartQueryIntegrationTests.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
+import static org.assertj.core.api.Assertions.*;
 import static org.skyscreamer.jsonassert.JSONAssert.*;
 
 import java.lang.reflect.Method;
@@ -23,23 +24,25 @@ import java.util.Collection;
 import java.util.List;
 
 import org.json.JSONException;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.elasticsearch.repository.query.ElasticsearchPartQuery;
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchQueryMethod;
+import org.springframework.data.elasticsearch.repository.query.RepositoryPartQuery;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.lang.Nullable;
 
 /**
- * Tests for {@link ElasticsearchPartQuery}. The tests make sure that queries are built according to the method naming.
+ * Tests for {@link RepositoryPartQuery}. The tests make sure that queries are built according to the method naming.
  * Classes implementing this abstract class are in the packages of their request factories and converters as these are
  * kept package private.
  *
@@ -48,7 +51,7 @@ import org.springframework.lang.Nullable;
  */
 @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @SpringIntegrationTest
-public abstract class ElasticsearchPartQueryIntegrationTests {
+public abstract class RepositoryPartQueryIntegrationTests {
 
 	public static final String BOOK_TITLE = "Title";
 	public static final int BOOK_PRICE = 42;
@@ -639,6 +642,84 @@ public abstract class ElasticsearchPartQueryIntegrationTests {
 		assertEquals(expected, query, false);
 	}
 
+	@Test // #3072
+	@DisplayName("should build sort object with correct field names")
+	void shouldBuildSortObjectWithCorrectFieldNames() throws NoSuchMethodException, JSONException {
+
+		String methodName = "findByNameOrderBySortAuthor_SortName";
+		Class<?>[] parameterClasses = new Class[] { String.class };
+		Object[] parameters = new Object[] { BOOK_TITLE };
+
+		String query = getQueryString(methodName, parameterClasses, parameters);
+
+		String expected = """
+
+				{
+				              "query": {
+				                "bool": {
+				                  "must": [
+				                    {
+				                      "query_string": {
+				                        "query": "Title",
+				                        "fields": [
+				                          "name"
+				                        ]
+				                      }
+				                    }
+				                  ]
+				                }
+				              },
+				              "sort": [
+				                {
+				                  "sort_author.sort_name": {
+				                    "order": "asc"
+				                  }
+				                }
+				              ]
+				            }""";
+
+		assertEquals(expected, query, false);
+	}
+
+	@Test // #3081
+	@DisplayName("should build sort object with unknown field names")
+	void shouldBuildSortObjectWithUnknownFieldNames() throws NoSuchMethodException, JSONException {
+
+		String methodName = "findByName";
+		Class<?>[] parameterClasses = new Class[] { String.class, Sort.class };
+		Object[] parameters = new Object[] { BOOK_TITLE, Sort.by("sortAuthor.sortName.raw") };
+
+		String query = getQueryString(methodName, parameterClasses, parameters);
+
+		String expected = """
+
+				{
+				              "query": {
+				                "bool": {
+				                  "must": [
+				                    {
+				                      "query_string": {
+				                        "query": "Title",
+				                        "fields": [
+				                          "name"
+				                        ]
+				                      }
+				                    }
+				                  ]
+				                }
+				              },
+				              "sort": [
+				                {
+				                  "sort_author.sort_name.raw": {
+				                    "order": "asc"
+				                  }
+				                }
+				              ]
+				            }""";
+
+		assertEquals(expected, query, false);
+	}
+
 	private String getQueryString(String methodName, Class<?>[] parameterClasses, Object[] parameters)
 			throws NoSuchMethodException {
 
@@ -646,8 +727,8 @@ public abstract class ElasticsearchPartQueryIntegrationTests {
 		ElasticsearchQueryMethod queryMethod = new ElasticsearchQueryMethod(method,
 				new DefaultRepositoryMetadata(SampleRepository.class), new SpelAwareProxyProjectionFactory(),
 				operations.getElasticsearchConverter().getMappingContext());
-		ElasticsearchPartQuery partQuery = new ElasticsearchPartQuery(queryMethod, operations,
-				QueryMethodEvaluationContextProvider.DEFAULT);
+		RepositoryPartQuery partQuery = new RepositoryPartQuery(queryMethod, operations,
+				ValueExpressionDelegate.create());
 		Query query = partQuery.createQuery(parameters);
 		return buildQueryString(query, Book.class);
 	}
@@ -726,6 +807,9 @@ public abstract class ElasticsearchPartQueryIntegrationTests {
 
 		List<Book> findByAvailableTrueOrderByNameDesc();
 
+		List<Book> findByNameOrderBySortAuthor_SortName(String name);
+
+		List<Book> findByName(String name, Sort sort);
 	}
 
 	public static class Book {
@@ -735,6 +819,10 @@ public abstract class ElasticsearchPartQueryIntegrationTests {
 		@Nullable private Integer price;
 		@Field(type = FieldType.Boolean) private boolean available;
 
+		// this is needed for the #3072 test
+		@Nullable
+		@Field(name = "sort_author", type = FieldType.Object) private Author sortAuthor;
+
 		@Nullable
 		public String getId() {
 			return id;
@@ -766,8 +854,32 @@ public abstract class ElasticsearchPartQueryIntegrationTests {
 			return available;
 		}
 
+		@Nullable
+		public Author getSortAuthor() {
+			return sortAuthor;
+		}
+
+		public void setSortAuthor(@Nullable Author sortAuthor) {
+			this.sortAuthor = sortAuthor;
+		}
+
 		public void setAvailable(Boolean available) {
 			this.available = available;
+
+		}
+	}
+
+	public static class Author {
+		@Nullable
+		@Field(name = "sort_name", type = FieldType.Keyword) private String sortName;
+
+		@Nullable
+		public String getSortName() {
+			return sortName;
+		}
+
+		public void setSortName(@Nullable String sortName) {
+			this.sortName = sortName;
 		}
 	}
 }

src/test/java/org/springframework/data/elasticsearch/core/query/scriptedandruntimefields/ScriptedAndRuntimeFieldsIntegrationTests.java

@@ -99,6 +99,8 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 	@DisplayName("should use runtime-field without script")
 	void shouldUseRuntimeFieldWithoutScript() {
 
+		// a runtime field without a script can be used to redefine the type of a field for the search,
+		// here we change the type from text to double
 		insert("1", "11", 10);
 		Query query = new CriteriaQuery(new Criteria("description").matches(11.0));
 		RuntimeField runtimeField = new RuntimeField("description", "double");
@@ -133,6 +135,25 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		assertThat(foundPerson.getBirthDate()).isEqualTo(birthDate);
 	}
 
+	@Test // #3076
+	@DisplayName("should return scripted fields that are lists")
+	void shouldReturnScriptedFieldsThatAreLists() {
+		var person = new Person();
+		person.setFirstName("John");
+		person.setLastName("Doe");
+		operations.save(person);
+		var query = Query.findAll();
+		query.addFields("allNames");
+		query.addSourceFilter(new FetchSourceFilterBuilder().withIncludes("*").build());
+
+		var searchHits = operations.search(query, Person.class);
+
+		assertThat(searchHits.getTotalHits()).isEqualTo(1);
+		var foundPerson = searchHits.getSearchHit(0).getContent();
+		// the painless script seems to return the data sorted no matter in which order the values are emitted
+		assertThat(foundPerson.getAllNames()).containsExactlyInAnyOrderElementsOf(List.of("John", "Doe"));
+	}
+
 	@Test // #2035
 	@DisplayName("should use repository method with ScriptedField parameters")
 	void shouldUseRepositoryMethodWithScriptedFieldParameters() {
@@ -143,9 +164,11 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 
 		repository.save(entity);
 
-		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField1 = getScriptedField("scriptedValue1",
+		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField1 = buildScriptedField(
+				"scriptedValue1",
 				2);
-		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField2 = getScriptedField("scriptedValue2",
+		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField2 = buildScriptedField(
+				"scriptedValue2",
 				3);
 
 		var searchHits = repository.findByValue(3, scriptedField1, scriptedField2);
@@ -157,17 +180,6 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		assertThat(foundEntity.getScriptedValue2()).isEqualTo(9);
 	}
 
-	@NotNull
-	private static org.springframework.data.elasticsearch.core.query.ScriptedField getScriptedField(String fieldName,
-			int factor) {
-		return org.springframework.data.elasticsearch.core.query.ScriptedField.of(
-				fieldName,
-				ScriptData.of(b -> b
-						.withType(ScriptType.INLINE)
-						.withScript("doc['value'].size() > 0 ? doc['value'].value * params['factor'] : 0")
-						.withParams(Map.of("factor", factor))));
-	}
-
 	@Test // #2035
 	@DisplayName("should use repository string query method with ScriptedField parameters")
 	void shouldUseRepositoryStringQueryMethodWithScriptedFieldParameters() {
@@ -178,9 +190,11 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 
 		repository.save(entity);
 
-		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField1 = getScriptedField("scriptedValue1",
+		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField1 = buildScriptedField(
+				"scriptedValue1",
 				2);
-		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField2 = getScriptedField("scriptedValue2",
+		org.springframework.data.elasticsearch.core.query.ScriptedField scriptedField2 = buildScriptedField(
+				"scriptedValue2",
 				3);
 
 		var searchHits = repository.findWithScriptedFields(3, scriptedField1, scriptedField2);
@@ -202,8 +216,8 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 
 		repository.save(entity);
 
-		var runtimeField1 = getRuntimeField("scriptedValue1", 3);
-		var runtimeField2 = getRuntimeField("scriptedValue2", 4);
+		var runtimeField1 = buildRuntimeField("scriptedValue1", 3);
+		var runtimeField2 = buildRuntimeField("scriptedValue2", 4);
 
 		var searchHits = repository.findByValue(3, runtimeField1, runtimeField2);
 
@@ -214,14 +228,6 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		assertThat(foundEntity.getScriptedValue2()).isEqualTo(12);
 	}
 
-	@NotNull
-	private static RuntimeField getRuntimeField(String fieldName, int factor) {
-		return new RuntimeField(
-				fieldName,
-				"long",
-				String.format("emit(doc['value'].size() > 0 ? doc['value'].value * %d : 0)", factor));
-	}
-
 	@Test // #2035
 	@DisplayName("should use repository string query method with RuntimeField parameters")
 	void shouldUseRepositoryStringQueryMethodWithRuntimeFieldParameters() {
@@ -232,8 +238,8 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 
 		repository.save(entity);
 
-		var runtimeField1 = getRuntimeField("scriptedValue1", 3);
-		var runtimeField2 = getRuntimeField("scriptedValue2", 4);
+		var runtimeField1 = buildRuntimeField("scriptedValue1", 3);
+		var runtimeField2 = buildRuntimeField("scriptedValue2", 4);
 
 		var searchHits = repository.findWithRuntimeFields(3, runtimeField1, runtimeField2);
 
@@ -263,8 +269,7 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 				"priceWithTax",
 				"double",
 				"emit(doc['price'].value * params.tax)",
-				Map.of("tax", 1.19)
-		);
+				Map.of("tax", 1.19));
 		var query = CriteriaQuery.builder(
 				Criteria.where("priceWithTax").greaterThan(100.0))
 				.withRuntimeFields(List.of(runtimeField))
@@ -275,6 +280,56 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		assertThat(searchHits).hasSize(1);
 	}
 
+	@Test // #3076
+	@DisplayName("should use runtime fields in queries returning lists")
+	void shouldUseRuntimeFieldsInQueriesReturningLists() {
+
+		insert("1", "item 1", 80.0);
+
+		var runtimeField = new RuntimeField(
+				"someStrings",
+				"keyword",
+				"emit('foo'); emit('bar');",
+				null);
+
+		var query = Query.findAll();
+		query.addRuntimeField(runtimeField);
+		query.addFields("someStrings");
+		query.addSourceFilter(new FetchSourceFilterBuilder().withIncludes("*").build());
+
+		var searchHits = operations.search(query, SomethingToBuy.class);
+
+		assertThat(searchHits).hasSize(1);
+		var somethingToBuy = searchHits.getSearchHit(0).getContent();
+		assertThat(somethingToBuy.someStrings).containsExactlyInAnyOrder("foo", "bar");
+	}
+
+	/**
+	 * build a {@link org.springframework.data.elasticsearch.core.query.ScriptedField} to return the product of the
+	 * document's value property and the given factor
+	 */
+	@NotNull
+	private static org.springframework.data.elasticsearch.core.query.ScriptedField buildScriptedField(String fieldName,
+			int factor) {
+		return org.springframework.data.elasticsearch.core.query.ScriptedField.of(
+				fieldName,
+				ScriptData.of(b -> b
+						.withType(ScriptType.INLINE)
+						.withScript("doc['value'].size() > 0 ? doc['value'].value * params['factor'] : 0")
+						.withParams(Map.of("factor", factor))));
+	}
+
+	/**
+	 * build a {@link RuntimeField} to return the product of the document's value property and the given factor
+	 */
+	@NotNull
+	private static RuntimeField buildRuntimeField(String fieldName, int factor) {
+		return new RuntimeField(
+				fieldName,
+				"long",
+				String.format("emit(doc['value'].size() > 0 ? doc['value'].value * %d : 0)", factor));
+	}
+
 	@SuppressWarnings("unused")
 	@Document(indexName = "#{@indexNameProvider.indexName()}-something-to-by")
 	private static class SomethingToBuy {
@@ -286,6 +341,9 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		@Nullable
 		@Field(type = FieldType.Double) private Double price;
 
+		@Nullable
+		@ScriptedField private List<String> someStrings;
+
 		@Nullable
 		public String getId() {
 			return id;
@@ -312,6 +370,15 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		public void setPrice(@Nullable Double price) {
 			this.price = price;
 		}
+
+		@Nullable
+		public List<String> getSomeStrings() {
+			return someStrings;
+		}
+
+		public void setSomeStrings(@Nullable List<String> someStrings) {
+			this.someStrings = someStrings;
+		}
 	}
 
 	@SuppressWarnings("unused")
@@ -320,6 +387,13 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 	public static class Person {
 		@Nullable private String id;
 
+		// need keywords as we are using them in the script
+		@Nullable
+		@Field(type = FieldType.Keyword) private String firstName;
+		@Nullable
+		@Field(type = FieldType.Keyword) private String lastName;
+		@ScriptedField private List<String> allNames = List.of();
+
 		@Field(type = FieldType.Date, format = DateFormat.basic_date)
 		@Nullable private LocalDate birthDate;
 
@@ -335,6 +409,24 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 			this.id = id;
 		}
 
+		@Nullable
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(@Nullable String firstName) {
+			this.firstName = firstName;
+		}
+
+		@Nullable
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(@Nullable String lastName) {
+			this.lastName = lastName;
+		}
+
 		@Nullable
 		public LocalDate getBirthDate() {
 			return birthDate;
@@ -352,6 +444,14 @@ public abstract class ScriptedAndRuntimeFieldsIntegrationTests {
 		public void setAge(@Nullable Integer age) {
 			this.age = age;
 		}
+
+		public List<String> getAllNames() {
+			return allNames;
+		}
+
+		public void setAllNames(List<String> allNames) {
+			this.allNames = allNames;
+		}
 	}
 
 	@SuppressWarnings("unused")

src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java

@@ -129,6 +129,9 @@ public class ClusterConnection implements ExtensionContext.Store.CloseableResour
 			Map<String, String> testcontainersProperties = testcontainersProperties(
 					"testcontainers-" + testcontainersConfiguration + ".properties");
 
+			var testcontainersPropertiesLocal = testcontainersProperties("testcontainers-local.properties");
+			testcontainersProperties.putAll(testcontainersPropertiesLocal);
+
 			DockerImageName dockerImageName = getDockerImageName(testcontainersProperties);
 
 			ElasticsearchContainer elasticsearchContainer = new SpringDataElasticsearchContainer(dockerImageName)

src/test/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQueryUnitTestBase.java

@@ -1,78 +0,0 @@
-/*
- * Copyright 2021-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository.query;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.CustomConversions;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
-import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
-import org.springframework.lang.Nullable;
-
-/**
- * @author Peter-Josef Meisch
- */
-public class ElasticsearchStringQueryUnitTestBase {
-
-	protected ElasticsearchConverter setupConverter() {
-		MappingElasticsearchConverter converter = new MappingElasticsearchConverter(
-				new SimpleElasticsearchMappingContext());
-		Collection<Converter<?, ?>> converters = new ArrayList<>();
-		converters.add(ElasticsearchStringQueryUnitTests.CarConverter.INSTANCE);
-		CustomConversions customConversions = new ElasticsearchCustomConversions(converters);
-		converter.setConversions(customConversions);
-		converter.afterPropertiesSet();
-		return converter;
-	}
-
-	static class Car {
-		@Nullable private String name;
-		@Nullable private String model;
-
-		@Nullable
-		public String getName() {
-			return name;
-		}
-
-		public void setName(@Nullable String name) {
-			this.name = name;
-		}
-
-		@Nullable
-		public String getModel() {
-			return model;
-		}
-
-		public void setModel(@Nullable String model) {
-			this.model = model;
-		}
-	}
-
-	enum CarConverter implements Converter<Car, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(ElasticsearchStringQueryUnitTests.Car car) {
-			return (car.getName() != null ? car.getName() : "null") + '-'
-					+ (car.getModel() != null ? car.getModel() : "null");
-		}
-	}
-
-}

src/test/java/org/springframework/data/elasticsearch/repository/query/ReactiveRepositoryQueryUnitTestsBase.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import static org.mockito.Mockito.*;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
+
+@ExtendWith(MockitoExtension.class)
+public class ReactiveRepositoryQueryUnitTestsBase {
+
+	@Mock ReactiveElasticsearchOperations operations;
+
+	/**
+	 * set up the {operations} mock to return the {@link ElasticsearchConverter} from setupConverter().
+	 */
+	@BeforeEach
+	public void setUp() {
+		when(operations.getElasticsearchConverter()).thenReturn(setupConverter());
+	}
+
+	/**
+	 * @return a simple {@link MappingElasticsearchConverter} with no special setup.
+	 */
+	protected MappingElasticsearchConverter setupConverter() {
+		return new MappingElasticsearchConverter(
+				new SimpleElasticsearchMappingContext());
+	}
+
+	/**
+	 * Creates a {@link ReactiveElasticsearchQueryMethod} for the given method
+	 *
+	 * @param repositoryClass
+	 * @param name
+	 * @param parameters
+	 * @return
+	 * @throws NoSuchMethodException
+	 */
+
+	protected ReactiveElasticsearchQueryMethod getQueryMethod(Class<?> repositoryClass, String name,
+			Class<?>... parameters)
+			throws NoSuchMethodException {
+
+		Method method = repositoryClass.getMethod(name, parameters);
+		return new ReactiveElasticsearchQueryMethod(method,
+				new DefaultRepositoryMetadata(repositoryClass),
+				new SpelAwareProxyProjectionFactory(), operations.getElasticsearchConverter().getMappingContext());
+	}
+}

src/test/java/org/springframework/data/elasticsearch/repository/query/ReactiveRepositorySearchTemplateQueryUnitTests.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.SearchTemplateQuery;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.lang.Nullable;
+
+public class ReactiveRepositorySearchTemplateQueryUnitTests extends ReactiveRepositoryQueryUnitTestsBase {
+
+	@Test // #2997
+	@DisplayName("should set searchtemplate id")
+	void shouldSetSearchTemplateId() throws NoSuchMethodException {
+
+		var query = createQuery("searchWithArgs", "answer", 42);
+
+		assertThat(query).isInstanceOf(org.springframework.data.elasticsearch.core.query.SearchTemplateQuery.class);
+		var searchTemplateQuery = (org.springframework.data.elasticsearch.core.query.SearchTemplateQuery) query;
+
+		assertThat(searchTemplateQuery.getId()).isEqualTo("searchtemplate-42");
+	}
+
+	@Test // #2997
+	@DisplayName("should set searchtemplate parameters")
+	void shouldSetSearchTemplateParameters() throws NoSuchMethodException {
+
+		var query = createQuery("searchWithArgs", "answer", 42);
+
+		assertThat(query).isInstanceOf(org.springframework.data.elasticsearch.core.query.SearchTemplateQuery.class);
+		var searchTemplateQuery = (org.springframework.data.elasticsearch.core.query.SearchTemplateQuery) query;
+
+		var params = searchTemplateQuery.getParams();
+		assertThat(params).isNotNull().hasSize(2);
+		assertThat(params.get("stringArg")).isEqualTo("answer");
+		assertThat(params.get("intArg")).isEqualTo(42);
+	}
+
+	// region helper methods
+	private Query createQuery(String methodName, Object... args) throws NoSuchMethodException {
+		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(Class[]::new);
+		ReactiveElasticsearchQueryMethod queryMethod = getQueryMethod(SampleRepository.class, methodName, argTypes);
+
+		ReactiveRepositorySearchTemplateQuery repositorySearchTemplateQuery = queryForMethod(queryMethod);
+
+		return repositorySearchTemplateQuery.createQuery(new ElasticsearchParametersParameterAccessor(queryMethod, args));
+	}
+
+	private ReactiveRepositorySearchTemplateQuery queryForMethod(ReactiveElasticsearchQueryMethod queryMethod) {
+		return new ReactiveRepositorySearchTemplateQuery(queryMethod, operations, ValueExpressionDelegate.create(),
+				queryMethod.getAnnotatedSearchTemplateQuery().id());
+	}
+	// endregion
+
+	// region test data
+	private interface SampleRepository extends ElasticsearchRepository<SampleEntity, String> {
+		@SearchTemplateQuery(id = "searchtemplate-42")
+		SearchHits<SampleEntity> searchWithArgs(String stringArg, Integer intArg);
+
+		@SearchTemplateQuery(id = "searchtemplate-42")
+		SearchHits<SampleEntity> searchWithArgsAndSort(String stringArg, Integer intArg, Sort sort);
+	}
+
+	@Document(indexName = "not-relevant")
+	static class SampleEntity {
+		@Nullable
+		@Id String id;
+		@Nullable String data;
+
+		@Nullable
+		public String getId() {
+			return id;
+		}
+
+		public void setId(@Nullable String id) {
+			this.id = id;
+		}
+
+		@Nullable
+		public String getData() {
+			return data;
+		}
+
+		public void setData(@Nullable String data) {
+			this.data = data;
+		}
+	}
+	// endregion
+}

src/test/java/org/springframework/data/elasticsearch/repository/query/ReactiveRepositoryStringQueryUnitTests.java

@@ -16,12 +16,11 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,28 +28,27 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.InnerField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.Query;
-import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHit;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.data.elasticsearch.repositories.custommethod.QueryParameter;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.lang.Nullable;
 
@@ -60,13 +58,54 @@ import org.springframework.lang.Nullable;
  * @author Haibo Liu
  */
 @ExtendWith(MockitoExtension.class)
-public class ReactiveElasticsearchStringQueryUnitTests extends ElasticsearchStringQueryUnitTestBase {
+public class ReactiveRepositoryStringQueryUnitTests extends ReactiveRepositoryQueryUnitTestsBase {
 
-	@Mock ReactiveElasticsearchOperations operations;
+	/**
+	 * Adds some data class and custom conversion to the base class implementation.
+	 */
+	protected MappingElasticsearchConverter setupConverter() {
 
-	@BeforeEach
-	public void setUp() {
-		when(operations.getElasticsearchConverter()).thenReturn(setupConverter());
+		Collection<Converter<?, ?>> converters = new ArrayList<>();
+		converters.add(CarConverter.INSTANCE);
+		CustomConversions customConversions = new ElasticsearchCustomConversions(converters);
+
+		MappingElasticsearchConverter converter = super.setupConverter();
+		converter.setConversions(customConversions);
+		converter.afterPropertiesSet();
+		return converter;
+	}
+
+	static class Car {
+		@Nullable private String name;
+		@Nullable private String model;
+
+		@Nullable
+		public String getName() {
+			return name;
+		}
+
+		public void setName(@Nullable String name) {
+			this.name = name;
+		}
+
+		@Nullable
+		public String getModel() {
+			return model;
+		}
+
+		public void setModel(@Nullable String model) {
+			this.model = model;
+		}
+	}
+
+	enum CarConverter implements Converter<Car, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(Car car) {
+			return (car.getName() != null ? car.getName() : "null") + '-'
+					+ (car.getModel() != null ? car.getModel() : "null");
+		}
 	}
 
 	@Test // DATAES-519
@@ -367,31 +406,23 @@ public class ReactiveElasticsearchStringQueryUnitTests extends ElasticsearchStri
 
 		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass)
 				.map(clazz -> Collection.class.isAssignableFrom(clazz) ? List.class : clazz).toArray(Class[]::new);
-		ReactiveElasticsearchQueryMethod queryMethod = getQueryMethod(methodName, argTypes);
-		ReactiveElasticsearchStringQuery elasticsearchStringQuery = queryForMethod(queryMethod);
+		ReactiveElasticsearchQueryMethod queryMethod = getQueryMethod(SampleRepository.class, methodName, argTypes);
+		ReactiveRepositoryStringQuery elasticsearchStringQuery = queryForMethod(queryMethod);
 
 		return elasticsearchStringQuery.createQuery(new ElasticsearchParametersParameterAccessor(queryMethod, args));
 	}
 
-	private ReactiveElasticsearchStringQuery queryForMethod(ReactiveElasticsearchQueryMethod queryMethod) {
-		return new ReactiveElasticsearchStringQuery(queryMethod, operations,
-				QueryMethodEvaluationContextProvider.DEFAULT);
-	}
+	private ReactiveRepositoryStringQuery createQueryForMethod(String name, Class<?>... parameters) throws Exception {
 
-	private ReactiveElasticsearchQueryMethod getQueryMethod(String name, Class<?>... parameters)
-			throws NoSuchMethodException {
-
-		Method method = SampleRepository.class.getMethod(name, parameters);
-		return new ReactiveElasticsearchQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
-				new SpelAwareProxyProjectionFactory(), operations.getElasticsearchConverter().getMappingContext());
-	}
-
-	private ReactiveElasticsearchStringQuery createQueryForMethod(String name, Class<?>... parameters) throws Exception {
-
-		ReactiveElasticsearchQueryMethod queryMethod = getQueryMethod(name, parameters);
+		ReactiveElasticsearchQueryMethod queryMethod = getQueryMethod(SampleRepository.class, name, parameters);
 		return queryForMethod(queryMethod);
 	}
 
+	private ReactiveRepositoryStringQuery queryForMethod(ReactiveElasticsearchQueryMethod queryMethod) {
+		return new ReactiveRepositoryStringQuery(queryMethod, operations,
+				ValueExpressionDelegate.create());
+	}
+
 	private interface SampleRepository extends Repository<Person, String> {
 
 		@Query("{ 'bool' : { 'must' : { 'term' : { 'name' : '?0' } } } }")

src/test/java/org/springframework/data/elasticsearch/repository/query/RepositoryQueryUnitTestsBase.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import static org.mockito.Mockito.*;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
+
+@ExtendWith(MockitoExtension.class)
+public class RepositoryQueryUnitTestsBase {
+
+	@Mock ElasticsearchOperations operations;
+
+	/**
+	 * set up the {operations} mock to return the {@link ElasticsearchConverter} from setupConverter().
+	 */
+	@BeforeEach
+	public void setUp() {
+		when(operations.getElasticsearchConverter()).thenReturn(setupConverter());
+	}
+
+	/**
+	 * @return a simple {@link MappingElasticsearchConverter} with no special setup.
+	 */
+	protected MappingElasticsearchConverter setupConverter() {
+		return new MappingElasticsearchConverter(
+				new SimpleElasticsearchMappingContext());
+	}
+
+	/**
+	 * Creates a {@link ElasticsearchQueryMethod} for the given method
+	 *
+	 * @param repositoryClass
+	 * @param name
+	 * @param parameters
+	 * @return
+	 * @throws NoSuchMethodException
+	 */
+	protected ElasticsearchQueryMethod getQueryMethod(Class<?> repositoryClass, String name, Class<?>... parameters)
+			throws NoSuchMethodException {
+
+		Method method = repositoryClass.getMethod(name, parameters);
+		return new ElasticsearchQueryMethod(method, new DefaultRepositoryMetadata(repositoryClass),
+				new SpelAwareProxyProjectionFactory(), operations.getElasticsearchConverter().getMappingContext());
+	}
+
+}

src/test/java/org/springframework/data/elasticsearch/repository/query/RepositorySearchTemplateQueryUnitTests.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.SearchTemplateQuery;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.lang.Nullable;
+
+public class RepositorySearchTemplateQueryUnitTests extends RepositoryQueryUnitTestsBase {
+
+	@Test // #2997
+	@DisplayName("should set searchtemplate id")
+	void shouldSetSearchTemplateId() throws NoSuchMethodException {
+
+		var query = createQuery("searchWithArgs", "answer", 42);
+
+		assertThat(query).isInstanceOf(org.springframework.data.elasticsearch.core.query.SearchTemplateQuery.class);
+		var searchTemplateQuery = (org.springframework.data.elasticsearch.core.query.SearchTemplateQuery) query;
+
+		assertThat(searchTemplateQuery.getId()).isEqualTo("searchtemplate-42");
+	}
+
+	@Test // #2997
+	@DisplayName("should set searchtemplate parameters")
+	void shouldSetSearchTemplateParameters() throws NoSuchMethodException {
+
+		var query = createQuery("searchWithArgs", "answer", 42);
+
+		assertThat(query).isInstanceOf(org.springframework.data.elasticsearch.core.query.SearchTemplateQuery.class);
+		var searchTemplateQuery = (org.springframework.data.elasticsearch.core.query.SearchTemplateQuery) query;
+
+		var params = searchTemplateQuery.getParams();
+		assertThat(params).isNotNull().hasSize(2);
+		assertThat(params.get("stringArg")).isEqualTo("answer");
+		assertThat(params.get("intArg")).isEqualTo(42);
+	}
+
+	// region helper methods
+	private Query createQuery(String methodName, Object... args) throws NoSuchMethodException {
+		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(Class[]::new);
+		ElasticsearchQueryMethod queryMethod = getQueryMethod(SampleRepository.class, methodName, argTypes);
+
+		RepositorySearchTemplateQuery repositorySearchTemplateQuery = queryForMethod(queryMethod);
+
+		return repositorySearchTemplateQuery.createQuery(new ElasticsearchParametersParameterAccessor(queryMethod, args));
+	}
+
+	private RepositorySearchTemplateQuery queryForMethod(ElasticsearchQueryMethod queryMethod) {
+		return new RepositorySearchTemplateQuery(queryMethod, operations, ValueExpressionDelegate.create(),
+				queryMethod.getAnnotatedSearchTemplateQuery().id());
+	}
+	// endregion
+
+	// region test data
+	private interface SampleRepository extends ElasticsearchRepository<SampleEntity, String> {
+		@SearchTemplateQuery(id = "searchtemplate-42")
+		SearchHits<SampleEntity> searchWithArgs(String stringArg, Integer intArg);
+
+		@SearchTemplateQuery(id = "searchtemplate-42")
+		SearchHits<SampleEntity> searchWithArgsAndSort(String stringArg, Integer intArg, Sort sort);
+	}
+
+	@Document(indexName = "not-relevant")
+	static class SampleEntity {
+		@Nullable
+		@Id String id;
+		@Nullable String data;
+
+		@Nullable
+		public String getId() {
+			return id;
+		}
+
+		public void setId(@Nullable String id) {
+			this.id = id;
+		}
+
+		@Nullable
+		public String getData() {
+			return data;
+		}
+
+		public void setData(@Nullable String data) {
+			this.data = data;
+		}
+	}
+	// endregion
+}

src/test/java/org/springframework/data/elasticsearch/repository/query/RepositoryStringQueryUnitTests.java

@@ -16,9 +16,7 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,29 +24,26 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.InnerField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.Query;
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.data.elasticsearch.repositories.custommethod.QueryParameter;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.lang.Nullable;
 
 /**
@@ -57,14 +52,53 @@ import org.springframework.lang.Nullable;
  * @author Niklas Herder
  * @author Haibo Liu
  */
-@ExtendWith(MockitoExtension.class)
-public class ElasticsearchStringQueryUnitTests extends ElasticsearchStringQueryUnitTestBase {
+public class RepositoryStringQueryUnitTests extends RepositoryStringQueryUnitTestsBase {
+	/**
+	 * Adds some data class and custom conversion to the base class implementation.
+	 */
+	protected MappingElasticsearchConverter setupConverter() {
 
-	@Mock ElasticsearchOperations operations;
+		Collection<Converter<?, ?>> converters = new ArrayList<>();
+		converters.add(RepositoryStringQueryUnitTests.CarConverter.INSTANCE);
+		CustomConversions customConversions = new ElasticsearchCustomConversions(converters);
 
-	@BeforeEach
-	public void setUp() {
-		when(operations.getElasticsearchConverter()).thenReturn(setupConverter());
+		MappingElasticsearchConverter converter = super.setupConverter();
+		converter.setConversions(customConversions);
+		converter.afterPropertiesSet();
+		return converter;
+	}
+
+	static class Car {
+		@Nullable private String name;
+		@Nullable private String model;
+
+		@Nullable
+		public String getName() {
+			return name;
+		}
+
+		public void setName(@Nullable String name) {
+			this.name = name;
+		}
+
+		@Nullable
+		public String getModel() {
+			return model;
+		}
+
+		public void setModel(@Nullable String model) {
+			this.model = model;
+		}
+	}
+
+	enum CarConverter implements Converter<Car, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(Car car) {
+			return (car.getName() != null ? car.getName() : "null") + '-'
+					+ (car.getModel() != null ? car.getModel() : "null");
+		}
 	}
 
 	@Test // DATAES-552
@@ -350,8 +384,9 @@ public class ElasticsearchStringQueryUnitTests extends ElasticsearchStringQueryU
 			throws NoSuchMethodException {
 
 		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(Class[]::new);
-		ElasticsearchQueryMethod queryMethod = getQueryMethod(methodName, argTypes);
-		ElasticsearchStringQuery elasticsearchStringQuery = queryForMethod(queryMethod);
+		ElasticsearchQueryMethod queryMethod = getQueryMethod(RepositoryStringQueryUnitTests.SampleRepository.class,
+				methodName, argTypes);
+		RepositoryStringQuery elasticsearchStringQuery = queryForMethod(queryMethod);
 		return elasticsearchStringQuery.createQuery(new ElasticsearchParametersParameterAccessor(queryMethod, args));
 	}
 
@@ -370,16 +405,9 @@ public class ElasticsearchStringQueryUnitTests extends ElasticsearchStringQueryU
 				.isEqualTo("{ 'bool' : { 'must' : { 'term' : { 'car' : 'Toyota-Prius' } } } }");
 	}
 
-	private ElasticsearchStringQuery queryForMethod(ElasticsearchQueryMethod queryMethod) {
-		return new ElasticsearchStringQuery(queryMethod, operations, queryMethod.getAnnotatedQuery(),
-				QueryMethodEvaluationContextProvider.DEFAULT);
-	}
-
-	private ElasticsearchQueryMethod getQueryMethod(String name, Class<?>... parameters) throws NoSuchMethodException {
-
-		Method method = SampleRepository.class.getMethod(name, parameters);
-		return new ElasticsearchQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
-				new SpelAwareProxyProjectionFactory(), operations.getElasticsearchConverter().getMappingContext());
+	private RepositoryStringQuery queryForMethod(ElasticsearchQueryMethod queryMethod) {
+		return new RepositoryStringQuery(queryMethod, operations, queryMethod.getAnnotatedQuery(),
+				ValueExpressionDelegate.create());
 	}
 
 	private interface SampleRepository extends Repository<Person, String> {

src/test/java/org/springframework/data/elasticsearch/repository/query/RepositoryStringQueryUnitTestsBase.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+/**
+ * @author Peter-Josef Meisch
+ */
+public class RepositoryStringQueryUnitTestsBase extends RepositoryQueryUnitTestsBase {
+
+}

src/test/java/org/springframework/data/elasticsearch/repository/support/ReactiveRepositoryQueryELCIntegrationTests.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.elasticsearch.junit.jupiter.ReactiveElasticsearchTemplateConfiguration;
+import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
+import org.springframework.data.elasticsearch.utils.IndexNameProvider;
+import org.springframework.test.context.ContextConfiguration;
+
+/**
+ * @since 5.5
+ */
+@ContextConfiguration(classes = ReactiveRepositoryQueryELCIntegrationTests.Config.class)
+public class ReactiveRepositoryQueryELCIntegrationTests
+		extends ReactiveRepositoryQueryIntegrationTests {
+
+	@Configuration
+	@Import({ ReactiveElasticsearchTemplateConfiguration.class })
+	@EnableReactiveElasticsearchRepositories(considerNestedRepositories = true)
+	static class Config {
+		@Bean
+		IndexNameProvider indexNameProvider() {
+			return new IndexNameProvider("reactive-repository-query");
+		}
+	}
+}

src/test/java/org/springframework/data/elasticsearch/repository/support/ReactiveRepositoryQueryIntegrationTests.java

@@ -0,0 +1,159 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.elasticsearch.core.IndexOperationsAdapter.*;
+
+import reactor.core.publisher.Flux;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.SearchTemplateQuery;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.SearchHit;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.script.Script;
+import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
+import org.springframework.data.elasticsearch.repository.ReactiveElasticsearchRepository;
+import org.springframework.data.elasticsearch.utils.IndexNameProvider;
+import org.springframework.lang.Nullable;
+
+/**
+ * @since 5.5
+ */
+@SpringIntegrationTest
+abstract class ReactiveRepositoryQueryIntegrationTests {
+	@Autowired private SampleElasticsearchRepository repository;
+	@Autowired private ReactiveElasticsearchOperations operations;
+	@Autowired private IndexNameProvider indexNameProvider;
+
+	@BeforeEach
+	void before() {
+		indexNameProvider.increment();
+		blocking(operations.indexOps(LOTRCharacter.class)).createWithMapping();
+	}
+
+	@Test
+	@org.junit.jupiter.api.Order(Integer.MAX_VALUE)
+	public void cleanup() {
+		blocking(operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*"))).delete();
+	}
+
+	@Test // #2997
+	@DisplayName("should use searchtemplate query")
+	void shouldUseSearchtemplateQuery() {
+		// store some data
+		repository.saveAll(List.of(
+				new LOTRCharacter("1", "Frodo is a hobbit"),
+				new LOTRCharacter("2", "Legolas is an elf"),
+				new LOTRCharacter("3", "Gandalf  is a wizard"),
+				new LOTRCharacter("4", "Bilbo is a hobbit"),
+				new LOTRCharacter("5", "Gimli is a dwarf")))
+				.blockLast();
+
+		// store a searchtemplate
+		String searchInCharacter = """
+				{
+					"query": {
+						"bool": {
+							"must": [
+								{
+									"match": {
+										"lotrCharacter": "{{word}}"
+									}
+								}
+							]
+						}
+					},
+					"from": 0,
+					"size": 100,
+					"sort": {
+						"id": {
+							"order": "desc"
+						}
+					}
+				  }
+				""";
+
+		Script scriptSearchInCharacter = Script.builder() //
+				.withId("searchInCharacter") //
+				.withLanguage("mustache") //
+				.withSource(searchInCharacter) //
+				.build();
+
+		var success = operations.putScript(scriptSearchInCharacter).block();
+		assertThat(success).isTrue();
+
+		// search with repository for hobbits order by id descending
+		var searchHits = repository.searchInCharacter("hobbit")
+				.collectList().block();
+
+		// check result (bilbo, frodo)
+		assertThat(searchHits).isNotNull();
+		assertThat(searchHits.size()).isEqualTo(2);
+		assertThat(searchHits.get(0).getId()).isEqualTo("4");
+		assertThat(searchHits.get(1).getId()).isEqualTo("1");
+	}
+
+	@Document(indexName = "#{@indexNameProvider.indexName()}")
+	static class LOTRCharacter {
+		@Nullable
+		@Id
+		@Field(fielddata = true) // needed for the sort to work
+		private String id;
+
+		@Field(type = FieldType.Text)
+		@Nullable private String lotrCharacter;
+
+		public LOTRCharacter(@Nullable String id, @Nullable String lotrCharacter) {
+			this.id = id;
+			this.lotrCharacter = lotrCharacter;
+		}
+
+		@Nullable
+		public String getId() {
+			return id;
+		}
+
+		public void setId(@Nullable String id) {
+			this.id = id;
+		}
+
+		@Nullable
+		public String getLotrCharacter() {
+			return lotrCharacter;
+		}
+
+		public void setLotrCharacter(@Nullable String lotrCharacter) {
+			this.lotrCharacter = lotrCharacter;
+		}
+	}
+
+	interface SampleElasticsearchRepository
+			extends ReactiveElasticsearchRepository<LOTRCharacter, String> {
+		@SearchTemplateQuery(id = "searchInCharacter")
+		Flux<SearchHit<LOTRCharacter>> searchInCharacter(String word);
+	}
+}

src/test/java/org/springframework/data/elasticsearch/repository/support/RepositoryQueryELCIntegrationTests.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchTemplateConfiguration;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.data.elasticsearch.utils.IndexNameProvider;
+import org.springframework.test.context.ContextConfiguration;
+
+@ContextConfiguration(classes = {RepositoryQueryELCIntegrationTests.Config.class })public class RepositoryQueryELCIntegrationTests extends RepositoryQueryIntegrationTests {
+    @Configuration
+    @Import({ElasticsearchTemplateConfiguration.class })
+    @EnableElasticsearchRepositories(basePackages = {"org.springframework.data.elasticsearch.repository.support" },
+            considerNestedRepositories = true)
+    static class Config {
+        @Bean
+        IndexNameProvider indexNameProvider() {
+            return new IndexNameProvider("repository-query");
+        }
+
+    }
+}

src/test/java/org/springframework/data/elasticsearch/repository/support/RepositoryQueryIntegrationTests.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.SearchTemplateQuery;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.script.Script;
+import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.elasticsearch.utils.IndexNameProvider;
+import org.springframework.lang.Nullable;
+
+@SpringIntegrationTest
+abstract class RepositoryQueryIntegrationTests {
+	@Autowired private SampleElasticsearchRepository repository;
+	@Autowired private ElasticsearchOperations operations;
+	@Autowired private IndexNameProvider indexNameProvider;
+
+	@BeforeEach
+	void before() {
+		indexNameProvider.increment();
+		operations.indexOps(LOTRCharacter.class).createWithMapping();
+	}
+
+	@Test
+	@org.junit.jupiter.api.Order(Integer.MAX_VALUE)
+	public void cleanup() {
+		operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete();
+	}
+
+	@Test // #2997
+	@DisplayName("should use searchtemplate query")
+	void shouldUseSearchtemplateQuery() {
+		// store some data
+		repository.saveAll(List.of(
+				new LOTRCharacter("1", "Frodo is a hobbit"),
+				new LOTRCharacter("2", "Legolas is an elf"),
+				new LOTRCharacter("3", "Gandalf  is a wizard"),
+				new LOTRCharacter("4", "Bilbo is a hobbit"),
+				new LOTRCharacter("5", "Gimli is a dwarf")));
+
+		// store a searchtemplate
+		String searchInCharacter = """
+				{
+					"query": {
+						"bool": {
+							"must": [
+								{
+									"match": {
+										"lotrCharacter": "{{word}}"
+									}
+								}
+							]
+						}
+					},
+					"from": 0,
+					"size": 100,
+					"sort": {
+						"id": {
+							"order": "desc"
+						}
+					}
+				  }
+				""";
+
+		Script scriptSearchInCharacter = Script.builder() //
+				.withId("searchInCharacter") //
+				.withLanguage("mustache") //
+				.withSource(searchInCharacter) //
+				.build();
+
+		var success = operations.putScript(scriptSearchInCharacter);
+		assertThat(success).isTrue();
+
+		// search with repository for hobbits order by id descending
+		var searchHits = repository.searchInCharacter("hobbit");
+
+		// check result (bilbo, frodo)
+		assertThat(searchHits).isNotNull();
+		assertThat(searchHits.getTotalHits()).isEqualTo(2);
+		assertThat(searchHits.getSearchHit(0).getId()).isEqualTo("4");
+		assertThat(searchHits.getSearchHit(1).getId()).isEqualTo("1");
+	}
+
+	@Document(indexName = "#{@indexNameProvider.indexName()}")
+	static class LOTRCharacter {
+		@Nullable
+		@Id
+		@Field(fielddata = true) // needed for the sort to work
+		private String id;
+
+		@Field(type = FieldType.Text)
+		@Nullable private String lotrCharacter;
+
+		public LOTRCharacter(@Nullable String id, @Nullable String lotrCharacter) {
+			this.id = id;
+			this.lotrCharacter = lotrCharacter;
+		}
+
+		@Nullable
+		public String getId() {
+			return id;
+		}
+
+		public void setId(@Nullable String id) {
+			this.id = id;
+		}
+
+		@Nullable
+		public String getLotrCharacter() {
+			return lotrCharacter;
+		}
+
+		public void setLotrCharacter(@Nullable String lotrCharacter) {
+			this.lotrCharacter = lotrCharacter;
+		}
+	}
+
+	interface SampleElasticsearchRepository
+			extends ElasticsearchRepository<LOTRCharacter, String> {
+		@SearchTemplateQuery(id = "searchInCharacter")
+		SearchHits<LOTRCharacter> searchInCharacter(String word);
+	}
+}

src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleReactiveElasticsearchRepositoryIntegrationTests.java

@@ -105,6 +105,26 @@ abstract class SimpleReactiveElasticsearchRepositoryIntegrationTests {
 		return operations.exists(id, IndexCoordinates.of(indexNameProvider.indexName()));
 	}
 
+	@Test // #3093
+	@DisplayName("should save all from empty collection")
+	void shouldSaveAllFromEmptyCollection() {
+
+		repository.saveAll(Collections.emptyList())
+				.as(StepVerifier::create)
+				.expectNextCount(0)
+				.verifyComplete();
+	}
+
+	@Test // #3093
+	@DisplayName("should save all from empty flux")
+	void shouldSaveAllFromEmptyFlux() {
+
+		repository.saveAll(Flux.empty())
+				.as(StepVerifier::create)
+				.expectNextCount(0)
+				.verifyComplete();
+	}
+
 	@Test // DATAES-519
 	void saveShouldComputeMultipleEntities() {
 

src/test/resources/runtime-fields-person.json

@@ -5,5 +5,12 @@
             "lang": "painless",
             "source": "Instant currentDate = Instant.ofEpochMilli(new Date().getTime()); Instant startDate = doc['birthDate'].value.toInstant(); emit(ChronoUnit.DAYS.between(startDate, currentDate) / 365);"
         }
+    },
+    "allNames": {
+        "type": "keyword",
+        "script": {
+            "lang": "painless",
+            "source": "emit(doc['firstName'].value);emit(doc['lastName'].value);"
+        }
     }
 }

src/test/resources/testcontainers-elasticsearch.properties

@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=8.15.5
+sde.testcontainers.image-version=8.18.1
 #
 #
 # needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13