Release version 5.1.4 (2023.0.4).

See #2674
Prepare 5.1.4 (2023.0.4).
2026-05-23 20:53:17 +00:00 · 2023-09-15 10:52:26 +02:00 · 2023-09-15 10:52:12 +02:00 · 2023-09-13 21:49:19 +02:00 · 2023-09-13 19:38:50 +02:00 · 2023-09-03 15:44:09 +02:00
710 changed files with 9539 additions and 1952 deletions
@@ -9,8 +9,7 @@ Make sure that:
 -->

 - [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
- [ ] **There is a ticket in the bug tracker for the project in our [issue tracker](https://github.
-  com/spring-projects/spring-data-elasticsearch/issues)**. Add the issue number to the _Closes #issue-number_ line below
+- [ ] **There is a ticket in the bug tracker for the project in our [issue tracker](https://github.com/spring-projects/spring-data-elasticsearch/issues)**. Add the issue number to the _Closes #issue-number_ line below
 - [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 - [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).
@@ -24,3 +24,5 @@ target


 /zap.env
+/localdocker.env
+.localdocker-env
@@ -1,3 +1,3 @@
-#Fri Jun 03 09:32:51 CEST 2022
+#Mon Aug 14 07:55:32 EDT 2023
 wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
@@ -1,6 +1,9 @@
 = Spring Data contribution guidelines

 You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/main/CONTRIBUTING.adoc[here].
+**Please read these carefully!**
+
+Do not submit a Pull Request before having created an issue and having discussed it. This prevents you from doing work that might be rejected.

 == Running the test locally

@@ -1,7 +1,7 @@
 def p = [:]
 node {
-    checkout scm
-    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+		checkout scm
+		p = readProperties interpolate: true, file: 'ci/pipeline.properties'
 }

 pipeline {
@@ -9,7 +9,7 @@ pipeline {

 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/3.1.x", threshold: hudson.model.Result.SUCCESS)
 	}

 	options {
@@ -18,7 +18,7 @@ pipeline {
 	}

 	stages {
-		stage("test: baseline (Java 17)") {
+		stage("test: baseline (main)") {
 			when {
 				beforeAgent(true)
 				anyOf {
@@ -32,17 +32,42 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES') }

 			environment {
-				DOCKER_HUB = credentials("${p['docker.credentials']}")
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}

 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-							sh 'PROFILE=none ci/verify.sh'
-							sh "ci/clean.sh"
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+						sh 'PROFILE=none ci/verify.sh'
+						sh "ci/clean.sh"
+					}
+				}
+			}
+		}
+
+		stage("Test other configurations") {
+			when {
+				beforeAgent(true)
+				allOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: baseline (next)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh 'PROFILE=none ci/verify.sh'
+								sh "ci/clean.sh"
+							}
 						}
 					}
 				}
@@ -68,17 +93,15 @@ pipeline {

 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.staging-repository=libs-snapshot-local " +
-									"-Dartifactory.build-name=spring-data-elasticsearch " +
-									"-Dartifactory.build-number=${BUILD_NUMBER} " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
+								'-Dartifactory.server=https://repo.spring.io ' +
+								"-Dartifactory.username=${ARTIFACTORY_USR} " +
+								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+								"-Dartifactory.staging-repository=libs-snapshot-local " +
+								"-Dartifactory.build-name=spring-data-elasticsearch " +
+								"-Dartifactory.build-number=${BUILD_NUMBER} " +
+								'-Dmaven.test.skip=true clean deploy -U -B'
 					}
 				}
 			}
@@ -88,10 +111,6 @@ pipeline {
 	post {
 		changed {
 			script {
-				slackSend(
-						color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
-						channel: '#spring-data-dev',
-						message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
 				emailext(
 						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
 						mimeType: 'text/html',
@@ -137,9 +137,9 @@ To use the Release candidate versions of the upcoming major version, use our Mav
 </dependency>

 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
  <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-milestone</url>
+  <url>https://repo.spring.io/milestone</url>
 </repository>
 ----

@@ -154,9 +154,9 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 </dependency>

 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
  <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-snapshot</url>
+  <url>https://repo.spring.io/snapshot</url>
 </repository>
 ----

@@ -1,19 +1,21 @@
 # Java versions
-java.main.tag=17.0.4.1_1-jdk-focal
+java.main.tag=17.0.8_7-jdk-focal
+java.next.tag=20-jdk-jammy

 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}

 # Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.17
-docker.mongodb.5.0.version=5.0.13
-docker.mongodb.6.0.version=6.0.2
+docker.mongodb.4.4.version=4.4.23
+docker.mongodb.5.0.version=5.0.19
+docker.mongodb.6.0.version=6.0.8

 # Supported versions of Redis
-docker.redis.6.version=6.2.6
+docker.redis.6.version=6.2.13

 # Supported versions of Cassandra
-docker.cassandra.3.version=3.11.14
+docker.cassandra.3.version=3.11.15

 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.0.0</version>
+	<version>5.1.4</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.1.4</version>
 	</parent>

 	<name>Spring Data Elasticsearch</name>
@@ -18,21 +18,22 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>

 	<properties>
-		<springdata.commons>3.0.0</springdata.commons>
+		<springdata.commons>3.1.4</springdata.commons>

 		<!-- version of the RestHighLevelClient	-->
-		<elasticsearch-rhlc>7.17.7</elasticsearch-rhlc>
+		<elasticsearch-rhlc>7.17.13</elasticsearch-rhlc>
 		<!-- version of the new ElasticsearchClient	-->
-		<elasticsearch-java>8.5.0</elasticsearch-java>
+		<elasticsearch-java>8.7.1</elasticsearch-java>

 		<log4j>2.18.0</log4j>
-		<netty>4.1.65.Final</netty>
+		<!-- netty dependency can be removed once the WebClient code is gone -->
+		<netty>4.1.90.Final</netty>

-		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
-		<hoverfly>0.14.3</hoverfly>
+		<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
+		<hoverfly>0.14.4</hoverfly>
 		<jsonassert>1.5.1</jsonassert>
-		<testcontainers>1.17.3</testcontainers>
-		<wiremock>2.33.2</wiremock>
+		<testcontainers>1.18.0</testcontainers>
+		<wiremock>2.35.0</wiremock>

 		<java-module-name>spring.data.elasticsearch</java-module-name>

@@ -43,7 +44,6 @@
 		-->
 		<mvn.unit-test.goal>test</mvn.unit-test.goal>
 		<mvn.integration-test-elasticsearch.goal>integration-test</mvn.integration-test-elasticsearch.goal>
-		<mvn.integration-test-opensearch.goal>none</mvn.integration-test-opensearch.goal>
 	</properties>

 	<developers>
@@ -197,7 +197,7 @@
 		<dependency>
 			<groupId>javax.interceptor</groupId>
 			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2</version>
 			<scope>test</scope>
 		</dependency>

@@ -279,24 +279,6 @@
 			<scope>test</scope>
 		</dependency>

-
-		<!--
-		  we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
-		  lombok compiler stuff is executed regardless of the fact that we don't need it.
-		  On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
-		  Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
-		  src/test/resources/local-maven-repo/
-		  It was installed with
-		   mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
-		-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!--suppress MavenPackageUpdate -->
-			<version>999999</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
@@ -419,45 +401,8 @@
 							</systemPropertyVariables>
 						</configuration>
 					</execution>
-					<!-- execution to run the integration tests against Opensearch -->
-					<execution>
-						<id>integration-test-opensearch</id>
-						<phase>${mvn.integration-test-opensearch.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-							<systemPropertyVariables>
-								<sde.integration-test.environment>opensearch</sde.integration-test.environment>
-							</systemPropertyVariables>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.pitest</groupId>
-				<artifactId>pitest-maven</artifactId>
-				<version>1.7.5</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.pitest</groupId>
-						<artifactId>pitest-junit5-plugin</artifactId>
-						<version>0.12</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<jvmArgs>
-						<jvmArg>-XX:+AllowRedefinitionToAddDeleteMethods</jvmArg>
-					</jvmArgs>
-					<excludedGroups>integration-test</excludedGroups>
-					<targetClasses>
-						<param>org.springframework.data.elasticsearch.core.geo.*</param>
-					</targetClasses>
-					<excludedMethods>toString</excludedMethods>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -466,7 +411,7 @@
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
 			</plugin>
-        </plugins>
+		</plugins>
 	</build>

 	<profiles>
@@ -519,23 +464,8 @@
 	</profiles>

 	<repositories>
-		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
-		</repository>
-
-		<repository>
-			<id>local-maven-repo</id>
-			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
-		</repository>
-
+		
+		
 	</repositories>

-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-plugins-release</id>
-			<url>https://repo.spring.io/plugins-release</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>
@@ -17,9 +17,9 @@ include::reference/elasticsearch-new.adoc[leveloffset=+1]
 * Version Control - https://github.com/spring-projects/spring-data-elasticsearch
 * API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
 * Bugtracker - https://github.com/spring-projects/spring-data-elasticsearch/issues
-* Release repository - https://repo.spring.io/libs-release
-* Milestone repository - https://repo.spring.io/libs-milestone
-* Snapshot repository - https://repo.spring.io/libs-snapshot
+* Release repository - https://repo1.maven.org/maven2/
+* Milestone repository - https://repo.spring.io/milestone/
+* Snapshot repository - https://repo.spring.io/snapshot/

 [[preface.requirements]]
 == Requirements
@@ -37,16 +37,17 @@ built and tested.
 [cols="^,^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2022.0 (Turing) | 5.0.x | 8.5.0 | 6.0.x | 3.0.x
-| 2021.2 (Raj) | 4.4.x | 7.17.3 | 5.3.x | 2.7.x
-| 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x
-| 2021.0 (Pascal) | 4.2.xfootnote:oom[Out of maintenance] | 7.12.0 | 5.3.x | 2.5.x
-| 2020.0 (Ockham)footnote:oom[] | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
-| Neumannfootnote:oom[] | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
-| Moorefootnote:oom[] | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
-| Lovelacefootnote:oom[] | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
-| Kayfootnote:oom[] | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
-| Ingallsfootnote:oom[] | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
+| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x | 3.1.x
+| 2022.0 (Turing) | 5.0.x | 8.5.3 | 6.0.x | 3.0.x
+| 2021.2 (Raj) | 4.4.xfootnote:oom[Out of maintenance] | 7.17.3 | 5.3.x | 2.7.x
+| 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x | 2.6.x
+| 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x | 2.5.x
+| 2020.0 (Ockham) | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
+| Neumann | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
+| Moore | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
+| Lovelace | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
+| Kay | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
+| Ingalls | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
 |===

 Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming
@@ -240,7 +240,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()

 <.> Define default headers, if they need to be customized
 <.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-<.> Optionally enable SSL.
+<.> Optionally enable SSL. There exist overloads of this function that can take a `SSLContext` or as an alternative the fingerprint of the certificate as it is output by Elasticsearch 8 on startup.
 <.> Optionally set a proxy.
 <.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
 <.> Set the connection timeout.
@@ -224,11 +224,11 @@ The following code shows as an example how to retrieve all entries that have a _
 SearchHits<Statement> hasVotes() {

 	Query query = NativeQuery.builder()
-		.withQuery(co.elastic.clients.elasticsearch._types.query_dsl.Query.of(qb -> qb //
+		.withQuery(co.elastic.clients.elasticsearch._types.query_dsl.Query.of(qb -> qb
 			.hasChild(hc -> hc
-				.queryName("vote") //
-				.query(matchAllQueryAsQuery()) //
-				.scoreMode(ChildScoreMode.None)//
+				.queryName("vote")
+				.query(matchAllQueryAsQuery())
+				.scoreMode(ChildScoreMode.None)
 			)))
 		.build();

@@ -0,0 +1,26 @@
+[[elasticsearch-migration-guide-5.0-5.1]]
+= Upgrading from 5.0.x to 5.1.x
+
+This section describes breaking changes from version 5.0.x to 5.1.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.0-5.1.breaking-changes]]
+== Breaking Changes
+
+In the `org.springframework.data.elasticsearch.core.index.AliasData` class, which is used for alias information returned from Elasticsearch, the property `filter` (of type `Document`) is replaced by `filterQuery` which is of type
+`org.springframework.data.elasticsearch.core.query.Query`.
+
+`org.springframework.data.elasticsearch.annotations.Similarity` was an enum class until 5.1. This enum was used in the `@Field` annotation to specify a similarity value.
+But besides the values defined by the enum, it is possible to have similarities with custom names in Elasticsearch.
+Therefore, the annotation property was changed from the type of the enum to a simple `String`.
+The previous enum values like `Similarity.Default` do still exist as String constants, so existing code will compile unmodified.
+Adaptions are necessary when this enum was used at other places than as a property of the `@Field` annotation.
+
+[[elasticsearch-migration-guide-5.0-5.1.deprecations]]
+== Deprecations
+
+=== template functions
+
+The functions in the `IndexOperations` and `ReactiverIndexOperations` to manage index templates that were introduced in Spring Data Elasticsearch 4.1
+have been deprecated. They were using the old Elasticsearch API that was deprecated in Elasticsearch version 7.8. 
+
+Please use the new functions that are based on the compsable index template API instead.
@@ -17,7 +17,6 @@ The following arguments are available:
 * `refreshIntervall`, defaults to _"1s"_
 * `indexStoreType`, defaults to _"fs"_

-
 It is as well possible to define https://www.elastic.co/guide/en/elasticsearch/reference/7.11/index-modules-index-sorting.html[index sorting] (check the linked Elasticsearch documentation for the possible field types and values):

 ====
@@ -133,9 +132,7 @@ stream.close();
 ----
 ====

-There are no methods in the `SearchOperations` API to access the scroll id, if it should be necessary to access this,
-the following methods of the `AbstractElasticsearchTemplate` can be used (this is the base implementation for the
-different `ElasticsearchOperations` implementations:
+There are no methods in the `SearchOperations` API to access the scroll id, if it should be necessary to access this, the following methods of the `AbstractElasticsearchTemplate` can be used (this is the base implementation for the different `ElasticsearchOperations` implementations):

 ====
 [source,java]
@@ -281,9 +278,8 @@ This works with every implementation of the `Query` interface.
 [[elasticsearch.misc.point-in-time]]
 == Point In Time (PIT) API

-`ElasticsearchOperations` supports the point in time API of Elasticsearch (see https://www.elastic
-.co/guide/en/elasticsearch/reference/8.3/point-in-time-api.html). The following code snippet shows how to use this
-feature with a fictional `Person` class:
+`ElasticsearchOperations` supports the point in time API of Elasticsearch (see https://www.elastic.co/guide/en/elasticsearch/reference/8.3/point-in-time-api.html).
+The following code snippet shows how to use this feature with a fictional `Person` class:

 ====
 [source,java]
@@ -311,8 +307,115 @@ SearchHits<Person> searchHits2 = operations.search(query2, Person.class);
 operations.closePointInTime(searchHits2.getPointInTimeId());                        <.>

 ----
+
 <.> create a point in time for an index (can be multiple names) and a keep-alive duration and retrieve its id
 <.> pass that id into the query to search together with the next keep-alive value
 <.> for the next query, use the id returned from the previous search
 <.> when done, close the point in time using the last returned id
 ====
+
+[[elasticsearch.misc.searchtemplates]]
+== Search Template support
+
+Use of the search template API is supported.
+To use this, it first is necessary to create a stored script.
+The `ElasticsearchOperations` interface extends `ScriptOperations` which provides the necessary functions.
+The example used here assumes that we have `Person` entity with a property named `firstName`.
+A search template script can be saved like this:
+
+====
+[source,java]
+----
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.script.Script;
+
+operations.putScript(                            <.>
+  Script.builder()
+    .withId("person-firstname")                  <.>
+    .withLanguage("mustache")                    <.>
+    .withSource("""                              <.>
+      {
+        "query": {
+          "bool": {
+            "must": [
+              {
+                "match": {
+                  "firstName": "{{firstName}}"   <.>
+                }
+              }
+            ]
+          }
+        },
+        "from": "{{from}}",                      <.>
+        "size": "{{size}}"                       <.>
+      }
+      """)
+    .build()
+);
+----
+
+<.> Use the `putScript()` method to store a search template script
+<.> The name / id of the script
+<.> Scripts that are used in search templates must be in the _mustache_ language.
+<.> The script source
+<.> The search parameter in the script
+<.> Paging request offset
+<.> Paging request size
+====
+
+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.
+
+In the following code, we will add a call using a search template query to a custom repository implementation (see 
+<<repositories.custom-implementations>>) as
+an example how this can be integrated into a repository call.
+
+We first define the custom repository fragment interface:
+
+====
+[source,java]
+----
+interface PersonCustomRepository {
+	SearchPage<Person> findByFirstNameWithSearchTemplate(String firstName, Pageable pageable);
+}
+----
+====
+
+The implementation of this repository fragment looks like this:
+
+====
+[source,java]
+----
+public class PersonCustomRepositoryImpl implements PersonCustomRepository {
+
+  private final ElasticsearchOperations operations;
+
+  public PersonCustomRepositoryImpl(ElasticsearchOperations operations) {
+    this.operations = operations;
+  }
+
+  @Override
+  public SearchPage<Person> findByFirstNameWithSearchTemplate(String firstName, Pageable pageable) {
+
+    var query = SearchTemplateQuery.builder()                               <.>
+      .withId("person-firstname")                                           <.>
+      .withParams(
+        Map.of(                                                             <.>                             
+          "firstName", firstName,
+          "from", pageable.getOffset(),
+          "size", pageable.getPageSize()
+          )
+      )
+      .build();
+
+    SearchHits<Person> searchHits = operations.search(query, Person.class); <.>
+
+    return SearchHitSupport.searchPageFor(searchHits, pageable);
+  }
+}
+----
+
+<.> Create a `SearchTemplateQuery`
+<.> Provide the id of the search template
+<.> The parameters are passed in a `Map<String,Object>`
+<.> Do the search in the same way as with the other query types.
+====
@@ -1,12 +1,18 @@
 [[new-features]]
 = What's new

+[[new-features.5-1-0]]
+== New in Spring Data Elasticsearch 5.1
+
+* Upgrade to Elasticsearch 8.7.0
+* Allow specification of the TLS certificate when connecting to an Elasticsearch 8 cluster 
+
 [[new-features.5-0-0]]
 == New in Spring Data Elasticsearch 5.0

 * Upgrade to Java 17 baseline
 * Upgrade to Spring Framework 6
-* Upograde to Elasticsearch 8.5.0
+* Upgrade to Elasticsearch 8.5.0
 * Use the new Elasticsearch client library

 [[new-features.4-4-0]]
@@ -1,9 +1,9 @@
 [[elasticsearch.mapping]]
 = Elasticsearch Object Mapping

-Spring Data Elasticsearch Object Mapping is the process that maps a Java object - the domain entity - into the JSON 
-representation that is stored in Elasticsearch and back. The class that is internally used for this mapping is the 
-`MappingElasticsearcvhConverter`.
+Spring Data Elasticsearch Object Mapping is the process that maps a Java object - the domain entity - into the JSON representation that is stored in Elasticsearch and back.
+The class that is internally used for this mapping is the
+`MappingElasticsearchConverter`.

 [[elasticsearch.mapping.meta-model]]
 == Meta Model Object Mapping
@@ -29,7 +29,7 @@ See <<elasticsearch.repositories.autocreation>>


 * `@Id`: Applied at the field level to mark the field used for identity purpose.
-* `@Transient`: By default all fields are mapped to the document when it is stored or retrieved, this annotation excludes the field.
+* `@Transient`, `@ReadOnlyProperty`, `@WriteOnlyProperty`: see the following section <<elasticsearch.mapping.meta-model.annotations.read-write>> for detailed information.
 * `@PersistenceConstructor`: Marks a given constructor - even a package protected one - to use when instantiating the object from the database.
 Constructor arguments are mapped by name to the key values in the retrieved Document.
 * `@Field`: Applied at the field level and defines properties of the field, most of the attributes map to the respective https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html[Elasticsearch Mapping] definitions (the following list is not complete, check the annotation Javadoc for a complete reference):
@@ -49,6 +49,19 @@ In difference to a registered Spring `Converter` this only converts the annotate

 The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.

+[[elasticsearch.mapping.meta-model.annotations.read-write]]
+==== Controlling which properties are written to and read from Elasticsearch
+
+This section details the annotations that define if the value of a property is written to or read from Elasticsearch.
+
+`@Transient`: A property annotated with this annotation will not be written to the mapping, it's value will not be sent to Elasticsearch and when documents are returned from Elasticsearch, this property will not be set in the resulting entity.
+
+`@ReadOnlyProperty`: A property with this annotaiton will not have its value written to Elasticsearch, but when returning data, the proeprty will be filled with the value returned in the document from Elasticsearch.
+One use case for this are runtime fields defined in the index mapping.
+
+`@WriteOnlyProperty`: A property with this annotaiton will have its value stored in Elasticsearch but will not be set with any value when reading document.
+This can be used for example for synthesized fields which should go into the Elasticsearch index but are not used elsewhere.
+
 [[elasticsearch.mapping.meta-model.annotations.date-formats]]
 ==== Date format mapping

@@ -91,8 +104,7 @@ The following table shows the different attributes and the mapping created from
 NOTE: If you are using a custom date format, you need to use _uuuu_ for the year instead of _yyyy_.
 This is due to a https://www.elastic.co/guide/en/elasticsearch/reference/current/migrate-to-java-time.html#java-time-migration-incompatible-date-formats[change in Elasticsearch 7].

-Check the code of the `org.springframework.data.elasticsearch.annotations.DateFormat` enum for a complete list of 
-predefined values and their patterns.
+Check the code of the `org.springframework.data.elasticsearch.annotations.DateFormat` enum for a complete list of predefined values and their patterns.

 [[elasticsearch.mapping.meta-model.annotations.range]]
 ==== Range types
@@ -153,12 +165,13 @@ A `FieldNamingStrategy` applies to all entities; it can be overwritten by settin
 [[elasticsearch.mapping.meta-model.annotations.non-field-backed-properties]]
 ==== Non-field-backed properties

-Normally the properties used in an entity are fields of the entity class. There might be cases, when a property value
-is calculated in the entity and should be stored in Elasticsearch. In this case, the getter method (`getProperty()`) can be 
-annotated 
-with the `@Field` annotation, in addition to that the method must be annotated with `@AccessType(AccessType.Type
-.PROPERTY)`. The third annotation that is needed in such a case is `@WriteOnlyProperty`, as such a value is only 
-written to Elasticsearch. A full example:
+Normally the properties used in an entity are fields of the entity class.
+There might be cases, when a property value is calculated in the entity and should be stored in Elasticsearch.
+In this case, the getter method (`getProperty()`) can be annotated with the `@Field` annotation, in addition to that the method must be annotated with `@AccessType(AccessType.Type
+.PROPERTY)`.
+The third annotation that is needed in such a case is `@WriteOnlyProperty`, as such a value is only written to Elasticsearch.
+A full example:
+
 ====
 [source,java]
 ----
@@ -171,6 +184,19 @@ public String getProperty() {
 ----
 ====

+[[elasticsearch.mapping.meta-model.annotations.misc]]
+==== Other property annotations
+
+===== @IndexedIndexName
+
+This annotation can be set on a String property of an entity.
+This property will not be written to the mapping, it will not be stored in Elasticsearch and its value will not be read from an Elasticsearch document.
+After an entity is persisted, for example with a call to `ElasticsearchOperations.save(T entity)`, the entity 
+returned from that call will contain the name of the index that an entity was saved to in that property.
+This is useful when the index name is dynamically set by a bean, or when writing to a write alias.
+
+Putting some value into such a property does not set the index into which an entity is stored!
+
 [[elasticsearch.mapping.meta-model.rules]]
 === Mapping Rules

@@ -393,12 +419,15 @@ Looking at the `Configuration` from the <<elasticsearch.mapping.meta-model, prev
 [source,java]
 ----
@Configuration
-public class Config extends AbstractElasticsearchConfiguration {
+public class Config extends ElasticsearchConfiguration  {

-  @Override
-  public RestHighLevelClient elasticsearchClient() {
-    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest();
-  }
+	@NonNull
+	@Override
+	public ClientConfiguration clientConfiguration() {
+		return ClientConfiguration.builder() //
+				.connectedTo("localhost:9200") //
+				.build();
+	}

  @Bean
  @Override
@@ -409,7 +438,7 @@ public class Config extends AbstractElasticsearchConfiguration {

  @WritingConverter                                                 <2>
  static class AddressToMap implements Converter<Address, Map<String, Object>> {
-
+	  
    @Override
    public Map<String, Object> convert(Address source) {

@@ -35,6 +35,7 @@ There is support for automatic creation of indices and writing the mappings when

 The example shows how to use an injected `ElasticsearchOperations` instance in a Spring REST controller.
 The example assumes that `Person` is a class that is annotated with `@Document`, `@Id` etc (see <<elasticsearch.mapping.meta-model.annotations>>).
+
 .ElasticsearchOperations usage
 ====
 [source,java]
@@ -65,8 +66,8 @@ public class TestController {
 ----

 <.> Let Spring inject the provided `ElasticsearchOperations` bean in the constructor.
-<.> Store some entity in the Elasticsearch cluster. The id is read from the returned entity, as it might have been 
-null in the `person` object and been created by Elasticsearch.
+<.> Store some entity in the Elasticsearch cluster.
+The id is read from the returned entity, as it might have been null in the `person` object and been created by Elasticsearch.
 <.> Retrieve the entity with a get by id.
 ====

@@ -146,7 +147,7 @@ Conditions for the same field can be chained, they will be combined with a logic
 ====
 [source,java]
 ----
-Criteria criteria = new Criteria("price").greaterThan(42.0).lessThan(34.0L);
+Criteria criteria = new Criteria("price").greaterThan(42.0).lessThan(34.0);
 Query query = new CriteriaQuery(criteria);
 ----
 ====
@@ -233,3 +234,9 @@ Query query = NativeQuery.builder()
 SearchHits<Person> searchHits = operations.search(query, Person.class);
 ----
 ====
+
+[[elasticsearch.operations.searchtemplateScOp§query]]
+=== SearchTemplateQuery
+
+This is a special implementation of the `Query` interface to be used in combination with a stored search template. 
+See <<elasticsearch.misc.searchtemplates>> for further information.
@@ -15,4 +15,6 @@ include::elasticsearch-migration-guide-4.3-4.4.adoc[]

 include::elasticsearch-migration-guide-4.4-5.0.adoc[]

+include::elasticsearch-migration-guide-5.0-5.1.adoc[]
+
 :leveloffset: -1
@@ -37,7 +37,7 @@ public class Person {
 [source,java]
 ----

-ReactiveELasticsearchOperations operations;                        <.>
+ReactiveElasticsearchOperations operations;

 // ...

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022-2023 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;
+
+import org.springframework.dao.NonTransientDataAccessResourceException;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 5.1
+ */
+public class ResourceNotFoundException extends NonTransientDataAccessResourceException {
+
+	public ResourceNotFoundException(String msg) {
+		super(msg);
+	}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 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.
@@ -77,6 +77,22 @@ public @interface Document {
 	 */
 	Dynamic dynamic() default Dynamic.INHERIT;

+	/**
+	 * Specifies if the id property should also be stored in the Elasticsearch document source. Default value is
+	 * {@literal true}
+	 *
+	 * @since 5.1
+	 */
+	boolean storeIdInSource() default true;
+
+	/**
+	 * Specifies if the version property should also be stored in the Elasticsearch document source. Default value is
+	 * true.
+	 *
+	 * @since 5.1
+	 */
+	boolean storeVersionInSource() default true;
+
 	/**
 	 * @since 4.3
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 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.
@@ -140,7 +140,7 @@ public @interface Field {
 	/**
 	 * @since 4.0
 	 */
-	Similarity similarity() default Similarity.Default;
+	String similarity() default Similarity.Default;

 	/**
 	 * @since 4.0
@@ -210,4 +210,12 @@ public @interface Field {
 	 * @since 4.3
 	 */
 	boolean excludeFromSource() default false;
+
+	/**
+	 * when this field is a {{@link String}}, a {{@link java.util.Collection}} or a {{@link java.util.Map}} that is empty
+	 * this property controlls whether the empty value is sent to Elasticsearch.
+	 *
+	 * @since 5.1
+	 */
+	boolean storeEmptyValue() default true;
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2017-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 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.
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 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.ReadOnlyProperty;
+import org.springframework.data.annotation.Transient;
+
+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 String property of an entity to be filled with the name of the index where the entity was
+ * stored after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created
+ * or when a document was indexed into a write alias.
+ *
+ * This can not be used to specify the index where an entity should be written to.
+ *
+ * @author Peter-Josef Meisch
+ * @since 5.1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Documented
+@Field(type = FieldType.Auto) // prevents the property being written to the index mapping
+public @interface IndexedIndexName {
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 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.
@@ -109,7 +109,7 @@ public @interface InnerField {
 	/**
 	 * @since 4.0
 	 */
-	Similarity similarity() default Similarity.Default;
+	String similarity() default Similarity.Default;

 	/**
 	 * @since 4.0
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 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.
@@ -19,18 +19,9 @@ package org.springframework.data.elasticsearch.annotations;
 * @author Peter-Josef Meisch
 * @since 4.0
 */
-public enum Similarity {
-	Default("default"), BM25("BM25"), classic("classic"), Boolean("boolean");
-
-	// need to use a custom name because 'boolean' can't be used as enum name
-	private final String toStringName;
-
-	Similarity(String name) {
-		this.toStringName = name;
-	}
-
-	@Override
-	public String toString() {
-		return toStringName;
-	}
+public final class Similarity {
+	public final static String Default = "default";
+	public final static String BM25 = "BM25";
+	public final static String classic = "classic";
+	public final static String Boolean = "boolean";
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 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.aot;
+
+import java.util.function.Predicate;
+
+import org.springframework.data.util.ReactiveWrappers;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 5.1
+ */
+public class ElasticsearchAotPredicates {
+
+	public static final Predicate<ReactiveWrappers.ReactiveLibrary> IS_REACTIVE_LIBARARY_AVAILABLE = (
+			lib) -> ReactiveWrappers.isAvailable(lib);
+
+	public static boolean isReactorPresent() {
+		return IS_REACTIVE_LIBARARY_AVAILABLE.test(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR);
+	}
+
+}
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 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.aot;
+
+import static org.springframework.data.elasticsearch.aot.ElasticsearchAotPredicates.*;
+
+import java.util.Arrays;
+
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.data.elasticsearch.client.elc.EntityAsMap;
+import org.springframework.data.elasticsearch.core.event.AfterConvertCallback;
+import org.springframework.data.elasticsearch.core.event.AfterLoadCallback;
+import org.springframework.data.elasticsearch.core.event.AfterSaveCallback;
+import org.springframework.data.elasticsearch.core.event.AuditingEntityCallback;
+import org.springframework.data.elasticsearch.core.event.BeforeConvertCallback;
+import org.springframework.data.elasticsearch.core.event.ReactiveAfterConvertCallback;
+import org.springframework.data.elasticsearch.core.event.ReactiveAfterLoadCallback;
+import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback;
+import org.springframework.data.elasticsearch.core.event.ReactiveAuditingEntityCallback;
+import org.springframework.data.elasticsearch.core.event.ReactiveBeforeConvertCallback;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.lang.Nullable;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 5.1
+ */
+public class ElasticsearchRuntimeHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+		hints.reflection().registerTypes( //
+				Arrays.asList( //
+						TypeReference.of(AfterConvertCallback.class), //
+						TypeReference.of(AfterLoadCallback.class), //
+						TypeReference.of(AfterSaveCallback.class), //
+						TypeReference.of(BeforeConvertCallback.class), //
+						TypeReference.of(EntityAsMap.class) //
+				), //
+				builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+						MemberCategory.INVOKE_PUBLIC_METHODS));
+
+		if (isReactorPresent()) {
+			hints.reflection().registerTypes( //
+					Arrays.asList( //
+							TypeReference.of(ReactiveAfterConvertCallback.class), //
+							TypeReference.of(ReactiveAfterLoadCallback.class), //
+							TypeReference.of(ReactiveAfterSaveCallback.class), //
+							TypeReference.of(ReactiveBeforeConvertCallback.class) //
+					), //
+					builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+							MemberCategory.INVOKE_PUBLIC_METHODS));
+		}
+
+		// properties needed to log the different versions
+		hints.resources().registerPattern("versions.properties");
+		hints.resources().registerPattern("co/elastic/clients/version.properties");
+	}
+}
@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.aot;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -20,7 +20,6 @@ import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.function.Supplier;

 import javax.net.ssl.HostnameVerifier;
@@ -28,7 +27,6 @@ import javax.net.ssl.SSLContext;

 import org.springframework.data.elasticsearch.support.HttpHeaders;
 import org.springframework.lang.Nullable;
-import org.springframework.web.reactive.function.client.WebClient;

 /**
 * Configuration interface exposing common client configuration properties for Elasticsearch clients.
@@ -122,6 +120,12 @@ public interface ClientConfiguration {
 	 */
 	Optional<SSLContext> getSslContext();

+	/**
+	 * @return the optional SHA-256 fingerprint of the self-signed http_ca.crt certificate output by Elasticsearch at
+	 *         startup time.
+	 */
+	Optional<String> getCaFingerprint();
+
 	/**
 	 * Returns the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
 	 *
@@ -163,11 +167,6 @@ public interface ClientConfiguration {
 	 */
 	Optional<String> getProxy();

-	/**
-	 * @return the function for configuring a WebClient.
-	 */
-	Function<WebClient, WebClient> getWebClientConfigurer();
-
 	/**
 	 * @return the client configuration callbacks
 	 * @since 4.3
@@ -255,6 +254,15 @@ public interface ClientConfiguration {
 		 * @return the {@link TerminalClientConfigurationBuilder}.
 		 */
 		TerminalClientConfigurationBuilder usingSsl(SSLContext sslContext, HostnameVerifier hostnameVerifier);
+
+		/**
+		 * Connect via https using a SSLContext that is build from the given certificate fingerprint.
+		 *
+		 * @param caFingerprint the SHA-256 fingerprint of the self-signed http_ca.crt certificate output by Elasticsearch
+		 *          at startup time.
+		 * @return the {@link TerminalClientConfigurationBuilder}.
+		 */
+		TerminalClientConfigurationBuilder usingSsl(String caFingerprint);
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -20,7 +20,6 @@ import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.Supplier;

 import javax.net.ssl.HostnameVerifier;
@@ -33,7 +32,6 @@ import org.springframework.data.elasticsearch.client.ClientConfiguration.Termina
 import org.springframework.data.elasticsearch.support.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.web.reactive.function.client.WebClient;

 /**
 * Default builder implementation for {@link ClientConfiguration}.
@@ -51,15 +49,15 @@ class ClientConfigurationBuilder
 	private final List<InetSocketAddress> hosts = new ArrayList<>();
 	private HttpHeaders headers = new HttpHeaders();
 	private boolean useSsl;
-	private @Nullable SSLContext sslContext;
-	private @Nullable HostnameVerifier hostnameVerifier;
+	@Nullable private SSLContext sslContext;
+	@Nullable private String caFingerprint;
+	@Nullable private HostnameVerifier hostnameVerifier;
 	private Duration connectTimeout = Duration.ofSeconds(10);
 	private Duration soTimeout = Duration.ofSeconds(5);
-	private @Nullable String username;
-	private @Nullable String password;
-	private @Nullable String pathPrefix;
-	private @Nullable String proxy;
-	private final Function<WebClient, WebClient> webClientConfigurer = Function.identity();
+	@Nullable private String username;
+	@Nullable private String password;
+	@Nullable private String pathPrefix;
+	@Nullable private String proxy;
 	private Supplier<HttpHeaders> headersSupplier = HttpHeaders::new;
 	@Deprecated private final HttpClientConfigCallback httpClientConfigurer = httpClientBuilder -> httpClientBuilder;
 	private final List<ClientConfiguration.ClientConfigurationCallback<?>> clientConfigurers = new ArrayList<>();
@@ -139,10 +137,20 @@ class ClientConfigurationBuilder
 		return this;
 	}

+	@Override
+	public TerminalClientConfigurationBuilder usingSsl(String caFingerprint) {
+
+		Assert.notNull(caFingerprint, "caFingerprint must not be null");
+
+		this.useSsl = true;
+		this.caFingerprint = caFingerprint;
+		return this;
+	}
+
 	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder#withDefaultHeaders(org.springframework.http.HttpHeaders)
-	 */
+	* (non-Javadoc)
+	* @see org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder#withDefaultHeaders(org.springframework.http.HttpHeaders)
+	*/
 	@Override
 	public TerminalClientConfigurationBuilder withDefaultHeaders(HttpHeaders defaultHeaders) {

@@ -229,8 +237,12 @@ class ClientConfigurationBuilder
 			headers.setBasicAuth(username, password);
 		}

-		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix,
-				hostnameVerifier, proxy, webClientConfigurer, httpClientConfigurer, clientConfigurers, headersSupplier);
+		if (sslContext != null && caFingerprint != null) {
+			throw new IllegalArgumentException("Either SSLContext or caFingerprint must be set, but not both");
+		}
+
+		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, caFingerprint, soTimeout, connectTimeout,
+				pathPrefix, hostnameVerifier, proxy, httpClientConfigurer, clientConfigurers, headersSupplier);
 	}

 	private static InetSocketAddress parse(String hostAndPort) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -19,7 +19,6 @@ import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.function.Supplier;

 import javax.net.ssl.HostnameVerifier;
@@ -28,7 +27,6 @@ import javax.net.ssl.SSLContext;
 import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.data.elasticsearch.support.HttpHeaders;
 import org.springframework.lang.Nullable;
-import org.springframework.web.reactive.function.client.WebClient;

 /**
 * Default {@link ClientConfiguration} implementation.
@@ -44,33 +42,33 @@ class DefaultClientConfiguration implements ClientConfiguration {
 	private final List<InetSocketAddress> hosts;
 	private final HttpHeaders headers;
 	private final boolean useSsl;
-	private final @Nullable SSLContext sslContext;
+	@Nullable private final SSLContext sslContext;
+	@Nullable private final String caFingerprint;
 	private final Duration soTimeout;
 	private final Duration connectTimeout;
-	private final @Nullable String pathPrefix;
-	private final @Nullable HostnameVerifier hostnameVerifier;
-	private final @Nullable String proxy;
-	private final Function<WebClient, WebClient> webClientConfigurer;
+	@Nullable private final String pathPrefix;
+	@Nullable private final HostnameVerifier hostnameVerifier;
+	@Nullable private final String proxy;
 	private final HttpClientConfigCallback httpClientConfigurer;
 	private final Supplier<HttpHeaders> headersSupplier;
 	private final List<ClientConfigurationCallback<?>> clientConfigurers;

 	DefaultClientConfiguration(List<InetSocketAddress> hosts, HttpHeaders headers, boolean useSsl,
-			@Nullable SSLContext sslContext, Duration soTimeout, Duration connectTimeout, @Nullable String pathPrefix,
-			@Nullable HostnameVerifier hostnameVerifier, @Nullable String proxy,
-			Function<WebClient, WebClient> webClientConfigurer, HttpClientConfigCallback httpClientConfigurer,
-			List<ClientConfigurationCallback<?>> clientConfigurers, Supplier<HttpHeaders> headersSupplier) {
+			@Nullable SSLContext sslContext, @Nullable String caFingerprint, Duration soTimeout, Duration connectTimeout,
+			@Nullable String pathPrefix, @Nullable HostnameVerifier hostnameVerifier, @Nullable String proxy,
+			HttpClientConfigCallback httpClientConfigurer, List<ClientConfigurationCallback<?>> clientConfigurers,
+			Supplier<HttpHeaders> headersSupplier) {

 		this.hosts = List.copyOf(hosts);
 		this.headers = headers;
 		this.useSsl = useSsl;
 		this.sslContext = sslContext;
+		this.caFingerprint = caFingerprint;
 		this.soTimeout = soTimeout;
 		this.connectTimeout = connectTimeout;
 		this.pathPrefix = pathPrefix;
 		this.hostnameVerifier = hostnameVerifier;
 		this.proxy = proxy;
-		this.webClientConfigurer = webClientConfigurer;
 		this.httpClientConfigurer = httpClientConfigurer;
 		this.clientConfigurers = clientConfigurers;
 		this.headersSupplier = headersSupplier;
@@ -96,6 +94,11 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return Optional.ofNullable(this.sslContext);
 	}

+	@Override
+	public Optional<String> getCaFingerprint() {
+		return Optional.ofNullable(this.caFingerprint);
+	}
+
 	@Override
 	public Optional<HostnameVerifier> getHostNameVerifier() {
 		return Optional.ofNullable(this.hostnameVerifier);
@@ -122,11 +125,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return Optional.ofNullable(proxy);
 	}

-	@Override
-	public Function<WebClient, WebClient> getWebClientConfigurer() {
-		return webClientConfigurer;
-	}
-
 	@Override
 	public <T> List<ClientConfigurationCallback<?>> getClientConfigurers() {
 		return clientConfigurers;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -15,7 +15,7 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

-import static org.springframework.data.elasticsearch.client.elc.QueryBuilders.*;
+import static org.springframework.data.elasticsearch.client.elc.Queries.*;
 import static org.springframework.util.StringUtils.*;

 import co.elastic.clients.elasticsearch._types.FieldValue;
@@ -39,6 +39,7 @@ import org.springframework.util.Assert;
 * query.
 *
 * @author Peter-Josef Meisch
+ * @author Ezequiel Antúnez Camacho
 * @since 4.4
 */
 class CriteriaQueryProcessor {
@@ -329,6 +330,13 @@ class CriteriaQueryProcessor {
 					throw new CriteriaQueryException("value for " + fieldName + " is not an Iterable");
 				}
 				break;
+			case REGEXP:
+				queryBuilder //
+						.regexp(rb -> rb //
+								.field(fieldName) //
+								.value(value.toString()) //
+								.boost(boost)); //
+				break;
 			default:
 				throw new CriteriaQueryException("Could not build query for " + entry);
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -19,6 +19,7 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.TransportUtils;
 import co.elastic.clients.transport.Version;
 import co.elastic.clients.transport.rest_client.RestClientOptions;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
@@ -34,13 +35,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;

-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.*;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
@@ -197,6 +192,10 @@ public final class ElasticsearchClients {
 		}

 		builder.setHttpClientConfigCallback(clientBuilder -> {
+			if (clientConfiguration.getCaFingerprint().isPresent()) {
+				clientBuilder
+						.setSSLContext(TransportUtils.sslContextFromCaFingerprint(clientConfiguration.getCaFingerprint().get()));
+			}
 			clientConfiguration.getSslContext().ifPresent(clientBuilder::setSSLContext);
 			clientConfiguration.getHostNameVerifier().ifPresent(clientBuilder::setSSLHostnameVerifier);
 			clientBuilder.addInterceptorLast(new CustomHeaderInjector(clientConfiguration.getHeadersSupplier()));
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -30,6 +30,7 @@ import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
+import org.springframework.data.elasticsearch.ResourceNotFoundException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;

 /**
@@ -74,22 +75,28 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 		if (ex instanceof ElasticsearchException elasticsearchException) {

 			ErrorResponse response = elasticsearchException.response();
+			var errorType = response.error().type();
+			var errorReason = response.error().reason() != null ? response.error().reason() : "undefined reason";

-			if (response.status() == 404 && "index_not_found_exception".equals(response.error().type())) {
+			if (response.status() == 404) {

-				// noinspection RegExpRedundantEscape
-				Pattern pattern = Pattern.compile(".*no such index \\[(.*)\\]");
-				String index = "";
-				Matcher matcher = pattern.matcher(response.error().reason());
-				if (matcher.matches()) {
-					index = matcher.group(1);
+				if ("index_not_found_exception".equals(errorType)) {
+					// noinspection RegExpRedundantEscape
+					Pattern pattern = Pattern.compile(".*no such index \\[(.*)\\]");
+					String index = "";
+					Matcher matcher = pattern.matcher(errorReason);
+					if (matcher.matches()) {
+						index = matcher.group(1);
+					}
+					return new NoSuchIndexException(index);
 				}
-				return new NoSuchIndexException(index);
+
+				return new ResourceNotFoundException(errorReason);
 			}
 			String body = JsonUtils.toJson(response, jsonpMapper);

-			if (response.error().type().contains("validation_exception")) {
-				return new DataIntegrityViolationException(response.error().reason());
+			if (errorType != null && errorType.contains("validation_exception")) {
+				return new DataIntegrityViolationException(errorReason);
 			}

 			return new UncategorizedElasticsearchException(ex.getMessage(), response.status(), body, ex);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -55,10 +55,12 @@ import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.core.query.SearchTemplateQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
 import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
 import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
+import org.springframework.data.elasticsearch.core.script.Script;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

@@ -67,6 +69,7 @@ import org.springframework.util.Assert;
 * Elasticsearch client.
 *
 * @author Peter-Josef Meisch
+ * @author Hamid Rahimi
 * @since 4.4
 */
 public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
@@ -112,16 +115,20 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	// region child templates
 	@Override
 	public IndexOperations indexOps(Class<?> clazz) {
-		return new IndicesTemplate(client.indices(), elasticsearchConverter, clazz);
+		return new IndicesTemplate(client.indices(), getClusterTemplate(), elasticsearchConverter, clazz);
 	}

 	@Override
 	public IndexOperations indexOps(IndexCoordinates index) {
-		return new IndicesTemplate(client.indices(), elasticsearchConverter, index);
+		return new IndicesTemplate(client.indices(), getClusterTemplate(), elasticsearchConverter, index);
 	}

 	@Override
 	public ClusterOperations cluster() {
+		return getClusterTemplate();
+	}
+
+	private ClusterTemplate getClusterTemplate() {
 		return new ClusterTemplate(client.cluster(), elasticsearchConverter);
 	}
 	// endregion
@@ -171,8 +178,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {

 		Assert.notNull(query, "query must not be null");

-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, clazz, index,
-				getRefreshPolicy());
+		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
+				clazz, index, getRefreshPolicy());

 		DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));

@@ -215,8 +222,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			query.setObject(updateIndexedObject(queryObject, IndexedObjectInformation.of(indexResponse.id(),
-					indexResponse.seqNo(), indexResponse.primaryTerm(), indexResponse.version())));
+			query.setObject(updateIndexedObject(queryObject, new IndexedObjectInformation(indexResponse.id(),
+					indexResponse.index(), indexResponse.seqNo(), indexResponse.primaryTerm(), indexResponse.version())));
 		}

 		return indexResponse.id();
@@ -296,7 +303,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {

 	@Override
 	public String getRuntimeLibraryVersion() {
-		return Version.VERSION.toString();
+		return Version.VERSION != null ? Version.VERSION.toString() : "0.0.0.?";
 	}

 	// region search operations
@@ -306,7 +313,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(index, "index must not be null");

-		SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, true, false);
+		SearchRequest searchRequest = requestConverter.searchRequest(query, routingResolver.getRouting(), clazz, index,
+				true);

 		SearchResponse<EntityAsMap> searchResponse = execute(client -> client.search(searchRequest, EntityAsMap.class));

@@ -317,11 +325,22 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	public <T> SearchHits<T> search(Query query, Class<T> clazz, IndexCoordinates index) {

 		Assert.notNull(query, "query must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
 		Assert.notNull(index, "index must not be null");

-		SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, false, false);
+		if (query instanceof SearchTemplateQuery searchTemplateQuery) {
+			return doSearch(searchTemplateQuery, clazz, index);
+		} else {
+			return doSearch(query, clazz, index);
+		}
+	}
+
+	protected <T> SearchHits<T> doSearch(Query query, Class<T> clazz, IndexCoordinates index) {
+		SearchRequest searchRequest = requestConverter.searchRequest(query, routingResolver.getRouting(), clazz, index,
+				false);
 		SearchResponse<EntityAsMap> searchResponse = execute(client -> client.search(searchRequest, EntityAsMap.class));

+		// noinspection DuplicatedCode
 		ReadDocumentCallback<T> readDocumentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
 		SearchDocumentResponse.EntityCreator<T> entityCreator = getEntityCreator(readDocumentCallback);
 		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
@@ -329,6 +348,18 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		return callback.doWith(SearchDocumentResponseBuilder.from(searchResponse, entityCreator, jsonpMapper));
 	}

+	protected <T> SearchHits<T> doSearch(SearchTemplateQuery query, Class<T> clazz, IndexCoordinates index) {
+		var searchTemplateRequest = requestConverter.searchTemplate(query, routingResolver.getRouting(), index);
+		var searchTemplateResponse = execute(client -> client.searchTemplate(searchTemplateRequest, EntityAsMap.class));
+
+		// noinspection DuplicatedCode
+		ReadDocumentCallback<T> readDocumentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
+		SearchDocumentResponse.EntityCreator<T> entityCreator = getEntityCreator(readDocumentCallback);
+		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
+
+		return callback.doWith(SearchDocumentResponseBuilder.from(searchTemplateResponse, entityCreator, jsonpMapper));
+	}
+
 	@Override
 	protected <T> SearchHits<T> doSearch(MoreLikeThisQuery query, Class<T> clazz, IndexCoordinates index) {

@@ -349,7 +380,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(query.getPageable(), "pageable of query must not be null.");

-		SearchRequest request = requestConverter.searchRequest(query, clazz, index, false, scrollTimeInMillis);
+		SearchRequest request = requestConverter.searchRequest(query, routingResolver.getRouting(), clazz, index, false,
+				scrollTimeInMillis);
 		SearchResponse<EntityAsMap> response = execute(client -> client.search(request, EntityAsMap.class));

 		return getSearchScrollHits(clazz, index, response);
@@ -441,10 +473,34 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		return doMultiSearch(multiSearchQueryParameters);
 	}

+	@Override
+	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes,
+			List<IndexCoordinates> indexes) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(classes, "classes must not be null");
+		Assert.notNull(indexes, "indexes must not be null");
+		Assert.isTrue(queries.size() == classes.size() && queries.size() == indexes.size(),
+				"queries, classes and indexes must have the same size");
+
+		List<MultiSearchQueryParameter> multiSearchQueryParameters = new ArrayList<>(queries.size());
+		Iterator<Class<?>> it = classes.iterator();
+		Iterator<IndexCoordinates> indexesIt = indexes.iterator();
+
+		for (Query query : queries) {
+			Class<?> clazz = it.next();
+			IndexCoordinates index = indexesIt.next();
+			multiSearchQueryParameters.add(new MultiSearchQueryParameter(query, clazz, index));
+		}
+
+		return doMultiSearch(multiSearchQueryParameters);
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private List<SearchHits<?>> doMultiSearch(List<MultiSearchQueryParameter> multiSearchQueryParameters) {

-		MsearchRequest request = requestConverter.searchMsearchRequest(multiSearchQueryParameters);
+		MsearchRequest request = requestConverter.searchMsearchRequest(multiSearchQueryParameters,
+				routingResolver.getRouting());

 		MsearchResponse<EntityAsMap> msearchResponse = execute(client -> client.msearch(request, EntityAsMap.class));
 		List<MultiSearchResponseItem<EntityAsMap>> responseItems = msearchResponse.responses();
@@ -513,6 +569,35 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {

 	// endregion

+	// region script methods
+	@Override
+	public boolean putScript(Script script) {
+
+		Assert.notNull(script, "script must not be null");
+
+		var request = requestConverter.scriptPut(script);
+		return execute(client -> client.putScript(request)).acknowledged();
+	}
+
+	@Nullable
+	@Override
+	public Script getScript(String name) {
+
+		Assert.notNull(name, "name must not be null");
+
+		var request = requestConverter.scriptGet(name);
+		return responseConverter.scriptResponse(execute(client -> client.getScript(request)));
+	}
+
+	public boolean deleteScript(String name) {
+
+		Assert.notNull(name, "name must not be null");
+
+		DeleteScriptRequest request = requestConverter.scriptDelete(name);
+		return execute(client -> client.deleteScript(request)).acknowledged();
+	}
+	// endregion
+
 	// region client callback
 	/**
 	 * Callback interface to be used with {@link #execute(ElasticsearchTemplate.ClientCallback)} for operating directly on
@@ -575,8 +660,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 					failedDocuments);
 		}

-		return bulkResponse.items().stream()
-				.map(item -> IndexedObjectInformation.of(item.id(), item.seqNo(), item.primaryTerm(), item.version()))
+		return bulkResponse.items().stream().map(
+				item -> new IndexedObjectInformation(item.id(), item.index(), item.seqNo(), item.primaryTerm(), item.version()))
 				.collect(Collectors.toList());

 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -37,15 +37,15 @@ import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.ResourceUtil;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.index.AliasActions;
-import org.springframework.data.elasticsearch.core.index.AliasData;
+import org.springframework.data.elasticsearch.core.index.*;
+import org.springframework.data.elasticsearch.core.index.DeleteIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.ExistsIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.GetIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.MappingBuilder;
+import org.springframework.data.elasticsearch.core.index.PutIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.Settings;
-import org.springframework.data.elasticsearch.core.index.TemplateData;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.lang.Nullable;
@@ -62,30 +62,37 @@ public class IndicesTemplate extends ChildTemplate<ElasticsearchTransport, Elast

 	private static final Logger LOGGER = LoggerFactory.getLogger(IndicesTemplate.class);

+	// we need a cluster client as well because ES has put some methods from the indices API into the cluster client
+	// (component templates)
+	private final ClusterTemplate clusterTemplate;
 	protected final ElasticsearchConverter elasticsearchConverter;
 	@Nullable protected final Class<?> boundClass;
 	@Nullable protected final IndexCoordinates boundIndex;

-	public IndicesTemplate(ElasticsearchIndicesClient client, ElasticsearchConverter elasticsearchConverter,
-			Class<?> boundClass) {
+	public IndicesTemplate(ElasticsearchIndicesClient client, ClusterTemplate clusterTemplate,
+			ElasticsearchConverter elasticsearchConverter, Class<?> boundClass) {
 		super(client, elasticsearchConverter);

+		Assert.notNull(clusterTemplate, "cluster must not be null");
 		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null");
 		Assert.notNull(boundClass, "boundClass may not be null");

+		this.clusterTemplate = clusterTemplate;
 		this.elasticsearchConverter = elasticsearchConverter;
 		this.boundClass = boundClass;
 		this.boundIndex = null;

 	}

-	public IndicesTemplate(ElasticsearchIndicesClient client, ElasticsearchConverter elasticsearchConverter,
-			IndexCoordinates boundIndex) {
+	public IndicesTemplate(ElasticsearchIndicesClient client, ClusterTemplate clusterTemplate,
+												 ElasticsearchConverter elasticsearchConverter, IndexCoordinates boundIndex) {
 		super(client, elasticsearchConverter);

+		Assert.notNull(clusterTemplate, "cluster must not be null");
 		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null");
 		Assert.notNull(boundIndex, "boundIndex must not be null");

+		this.clusterTemplate = clusterTemplate;
 		this.elasticsearchConverter = elasticsearchConverter;
 		this.boundClass = null;
 		this.boundIndex = boundIndex;
@@ -338,6 +345,87 @@ public class IndicesTemplate extends ChildTemplate<ElasticsearchTransport, Elast
 		return execute(client -> client.deleteTemplate(deleteTemplateRequestES)).acknowledged();
 	}

+	@Override
+	public boolean putIndexTemplate(PutIndexTemplateRequest putIndexTemplateRequest) {
+
+		co.elastic.clients.elasticsearch.indices.PutIndexTemplateRequest putIndexTemplateRequestES = requestConverter
+				.indicesPutIndexTemplateRequest(putIndexTemplateRequest);
+
+		return execute(client -> client.putIndexTemplate(putIndexTemplateRequestES)).acknowledged();
+	}
+
+	@Override
+	public boolean existsIndexTemplate(ExistsIndexTemplateRequest existsIndexTemplateRequest) {
+
+		Assert.notNull(existsIndexTemplateRequest, "existsIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest existsTemplateRequestES = requestConverter
+				.indicesExistsIndexTemplateRequest(existsIndexTemplateRequest);
+		return execute(client -> client.existsIndexTemplate(existsTemplateRequestES)).value();
+	}
+
+	@Override
+	public List<TemplateResponse> getIndexTemplate(GetIndexTemplateRequest getIndexTemplateRequest) {
+
+		Assert.notNull(getIndexTemplateRequest, "getIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.GetIndexTemplateRequest getIndexTemplateRequestES = requestConverter
+				.indicesGetIndexTemplateRequest(getIndexTemplateRequest);
+		var getIndexTemplateResponse = execute(client -> client.getIndexTemplate(getIndexTemplateRequestES));
+		return responseConverter.getIndexTemplates(getIndexTemplateResponse);
+	}
+
+	@Override
+	public boolean deleteIndexTemplate(DeleteIndexTemplateRequest deleteIndexTemplateRequest) {
+
+		Assert.notNull(deleteIndexTemplateRequest, "deleteIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.DeleteIndexTemplateRequest deleteIndexTemplateRequestES = requestConverter
+				.indicesDeleteIndexTemplateRequest(deleteIndexTemplateRequest);
+		return execute(client -> client.deleteIndexTemplate(deleteIndexTemplateRequestES)).acknowledged();
+	}
+
+	@Override
+	public boolean putComponentTemplate(PutComponentTemplateRequest putComponentTemplateRequest) {
+
+		Assert.notNull(putComponentTemplateRequest, "putComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest putComponentTemplateRequestES = requestConverter
+				.clusterPutComponentTemplateRequest(putComponentTemplateRequest);
+		// the new Elasticsearch client has this call in the cluster index
+		return clusterTemplate.execute(client -> client.putComponentTemplate(putComponentTemplateRequestES)).acknowledged();
+	}
+
+	@Override
+	public boolean existsComponentTemplate(ExistsComponentTemplateRequest existsComponentTemplateRequest) {
+
+		Assert.notNull(existsComponentTemplateRequest, "existsComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.ExistsComponentTemplateRequest existsComponentTemplateRequestES = requestConverter
+				.clusterExistsComponentTemplateRequest(existsComponentTemplateRequest);
+		return clusterTemplate.execute(client -> client.existsComponentTemplate(existsComponentTemplateRequestES)).value();
+	}
+
+	@Override
+	public List<TemplateResponse> getComponentTemplate(GetComponentTemplateRequest getComponentTemplateRequest) {
+
+		co.elastic.clients.elasticsearch.cluster.GetComponentTemplateRequest getComponentTemplateRequestES = requestConverter
+				.clusterGetComponentTemplateRequest(getComponentTemplateRequest);
+		var response = clusterTemplate.execute(client -> client.getComponentTemplate(getComponentTemplateRequestES));
+		return responseConverter.clusterGetComponentTemplates(response);
+	}
+
+	@Override
+	public boolean deleteComponentTemplate(DeleteComponentTemplateRequest deleteComponentTemplateRequest) {
+
+		Assert.notNull(deleteComponentTemplateRequest, "deleteComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.DeleteComponentTemplateRequest deleteComponentTemplateRequestES = requestConverter
+				.clusterDeleteComponentTemplateRequest(deleteComponentTemplateRequest);
+		return clusterTemplate.execute(client -> client.deleteComponentTemplate(deleteComponentTemplateRequestES))
+				.acknowledged();
+	}
+
 	@Override
 	public List<IndexInformation> getInformation(IndexCoordinates indexCoordinates) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -15,6 +15,7 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

+import co.elastic.clients.elasticsearch._types.KnnQuery;
 import co.elastic.clients.elasticsearch._types.SortOptions;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
@@ -30,6 +31,7 @@ import java.util.Map;
 import org.springframework.data.elasticsearch.core.query.BaseQuery;
 import org.springframework.data.elasticsearch.core.query.ScriptedField;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;

 /**
 * A {@link org.springframework.data.elasticsearch.core.query.Query} implementation using query builders from the new
@@ -42,15 +44,16 @@ import org.springframework.lang.Nullable;
 public class NativeQuery extends BaseQuery {

 	@Nullable private final Query query;
+	@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
 	@Nullable private Query filter;
 	// note: the new client does not have pipeline aggs, these are just set up as normal aggs
 	private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
 	@Nullable private Suggester suggester;
 	@Nullable private FieldCollapse fieldCollapse;
-	private List<ScriptedField> scriptedFields = Collections.emptyList();
 	private List<SortOptions> sortOptions = Collections.emptyList();

 	private Map<String, JsonData> searchExtensions = Collections.emptyMap();
+	@Nullable private KnnQuery knnQuery;

 	public NativeQuery(NativeQueryBuilder builder) {
 		super(builder);
@@ -59,9 +62,15 @@ public class NativeQuery extends BaseQuery {
 		this.aggregations.putAll(builder.getAggregations());
 		this.suggester = builder.getSuggester();
 		this.fieldCollapse = builder.getFieldCollapse();
-		this.scriptedFields = builder.getScriptedFields();
 		this.sortOptions = builder.getSortOptions();
 		this.searchExtensions = builder.getSearchExtensions();
+
+		if (builder.getSpringDataQuery() != null) {
+			Assert.isTrue(!NativeQuery.class.isAssignableFrom(builder.getSpringDataQuery().getClass()),
+					"Cannot add an NativeQuery in a NativeQuery");
+		}
+		this.springDataQuery = builder.getSpringDataQuery();
+		this.knnQuery = builder.getKnnQuery();
 	}

 	public NativeQuery(@Nullable Query query) {
@@ -96,10 +105,6 @@ public class NativeQuery extends BaseQuery {
 		return fieldCollapse;
 	}

-	public List<ScriptedField> getScriptedFields() {
-		return scriptedFields;
-	}
-
 	public List<SortOptions> getSortOptions() {
 		return sortOptions;
 	}
@@ -107,4 +112,25 @@ public class NativeQuery extends BaseQuery {
 	public Map<String, JsonData> getSearchExtensions() {
 		return searchExtensions;
 	}
+
+	/**
+	 * @see NativeQueryBuilder#withQuery(org.springframework.data.elasticsearch.core.query.Query).
+	 * @since 5.1
+	 */
+	public void setSpringDataQuery(@Nullable org.springframework.data.elasticsearch.core.query.Query springDataQuery) {
+		this.springDataQuery = springDataQuery;
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	@Nullable
+	public KnnQuery getKnnQuery() {
+		return knnQuery;
+	}
+
+	@Nullable
+	public org.springframework.data.elasticsearch.core.query.Query getSpringDataQuery() {
+		return springDataQuery;
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -15,6 +15,7 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

+import co.elastic.clients.elasticsearch._types.KnnQuery;
 import co.elastic.clients.elasticsearch._types.SortOptions;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
@@ -31,7 +32,6 @@ import java.util.Map;
 import java.util.function.Function;

 import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
-import org.springframework.data.elasticsearch.core.query.ScriptedField;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

@@ -47,10 +47,12 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 	private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
 	@Nullable private Suggester suggester;
 	@Nullable private FieldCollapse fieldCollapse;
-	private final List<ScriptedField> scriptedFields = new ArrayList<>();
 	private List<SortOptions> sortOptions = new ArrayList<>();
 	private Map<String, JsonData> searchExtensions = new LinkedHashMap<>();

+	@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
+	@Nullable private KnnQuery knnQuery;
+
 	public NativeQueryBuilder() {}

 	@Nullable
@@ -77,10 +79,6 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 		return fieldCollapse;
 	}

-	public List<ScriptedField> getScriptedFields() {
-		return scriptedFields;
-	}
-
 	public List<SortOptions> getSortOptions() {
 		return sortOptions;
 	}
@@ -89,6 +87,16 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 		return this.searchExtensions;
 	}

+	@Nullable
+	public KnnQuery getKnnQuery() {
+		return knnQuery;
+	}
+
+	@Nullable
+	public org.springframework.data.elasticsearch.core.query.Query getSpringDataQuery() {
+		return springDataQuery;
+	}
+
 	public NativeQueryBuilder withQuery(Query query) {

 		Assert.notNull(query, "query must not be null");
@@ -135,17 +143,10 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 		return this;
 	}

-	public NativeQueryBuilder withScriptedField(ScriptedField scriptedField) {
-
-		Assert.notNull(scriptedField, "scriptedField must not be null");
-
-		this.scriptedFields.add(scriptedField);
-		return this;
-	}
-
 	public NativeQueryBuilder withSort(List<SortOptions> values) {

 		Assert.notEmpty(values, "values must not be empty");
+
 		sortOptions.clear();
 		sortOptions.addAll(values);

@@ -184,11 +185,32 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer

 		Assert.notNull(searchExtensions, "searchExtensions must not be null");

-		searchExtensions.putAll(searchExtensions);
+		this.searchExtensions.putAll(searchExtensions);
+		return this;
+	}
+
+	/**
+	 * Allows to use a {@link org.springframework.data.elasticsearch.core.query.Query} within a NativeQuery. Cannot be
+	 * used together with {@link #withQuery(Query)} that sets an Elasticsearch query. Passing in a {@link NativeQuery}
+	 * will result in an exception when {@link #build()} is called.
+	 *
+	 * @since 5.1
+	 */
+	public NativeQueryBuilder withQuery(org.springframework.data.elasticsearch.core.query.Query query) {
+		this.springDataQuery = query;
+		return this;
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public NativeQueryBuilder withKnnQuery(KnnQuery knnQuery) {
+		this.knnQuery = knnQuery;
 		return this;
 	}

 	public NativeQuery build() {
+		Assert.isTrue(query == null || springDataQuery == null, "Cannot have both a native query and a Spring Data query");
 		return new NativeQuery(this);
 	}
 }
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2022-2023 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.client.elc;
+
+import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.LatLonGeoLocation;
+import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
+import co.elastic.clients.elasticsearch._types.query_dsl.IdsQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.MatchAllQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.MatchQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryStringQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.TermQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.WildcardQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.WrapperQuery;
+import co.elastic.clients.util.ObjectBuilder;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.function.Function;
+
+import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Utility class simplifying the creation of some more complex queries and type.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public final class Queries {
+
+	private Queries() {}
+
+	public static IdsQuery idsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		return IdsQuery.of(i -> i.values(ids));
+	}
+
+	public static Query idsQueryAsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.ids(idsQuery(ids));
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static MatchQuery matchQuery(String fieldName, String query, @Nullable Operator operator,
+			@Nullable Float boost) {
+
+		Assert.notNull(fieldName, "fieldName must not be null");
+		Assert.notNull(query, "query must not be null");
+
+		return MatchQuery.of(mb -> mb.field(fieldName).query(FieldValue.of(query)).operator(operator).boost(boost));
+	}
+
+	public static Query matchQueryAsQuery(String fieldName, String query, @Nullable Operator operator,
+			@Nullable Float boost) {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.match(matchQuery(fieldName, query, operator, boost));
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static MatchAllQuery matchAllQuery() {
+
+		return MatchAllQuery.of(b -> b);
+	}
+
+	public static Query matchAllQueryAsQuery() {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.matchAll(matchAllQuery());
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, @Nullable Float boost) {
+		return queryStringQuery(fieldName, query, null, null, boost);
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, Operator defaultOperator,
+			@Nullable Float boost) {
+		return queryStringQuery(fieldName, query, null, defaultOperator, boost);
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, @Nullable Boolean analyzeWildcard,
+			@Nullable Float boost) {
+		return queryStringQuery(fieldName, query, analyzeWildcard, null, boost);
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, @Nullable Boolean analyzeWildcard,
+			@Nullable Operator defaultOperator, @Nullable Float boost) {
+
+		Assert.notNull(fieldName, "fieldName must not be null");
+		Assert.notNull(query, "query must not be null");
+
+		return QueryStringQuery.of(qs -> qs.fields(fieldName).query(query).analyzeWildcard(analyzeWildcard)
+				.defaultOperator(defaultOperator).boost(boost));
+	}
+
+	public static TermQuery termQuery(String fieldName, String value) {
+
+		Assert.notNull(fieldName, "fieldName must not be null");
+		Assert.notNull(value, "value must not be null");
+
+		return TermQuery.of(t -> t.field(fieldName).value(FieldValue.of(value)));
+	}
+
+	public static Query termQueryAsQuery(String fieldName, String value) {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = q -> q.term(termQuery(fieldName, value));
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static WildcardQuery wildcardQuery(String field, String value) {
+
+		Assert.notNull(field, "field must not be null");
+		Assert.notNull(value, "value must not be null");
+
+		return WildcardQuery.of(w -> w.field(field).wildcard(value));
+	}
+
+	public static Query wildcardQueryAsQuery(String field, String value) {
+		Function<Query.Builder, ObjectBuilder<Query>> builder = q -> q.wildcard(wildcardQuery(field, value));
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static Query wrapperQueryAsQuery(String query) {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = q -> q.wrapper(wrapperQuery(query));
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static WrapperQuery wrapperQuery(String query) {
+
+		Assert.notNull(query, "query must not be null");
+
+		String encodedValue = Base64.getEncoder().encodeToString(query.getBytes(StandardCharsets.UTF_8));
+
+		return WrapperQuery.of(wq -> wq.query(encodedValue));
+	}
+
+	public static LatLonGeoLocation latLon(GeoPoint geoPoint) {
+
+		Assert.notNull(geoPoint, "geoPoint must not be null");
+
+		return latLon(geoPoint.getLat(), geoPoint.getLon());
+	}
+
+	public static LatLonGeoLocation latLon(double lat, double lon) {
+		return LatLonGeoLocation.of(_0 -> _0.lat(lat).lon(lon));
+	}
+
+	public static org.springframework.data.elasticsearch.core.query.Query getTermsAggsQuery(String aggsName,
+			String aggsField) {
+		return NativeQuery.builder() //
+				.withQuery(Queries.matchAllQueryAsQuery()) //
+				.withAggregation(aggsName, Aggregation.of(a -> a //
+						.terms(ta -> ta.field(aggsField)))) //
+				.withMaxResults(0) //
+				.build();
+	}
+
+	public static org.springframework.data.elasticsearch.core.query.Query queryWithIds(String... ids) {
+		return NativeQuery.builder().withIds(ids).build();
+	}
+
+	public static BaseQueryBuilder<?, ?> getBuilderWithMatchAllQuery() {
+		return NativeQuery.builder().withQuery(matchAllQueryAsQuery());
+	}
+
+	public static BaseQueryBuilder<?, ?> getBuilderWithTermQuery(String field, String value) {
+		return NativeQuery.builder().withQuery(termQueryAsQuery(field, value));
+	}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -42,7 +42,9 @@ import org.springframework.util.Assert;
 *
 * @author Peter-Josef Meisch
 * @since 4.4
+ * @deprecated since 5.1, use {@link Queries} instead.
 */
+@Deprecated(forRemoval = true)
 public final class QueryBuilders {

 	private QueryBuilders() {}
@@ -62,6 +64,7 @@ public final class QueryBuilders {

 		return builder.apply(new Query.Builder()).build();
 	}
+
 	public static MatchQuery matchQuery(String fieldName, String query, @Nullable Operator operator,
 			@Nullable Float boost) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -20,8 +20,8 @@ import co.elastic.clients.elasticsearch.cluster.HealthResponse;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import reactor.core.publisher.Mono;

-import org.springframework.data.elasticsearch.client.erhlc.ReactiveClusterOperations;
 import org.springframework.data.elasticsearch.core.cluster.ClusterHealth;
+import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;

 /**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -237,6 +237,29 @@ public class ReactiveElasticsearchClient extends ApiClient<ElasticsearchTranspor
 		return search(fn.apply(new SearchRequest.Builder()).build(), tDocumentClass);
 	}

+	/**
+	 * @since 5.1
+	 */
+	public <T> Mono<SearchTemplateResponse<T>> searchTemplate(SearchTemplateRequest request, Class<T> tDocumentClass) {
+
+		Assert.notNull(request, "request must not be null");
+		Assert.notNull(tDocumentClass, "tDocumentClass must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request,
+				SearchTemplateRequest.createSearchTemplateEndpoint(this.getDeserializer(tDocumentClass)), transportOptions));
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public <T> Mono<SearchTemplateResponse<T>> searchTemplate(
+			Function<SearchTemplateRequest.Builder, ObjectBuilder<SearchTemplateRequest>> fn, Class<T> tDocumentClass) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return searchTemplate(fn.apply(new SearchTemplateRequest.Builder()).build(), tDocumentClass);
+	}
+
 	public <T> Mono<ScrollResponse<T>> scroll(ScrollRequest request, Class<T> tDocumentClass) {

 		Assert.notNull(request, "request must not be null");
@@ -320,4 +343,67 @@ public class ReactiveElasticsearchClient extends ApiClient<ElasticsearchTranspor
 	}
 	// endregion

+	// region script api
+	/**
+	 * @since 5.1
+	 */
+	public Mono<PutScriptResponse> putScript(PutScriptRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, PutScriptRequest._ENDPOINT, transportOptions));
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public Mono<PutScriptResponse> putScript(Function<PutScriptRequest.Builder, ObjectBuilder<PutScriptRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return putScript(fn.apply(new PutScriptRequest.Builder()).build());
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public Mono<GetScriptResponse> getScript(GetScriptRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, GetScriptRequest._ENDPOINT, transportOptions));
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public Mono<GetScriptResponse> getScript(Function<GetScriptRequest.Builder, ObjectBuilder<GetScriptRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return getScript(fn.apply(new GetScriptRequest.Builder()).build());
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public Mono<DeleteScriptResponse> deleteScript(DeleteScriptRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteScriptRequest._ENDPOINT, transportOptions));
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public Mono<DeleteScriptResponse> deleteScript(
+			Function<DeleteScriptRequest.Builder, ObjectBuilder<DeleteScriptRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return deleteScript(fn.apply(new DeleteScriptRequest.Builder()).build());
+	}
+	// endregion
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -16,10 +16,10 @@
 package org.springframework.data.elasticsearch.client.elc;

 import co.elastic.clients.ApiClient;
-import co.elastic.clients.elasticsearch.cluster.HealthRequest;
-import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+import co.elastic.clients.elasticsearch.cluster.*;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.endpoints.BooleanResponse;
 import co.elastic.clients.util.ObjectBuilder;
 import reactor.core.publisher.Mono;

@@ -53,4 +53,47 @@ public class ReactiveElasticsearchClusterClient
 	public Mono<HealthResponse> health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn) {
 		return health(fn.apply(new HealthRequest.Builder()).build());
 	}
+
+	public Mono<PutComponentTemplateResponse> putComponentTemplate(
+			PutComponentTemplateRequest putComponentTemplateRequest) {
+		return Mono.fromFuture(transport.performRequestAsync(putComponentTemplateRequest,
+				PutComponentTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PutComponentTemplateResponse> putComponentTemplate(
+			Function<PutComponentTemplateRequest.Builder, ObjectBuilder<PutComponentTemplateRequest>> fn) {
+		return putComponentTemplate(fn.apply(new PutComponentTemplateRequest.Builder()).build());
+	}
+
+	public Mono<GetComponentTemplateResponse> getComponentTemplate(
+			GetComponentTemplateRequest getComponentTemplateRequest) {
+		return Mono.fromFuture(transport.performRequestAsync(getComponentTemplateRequest,
+				GetComponentTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetComponentTemplateResponse> getComponentTemplate(
+			Function<GetComponentTemplateRequest.Builder, ObjectBuilder<GetComponentTemplateRequest>> fn) {
+		return getComponentTemplate(fn.apply(new GetComponentTemplateRequest.Builder()).build());
+	}
+
+	public Mono<BooleanResponse> existsComponentTemplate(ExistsComponentTemplateRequest existsComponentTemplateRequest) {
+		return Mono.fromFuture(transport.performRequestAsync(existsComponentTemplateRequest,
+				ExistsComponentTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BooleanResponse> existsComponentTemplate(
+			Function<ExistsComponentTemplateRequest.Builder, ObjectBuilder<ExistsComponentTemplateRequest>> fn) {
+		return existsComponentTemplate(fn.apply(new ExistsComponentTemplateRequest.Builder()).build());
+	}
+
+	public Mono<DeleteComponentTemplateResponse> deleteComponentTemplate(
+			DeleteComponentTemplateRequest deleteComponentTemplateRequest) {
+		return Mono.fromFuture(transport.performRequestAsync(deleteComponentTemplateRequest,
+				DeleteComponentTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteComponentTemplateResponse> deleteComponentTemplate(
+			Function<DeleteComponentTemplateRequest.Builder, ObjectBuilder<DeleteComponentTemplateRequest>> fn) {
+		return deleteComponentTemplate(fn.apply(new DeleteComponentTemplateRequest.Builder()).build());
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -15,11 +15,10 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

-import static co.elastic.clients.util.ApiTypeHelper.*;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+import static co.elastic.clients.util.ApiTypeHelper.DANGEROUS_disableRequiredPropertiesCheck;
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.result;

 import co.elastic.clients.elasticsearch._types.Result;
-import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch.core.*;
 import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
 import co.elastic.clients.elasticsearch.core.get.GetResult;
@@ -35,35 +34,34 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.stream.Collectors;

 import org.reactivestreams.Publisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.BulkFailureException;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
 import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
-import org.springframework.data.elasticsearch.client.erhlc.ReactiveClusterOperations;
-import org.springframework.data.elasticsearch.client.util.ScrollState;
-import org.springframework.data.elasticsearch.core.AbstractReactiveElasticsearchTemplate;
-import org.springframework.data.elasticsearch.core.AggregationContainer;
-import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
-import org.springframework.data.elasticsearch.core.MultiGetItem;
-import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
+import org.springframework.data.elasticsearch.core.*;
+import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.document.SearchDocument;
 import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
 import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
 import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
+import org.springframework.data.elasticsearch.core.script.Script;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;

 /**
 * Implementation of {@link org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations} using the new
@@ -74,6 +72,8 @@ import org.springframework.util.CollectionUtils;
 */
 public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate {

+	private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveElasticsearchTemplate.class);
+
 	private final ReactiveElasticsearchClient client;
 	private final RequestConverter requestConverter;
 	private final ResponseConverter responseConverter;
@@ -102,6 +102,7 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 				.zipWith(//
 						Mono.from(execute((ClientCallback<Publisher<IndexResponse>>) client -> client.index(indexRequest))) //
 								.map(indexResponse -> new IndexResponseMetaData(indexResponse.id(), //
+										indexResponse.index(), //
 										indexResponse.seqNo(), //
 										indexResponse.primaryTerm(), //
 										indexResponse.version() //
@@ -115,7 +116,7 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch

 		return entitiesPublisher //
 				.flatMapMany(entities -> Flux.fromIterable(entities) //
-						.concatMap(entity -> maybeCallBeforeConvert(entity, index)) //
+						.concatMap(entity -> maybeCallbackBeforeConvert(entity, index)) //
 				).collectList() //
 				.map(Entities::new) //
 				.flatMapMany(entities -> {
@@ -129,13 +130,43 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 							.flatMap(indexAndResponse -> {
 								T savedEntity = entities.entityAt(indexAndResponse.getT1());
 								BulkResponseItem response = indexAndResponse.getT2();
-								updateIndexedObject(savedEntity, IndexedObjectInformation.of(response.id(), response.seqNo(),
-										response.primaryTerm(), response.version()));
-								return maybeCallAfterSave(savedEntity, index);
+								updateIndexedObject(savedEntity, new IndexedObjectInformation( //
+										response.id(), //
+										response.index(), //
+										response.seqNo(), //
+										response.primaryTerm(), //
+										response.version()));
+								return maybeCallbackAfterSave(savedEntity, index);
 							});
 				});
 	}

+	@Override
+	protected Mono<Boolean> doExists(String id, IndexCoordinates index) {
+
+		Assert.notNull(id, "id must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		GetRequest getRequest = requestConverter.documentGetRequest(id, routingResolver.getRouting(), index, true);
+
+		return Mono.from(execute(
+				((ClientCallback<Publisher<GetResponse<EntityAsMap>>>) client -> client.get(getRequest, EntityAsMap.class))))
+				.map(GetResult::found) //
+				.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((ClientCallback<Publisher<DeleteByQueryResponse>>) client -> client.deleteByQuery(request)))
+				.map(responseConverter::byQueryResponse);
+	}
+
 	@Override
 	public <T> Mono<T> get(String id, Class<T> entityType, IndexCoordinates index) {

@@ -183,6 +214,29 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 						: Mono.just(response.task()));
 	}

+	@Override
+	public Mono<UpdateResponse> update(UpdateQuery updateQuery, IndexCoordinates index) {
+
+		Assert.notNull(updateQuery, "UpdateQuery must not be null");
+		Assert.notNull(index, "Index must not be null");
+
+		UpdateRequest<Document, ?> request = requestConverter.documentUpdateRequest(updateQuery, index, getRefreshPolicy(),
+				routingResolver.getRouting());
+
+		return Mono.from(execute(
+				(ClientCallback<Publisher<co.elastic.clients.elasticsearch.core.UpdateResponse<Document>>>) client -> client
+						.update(request, Document.class)))
+				.flatMap(response -> {
+					UpdateResponse.Result result = result(response.result());
+					return result == null ? Mono.empty() : Mono.just(UpdateResponse.of(result));
+				});
+	}
+
+	@Override
+	public Mono<ByQueryResponse> updateByQuery(UpdateQuery updateQuery, IndexCoordinates index) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
 	@Override
 	public Mono<Void> bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index) {

@@ -279,83 +333,116 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 		return new ReactiveElasticsearchTemplate(client, converter);
 	}

-	@Override
-	protected Mono<Boolean> doExists(String id, IndexCoordinates index) {
-
-		Assert.notNull(id, "id must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		GetRequest getRequest = requestConverter.documentGetRequest(id, routingResolver.getRouting(), index, true);
-
-		return Mono.from(execute(
-				((ClientCallback<Publisher<GetResponse<EntityAsMap>>>) client -> client.get(getRequest, EntityAsMap.class))))
-				.map(GetResult::found) //
-				.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, entityType, index,
-				getRefreshPolicy());
-		return Mono
-				.from(execute((ClientCallback<Publisher<DeleteByQueryResponse>>) client -> client.deleteByQuery(request)))
-				.map(responseConverter::byQueryResponse);
-	}
-
 	// region search operations

 	@Override
 	protected Flux<SearchDocument> doFind(Query query, Class<?> clazz, IndexCoordinates index) {

-		return Flux.defer(() -> {
-			boolean useScroll = !(query.getPageable().isPaged() || query.isLimiting());
-			SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, false, useScroll);
-
-			if (useScroll) {
-				return doScroll(searchRequest);
-			} else {
-				return doFind(searchRequest);
-			}
-		});
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
+		Assert.notNull(index, "index must not be null");

+		if (query instanceof SearchTemplateQuery searchTemplateQuery) {
+			return Flux.defer(() -> doSearch(searchTemplateQuery, clazz, index));
+		} else {
+			return Flux.defer(() -> {
+				boolean queryIsUnbounded = !(query.getPageable().isPaged() || query.isLimiting());
+				return queryIsUnbounded ? doFindUnbounded(query, clazz, index) : doFindBounded(query, clazz, index);
+			});
+		}
 	}

-	private Flux<SearchDocument> doScroll(SearchRequest searchRequest) {
+	private Flux<SearchDocument> doFindUnbounded(Query query, Class<?> clazz, IndexCoordinates index) {

-		Time scrollTimeout = searchRequest.scroll() != null ? searchRequest.scroll() : Time.of(t -> t.time("1m"));
+		if (query instanceof BaseQuery baseQuery) {
+			var pitKeepAlive = Duration.ofMinutes(5);
+			// setup functions for Flux.usingWhen()
+			Mono<PitSearchAfter> resourceSupplier = openPointInTime(index, pitKeepAlive, true)
+					.map(pit -> new PitSearchAfter(baseQuery, pit));

-		Flux<ResponseBody<EntityAsMap>> searchResponses = Flux.usingWhen(Mono.fromSupplier(ScrollState::new), //
-				state -> Mono
-						.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client1 -> client1
-								.search(searchRequest, EntityAsMap.class))) //
-						.expand(entityAsMapSearchResponse -> {
+			Function<PitSearchAfter, Publisher<?>> asyncComplete = this::cleanupPit;

-							state.updateScrollId(entityAsMapSearchResponse.scrollId());
+			BiFunction<PitSearchAfter, Throwable, Publisher<?>> asyncError = (psa, ex) -> {
+				if (LOGGER.isErrorEnabled()) {
+					LOGGER.error(String.format("Error during pit/search_after"), ex);
+				}
+				return cleanupPit(psa);
+			};

-							if (entityAsMapSearchResponse.hits() == null
-									|| CollectionUtils.isEmpty(entityAsMapSearchResponse.hits().hits())) {
+			Function<PitSearchAfter, Publisher<?>> asyncCancel = psa -> {
+				if (LOGGER.isWarnEnabled()) {
+					LOGGER.warn(String.format("pit/search_after was cancelled"));
+				}
+				return cleanupPit(psa);
+			};
+
+			Function<PitSearchAfter, Publisher<? extends ResponseBody<EntityAsMap>>> resourceClosure = psa -> {
+
+				baseQuery.setPointInTime(new Query.PointInTime(psa.getPit(), pitKeepAlive));
+				baseQuery.addSort(Sort.by("_shard_doc"));
+				SearchRequest firstSearchRequest = requestConverter.searchRequest(baseQuery, routingResolver.getRouting(),
+						clazz, index, false, true);
+
+				return Mono.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client
+						.search(firstSearchRequest, EntityAsMap.class))).expand(entityAsMapSearchResponse -> {
+
+							var hits = entityAsMapSearchResponse.hits().hits();
+							if (CollectionUtils.isEmpty(hits)) {
 								return Mono.empty();
 							}

-							return Mono.from(execute((ClientCallback<Publisher<ScrollResponse<EntityAsMap>>>) client1 -> {
-								ScrollRequest scrollRequest = ScrollRequest
-										.of(sr -> sr.scrollId(state.getScrollId()).scroll(scrollTimeout));
-								return client1.scroll(scrollRequest, EntityAsMap.class);
-							}));
-						}),
-				this::cleanupScroll, (state, ex) -> cleanupScroll(state), this::cleanupScroll);
+							List<Object> sortOptions = hits.get(hits.size() - 1).sort().stream().map(TypeUtils::toObject)
+									.collect(Collectors.toList());
+							baseQuery.setSearchAfter(sortOptions);
+							SearchRequest followSearchRequest = requestConverter.searchRequest(baseQuery,
+									routingResolver.getRouting(), clazz, index, false, true);
+							return Mono.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client
+									.search(followSearchRequest, EntityAsMap.class)));
+						});

-		return searchResponses.flatMapIterable(entityAsMapSearchResponse -> entityAsMapSearchResponse.hits().hits())
-				.map(entityAsMapHit -> DocumentAdapters.from(entityAsMapHit, jsonpMapper));
+			};
+
+			Flux<ResponseBody<EntityAsMap>> searchResponses = Flux.usingWhen(resourceSupplier, resourceClosure, asyncComplete,
+					asyncError, asyncCancel);
+			return searchResponses.flatMapIterable(entityAsMapSearchResponse -> entityAsMapSearchResponse.hits().hits())
+					.map(entityAsMapHit -> DocumentAdapters.from(entityAsMapHit, jsonpMapper));
+		} else {
+			return Flux.error(new IllegalArgumentException("Query must be derived from BaseQuery"));
+		}
 	}

-	private Publisher<?> cleanupScroll(ScrollState state) {
+	private Publisher<?> cleanupPit(PitSearchAfter psa) {
+		var baseQuery = psa.getBaseQuery();
+		baseQuery.setPointInTime(null);
+		baseQuery.setSearchAfter(null);
+		baseQuery.setSort(psa.getSort());
+		var pit = psa.getPit();
+		return StringUtils.hasText(pit) ? closePointInTime(pit) : Mono.empty();
+	}

-		return execute((ClientCallback<Publisher<ClearScrollResponse>>) client -> client
-				.clearScroll(ClearScrollRequest.of(csr -> csr.scrollId(state.getScrollIds()))));
+	static private class PitSearchAfter {
+		private final BaseQuery baseQuery;
+		@Nullable private final Sort sort;
+		private final String pit;
+
+		PitSearchAfter(BaseQuery baseQuery, String pit) {
+			this.baseQuery = baseQuery;
+			this.sort = baseQuery.getSort();
+			this.pit = pit;
+		}
+
+		public BaseQuery getBaseQuery() {
+			return baseQuery;
+		}
+
+		@Nullable
+		public Sort getSort() {
+			return sort;
+		}
+
+		public String getPit() {
+			return pit;
+		}
 	}

 	@Override
@@ -364,7 +451,8 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(index, "index must not be null");

-		SearchRequest searchRequest = requestConverter.searchRequest(query, entityType, index, true, false);
+		SearchRequest searchRequest = requestConverter.searchRequest(query, routingResolver.getRouting(), entityType, index,
+				true);

 		return Mono
 				.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client.search(searchRequest,
@@ -372,7 +460,10 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 				.map(searchResponse -> searchResponse.hits().total() != null ? searchResponse.hits().total().value() : 0L);
 	}

-	private Flux<SearchDocument> doFind(SearchRequest searchRequest) {
+	private Flux<SearchDocument> doFindBounded(Query query, Class<?> clazz, IndexCoordinates index) {
+
+		SearchRequest searchRequest = requestConverter.searchRequest(query, routingResolver.getRouting(), clazz, index,
+				false, false);

 		return Mono
 				.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client.search(searchRequest,
@@ -381,13 +472,25 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 				.map(entityAsMapHit -> DocumentAdapters.from(entityAsMapHit, jsonpMapper));
 	}

+	private Flux<SearchDocument> doSearch(SearchTemplateQuery query, Class<?> clazz, IndexCoordinates index) {
+
+		var request = requestConverter.searchTemplate(query, routingResolver.getRouting(), index);
+
+		return Mono
+				.from(execute((ClientCallback<Publisher<SearchTemplateResponse<EntityAsMap>>>) client -> client
+						.searchTemplate(request, EntityAsMap.class))) //
+				.flatMapIterable(entityAsMapSearchResponse -> entityAsMapSearchResponse.hits().hits()) //
+				.map(entityAsMapHit -> DocumentAdapters.from(entityAsMapHit, jsonpMapper));
+	}
+
 	@Override
 	protected <T> Mono<SearchDocumentResponse> doFindForResponse(Query query, Class<?> clazz, IndexCoordinates index) {

 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(index, "index must not be null");

-		SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, false, false);
+		SearchRequest searchRequest = requestConverter.searchRequest(query, routingResolver.getRouting(), clazz, index,
+				false);

 		// noinspection unchecked
 		SearchDocumentCallback<T> callback = new ReadSearchDocumentCallback<>((Class<T>) clazz, index);
@@ -435,6 +538,37 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch

 	// endregion

+	// region script operations
+	@Override
+	public Mono<Boolean> putScript(Script script) {
+
+		Assert.notNull(script, "script must not be null");
+
+		var request = requestConverter.scriptPut(script);
+		return Mono.from(execute((ClientCallback<Publisher<PutScriptResponse>>) client -> client.putScript(request)))
+				.map(PutScriptResponse::acknowledged);
+	}
+
+	@Override
+	public Mono<Script> getScript(String name) {
+
+		Assert.notNull(name, "name must not be null");
+
+		var request = requestConverter.scriptGet(name);
+		return Mono.from(execute((ClientCallback<Publisher<GetScriptResponse>>) client -> client.getScript(request)))
+				.mapNotNull(responseConverter::scriptResponse);
+	}
+
+	@Override
+	public Mono<Boolean> deleteScript(String name) {
+		Assert.notNull(name, "name must not be null");
+
+		var request = requestConverter.scriptDelete(name);
+		return Mono.from(execute((ClientCallback<Publisher<DeleteScriptResponse>>) client -> client.deleteScript(request)))
+				.map(DeleteScriptResponse::acknowledged);
+	}
+	// endregion
+
 	@Override
 	public Mono<String> getVendor() {
 		return Mono.just("Elasticsearch");
@@ -454,29 +588,6 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 		})).map(infoResponse -> infoResponse.version().number());
 	}

-	@Override
-	public Mono<UpdateResponse> update(UpdateQuery updateQuery, IndexCoordinates index) {
-
-		Assert.notNull(updateQuery, "UpdateQuery must not be null");
-		Assert.notNull(index, "Index must not be null");
-
-		UpdateRequest<Document, ?> request = requestConverter.documentUpdateRequest(updateQuery, index, getRefreshPolicy(),
-				routingResolver.getRouting());
-
-		return Mono.from(execute(
-				(ClientCallback<Publisher<co.elastic.clients.elasticsearch.core.UpdateResponse<Document>>>) client -> client
-						.update(request, Document.class)))
-				.flatMap(response -> {
-					UpdateResponse.Result result = result(response.result());
-					return result == null ? Mono.empty() : Mono.just(UpdateResponse.of(result));
-				});
-	}
-
-	@Override
-	public Mono<ByQueryResponse> updateByQuery(UpdateQuery updateQuery, IndexCoordinates index) {
-		throw new UnsupportedOperationException("not implemented");
-	}
-
 	@Override
 	@Deprecated
 	public <T> Publisher<T> execute(ReactiveElasticsearchOperations.ClientCallback<Publisher<T>> callback) {
@@ -495,27 +606,34 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch

 	@Override
 	public ReactiveIndexOperations indexOps(IndexCoordinates index) {
-		return new ReactiveIndicesTemplate(client.indices(), converter, index);
+		return new ReactiveIndicesTemplate(client.indices(), getReactiveClusterTemplate(), converter, index);
 	}

 	@Override
 	public ReactiveIndexOperations indexOps(Class<?> clazz) {
-		return new ReactiveIndicesTemplate(client.indices(), converter, clazz);
+		return new ReactiveIndicesTemplate(client.indices(), getReactiveClusterTemplate(), converter, clazz);
 	}

 	@Override
 	public ReactiveClusterOperations cluster() {
+		return getReactiveClusterTemplate();
+	}
+
+		/**
+		 * @since 5.1
+		 */
+	private ReactiveClusterTemplate getReactiveClusterTemplate() {
 		return new ReactiveClusterTemplate(client.cluster(), converter);
 	}

 	@Override
 	public Query matchAllQuery() {
-		return NativeQuery.builder().withQuery(QueryBuilders.matchAllQueryAsQuery()).build();
+		return NativeQuery.builder().withQuery(Queries.matchAllQueryAsQuery()).build();
 	}

 	@Override
 	public Query idsQuery(List<String> ids) {
-		return NativeQuery.builder().withQuery(QueryBuilders.idsQueryAsQuery(ids)).build();
+		return NativeQuery.builder().withQuery(Queries.idsQueryAsQuery(ids)).build();
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -15,7 +15,7 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

-import static org.springframework.util.StringUtils.*;
+import static org.springframework.util.StringUtils.hasText;

 import co.elastic.clients.elasticsearch._types.AcknowledgedResponseBase;
 import co.elastic.clients.elasticsearch.indices.*;
@@ -37,15 +37,15 @@ import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
 import org.springframework.data.elasticsearch.core.ReactiveResourceUtil;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.index.AliasActions;
-import org.springframework.data.elasticsearch.core.index.AliasData;
+import org.springframework.data.elasticsearch.core.index.*;
+import org.springframework.data.elasticsearch.core.index.DeleteIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.ExistsIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.GetIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.PutIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.ReactiveMappingBuilder;
-import org.springframework.data.elasticsearch.core.index.Settings;
-import org.springframework.data.elasticsearch.core.index.TemplateData;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.lang.Nullable;
@@ -58,27 +58,35 @@ public class ReactiveIndicesTemplate
 		extends ReactiveChildTemplate<ElasticsearchTransport, ReactiveElasticsearchIndicesClient>
 		implements ReactiveIndexOperations {

+	// we need a cluster client as well because ES has put some methods from the indices API into the cluster client
+	// (component templates)
+	private final ReactiveClusterTemplate clusterTemplate;
+
 	@Nullable private final Class<?> boundClass;
 	private final IndexCoordinates boundIndexCoordinates;

-	public ReactiveIndicesTemplate(ReactiveElasticsearchIndicesClient client,
+	public ReactiveIndicesTemplate(ReactiveElasticsearchIndicesClient client, ReactiveClusterTemplate clusterTemplate,
 			ElasticsearchConverter elasticsearchConverter, IndexCoordinates index) {

 		super(client, elasticsearchConverter);

 		Assert.notNull(index, "index must not be null");
+		Assert.notNull(clusterTemplate, "clusterTemplate must not be null");

+		this.clusterTemplate = clusterTemplate;
 		this.boundClass = null;
 		this.boundIndexCoordinates = index;
 	}

-	public ReactiveIndicesTemplate(ReactiveElasticsearchIndicesClient client,
+	public ReactiveIndicesTemplate(ReactiveElasticsearchIndicesClient client, ReactiveClusterTemplate clusterTemplate,
 			ElasticsearchConverter elasticsearchConverter, Class<?> clazz) {

 		super(client, elasticsearchConverter);

 		Assert.notNull(clazz, "clazz must not be null");
+		Assert.notNull(clusterTemplate, "clusterTemplate must not be null");

+		this.clusterTemplate = clusterTemplate;
 		this.boundClass = clazz;
 		this.boundIndexCoordinates = getIndexCoordinatesFor(clazz);
 	}
@@ -154,7 +162,8 @@ public class ReactiveIndicesTemplate

 	@Override
 	public Mono<Void> refresh() {
-		return Mono.from(execute(ReactiveElasticsearchIndicesClient::refresh)).then();
+		RefreshRequest refreshRequest = requestConverter.indicesRefreshRequest(getIndexCoordinates());
+		return Mono.from(execute(client -> client.refresh(refreshRequest))).then();
 	}

 	@Override
@@ -270,6 +279,99 @@ public class ReactiveIndicesTemplate
 		return putTemplateResponse.map(PutTemplateResponse::acknowledged);
 	}

+	@Override
+	public Mono<Boolean> putComponentTemplate(PutComponentTemplateRequest putComponentTemplateRequest) {
+
+		Assert.notNull(putComponentTemplateRequest, "putComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest putComponentTemplateRequestES = requestConverter
+				.clusterPutComponentTemplateRequest(putComponentTemplateRequest);
+		// the new Elasticsearch client has this call in the cluster index
+		return Mono.from(clusterTemplate.execute(client -> client.putComponentTemplate(putComponentTemplateRequestES)))
+				.map(AcknowledgedResponseBase::acknowledged);
+	}
+
+	@Override
+	public Flux<TemplateResponse> getComponentTemplate(GetComponentTemplateRequest getComponentTemplateRequest) {
+
+		Assert.notNull(getComponentTemplateRequest, "getComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.GetComponentTemplateRequest getComponentTemplateRequestES = requestConverter
+				.clusterGetComponentTemplateRequest(getComponentTemplateRequest);
+		return Flux.from(clusterTemplate.execute(client -> client.getComponentTemplate(getComponentTemplateRequestES)))
+				.flatMapIterable(responseConverter::clusterGetComponentTemplates);
+	}
+
+	@Override
+	public Mono<Boolean> existsComponentTemplate(ExistsComponentTemplateRequest existsComponentTemplateRequest) {
+
+		Assert.notNull(existsComponentTemplateRequest, "existsComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.ExistsComponentTemplateRequest existsComponentTemplateRequestES = requestConverter
+				.clusterExistsComponentTemplateRequest(existsComponentTemplateRequest);
+
+		return Mono
+				.from(clusterTemplate.execute(client -> client.existsComponentTemplate(existsComponentTemplateRequestES)))
+				.map(BooleanResponse::value);
+	}
+
+	@Override
+	public Mono<Boolean> deleteComponentTemplate(DeleteComponentTemplateRequest deleteComponentTemplateRequest) {
+
+		Assert.notNull(deleteComponentTemplateRequest, "deleteComponentTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.cluster.DeleteComponentTemplateRequest deleteComponentTemplateRequestES = requestConverter
+				.clusterDeleteComponentTemplateRequest(deleteComponentTemplateRequest);
+		return Mono
+				.from(clusterTemplate.execute(client -> client.deleteComponentTemplate(deleteComponentTemplateRequestES)))
+				.map(AcknowledgedResponseBase::acknowledged);
+	}
+
+	@Override
+	public Mono<Boolean> putIndexTemplate(PutIndexTemplateRequest putIndexTemplateRequest) {
+
+		Assert.notNull(putIndexTemplateRequest, "putIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.PutIndexTemplateRequest putIndexTemplateRequestES = requestConverter
+				.indicesPutIndexTemplateRequest(putIndexTemplateRequest);
+
+		return Mono.from(execute(client -> client.putIndexTemplate(putIndexTemplateRequestES)))
+				.map(PutIndexTemplateResponse::acknowledged);
+	}
+
+	@Override
+	public Mono<Boolean> existsIndexTemplate(ExistsIndexTemplateRequest existsIndexTemplateRequest) {
+
+		Assert.notNull(existsIndexTemplateRequest, "existsIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest existsIndexTemplateRequestES = requestConverter
+				.indicesExistsIndexTemplateRequest(existsIndexTemplateRequest);
+		return Mono.from(execute(client -> client.existsIndexTemplate(existsIndexTemplateRequestES)))
+				.map(BooleanResponse::value);
+	}
+
+	@Override
+	public Flux<TemplateResponse> getIndexTemplate(GetIndexTemplateRequest getIndexTemplateRequest) {
+
+		Assert.notNull(getIndexTemplateRequest, "getIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.GetIndexTemplateRequest getIndexTemplateRequestES = requestConverter
+				.indicesGetIndexTemplateRequest(getIndexTemplateRequest);
+		return Mono.from(execute(client -> client.getIndexTemplate(getIndexTemplateRequestES)))
+				.flatMapIterable(responseConverter::getIndexTemplates);
+	}
+
+	@Override
+	public Mono<Boolean> deleteIndexTemplate(DeleteIndexTemplateRequest deleteIndexTemplateRequest) {
+
+		Assert.notNull(deleteIndexTemplateRequest, "deleteIndexTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.DeleteIndexTemplateRequest deleteIndexTemplateRequestES = requestConverter
+				.indicesDeleteIndexTemplateRequest(deleteIndexTemplateRequest);
+		return Mono.from(execute(client -> client.deleteIndexTemplate(deleteIndexTemplateRequestES)))
+				.map(AcknowledgedResponseBase::acknowledged);
+	}
+
 	@Override
 	public Mono<TemplateData> getTemplate(GetTemplateRequest getTemplateRequest) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -15,15 +15,10 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.searchType;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.slices;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.time;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.timeStringMs;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.toFloat;
-import static org.springframework.util.CollectionUtils.isEmpty;
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+import static org.springframework.util.CollectionUtils.*;

 import co.elastic.clients.elasticsearch._types.Conflicts;
-import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.InlineScript;
 import co.elastic.clients.elasticsearch._types.OpType;
 import co.elastic.clients.elasticsearch._types.SortOptions;
@@ -31,24 +26,16 @@ import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.VersionType;
 import co.elastic.clients.elasticsearch._types.WaitForActiveShardOptions;
 import co.elastic.clients.elasticsearch._types.mapping.FieldType;
-import co.elastic.clients.elasticsearch._types.mapping.Property;
 import co.elastic.clients.elasticsearch._types.mapping.RuntimeField;
 import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
-import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
+import co.elastic.clients.elasticsearch._types.query_dsl.FieldAndFormat;
 import co.elastic.clients.elasticsearch._types.query_dsl.Like;
+import co.elastic.clients.elasticsearch.cluster.DeleteComponentTemplateRequest;
+import co.elastic.clients.elasticsearch.cluster.ExistsComponentTemplateRequest;
+import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateRequest;
 import co.elastic.clients.elasticsearch.cluster.HealthRequest;
-import co.elastic.clients.elasticsearch.core.BulkRequest;
-import co.elastic.clients.elasticsearch.core.ClosePointInTimeRequest;
-import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest;
-import co.elastic.clients.elasticsearch.core.DeleteRequest;
-import co.elastic.clients.elasticsearch.core.GetRequest;
-import co.elastic.clients.elasticsearch.core.IndexRequest;
-import co.elastic.clients.elasticsearch.core.MgetRequest;
-import co.elastic.clients.elasticsearch.core.MsearchRequest;
-import co.elastic.clients.elasticsearch.core.OpenPointInTimeRequest;
-import co.elastic.clients.elasticsearch.core.SearchRequest;
-import co.elastic.clients.elasticsearch.core.UpdateByQueryRequest;
-import co.elastic.clients.elasticsearch.core.UpdateRequest;
+import co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest;
+import co.elastic.clients.elasticsearch.core.*;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
 import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
 import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
@@ -58,33 +45,23 @@ import co.elastic.clients.elasticsearch.core.msearch.MultisearchBody;
 import co.elastic.clients.elasticsearch.core.search.Highlight;
 import co.elastic.clients.elasticsearch.core.search.Rescore;
 import co.elastic.clients.elasticsearch.core.search.SourceConfig;
-import co.elastic.clients.elasticsearch.indices.CreateIndexRequest;
-import co.elastic.clients.elasticsearch.indices.DeleteIndexRequest;
+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.GetAliasRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndexRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndicesSettingsRequest;
-import co.elastic.clients.elasticsearch.indices.GetMappingRequest;
-import co.elastic.clients.elasticsearch.indices.IndexSettings;
-import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
-import co.elastic.clients.elasticsearch.indices.RefreshRequest;
-import co.elastic.clients.elasticsearch.indices.UpdateAliasesRequest;
 import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
-import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;

 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -96,34 +73,25 @@ import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.ScriptType;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.index.AliasAction;
-import org.springframework.data.elasticsearch.core.index.AliasActionParameters;
-import org.springframework.data.elasticsearch.core.index.AliasActions;
+import org.springframework.data.elasticsearch.core.index.*;
+import org.springframework.data.elasticsearch.core.index.DeleteIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.GetIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.PutIndexTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.BaseQuery;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
-import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
-import org.springframework.data.elasticsearch.core.query.Order;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.data.elasticsearch.core.query.RescorerQuery;
-import org.springframework.data.elasticsearch.core.query.ScriptData;
-import org.springframework.data.elasticsearch.core.query.SourceFilter;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
 import org.springframework.data.elasticsearch.core.reindex.Remote;
+import org.springframework.data.elasticsearch.core.script.Script;
 import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -132,8 +100,10 @@ import org.springframework.util.StringUtils;
 * @author Peter-Josef Meisch
 * @author Sascha Woo
 * @author cdalxndr
+ * @author scoobyzhang
 * @since 4.4
 */
+@SuppressWarnings("ClassCanBeRecord")
 class RequestConverter {

 	// the default max result window size of Elasticsearch
@@ -151,9 +121,101 @@ class RequestConverter {
 	}

 	// region Cluster client
-	public HealthRequest clusterHealthRequest() {
+	public co.elastic.clients.elasticsearch.cluster.HealthRequest clusterHealthRequest() {
 		return new HealthRequest.Builder().build();
 	}
+
+	public co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest clusterPutComponentTemplateRequest(
+			org.springframework.data.elasticsearch.core.index.PutComponentTemplateRequest putComponentTemplateRequest) {
+
+		Assert.notNull(putComponentTemplateRequest, "putComponentTemplateRequest must not be null");
+
+		return PutComponentTemplateRequest.of(b -> b //
+				.name(putComponentTemplateRequest.name()) //
+				.create(putComponentTemplateRequest.create()) //
+				.version(putComponentTemplateRequest.version()) //
+				.masterTimeout(time(putComponentTemplateRequest.masterTimeout())) //
+				.template(isb -> {
+					var componentTemplateData = putComponentTemplateRequest.template();
+					isb //
+							.mappings(typeMapping(componentTemplateData.mapping())) //
+							.settings(indexSettings(componentTemplateData.settings()));
+					// same code schema, but different Elasticsearch builder types
+					// noinspection DuplicatedCode
+					var aliasActions = componentTemplateData.aliasActions();
+					if (aliasActions != null) {
+						aliasActions.getActions().forEach(aliasAction -> {
+							if (aliasAction instanceof AliasAction.Add add) {
+								var parameters = add.getParameters();
+								// noinspection DuplicatedCode
+								String[] parametersAliases = parameters.getAliases();
+								if (parametersAliases != null) {
+									for (String aliasName : parametersAliases) {
+										isb.aliases(aliasName, aliasBuilder -> buildAlias(parameters, aliasBuilder));
+									}
+								}
+							}
+						});
+					}
+					return isb;
+				}));
+	}
+
+	private Alias.Builder buildAlias(AliasActionParameters parameters, Alias.Builder aliasBuilder) {
+
+		// noinspection DuplicatedCode
+		if (parameters.getRouting() != null) {
+			aliasBuilder.routing(parameters.getRouting());
+		}
+
+		if (parameters.getIndexRouting() != null) {
+			aliasBuilder.indexRouting(parameters.getIndexRouting());
+		}
+
+		if (parameters.getSearchRouting() != null) {
+			aliasBuilder.searchRouting(parameters.getSearchRouting());
+		}
+
+		if (parameters.getHidden() != null) {
+			aliasBuilder.isHidden(parameters.getHidden());
+		}
+
+		if (parameters.getWriteIndex() != null) {
+			aliasBuilder.isWriteIndex(parameters.getWriteIndex());
+		}
+
+		Query filterQuery = parameters.getFilterQuery();
+
+		if (filterQuery != null) {
+			co.elastic.clients.elasticsearch._types.query_dsl.Query esQuery = getQuery(filterQuery, null);
+
+			if (esQuery != null) {
+				aliasBuilder.filter(esQuery);
+			}
+		}
+		return aliasBuilder;
+	}
+
+	public ExistsComponentTemplateRequest clusterExistsComponentTemplateRequest(
+			org.springframework.data.elasticsearch.core.index.ExistsComponentTemplateRequest existsComponentTemplateRequest) {
+
+		Assert.notNull(existsComponentTemplateRequest, "existsComponentTemplateRequest must not be null");
+
+		return ExistsComponentTemplateRequest.of(b -> b.name(existsComponentTemplateRequest.templateName()));
+	}
+
+	public GetComponentTemplateRequest clusterGetComponentTemplateRequest(
+			org.springframework.data.elasticsearch.core.index.GetComponentTemplateRequest getComponentTemplateRequest) {
+
+		Assert.notNull(getComponentTemplateRequest, "getComponentTemplateRequest must not be null");
+
+		return GetComponentTemplateRequest.of(b -> b.name(getComponentTemplateRequest.templateName()));
+	}
+
+	public DeleteComponentTemplateRequest clusterDeleteComponentTemplateRequest(
+			org.springframework.data.elasticsearch.core.index.DeleteComponentTemplateRequest deleteComponentTemplateRequest) {
+		return DeleteComponentTemplateRequest.of(b -> b.name(deleteComponentTemplateRequest.templateName()));
+	}
 	// endregion

 	// region Indices client
@@ -170,22 +232,12 @@ class RequestConverter {
 		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
 		Assert.notNull(settings, "settings must not be null");

-		CreateIndexRequest.Builder createRequestBuilder = new CreateIndexRequest.Builder();
-
-		createRequestBuilder.index(indexCoordinates.getIndexName());
-
 		// note: the new client does not support the index.storeType anymore
-		String settingsJson = Document.from(settings).toJson();
-		IndexSettings indexSettings = fromJson(settingsJson, IndexSettings._DESERIALIZER);
-		createRequestBuilder.settings(indexSettings);
-
-		if (mapping != null) {
-			String mappingJson = mapping.toJson();
-			TypeMapping typeMapping = fromJson(mappingJson, TypeMapping._DESERIALIZER);
-			createRequestBuilder.mappings(typeMapping);
-		}
-
-		return createRequestBuilder.build();
+		return new CreateIndexRequest.Builder() //
+				.index(indexCoordinates.getIndexName()) //
+				.settings(indexSettings(settings)) //
+				.mappings(typeMapping(mapping)) //
+				.build();
 	}

 	public RefreshRequest indicesRefreshRequest(IndexCoordinates indexCoordinates) {
@@ -274,46 +326,19 @@ class RequestConverter {
 		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
 		Assert.notNull(mapping, "mapping must not be null");

-		PutMappingRequest.Builder builder = new PutMappingRequest.Builder();
-		builder.index(Arrays.asList(indexCoordinates.getIndexNames()));
-		addPropertiesToMapping(builder, mapping);
+		PutMappingRequest request = new PutMappingRequest.Builder() //
+				.withJson(new StringReader(mapping.toJson())) //
+				.index(Arrays.asList(indexCoordinates.getIndexNames())) //
+				.build();

-		return builder.build();
+		return request;
 	}

 	public GetMappingRequest indicesGetMappingRequest(IndexCoordinates indexCoordinates) {

 		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");

-		return new GetMappingRequest.Builder().index(Arrays.asList(indexCoordinates.getIndexNames())).build();
-	}
-
-	private void addPropertiesToMapping(PutMappingRequest.Builder builder, Document mapping) {
-		Object properties = mapping.get("properties");
-
-		if (properties != null) {
-
-			if (properties instanceof Map) {
-				Map<String, Property> propertiesMap = new HashMap<>();
-				// noinspection unchecked
-				((Map<String, Object>) properties).forEach((key, value) -> {
-					Property property = getProperty(value);
-					propertiesMap.put(key, property);
-				});
-				builder.properties(propertiesMap);
-			}
-		}
-	}
-
-	private Property getProperty(Object value) {
-		// noinspection SpellCheckingInspection
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		JsonGenerator generator = jsonpMapper.jsonProvider().createGenerator(baos);
-		jsonpMapper.serialize(value, generator);
-		generator.close();
-		// noinspection SpellCheckingInspection
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-		return fromJson(bais, Property._DESERIALIZER);
+		return new GetMappingRequest.Builder().index(List.of(indexCoordinates.getIndexNames())).build();
 	}

 	public GetIndicesSettingsRequest indicesGetSettingsRequest(IndexCoordinates indexCoordinates,
@@ -370,7 +395,7 @@ class RequestConverter {
 		}

 		if (putTemplateRequest.getMappings() != null) {
-			builder.mappings(fromJson(putTemplateRequest.getMappings().toJson(), TypeMapping._DESERIALIZER));
+			builder.mappings(typeMapping(putTemplateRequest.getMappings()));
 		}

 		if (putTemplateRequest.getVersion() != null) {
@@ -381,43 +406,14 @@ class RequestConverter {
 		if (aliasActions != null) {
 			aliasActions.getActions().forEach(aliasAction -> {
 				AliasActionParameters parameters = aliasAction.getParameters();
+				// noinspection DuplicatedCode
 				String[] parametersAliases = parameters.getAliases();

 				if (parametersAliases != null) {
 					for (String aliasName : parametersAliases) {
 						builder.aliases(aliasName, aliasBuilder -> {

-							// noinspection DuplicatedCode
-							if (parameters.getRouting() != null) {
-								aliasBuilder.routing(parameters.getRouting());
-							}
-
-							if (parameters.getIndexRouting() != null) {
-								aliasBuilder.indexRouting(parameters.getIndexRouting());
-							}
-
-							if (parameters.getSearchRouting() != null) {
-								aliasBuilder.searchRouting(parameters.getSearchRouting());
-							}
-
-							if (parameters.getHidden() != null) {
-								aliasBuilder.isHidden(parameters.getHidden());
-							}
-
-							if (parameters.getWriteIndex() != null) {
-								aliasBuilder.isWriteIndex(parameters.getWriteIndex());
-							}
-
-							Query filterQuery = parameters.getFilterQuery();
-
-							if (filterQuery != null) {
-								co.elastic.clients.elasticsearch._types.query_dsl.Query esQuery = getQuery(filterQuery, null);
-
-								if (esQuery != null) {
-									aliasBuilder.filter(esQuery);
-								}
-							}
-							return aliasBuilder;
+							return buildAlias(parameters, aliasBuilder);
 						});
 					}
 				}
@@ -427,6 +423,55 @@ class RequestConverter {
 		return builder.build();
 	}

+	public co.elastic.clients.elasticsearch.indices.PutIndexTemplateRequest indicesPutIndexTemplateRequest(
+			PutIndexTemplateRequest putIndexTemplateRequest) {
+
+		Assert.notNull(putIndexTemplateRequest, "putIndexTemplateRequest must not be null");
+
+		var builder = new co.elastic.clients.elasticsearch.indices.PutIndexTemplateRequest.Builder()
+				.name(putIndexTemplateRequest.name()) //
+				.indexPatterns(Arrays.asList(putIndexTemplateRequest.indexPatterns())) //
+				.template(t -> {
+					t //
+							.settings(indexSettings(putIndexTemplateRequest.settings())) //
+							.mappings(typeMapping(putIndexTemplateRequest.mapping()));
+
+					// same code schema, but different Elasticsearch builder types
+					// noinspection DuplicatedCode
+					var aliasActions = putIndexTemplateRequest.aliasActions();
+					if (aliasActions != null) {
+						aliasActions.getActions().forEach(aliasAction -> {
+							if (aliasAction instanceof AliasAction.Add add) {
+								var parameters = add.getParameters();
+								// noinspection DuplicatedCode
+								String[] parametersAliases = parameters.getAliases();
+								if (parametersAliases != null) {
+									for (String aliasName : parametersAliases) {
+										t.aliases(aliasName, aliasBuilder -> buildAlias(parameters, aliasBuilder));
+									}
+								}
+							}
+						});
+					}
+					return t;
+				});
+
+		if (!putIndexTemplateRequest.composedOf().isEmpty()) {
+			builder.composedOf(putIndexTemplateRequest.composedOf());
+		}
+
+		return builder.build();
+	}
+
+	public ExistsIndexTemplateRequest indicesExistsIndexTemplateRequest(
+			org.springframework.data.elasticsearch.core.index.ExistsIndexTemplateRequest existsIndexTemplateRequest) {
+
+		Assert.notNull(existsIndexTemplateRequest, "existsIndexTemplateRequest must not be null");
+
+		return co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest
+				.of(b -> b.name(existsIndexTemplateRequest.templateName()));
+	}
+
 	public co.elastic.clients.elasticsearch.indices.ExistsTemplateRequest indicesExistsTemplateRequest(
 			ExistsTemplateRequest existsTemplateRequest) {

@@ -436,6 +481,24 @@ class RequestConverter {
 				.of(etr -> etr.name(existsTemplateRequest.getTemplateName()));
 	}

+	public co.elastic.clients.elasticsearch.indices.GetIndexTemplateRequest indicesGetIndexTemplateRequest(
+			GetIndexTemplateRequest getIndexTemplateRequest) {
+
+		Assert.notNull(getIndexTemplateRequest, "getIndexTemplateRequest must not be null");
+
+		return co.elastic.clients.elasticsearch.indices.GetIndexTemplateRequest
+				.of(gitr -> gitr.name(getIndexTemplateRequest.templateName()));
+	}
+
+	public co.elastic.clients.elasticsearch.indices.DeleteIndexTemplateRequest indicesDeleteIndexTemplateRequest(
+			DeleteIndexTemplateRequest deleteIndexTemplateRequest) {
+
+		Assert.notNull(deleteIndexTemplateRequest, "deleteIndexTemplateRequest must not be null");
+
+		return co.elastic.clients.elasticsearch.indices.DeleteIndexTemplateRequest
+				.of(ditr -> ditr.name(deleteIndexTemplateRequest.templateName()));
+	}
+
 	public co.elastic.clients.elasticsearch.indices.DeleteTemplateRequest indicesDeleteTemplateRequest(
 			DeleteTemplateRequest existsTemplateRequest) {

@@ -476,7 +539,7 @@ class RequestConverter {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			String id = !StringUtils.hasText(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
 			builder //
 					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
@@ -507,7 +570,7 @@ class RequestConverter {
 			}
 		}

-		builder.refresh(TypeUtils.refresh(refreshPolicy));
+		builder.refresh(refresh(refreshPolicy));

 		return builder.build();
 	}
@@ -528,7 +591,7 @@ class RequestConverter {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
 			builder //
 					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
@@ -569,7 +632,7 @@ class RequestConverter {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
 			builder //
 					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
@@ -674,9 +737,9 @@ class RequestConverter {
 			builder.timeout(tb -> tb.time(Long.valueOf(bulkOptions.getTimeout().toMillis()).toString() + "ms"));
 		}

-		builder.refresh(TypeUtils.refresh(refreshPolicy));
+		builder.refresh(refresh(refreshPolicy));
 		if (bulkOptions.getRefreshPolicy() != null) {
-			builder.refresh(TypeUtils.refresh(bulkOptions.getRefreshPolicy()));
+			builder.refresh(refresh(bulkOptions.getRefreshPolicy()));
 		}

 		if (bulkOptions.getWaitForActiveShards() != null) {
@@ -819,13 +882,13 @@ class RequestConverter {
 					ReindexRequest.Dest dest = reindexRequest.getDest();
 					return d //
 							.index(dest.getIndex().getIndexName()) //
-							.versionType(TypeUtils.versionType(dest.getVersionType())) //
-							.opType(TypeUtils.opType(dest.getOpType()));
+							.versionType(versionType(dest.getVersionType())) //
+							.opType(opType(dest.getOpType()));
 				} //
 				);

 		if (reindexRequest.getConflicts() != null) {
-			builder.conflicts(TypeUtils.conflicts(reindexRequest.getConflicts()));
+			builder.conflicts(conflicts(reindexRequest.getConflicts()));
 		}

 		ReindexRequest.Script script = reindexRequest.getScript();
@@ -838,7 +901,7 @@ class RequestConverter {

 		if (reindexRequest.getWaitForActiveShards() != null) {
 			builder.waitForActiveShards(wfas -> wfas //
-					.count(TypeUtils.waitForActiveShardsCount(reindexRequest.getWaitForActiveShards())));
+					.count(waitForActiveShardsCount(reindexRequest.getWaitForActiveShards())));
 		}

 		builder //
@@ -863,13 +926,13 @@ class RequestConverter {
 			if (routing != null) {
 				r.routing(routing);
 			}
-			r.refresh(TypeUtils.refresh(refreshPolicy));
+			r.refresh(refresh(refreshPolicy));
 			return r;
 		});
 	}

-	public DeleteByQueryRequest documentDeleteByQueryRequest(Query query, Class<?> clazz, IndexCoordinates index,
-			@Nullable RefreshPolicy refreshPolicy) {
+	public DeleteByQueryRequest documentDeleteByQueryRequest(Query query, @Nullable String routing, Class<?> clazz,
+			IndexCoordinates index, @Nullable RefreshPolicy refreshPolicy) {

 		Assert.notNull(query, "query must not be null");
 		Assert.notNull(index, "index must not be null");
@@ -888,6 +951,8 @@ class RequestConverter {

 			if (query.getRoute() != null) {
 				b.routing(query.getRoute());
+			} else if (StringUtils.hasText(routing)) {
+				b.routing(routing);
 			}

 			return b;
@@ -934,7 +999,7 @@ class RequestConverter {
 					.docAsUpsert(query.getDocAsUpsert()) //
 					.ifSeqNo(query.getIfSeqNo() != null ? Long.valueOf(query.getIfSeqNo()) : null) //
 					.ifPrimaryTerm(query.getIfPrimaryTerm() != null ? Long.valueOf(query.getIfPrimaryTerm()) : null) //
-					.refresh(TypeUtils.refresh(refreshPolicy)) //
+					.refresh(query.getRefreshPolicy() != null ? refresh(query.getRefreshPolicy()) : refresh(refreshPolicy)) //
 					.retryOnConflict(query.getRetryOnConflict()) //
 			;

@@ -1018,7 +1083,7 @@ class RequestConverter {
 			}

 			if (updateQuery.getWaitForActiveShards() != null) {
-				ub.waitForActiveShards(w -> w.count(TypeUtils.waitForActiveShardsCount(updateQuery.getWaitForActiveShards())));
+				ub.waitForActiveShards(w -> w.count(waitForActiveShardsCount(updateQuery.getWaitForActiveShards())));
 			}

 			return ub;
@@ -1029,19 +1094,24 @@ class RequestConverter {

 	// region search

-	public <T> SearchRequest searchRequest(Query query, @Nullable Class<T> clazz, IndexCoordinates indexCoordinates,
-			boolean forCount, long scrollTimeInMillis) {
-
-		return searchRequest(query, clazz, indexCoordinates, forCount, true, scrollTimeInMillis);
+	public <T> SearchRequest searchRequest(Query query, @Nullable String routing, @Nullable Class<T> clazz,
+			IndexCoordinates indexCoordinates, boolean forCount) {
+		return searchRequest(query, routing, clazz, indexCoordinates, forCount, false, null);
 	}

-	public <T> SearchRequest searchRequest(Query query, @Nullable Class<T> clazz, IndexCoordinates indexCoordinates,
-			boolean forCount, boolean useScroll) {
-		return searchRequest(query, clazz, indexCoordinates, forCount, useScroll, null);
+	public <T> SearchRequest searchRequest(Query query, @Nullable String routing, @Nullable Class<T> clazz,
+			IndexCoordinates indexCoordinates, boolean forCount, long scrollTimeInMillis) {
+		return searchRequest(query, routing, clazz, indexCoordinates, forCount, true, scrollTimeInMillis);
 	}

-	public <T> SearchRequest searchRequest(Query query, @Nullable Class<T> clazz, IndexCoordinates indexCoordinates,
-			boolean forCount, boolean useScroll, @Nullable Long scrollTimeInMillis) {
+	public <T> SearchRequest searchRequest(Query query, @Nullable String routing, @Nullable Class<T> clazz,
+			IndexCoordinates indexCoordinates, boolean forCount, boolean forBatchedSearch) {
+		return searchRequest(query, routing, clazz, indexCoordinates, forCount, forBatchedSearch, null);
+	}
+
+	public <T> SearchRequest searchRequest(Query query, @Nullable String routing, @Nullable Class<T> clazz,
+			IndexCoordinates indexCoordinates, boolean forCount, boolean forBatchedSearch,
+			@Nullable Long scrollTimeInMillis) {

 		String[] indexNames = indexCoordinates.getIndexNames();
 		Assert.notNull(query, "query must not be null");
@@ -1049,7 +1119,7 @@ class RequestConverter {

 		elasticsearchConverter.updateQuery(query, clazz);
 		SearchRequest.Builder builder = new SearchRequest.Builder();
-		prepareSearchRequest(query, clazz, indexCoordinates, builder, forCount, useScroll);
+		prepareSearchRequest(query, routing, clazz, indexCoordinates, builder, forCount, forBatchedSearch);

 		if (scrollTimeInMillis != null) {
 			builder.scroll(t -> t.time(scrollTimeInMillis + "ms"));
@@ -1057,13 +1127,20 @@ class RequestConverter {

 		builder.query(getQuery(query, clazz));

+		if (StringUtils.hasText(query.getRoute())) {
+			builder.routing(query.getRoute());
+		}
+		if (StringUtils.hasText(routing)) {
+			builder.routing(routing);
+		}
+
 		addFilter(query, builder);

 		return builder.build();
 	}

 	public MsearchRequest searchMsearchRequest(
-			List<ElasticsearchTemplate.MultiSearchQueryParameter> multiSearchQueryParameters) {
+			List<ElasticsearchTemplate.MultiSearchQueryParameter> multiSearchQueryParameters, @Nullable String routing) {

 		// basically the same stuff as in prepareSearchRequest, but the new Elasticsearch has different builders for a
 		// normal search and msearch
@@ -1076,11 +1153,16 @@ class RequestConverter {
 						.header(h -> {
 							h //
 									.index(Arrays.asList(param.index().getIndexNames())) //
-									.routing(query.getRoute()) //
 									.searchType(searchType(query.getSearchType())) //
 									.requestCache(query.getRequestCache()) //
 							;

+							if (StringUtils.hasText(query.getRoute())) {
+								h.routing(query.getRoute());
+							} else if (StringUtils.hasText(routing)) {
+								h.routing(routing);
+							}
+
 							if (query.getPreference() != null) {
 								h.preference(query.getPreference());
 							}
@@ -1137,8 +1219,7 @@ class RequestConverter {
 							}

 							if (!isEmpty(query.getSearchAfter())) {
-								bb.searchAfter(query.getSearchAfter().stream().map(it -> FieldValue.of(it.toString()))
-										.collect(Collectors.toList()));
+								bb.searchAfter(query.getSearchAfter().stream().map(TypeUtils::toFieldValue).toList());
 							}

 							query.getRescorerQueries().forEach(rescorerQuery -> bb.rescore(getRescore(rescorerQuery)));
@@ -1162,13 +1243,14 @@ class RequestConverter {
 							}

 							if (!isEmpty(query.getIndicesBoost())) {
-								Map<String, Double> boosts = new LinkedHashMap<>();
-								query.getIndicesBoost()
-										.forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost()));
-								// noinspection unchecked
-								bb.indicesBoost(boosts);
+								bb.indicesBoost(query.getIndicesBoost().stream()
+										.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost())))
+										.collect(Collectors.toList()));
 							}

+							query.getScriptedFields().forEach(scriptedField -> bb.scriptFields(scriptedField.getFieldName(),
+									sf -> sf.script(getScript(scriptedField.getScriptData()))));
+
 							if (query instanceof NativeQuery) {
 								prepareNativeSearch((NativeQuery) query, bb);
 							}
@@ -1183,8 +1265,8 @@ class RequestConverter {
 		});
 	}

-	private <T> void prepareSearchRequest(Query query, @Nullable Class<T> clazz, IndexCoordinates indexCoordinates,
-			SearchRequest.Builder builder, boolean forCount, boolean useScroll) {
+	private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nullable Class<T> clazz,
+			IndexCoordinates indexCoordinates, SearchRequest.Builder builder, boolean forCount, boolean forBatchedSearch) {

 		String[] indexNames = indexCoordinates.getIndexNames();

@@ -1194,16 +1276,31 @@ class RequestConverter {

 		builder //
 				.version(true) //
-				.trackScores(query.getTrackScores());
+				.trackScores(query.getTrackScores()) //
+				.allowNoIndices(query.getAllowNoIndices()) //
+				.source(getSourceConfig(query)) //
+				.searchType(searchType(query.getSearchType())) //
+				.timeout(timeStringMs(query.getTimeout())) //
+				.requestCache(query.getRequestCache()) //
+		;

 		var pointInTime = query.getPointInTime();
 		if (pointInTime != null) {
 			builder.pit(pb -> pb.id(pointInTime.id()).keepAlive(time(pointInTime.keepAlive())));
 		} else {
-			builder.index(Arrays.asList(indexNames));
+			builder //
+					.index(Arrays.asList(indexNames)) //
+			;
+
+			var expandWildcards = query.getExpandWildcards();
+			if (expandWildcards != null && !expandWildcards.isEmpty()) {
+				builder.expandWildcards(expandWildcards(expandWildcards));
+			}

 			if (query.getRoute() != null) {
 				builder.routing(query.getRoute());
+			} else if (StringUtils.hasText(routing)) {
+				builder.routing(routing);
 			}

 			if (query.getPreference() != null) {
@@ -1223,8 +1320,6 @@ class RequestConverter {
 			builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
 		}

-		builder.source(getSourceConfig(query));
-
 		if (!isEmpty(query.getFields())) {
 			builder.fields(fb -> {
 				query.getFields().forEach(fb::field);
@@ -1248,8 +1343,6 @@ class RequestConverter {
 			builder.minScore((double) query.getMinScore());
 		}

-		builder.searchType(searchType(query.getSearchType()));
-
 		if (query.getSort() != null) {
 			List<SortOptions> sortOptions = getSortOptions(query.getSort(), persistentEntity);

@@ -1260,6 +1353,9 @@ class RequestConverter {

 		addHighlight(query, builder);

+		query.getScriptedFields().forEach(scriptedField -> builder.scriptFields(scriptedField.getFieldName(),
+				sf -> sf.script(getScript(scriptedField.getScriptData()))));
+
 		if (query instanceof NativeQuery) {
 			prepareNativeSearch((NativeQuery) query, builder);
 		}
@@ -1272,21 +1368,16 @@ class RequestConverter {
 			builder.trackTotalHits(th -> th.count(query.getTrackTotalHitsUpTo()));
 		}

-		builder.timeout(timeStringMs(query.getTimeout()));
-
 		if (query.getExplain()) {
 			builder.explain(true);
 		}

 		if (!isEmpty(query.getSearchAfter())) {
-			builder.searchAfter(
-					query.getSearchAfter().stream().map(it -> FieldValue.of(it.toString())).collect(Collectors.toList()));
+			builder.searchAfter(query.getSearchAfter().stream().map(TypeUtils::toFieldValue).toList());
 		}

 		query.getRescorerQueries().forEach(rescorerQuery -> builder.rescore(getRescore(rescorerQuery)));

-		builder.requestCache(query.getRequestCache());
-
 		if (!query.getRuntimeFields().isEmpty()) {

 			Map<String, RuntimeField> runtimeMappings = new HashMap<>();
@@ -1307,21 +1398,23 @@ class RequestConverter {
 			builder.size(0) //
 					.trackTotalHits(th -> th.count(Integer.MAX_VALUE)) //
 					.source(SourceConfig.of(sc -> sc.fetch(false)));
-		} else if (useScroll) {
+		} else if (forBatchedSearch) {
 			// request_cache is not allowed on scroll requests.
 			builder.requestCache(null);
-			Duration scrollTimeout = query.getScrollTime() != null ? query.getScrollTime() : Duration.ofMinutes(1);
-			builder.scroll(time(scrollTimeout));
 			// limit the number of documents in a batch
-			builder.size(500);
+			builder.size(query.getReactiveBatchSize());
 		}

 		if (!isEmpty(query.getIndicesBoost())) {
-			Map<String, Double> boosts = new LinkedHashMap<>();
-			query.getIndicesBoost()
-					.forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost()));
-			// noinspection unchecked
-			builder.indicesBoost(boosts);
+			builder.indicesBoost(query.getIndicesBoost().stream()
+					.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost())))
+					.collect(Collectors.toList()));
+		}
+
+		if (!isEmpty(query.getDocValueFields())) {
+			builder.docvalueFields(query.getDocValueFields().stream() //
+					.map(docValueField -> FieldAndFormat.of(b -> b.field(docValueField.field()).format(docValueField.format())))
+					.toList());
 		}
 	}

@@ -1330,7 +1423,7 @@ class RequestConverter {
 		return Rescore.of(r -> r //
 				.query(rq -> rq //
 						.query(getQuery(rescorerQuery.getQuery(), null)) //
-						.scoreMode(TypeUtils.scoreMode(rescorerQuery.getScoreMode())) //
+						.scoreMode(scoreMode(rescorerQuery.getScoreMode())) //
 						.queryWeight(rescorerQuery.getQueryWeight() != null ? Double.valueOf(rescorerQuery.getQueryWeight()) : 1.0) //
 						.rescoreQueryWeight(
 								rescorerQuery.getRescoreQueryWeight() != null ? Double.valueOf(rescorerQuery.getRescoreQueryWeight())
@@ -1389,10 +1482,10 @@ class RequestConverter {
 				return SortOptions.of(so -> so //
 						.geoDistance(gd -> gd //
 								.field(fieldName) //
-								.location(loc -> loc.latlon(QueryBuilders.latLon(geoDistanceOrder.getGeoPoint())))//
-								.distanceType(TypeUtils.geoDistanceType(geoDistanceOrder.getDistanceType()))
-								.mode(TypeUtils.sortMode(finalMode)) //
-								.unit(TypeUtils.distanceUnit(geoDistanceOrder.getUnit())) //
+								.location(loc -> loc.latlon(Queries.latLon(geoDistanceOrder.getGeoPoint()))) //
+								.distanceType(geoDistanceType(geoDistanceOrder.getDistanceType())).mode(sortMode(finalMode)) //
+								.order(sortOrder(geoDistanceOrder.getDirection())) //
+								.unit(distanceUnit(geoDistanceOrder.getUnit())) //
 								.ignoreUnmapped(geoDistanceOrder.getIgnoreUnmapped())));
 			} else {
 				String missing = (order.getNullHandling() == Sort.NullHandling.NULLS_FIRST) ? "_first"
@@ -1402,10 +1495,10 @@ class RequestConverter {
 						.field(f -> {
 							f.field(fieldName) //
 									.order(sortOrder) //
-									.mode(TypeUtils.sortMode(finalMode));
+									.mode(sortMode(finalMode));

 							if (finalUnmappedType != null) {
-								FieldType fieldType = TypeUtils.fieldType(finalUnmappedType);
+								FieldType fieldType = fieldType(finalUnmappedType);

 								if (fieldType != null) {
 									f.unmappedType(fieldType);
@@ -1425,13 +1518,15 @@ class RequestConverter {
 	@SuppressWarnings("DuplicatedCode")
 	private void prepareNativeSearch(NativeQuery query, SearchRequest.Builder builder) {

-		query.getScriptedFields().forEach(scriptedField -> builder.scriptFields(scriptedField.getFieldName(),
-				sf -> sf.script(getScript(scriptedField.getScriptData()))));
-
 		builder //
 				.suggest(query.getSuggester()) //
 				.collapse(query.getFieldCollapse()) //
-				.sort(query.getSortOptions());
+				.sort(query.getSortOptions()) //
+		;
+
+		if (query.getKnnQuery() != null) {
+			builder.knn(query.getKnnQuery());
+		}

 		if (!isEmpty(query.getAggregations())) {
 			builder.aggregations(query.getAggregations());
@@ -1445,14 +1540,15 @@ class RequestConverter {
 	@SuppressWarnings("DuplicatedCode")
 	private void prepareNativeSearch(NativeQuery query, MultisearchBody.Builder builder) {

-		query.getScriptedFields().forEach(scriptedField -> builder.scriptFields(scriptedField.getFieldName(),
-				sf -> sf.script(getScript(scriptedField.getScriptData()))));
-
 		builder //
 				.suggest(query.getSuggester()) //
 				.collapse(query.getFieldCollapse()) //
 				.sort(query.getSortOptions());

+		if (query.getKnnQuery() != null) {
+			builder.knn(query.getKnnQuery());
+		}
+
 		if (!isEmpty(query.getAggregations())) {
 			builder.aggregations(query.getAggregations());
 		}
@@ -1477,11 +1573,13 @@ class RequestConverter {
 		if (query instanceof CriteriaQuery) {
 			esQuery = CriteriaQueryProcessor.createQuery(((CriteriaQuery) query).getCriteria());
 		} else if (query instanceof StringQuery) {
-			esQuery = QueryBuilders.wrapperQueryAsQuery(((StringQuery) query).getSource());
+			esQuery = Queries.wrapperQueryAsQuery(((StringQuery) query).getSource());
 		} else if (query instanceof NativeQuery nativeQuery) {

 			if (nativeQuery.getQuery() != null) {
 				esQuery = nativeQuery.getQuery();
+			} else if (nativeQuery.getSpringDataQuery() != null) {
+				esQuery = getQuery(nativeQuery.getSpringDataQuery(), clazz);
 			}
 		} else {
 			throw new IllegalArgumentException("unhandled Query implementation " + query.getClass().getName());
@@ -1573,8 +1671,74 @@ class RequestConverter {
 		return ClosePointInTimeRequest.of(cpit -> cpit.id(pit));
 	}

+	public SearchTemplateRequest searchTemplate(SearchTemplateQuery query, @Nullable String routing,
+			IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+
+		return SearchTemplateRequest.of(builder -> {
+			builder //
+					.allowNoIndices(query.getAllowNoIndices()) //
+					.explain(query.getExplain()) //
+					.id(query.getId()) //
+					.index(Arrays.asList(index.getIndexNames())) //
+					.preference(query.getPreference()) //
+					.searchType(searchType(query.getSearchType())).source(query.getSource()) //
+			;
+
+			if (query.getRoute() != null) {
+				builder.routing(query.getRoute());
+			} else if (StringUtils.hasText(routing)) {
+				builder.routing(routing);
+			}
+
+			var expandWildcards = query.getExpandWildcards();
+			if (!expandWildcards.isEmpty()) {
+				builder.expandWildcards(expandWildcards(expandWildcards));
+			}
+
+			if (query.hasScrollTime()) {
+				builder.scroll(time(query.getScrollTime()));
+			}
+
+			if (!CollectionUtils.isEmpty(query.getParams())) {
+				Function<Map.Entry<String, Object>, String> keyMapper = Map.Entry::getKey;
+				Function<Map.Entry<String, Object>, JsonData> valueMapper = entry -> JsonData.of(entry.getValue(), jsonpMapper);
+				Map<String, JsonData> params = query.getParams().entrySet().stream()
+						.collect(Collectors.toMap(keyMapper, valueMapper));
+				builder.params(params);
+			}
+
+			return builder;
+		});
+	}
+
 	// endregion

+	public PutScriptRequest scriptPut(Script script) {
+
+		Assert.notNull(script, "script must not be null");
+
+		return PutScriptRequest.of(b -> b //
+				.id(script.id()) //
+				.script(sb -> sb //
+						.lang(script.language()) //
+						.source(script.source())));
+	}
+
+	public GetScriptRequest scriptGet(String name) {
+
+		Assert.notNull(name, "name must not be null");
+
+		return GetScriptRequest.of(b -> b.id(name));
+	}
+
+	public DeleteScriptRequest scriptDelete(String name) {
+
+		Assert.notNull(name, "name must not be null");
+
+		return DeleteScriptRequest.of(b -> b.id(name));
+	}
 	// region helper functions

 	public <T> T fromJson(String json, JsonpDeserializer<T> deserializer) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	7f3035dab5	Release version 5.1.4 (2023.0.4). See #2674	2023-09-15 10:52:26 +02:00
Mark Paluch	a5c4867684	Prepare 5.1.4 (2023.0.4). See #2674	2023-09-15 10:52:12 +02:00
Peter-Josef Meisch	572cc7ffea	Fix refresh policy in UpdateQuery. Original Pull Request #2696 Closes #2692 (cherry picked from commit `2d0aee08ce`)	2023-09-13 21:49:19 +02:00
Peter-Josef Meisch	4e7bcac5f5	Upgrade deprecated client to Elasticsearch-7.17.13. Original Pull Request #2694 Closes #2688	2023-09-13 19:38:50 +02:00
Peter-Josef Meisch	4628908e84	Polishing. (cherry picked from commit `a82952b124`)	2023-09-03 15:44:09 +02:00
Sébastien Comeau	922f4b1760	Fix: missing PhraseSuggestion.Entry.Option's score and collateMatch values. Original Pull Request #2680 Closes #2681 (cherry picked from commit `7c466395c4`)	2023-09-03 15:44:08 +02:00
Peter-Josef Meisch	4614c62bb5	Fix search_after field values (#2679 ) Closes #2678 (cherry picked from commit `9adc4d2b36`)	2023-08-28 20:27:21 +02:00
Mark Paluch	063020f8b3	After release cleanups. See #2631	2023-08-18 14:07:36 +02:00
Mark Paluch	0c98c419c9	Prepare next development iteration. See #2631	2023-08-18 14:07:34 +02:00
Mark Paluch	3f085b2675	Release version 5.1.3 (2023.0.3). See #2631	2023-08-18 14:04:04 +02:00
Mark Paluch	42aeb48b43	Prepare 5.1.3 (2023.0.3). See #2631	2023-08-18 14:03:49 +02:00
Julia Lee	449910b4f7	Update CI properties. See #2631	2023-08-14 11:29:43 -04:00
Julia Lee	2e99f5b2e0	Upgrade to Maven Wrapper 3.9.4. See #2669	2023-08-14 07:55:32 -04:00
Peter-Josef Meisch	9b9136d852	Fix similarity field mapping. Original Pull Request #2666 Closes #2659 (cherry picked from commit `8c5ff92cd2`)	2023-08-13 21:40:31 +02:00
Peter-Josef Meisch	a266d7c46a	Upgrade deprecated dependency to Elasticsearch 7.17.12. Original Pull Request #2655 #Closes #2651	2023-07-30 19:51:01 +02:00
Peter-Josef Meisch	c045a8ae29	Fix MappingElasticsearchConverter. Original Pull Request #2637 Closes #2627 (cherry picked from commit `d9bb9911f9`)	2023-07-18 22:51:45 +02:00
Mark Paluch	11c87a1251	After release cleanups. See #2595	2023-07-14 13:57:59 +02:00
Mark Paluch	c9e9bf757e	Prepare next development iteration. See #2595	2023-07-14 13:57:58 +02:00
Mark Paluch	db8d89aeff	Release version 5.1.2 (2023.0.2). See #2595	2023-07-14 13:54:08 +02:00
Mark Paluch	0ed14e7caa	Prepare 5.1.2 (2023.0.2). See #2595	2023-07-14 13:52:55 +02:00
Peter-Josef Meisch	d0658affc3	Upgrade to Elasticsearch 7.17.11. Original Pull Request #2625 Closes #2622	2023-07-12 20:05:40 +02:00
Mark Paluch	7c10128cec	Update CI properties. See #2595	2023-07-03 09:49:00 +02:00
Mark Paluch	6e3535d68d	Upgrade to Maven Wrapper 3.9.3. See #2614	2023-07-03 09:48:29 +02:00
Peter-Josef Meisch	121b47e1be	Fix IndicesBoost error. Original Pull Request #2606 Closes #2598 (cherry picked from commit `d9fd722bb6`)	2023-06-27 22:28:16 +02:00
Greg L. Turnquist	3abe6d9c1b	Stop posting build status on internal Slack. See #2603	2023-06-26 13:38:20 -05:00
seunghyun.cheong	d43b44ba9c	Adding GeoDistanceOrder's direction in request. Original Pull Request #2602 Closes #2601 (cherry picked from commit `8a164b1039`) Polishing (cherry picked from commit `b7570ffa95`) add implementation for old client	2023-06-24 11:16:14 +02:00
John Blum	a715d2836d	After release cleanups. See #2548	2023-06-16 08:13:31 -07:00
John Blum	a69b95867a	Prepare next development iteration. See #2548	2023-06-16 08:13:28 -07:00
John Blum	d424195c8b	Release version 5.1.1 (2023.0.1). See #2548	2023-06-16 08:05:37 -07:00
John Blum	44d1614a20	Prepare 5.1.1 (2023.0.1). See #2548	2023-06-16 08:05:07 -07:00
Mark Paluch	7b6823cc31	Upgrade to Maven Wrapper 3.9.2. See #2588	2023-06-13 08:54:05 +02:00
Mark Paluch	2e43c7800b	Reformat pom.xml. See #2585	2023-06-06 10:57:04 +02:00
Mark Paluch	59968e8118	Use snapshot and milestone repositories instead of libs-snapshot and libs-milestone. Closes #2585	2023-06-06 10:56:48 +02:00
Peter-Josef Meisch	a5934442bf	Fix reactive save of Flux. Original Pull Request #2581 Closes #2576 (cherry picked from commit `d6b5540614`)	2023-06-02 17:39:16 +02:00
Peter-Josef Meisch	89afa819f3	Polishing (cherry picked from commit `6edd3cf1fe`)	2023-05-17 20:23:23 +02:00
Pierre Mazieres @Semarchy	5561a5b1ae	"BaseQuery" class : the "build" method does not apply to the "runtimeFields" field. Original Pull Request #2568 Closes #2567 (cherry picked from commit `7b527c4451`)	2023-05-17 20:23:23 +02:00
Peter-Josef Meisch	23a5071ee5	Upgrade to Elasticsearch 8.7.1. Closes #2541 (cherry picked from commit `af924c2cbc`)	2023-05-12 22:35:53 +02:00
Peter-Josef Meisch	d1324a26db	Documentation misses link to migration page 5.0 -> 5.1. Original Pull Request #2554 Closes #2553	2023-05-12 18:59:21 +02:00
Mark Paluch	34e3e8f5da	Update Jenkins triggers after GA release. See #2532	2023-05-12 14:47:15 +02:00
Christoph Strobl	1571b9b4e2	After release cleanups. See #2532	2023-05-12 14:19:11 +02:00
Christoph Strobl	78e7dd2764	Prepare next development iteration. See #2532	2023-05-12 14:19:10 +02:00
Christoph Strobl	2f54bdec01	Release version 5.1 GA (2023.0.0). See #2532	2023-05-12 14:14:39 +02:00
Christoph Strobl	b3d582cd93	Prepare 5.1 GA (2023.0.0). See #2532	2023-05-12 14:14:08 +02:00
Pierre Mazieres @Semarchy	9c497c2dea	Fix assignment in NativeQueryBuilder. Original Pull Request: #2543 Closes #2542	2023-05-10 18:31:04 +02:00
Peter-Josef Meisch	406961c13b	Allow SSL configuration with the Elasticsearch CA fingerprint. Original Pull Request #2540 Closes #2539	2023-04-29 18:43:50 +02:00
Peter-Josef Meisch	17ecce4362	Documentation update. Original Pull Request #2537 Closes #2536	2023-04-23 22:16:53 +02:00
Peter-Josef Meisch	bbd5e8119a	Component templates. Original Pull Request #2534 Closes #1458	2023-04-18 20:58:07 +02:00
Peter-Josef Meisch	df7a614638	dependency updates. Original Pull Request #2531 Closes #2530	2023-04-15 12:37:50 +02:00
Greg L. Turnquist	90db137548	After release cleanups. See #2500	2023-04-14 12:00:04 -05:00
Greg L. Turnquist	aa3a3df2f3	Prepare next development iteration. See #2500	2023-04-14 11:59:59 -05:00
Greg L. Turnquist	de437cd7da	Release version 5.1 RC1 (2023.0.0). See #2500	2023-04-14 11:54:01 -05:00
Greg L. Turnquist	5ac83f696e	Prepare 5.1 RC1 (2023.0.0). See #2500	2023-04-14 11:53:25 -05:00
Peter-Josef Meisch	6100c2491a	Cleanup. Original Pull Request #2526 Closes #2525	2023-04-12 22:19:19 +02:00
Peter-Josef Meisch	d597baccd3	Upgrade to Elasticsearch 8.7.0. Original Pull Request #2524 Closes #2523	2023-04-11 20:45:52 +02:00
Peter-Josef Meisch	dfc1be286c	Polishing	2023-04-10 11:22:45 +02:00
JKatzwinkel	1f7fa77c15	Fix inner hits metadata mapping. Original Pull Request #2522 Closes #2521	2023-04-10 11:18:26 +02:00
Mark Paluch	699c0ef265	Upgrade to Maven Wrapper 3.9.1. See #2518	2023-04-06 16:16:37 +02:00
Peter-Josef Meisch	9771b9c1d6	clarify PR submission	2023-04-05 08:07:27 +02:00
Peter-Josef Meisch	437279f637	remove erroneous linebreak	2023-04-04 17:45:28 +02:00
Peter-Josef Meisch	ed1c416cd3	Javadoc Original Pull Request #2516 Closes #2515	2023-04-03 20:20:13 +02:00
Peter-Josef Meisch	a5fb7a3c76	Remove old methods from configuration. Original Pull Request #2513 Closes #2512	2023-04-02 20:16:13 +02:00
Greg L. Turnquist	7f772703d3	Test against Java 20 on CI. See #2507.	2023-03-30 11:40:56 -05:00
Greg L. Turnquist	43eb40e45e	Upgrade to BlockHound 1.0.7.RELEASE. Closes #2510.	2023-03-30 11:39:57 -05:00
Greg L. Turnquist	75bf578b31	Update CI properties. See #2500	2023-03-28 13:58:23 -05:00
Peter-Josef Meisch	675b77982b	Allow field names with dots. Original Pull Request #2504 Closes #2502	2023-03-22 19:51:00 +01:00
Christoph Strobl	d95af9fcfa	After release cleanups. See #2464	2023-03-20 15:05:35 +01:00
Christoph Strobl	96985fa14a	Prepare next development iteration. See #2464	2023-03-20 15:05:34 +01:00
Christoph Strobl	ff1f25b0b2	Release version 5.1 M3 (2023.0.0). See #2464	2023-03-20 15:01:48 +01:00
Christoph Strobl	d3e95815d9	Prepare 5.1 M3 (2023.0.0). See #2464	2023-03-20 15:01:20 +01:00
Peter-Josef Meisch	797dbb5a18	Improve save(Flux<T>) implementations. Original Pull Request #2497 Closes #2496 Closes #2492	2023-03-19 15:01:24 +01:00
Mark Paluch	a7d6b9df6d	Adopt to newly introduced `ParameterAccessor.getScrollPosition()`. Closes #2494	2023-03-16 15:26:47 +01:00
Peter-Josef Meisch	ade90328d3	ValueConverters can be derived from AbstractPropertyValueConverter. Original Pull Request #2490 Closes #2489	2023-03-05 20:54:20 +01:00
Peter-Josef Meisch	ec77b3a082	Add option to not write version to document source. Original Pull Request #2487 Closes #2466	2023-03-05 09:53:41 +01:00
Peter-Josef Meisch	63cebd7038	Fix putMapping request creation . Original Pull Request #2483 Closes #2487	2023-02-26 15:41:12 +01:00
Peter-Josef Meisch	e7c9bf20f6	Add option to specify if empty property should not be sent to Elasticsearch. Original Pull Request #2482 Closes #2290	2023-02-25 17:50:12 +01:00
Peter-Josef Meisch	b4c3e25a60	Move scripted fields from native query up to base query. Original Pull Request #2481 Closes #2477	2023-02-25 14:43:32 +01:00
Peter-Josef Meisch	43ab49b5fa	refactor tests Original Pull Request #2480 Closes #2479	2023-02-25 13:38:50 +01:00
Peter-Josef Meisch	c9b8b1af19	Adapt custom routing. Original Pull Request #2474 Closes #2087	2023-02-21 20:17:45 +01:00
Mark Paluch	9c80dc9ae8	Upgrade to Maven Wrapper 3.9.0. See #2471	2023-02-20 11:58:19 +01:00
Peter-Josef Meisch	03ffb07827	Upgrade to Elasticsearch 8.6.2. Original Pull Request #2470 Closes #2468	2023-02-19 12:57:18 +01:00
Christoph Strobl	d29cf7788b	After release cleanups. See #2463	2023-02-17 14:25:49 +01:00
Christoph Strobl	71e46c8277	Prepare next development iteration. See #2463	2023-02-17 14:25:47 +01:00
Christoph Strobl	fc1e8d3cf6	Release version 5.1 M2 (2023.0.0). See #2463	2023-02-17 14:22:31 +01:00
Christoph Strobl	c84a8bbc12	Prepare 5.1 M2 (2023.0.0). See #2463	2023-02-17 14:22:18 +01:00
Christoph Strobl	97a9176775	After release cleanups. See #2367	2023-02-17 13:31:54 +01:00
Christoph Strobl	7eff8f5dd1	Prepare next development iteration. See #2367	2023-02-17 13:31:53 +01:00
Christoph Strobl	6d4247312d	Release version 5.1 M1 (2023.0.0). See #2367	2023-02-17 13:27:50 +01:00
Christoph Strobl	81f52244a8	Prepare 5.1 M1 (2023.0.0). See #2367	2023-02-17 13:27:11 +01:00
Peter-Josef Meisch	e741df9c7c	Support KNN queries in NativeQuery. Original Pull Request #2458 Closes #2433	2023-02-14 20:45:16 +01:00
Peter-Josef Meisch	3875bb6abf	Upgrade to Elasticsearch 8.6.1. Original Pull Request #2455 Closes #2452	2023-02-14 18:34:19 +01:00
Peter-Josef Meisch	1860d7353a	Allow for Spring Data Elasticsearch queries to be added to NativeQuery. Original Pull Request #2451 #Closes 2391	2023-02-12 17:50:55 +01:00
Peter-Josef Meisch	4f30a492b9	@Query annotated repository method does not use Sort parameter. Original Pull Request #2450 Closes #2449	2023-02-10 22:46:39 +01:00
Peter-Josef Meisch	6805fff1fa	Option to add docvalue_fields to a search query. Original Pull Request #2446 #Closes 2316	2023-02-06 20:39:00 +01:00
Urs Keller	0971acfe25	Fix ReactiveIndicesTemplate: Refresh not called on bound indices. Original Pull Request #2444 Closes #2441	2023-02-03 19:56:47 +01:00
Zhenxi	36805c3ecb	Fix typo in documentation. Original Pull Request #2443 Closes #2442	2023-02-03 18:31:16 +01:00
Mark Paluch	b75d2eb01f	Update CI properties. See #2367	2023-01-30 10:49:51 +01:00
Mark Paluch	f94f2b0618	Upgrade to Maven Wrapper 3.8.7. See #2440	2023-01-30 10:48:19 +01:00
Peter-Josef Meisch	82607b3d4d	Add Option to not store the id property in the document source. Original Pull Request #2438 Closes #2364	2023-01-29 16:51:41 +01:00
Peter-Josef Meisch	cf9b106c31	Polishing	2023-01-26 19:07:21 +01:00
Hamid Rahimi	b0c2ce3084	Overload multiSearch method to support list of IndexCoordinates. Original Pull Request #2436 Closes #2434	2023-01-26 19:03:35 +01:00
Peter-Josef Meisch	b3f9bdb80f	Support returning the name of the index an entity was persisted to. Original Pull Request #2435 Closes #2112	2023-01-25 20:17:26 +01:00
Peter-Josef Meisch	d9bf76fb31	Fix reading response runtime field by mapping. Original Pull Request #2432 Closes #2431	2023-01-22 19:15:12 +01:00
Peter-Josef Meisch	4d11a56e84	Upgrade to Elasticsearch 8.6.0. Original Pull Request #2430 Closes #2426	2023-01-20 09:05:53 +01:00
Peter-Josef Meisch	73d5d623dd	Enable custom similarity value. Original Pull Request #2429 Closes #2424	2023-01-19 21:08:40 +01:00
ezequielantunez	5a36f5e1e8	Add Query by Example feature. Original Pull Request #2422 Closes #2418	2023-01-11 21:50:19 +01:00
Peter-Josef Meisch	44a5c7545f	AOT/Native support. Original Pull Request #2423 Closes #2419	2023-01-08 15:43:32 +01:00
Peter-Josef Meisch	28489ffee8	findAllById returns all requested documents. Original Pull Request #2421 Closes #2417	2023-01-04 17:13:22 +01:00
Mark Paluch	605c83f628	Extend license header copyright years to 2023. See #2416	2023-01-02 09:53:40 +01:00
Peter-Josef Meisch	f3a6a42b82	Upgrade Elasticsearch to 8.5.3 (old client to 7.17.8). Original Pull Request #2411 Closes #2403	2022-12-30 23:30:51 +01:00
Peter-Josef Meisch	efd394370a	Implement search by template. Original Pull Request #2410 Closes #1891	2022-12-30 19:11:17 +01:00
Scooby	4d7d0955f9	IndexQuery's id get ignored in bulkIndexOperation. Original Pull Request #2407 Closdes #2405	2022-12-27 19:53:51 +01:00
Peter-Josef Meisch	2fb90621a2	Polishing.	2022-12-23 14:20:56 +01:00
Hao	bc7667fdbc	Update documentation. Original Pull Request #2400 Closes #2404	2022-12-23 14:19:28 +01:00
Peter-Josef Meisch	2ea568d2e4	Rename QueryBuilders to avoid name clash wih Elasticsearch class. Original Pull Request #2397 Closes #2390	2022-12-16 20:15:22 +01:00
Peter-Josef Meisch	c460a5f37d	Add update(entity, index) operation. Original Pull Request #2394 Closes #2385	2022-12-14 08:07:48 +01:00
Peter-Josef Meisch	e1c8a2adeb	Switch reactive unpaged search from scroll to pit with search_after. Original Pull Request #2393 Closes #1685	2022-12-12 20:23:39 +01:00
Peter-Josef Meisch	014aa3dbf6	Add reactive search batch size option to query. Original Pull Request #2392 Closes #2061	2022-12-07 13:07:05 +01:00
Peter-Josef Meisch	9446d726bc	Fix NPE in ElasticsearchExceptionTranslator. Original Pull Request #2389 Closes #2388	2022-12-05 13:13:27 +01:00
Peter-Josef Meisch	1fa6c9f3e5	Support Kotlin Flow as possible return type in repository functions. Original Pull Request #2387 Closes #2386	2022-12-03 22:46:55 +01:00
Peter-Josef Meisch	3c7ce7413a	Upgrade to Elasticsearch 8.5.2. Original Pull Request #2382 Closes #2380	2022-11-26 09:24:13 +01:00
Peter-Josef Meisch	f6c6f64f04	Change AliasData filter property to Query. Original Pull Request #2374 Closes #2073	2022-11-19 19:38:26 +01:00
Peter-Josef Meisch	9f63369c4b	Remove all indices after testing. Original Pull Request #2373 Closes #2372	2022-11-19 15:12:32 +01:00
Peter-Josef Meisch	bae182b162	Upgrade to Elasticsearch 8.5.1. Original Pull Request #2370 Closes #2368	2022-11-18 19:53:54 +01:00
Mark Paluch	8db4e430d7	Update CI properties. See #2367	2022-11-18 15:31:11 +01:00
Mark Paluch	c1de8b1e85	After release cleanups. See #2336	2022-11-18 14:30:20 +01:00
Mark Paluch	c7b8848afe	Prepare next development iteration. See #2336	2022-11-18 14:30:19 +01:00