Release version 5.1 M1 (2023.0.0).

See #2367

.gitignore

@@ -24,3 +24,4 @@ target
 
 
 /zap.env
+.localdocker-env

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
-#Fri Jun 03 09:32:51 CEST 2022
+#Mon Jan 30 10:48:19 CET 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.8.7/apache-maven-3.8.7-bin.zip

CONTRIBUTING.adoc

@@ -8,4 +8,4 @@ In order to run the tests locally with `./mvnw test` you need to have docker run
 
 == Class names of the test classes
 
-Tset classes that do depend on the client have either `ERHLC` (when using the deprecated Elasticsearch  `RestHighLevelClient`) or `ELC` (the new `ElasticsearchClient`) in their name.
+Test classes that do depend on the client have either `ERHLC` (when using the deprecated Elasticsearch  `RestHighLevelClient`) or `ELC` (the new `ElasticsearchClient`) in their name.

README.adoc

@@ -169,7 +169,6 @@ We’d love to help!
 https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/[reference documentation], and https://docs.spring.io/spring-data/elasticsearch/docs/current/api/[Javadocs].
 * Learn the Spring basics – Spring Data builds on Spring Framework, check the https://spring.io[spring.io] web-site for a wealth of reference documentation.
 If you are just starting out with Spring, try one of the https://spring.io/guides[guides].
-* If you are upgrading, check out the https://docs.spring.io/spring-data/elasticsearch/docs/current/changelog.txt[changelog] for "`new and noteworthy`" features.
 * Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data-elasticsearch`].
 You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
 * Report bugs with Spring Data for Elasticsearch at https://github.com/spring-projects/spring-data-elasticsearch/issues[https://github.com/spring-projects/spring-data-elasticsearch/issues].

ci/pipeline.properties

@@ -1,18 +1,19 @@
 # Java versions
-java.main.tag=17.0.3_7-jdk
+java.main.tag=17.0.6_10-jdk-focal
 
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
 
 # Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.12
-docker.mongodb.5.0.version=5.0.6
+docker.mongodb.4.4.version=4.4.18
+docker.mongodb.5.0.version=5.0.14
+docker.mongodb.6.0.version=6.0.4
 
 # Supported versions of Redis
-docker.redis.6.version=6.2.6
+docker.redis.6.version=6.2.10
 
 # Supported versions of Cassandra
-docker.cassandra.3.version=3.11.12
+docker.cassandra.3.version=3.11.14
 
 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.0.0-M6</version>
+	<version>5.1.0-M1</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.0.0-M6</version>
+		<version>3.1.0-M1</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,18 +18,18 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<springdata.commons>3.0.0-M6</springdata.commons>
+		<springdata.commons>3.1.0-M1</springdata.commons>
 
 		<!-- version of the RestHighLevelClient	-->
-		<elasticsearch-rhlc>7.17.5</elasticsearch-rhlc>
+		<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
 		<!-- version of the new ElasticsearchClient	-->
-		<elasticsearch-java>8.3.3</elasticsearch-java>
+		<elasticsearch-java>8.6.1</elasticsearch-java>
 
 		<log4j>2.18.0</log4j>
 		<netty>4.1.65.Final</netty>
 
 		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
-		<hoverfly>0.14.2</hoverfly>
+		<hoverfly>0.14.3</hoverfly>
 		<jsonassert>1.5.1</jsonassert>
 		<testcontainers>1.17.3</testcontainers>
 		<wiremock>2.33.2</wiremock>
@@ -193,13 +193,6 @@
 		</dependency>
 
 		<!-- CDI -->
-		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>javax.interceptor</groupId>
@@ -211,7 +204,7 @@
 		<dependency>
 			<groupId>jakarta.enterprise</groupId>
 			<artifactId>jakarta.enterprise.cdi-api</artifactId>
-			<version>${cdi}</version>
+			<version>3.0.1</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -459,7 +452,7 @@
 					</jvmArgs>
 					<excludedGroups>integration-test</excludedGroups>
 					<targetClasses>
-						<param>org.springframework.data.elasticsearch.core.geo.*</param>
+						<param>org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter*</param>
 					</targetClasses>
 					<excludedMethods>toString</excludedMethods>
 				</configuration>

src/main/asciidoc/index.adoc

@@ -5,13 +5,15 @@ BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Stro
 ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
 :spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc
 
-(C) 2013-2021 The original author(s).
+(C) 2013-2022 The original author(s).
 
 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 
 toc::[]
 
 include::preface.adoc[]
+include::{spring-data-commons-docs}/upgrade.adoc[leveloffset=+1]
+
 
 :leveloffset: +1
 include::{spring-data-commons-docs}/repositories.adoc[]

src/main/asciidoc/preface.adoc

@@ -37,7 +37,8 @@ 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.3.3 | 6.0.x | 3.0.x?
+| 2022.1 | 5.1.x | 8.6.1 | 6.0.x | 3.0.x
+| 2022.0 (Turing) | 5.0.x | 8.5.3 | 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

src/main/asciidoc/reference/elasticsearch-auditing.adoc

@@ -1,6 +1,7 @@
 [[elasticsearch.auditing]]
 == Elasticsearch Auditing
 
+[[elasticsearch.auditing.preparing]]
 === Preparing entities
 
 In order for the auditing code to be able to decide whether an entity instance is new, the entity must implement the `Persistable<ID>` interface which is defined as follows:
@@ -54,6 +55,7 @@ public class Person implements Persistable<Long> {
 <.> the getter is the required implementation from the interface
 <.> an object is new if it either has no `id` or none of fields containing creation attributes are set.
 
+[[elasticsearch.auditing.activating]]
 === Activating auditing
 
 After the entities have been set up and providing the `AuditorAware` - or `ReactiveAuditorAware` - the Auditing must be activated by setting the `@EnableElasticsearchAuditing` on a configuration class:

src/main/asciidoc/reference/elasticsearch-clients.adoc

@@ -3,8 +3,10 @@
 
 This chapter illustrates configuration and usage of supported Elasticsearch client implementations.
 
-Spring Data Elasticsearch operates upon an Elasticsearch client that is connected to a single Elasticsearch node or a cluster.
-Although the Elasticsearch Client can be used to work with the cluster, applications using Spring Data Elasticsearch normally use the higher level abstractions of <<elasticsearch.operations>> and <<elasticsearch.repositories>>.
+Spring Data Elasticsearch operates upon an Elasticsearch client (provided by Elasticsearch client libraries) that is 
+connected to a single Elasticsearch node or a cluster. 
+Although the Elasticsearch Client can be used directly to work with the cluster, applications using Spring Data 
+Elasticsearch normally use the higher level abstractions of <<elasticsearch.operations>> and <<elasticsearch.repositories>>.
 
 [[elasticsearch.clients.restclient]]
 == Imperative Rest Client
@@ -21,14 +23,20 @@ public class MyClientConfig extends ElasticsearchConfiguration {
 
 	@Override
 	public ClientConfiguration clientConfiguration() {
-		return ClientConfiguration.builder() //
-			.connectedTo("localhost:9200") //
+		return ClientConfiguration.builder()           <.> 
+			.connectedTo("localhost:9200") 
 			.build();
 	}
 }
+----
+<.> for a detailed description of the builder methods see <<elasticsearch.clients.configuration>>
+====
 
-// ...
+The following beans can then be injected in other Spring components:
 
+====
+[source,java]
+----
 @Autowired
 ElasticsearchOperations operations;      <.>
 
@@ -39,11 +47,8 @@ ElasticsearchClient elasticsearchClient; <.>
 RestClient restClient;                   <.>
 ----
 
-the following can be injected:
-
 <.> an implementation of `ElasticsearchOperations`
 <.> the `co.elastic.clients.elasticsearch.ElasticsearchClient` that is used.
-This is new Elasticsearch client implementation.
 <.> the low level `RestClient` from the Elasticsearch libraries
 ====
 
@@ -61,18 +66,24 @@ When working with the reactive stack, the configuration must be derived from a d
 import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchConfiguration;
 
 @Configuration
-public class MyClientConfig extends ElasticsearchConfiguration {
+public class MyClientConfig extends ReactiveElasticsearchConfiguration {
 
 	@Override
 	public ClientConfiguration clientConfiguration() {
-		return ClientConfiguration.builder() //
-			.connectedTo("localhost:9200") //
+		return ClientConfiguration.builder()           <.>
+			.connectedTo("localhost:9200") 
 			.build();
 	}
 }
+----
+<.> for a detailed description of the builder methods see <<elasticsearch.clients.configuration>>
+====
 
-// ...
+The following beans can then be injected in other Spring components:
 
+====
+[source,java]
+----
 @Autowired
 ReactiveElasticsearchOperations operations;      <.>
 
@@ -85,9 +96,9 @@ RestClient restClient;                           <.>
 
 the following can be injected:
 
-<.> an implementation of `ElasticsearchOperations`
+<.> an implementation of `ReactiveElasticsearchOperations`
 <.> the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient` that is used.
-This is based on the new Elasticsearch client implementation.
+This is a reactive implementation based on the Elasticsearch client implementation.
 <.> the low level `RestClient` from the Elasticsearch libraries
 ====
 
@@ -97,8 +108,14 @@ When using repositories, this instance is used under the hood as well.
 [[elasticsearch.clients.resthighlevelclient]]
 == High Level REST Client (deprecated)
 
-The Java RestHighLevelClient is deprecated, but still can be configured like shown (read
-<<elasticsearch-migration-guide-4.4-5.0.old-client>> as well):
+[CAUTION]
+====
+The Elasticsearch Java RestHighLevelClient is deprecated, but still can be configured like shown (make sure to read
+<<elasticsearch-migration-guide-4.4-5.0.old-client>> as well). 
+
+It should only be used to access an Elasticsearch cluster running version 7, even with the compatibility headers set 
+there are cases where the `RestHighLevelClient` cannot read the responses sent from a version 8 cluster. 
+====
 
 .RestHighLevelClient
 ====
@@ -127,15 +144,6 @@ public class RestClientConfig extends AbstractElasticsearchConfiguration {
   RestHighLevelClient highLevelClient;
 
   RestClient lowLevelClient = highLevelClient.lowLevelClient();                        <3>
-
-// ...
-
-IndexRequest request = new IndexRequest("spring-data")
-  .id(randomID())
-  .source(singletonMap("feature", "high-level-rest-client"))
-  .setRefreshPolicy(IMMEDIATE);
-
-IndexResponse response = highLevelClient.index(request,RequestOptions.DEFAULT);
 ----
 
 <1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
@@ -150,8 +158,12 @@ The `org.springframework.data.elasticsearch.client.erhlc.ReactiveElasticsearchCl
 It uses the request/response objects provided by the Elasticsearch core project.
 Calls are directly operated on the reactive stack, **not** wrapping async (thread pool bound) responses into reactive types.
 
-This was the first reactive implementation Spring Data Elasticsearch provided, but now is deprecated in favour of the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient`
+[CAUTION]
+====
+This was the first reactive implementation Spring Data Elasticsearch provided, but now is deprecated in favour
+of the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient`
 which uses the functionality offered by the new Elasticsearch client libraries.
+====
 
 .Reactive REST Client (deprecated)
 ====
@@ -194,6 +206,11 @@ Client behaviour can be changed via the `ClientConfiguration` that allows to set
 ====
 [source,java]
 ----
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.support.HttpHeaders;
+
+import static org.springframework.data.elasticsearch.client.elc.ElasticsearchClients.*;
+
 HttpHeaders httpHeaders = new HttpHeaders();
 httpHeaders.add("some-header", "on every request")                      <.>
 
@@ -212,7 +229,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()
     return headers;
   })
   .withClientConfigurer(                                                <.>
-    ElasticsearchClients.ElasticsearchClientConfigurationCallback.from(clientBuilder -> {
+    ElasticsearchClientConfigurationCallback.from(clientBuilder -> {
   	  // ...
       return clientBuilder;
   	}))
@@ -227,13 +244,12 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()
 <.> Optionally set a proxy.
 <.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
 <.> Set the connection timeout.
-Default is 10 sec.
 <.> Set the socket timeout.
-Default is 5 sec.
 <.> Optionally set headers.
 <.> Add basic authentication.
-<.> A `Supplier<Header>` function can be specified which is called every time before a request is sent to Elasticsearch - here, as an example, the current time is written in a header.
-<.> a function to configure the created client (see <<elasticsearch.clients.configuration.callbacks>>), can be added multiple times.
+<.> A `Supplier<HttpHeaders>` function can be specified which is called every time before a request is sent to Elasticsearch - here, as an example, the current time is written in a header.
+<.> a function to configure the created client (see <<elasticsearch.clients.configuration.callbacks>>), can be added 
+multiple times.
 ====
 
 IMPORTANT: Adding a Header supplier as shown in above example allows to inject headers that may change over the time, like authentication JWT tokens.
@@ -247,8 +263,11 @@ enough, the user can add callback functions by using the `withClientConfigurer(C
 
 The following callbacks are provided:
 
+[[elasticsearch.clients.configuration.callbacks.rest]]
 ==== Configuration of the low level Elasticsearch `RestClient`:
 
+This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
+`RestClient`:
 ====
 [source,java]
 ----
@@ -261,8 +280,12 @@ ClientConfiguration.builder()
 ----
 ====
 
+[[elasticsearch.clients.configurationcallbacks.httpasync]]
 ==== Configuration of the HttpAsyncClient used by the low level Elasticsearch `RestClient`:
 
+This callback provides a `org.apache.http.impl.nio.client.HttpAsyncClientBuilder` to configure the HttpCLient that is
+used by the `RestClient`.
+
 ====
 [source,java]
 ----
@@ -275,7 +298,7 @@ ClientConfiguration.builder()
 ----
 ====
 
-
+[[elasticsearch.clients.configuration.headers]]
 === Elasticsearch 7 compatibility headers
 
 When using the deprecated `RestHighLevelClient` and accessing an Elasticsearch cluster that is running on version 8, it is necessary to set the compatibility headers
@@ -284,6 +307,9 @@ documentation].
 
 For the imperative client this must be done by setting the default headers, for the reactive code this must be done using a header supplier:
 
+CAUTION: Even when these headers are set, there are cases where the response returned from the cluster cannot be 
+parsed with the client. This is not an error in Spring Data Elasticsearch.
+
 ====
 [source,java]
 ----
@@ -307,12 +333,13 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()
 [[elasticsearch.clients.logging]]
 == Client Logging
 
-To see what is actually sent to and received from the server `Request` / `Response` logging on the transport level needs to be turned on as outlined in the snippet below.
+To see what is actually sent to and received from the server `Request` / `Response` logging on the transport level 
+needs to be turned on as outlined in the snippet below. This can be enabled in the Elasticsearch client by setting 
+the level of the `tracer` package to "trace" (see 
+https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/java-rest-low-usage-logging.html)
 
 .Enable transport layer logging
 [source,xml]
 ----
-<logger name="org.springframework.data.elasticsearch.client.WIRE" level="trace"/>
+<logger name="tracer" level="trace"/>
 ----
-
-NOTE: The above applies to both the `RestHighLevelClient` and `ReactiveElasticsearchClient` when obtained via `RestClients` respectively `ReactiveRestClients`.

src/main/asciidoc/reference/elasticsearch-join-types.adoc

@@ -3,6 +3,7 @@
 
 Spring Data Elasticsearch supports the https://www.elastic.co/guide/en/elasticsearch/reference/current/parent-join.html[Join data type] for creating the corresponding index mappings and for storing the relevant information.
 
+[[elasticsearch.jointype.setting-up]]
 == Setting up the data
 
 For an entity to be used in a parent child join relationship, it must have a property of type `JoinField` which must be annotated.
@@ -160,6 +161,7 @@ Spring Data Elasticsearch will build the following mapping for this class:
 ----
 ====
 
+[[elasticsearch.jointype.storing]]
 ==  Storing data
 
 Given a repository for this class the following code inserts a question, two answers, a comment and a vote:
@@ -209,6 +211,7 @@ void init() {
 <5> a vote for the first answer, this needs to have the routing set to the weather document, see <<elasticsearch.routing>>.
 ====
 
+[[elasticsearch.jointype.retrieving]]
 ==  Retrieving data
 
 Currently native queries must be used to query the data, so there is no support from standard repository methods. <<repositories.custom-implementations>> can be used instead.
@@ -221,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();
 

src/main/asciidoc/reference/elasticsearch-migration-guide-3.2-4.0.adoc

@@ -95,6 +95,7 @@ default boolean createIndex(String indexName) {
 [[elasticsearch-migration-guide-3.2-4.0.deprecations]]
 == Deprecations
 
+[[elasticsearch-migration-guide-3.2-4.0.deprecations.methods-classes]]
 === Methods and classes
 
 Many functions and classes have been deprecated. These functions still work, but the Javadocs show with what they should be replaced.
@@ -115,6 +116,7 @@ Many functions and classes have been deprecated. These functions still work, but
 <T> T queryForObject(GetQuery query, Class<T> clazz);
 ----
 
+[[elasticsearch-migration-guide-3.2-4.0.deprecations.elasticsearch]]
 === Elasticsearch deprecations
 
 Since version 7 the Elasticsearch `TransportClient` is deprecated, it will be removed with Elasticsearch version 8. Spring Data Elasticsearch deprecates the `ElasticsearchTemplate` class which uses the `TransportClient` in version 4.0.

src/main/asciidoc/reference/elasticsearch-migration-guide-4.0-4.1.adoc

@@ -9,7 +9,7 @@ This section describes breaking changes from version 4.0.x to 4.1.x and how remo
 .Definition of the id property
 It is possible to define a property of en entity as the id property by naming it either `id` or  `document`.
 This behaviour is now deprecated and will produce a warning.
-PLease us the `@Id` annotation to mark a property as being the id property.
+Please use the `@Id` annotation to mark a property as being the id property.
 
 .Index mappings
 In the `ReactiveElasticsearchClient.Indices` interface the `updateMapping` methods are deprecated in favour of the `putMapping` methods.
@@ -32,6 +32,7 @@ They had been deprecated in Spring Data Elasticsearch 4.0 and their values weren
 [[elasticsearch-migration-guide-4.0-4.1.breaking-changes]]
 == Breaking Changes
 
+[[elasticsearch-migration-guide-4.0-4.1.breaking-changes.returntypes-1]]
 === Return types of ReactiveElasticsearchClient.Indices methods
 
 The methods in the `ReactiveElasticsearchClient.Indices` were not used up to now.
@@ -40,7 +41,8 @@ With the introduction of the `ReactiveIndexOperations` it became necessary to ch
 * the `createIndex`  variants now return a `Mono<Boolean>` instead of a `Mono<Void>` to signal successful index creation.
 * the `updateMapping`  variants now return a `Mono<Boolean>` instead of a `Mono<Void>` to signal successful mappings storage.
 
-=== Return types of DocumentOperartions.bulkIndex methods
+[[elasticsearch-migration-guide-4.0-4.1.breaking-changes.returntypes-2]]
+=== Return types of DocumentOperations.bulkIndex methods
 
-These methods were returing a `List<String>` containing the ids of the new indexed records.
+These methods were returning a `List<String>` containing the ids of the new indexed records.
 Now they return a `List<IndexedObjectInformation>`; these objects contain the id and information about optimistic locking (seq_no and primary_term)

src/main/asciidoc/reference/elasticsearch-migration-guide-4.1-4.2.adoc

@@ -6,6 +6,7 @@ This section describes breaking changes from version 4.1.x to 4.2.x and how remo
 [[elasticsearch-migration-guide-4.1-4.2.deprecations]]
 == Deprecations
 
+[[elasticsearch-migration-guide-4.1-4.2.deprecations.document]]
 === @Document parameters
 
 The parameters of the `@Document` annotation that are relevant for  the index settings (`useServerConfiguration`, `shards`. `replicas`, `refreshIntervall` and `indexStoretype`) have been moved to the `@Setting` annotation. Use in `@Document` is still possible but deprecated.
@@ -28,8 +29,10 @@ The deprecated `find` methods from `ReactiveSearchOperations` and `ReactiveDocum
 [[elasticsearch-migration-guide-4.1-4.2.breaking-changes]]
 == Breaking Changes
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.refresh-policy]]
 === RefreshPolicy
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.refresh-policy.enum]]
 ==== Enum package changed
 
 It was possible in 4.1 to configure the refresh policy for the `ReactiveElasticsearchTemplate` by overriding the method `AbstractReactiveElasticsearchConfiguration.refreshPolicy()` in a custom configuration class.
@@ -38,6 +41,7 @@ The return value of this method was an instance of the class `org.elasticsearch.
 Now the configuration must return `org.springframework.data.elasticsearch.core.RefreshPolicy`.
 This enum has the same values and triggers the same behaviour as before, so only the `import` statement has to be adjusted.
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.refresh-policy.behaviour]]
 ==== Refresh behaviour
 
 `ElasticsearchOperations` and `ReactiveElasticsearchOperations` now explicitly use the `RefreshPolicy` set on the template for write requests if not null.
@@ -47,17 +51,21 @@ The provided implementations for `ElasticsearchRepository` and `ReactiveElastics
 This is the same behaviour as in previous versions.
 If a refresh policy is set, then it will be used by the repositories as well.
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.refresh-policy.configuration]]
 ==== Refresh configuration
 
 When configuring Spring Data Elasticsearch like described in <<elasticsearch.clients>> by using `ElasticsearchConfigurationSupport`, `AbstractElasticsearchConfiguration` or `AbstractReactiveElasticsearchConfiguration` the refresh policy will be initialized to `null`.
 Previously the reactive code initialized this to `IMMEDIATE`, now reactive and non-reactive code show the same behaviour.
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.method-return-types]]
 === Method return types
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.method-return-types.delete]]
 ==== delete methods that take a Query
 
 The reactive methods previously returned a `Mono<Long>` with the number of deleted documents, the non reactive versions were void. They now return a `Mono<ByQueryResponse>` which contains much more detailed information about the deleted documents and errors that might have occurred.
 
+[[elasticsearch-migration-guide-4.1-4.2.breaking-changes.method-return-types.multiget]]
 ==== multiget methods
 
 The implementations of _multiget_ previousl only returned the found entities in a `List<T>` for non-reactive implementations and in a `Flux<T>` for reactive implementations. If the request contained ids that were not found, the information that these are missing was not available. The user needed to compare the returned ids to the requested ones to find

src/main/asciidoc/reference/elasticsearch-migration-guide-4.2-4.3.adoc

@@ -21,6 +21,7 @@ Check the sections on <<elasticsearch-migration-guide-4.2-4.3.deprecations>> and
 [[elasticsearch-migration-guide-4.2-4.3.deprecations]]
 == Deprecations
 
+[[elasticsearch-migration-guide-4.2-4.3.deprecations.suggest]]
 === suggest methods
 
 In `SearchOperations`, and so in `ElasticsearchOperations` as well, the `suggest` methods taking a `org.elasticsearch.search.suggest.SuggestBuilder` as argument and returning a `org.elasticsearch.action.search.SearchResponse` have been deprecated.
@@ -32,6 +33,7 @@ Here as well the old methods are deprecated.
 [[elasticsearch-migration-guide-4.2-4.3.breaking-changes]]
 == Breaking Changes
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.1]]
 === Removal of `org.elasticsearch` classes from the API.
 
 * In the `org.springframework.data.elasticsearch.annotations.CompletionContext` annotation the property `type()` has changed from `org.elasticsearch.search.suggest.completion.context.ContextMapping.Type` to `org.springframework.data.elasticsearch.annotations.CompletionContext.ContextMappingType`, the available enum values are the same.
@@ -46,6 +48,7 @@ The same change has been done to the `ReactiveSearchOperations.aggregate()` func
 Programs using the aggregations need to be changed to cast the returned value to the appropriate class to further proces it.
 * methods that might have thrown a `org.elasticsearch.ElasticsearchStatusException` now will throw `org.springframework.data.elasticsearch.RestStatusException` instead.
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.2]]
 === Handling of field and sourceFilter properties of Query
 
 Up to version 4.2 the `fields` property of a `Query` was interpreted and added to the include list of the `sourceFilter`.
@@ -53,11 +56,13 @@ This was not correct, as these are different things for Elasticsearch.
 This has been corrected.
 As a consequence code might not work anymore that relies on using `fields` to specify which fields should be returned from the document's `_source' and should be changed to use the `sourceFilter`.
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.3]]
 === search_type default value
 
 The default value for the `search_type` in Elasticsearch is `query_then_fetch`.
 This now is also set as default value in the `Query` implementations, it was previously set to `dfs_query_then_fetch`.
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.4]]
 === BulkOptions changes
 
 Some properties of the `org.springframework.data.elasticsearch.core.query.BulkOptions` class have changed their type:
@@ -65,14 +70,17 @@ Some properties of the `org.springframework.data.elasticsearch.core.query.BulkOp
 * the type of the `timeout` property has been changed to `java.time.Duration`.
 * the type of the`refreshPolicy` property has been changed to `org.springframework.data.elasticsearch.core.RefreshPolicy`.
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.5]]
 === IndicesOptions change
 
 Spring Data Elasticsearch now uses `org.springframework.data.elasticsearch.core.query.IndicesOptions` instead of `org.elasticsearch.action.support.IndicesOptions`.
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.6]]
 === Completion classes
 
 The classes from the package `org.springframework.data.elasticsearch.core.completion` have been moved to `org.springframework.data.elasticsearch.core.suggest`.
 
+[[elasticsearch-migration-guide-4.2-4.3.breaking-changes.7]]
 === Other renamings
 
 The `org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentPropertyConverter` interface has been renamed to `org.springframework.data.elasticsearch.core.mapping.PropertyValueConverter`.

src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc

@@ -6,6 +6,7 @@ This section describes breaking changes from version 4.3.x to 4.4.x and how remo
 [[elasticsearch-migration-guide-4.3-4.4.deprecations]]
 == Deprecations
 
+[[elasticsearch-migration-guide-4.3-4.4.deprecations.reactive-operations]]
 === org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations
 
 The method `<T> Publisher<T> execute(ClientCallback<Publisher<T>> callback)` has been deprecated.
@@ -14,6 +15,7 @@ As there now are multiple implementations using different client libraries the `
 [[elasticsearch-migration-guide-4.3-4.4.breaking-changes]]
 == Breaking Changes
 
+[[elasticsearch-migration-guide-4.3-4.4.breaking-changes.1]]
 === Removal of deprecated classes
 
 ==== `org.springframework.data.elasticsearch.core.ElasticsearchTemplate` has been removed
@@ -23,11 +25,13 @@ This means that the `org.springframework.data.elasticsearch.core.ElasticsearchTe
 This was the implementation of the `ElasticsearchOperations` interface that was using the `TransportClient`.
 Connections to Elasticsearch must be made using either the imperative `ElasticsearchRestTemplate` or the reactive `ReactiveElasticsearchTemplate`.
 
+[[elasticsearch-migration-guide-4.3-4.4.breaking-changes.2]]
 === Package changes
 
 In 4.3 two classes (`ElasticsearchAggregations` and `ElasticsearchAggregation`) had been moved to the `org.springframework.data.elasticsearch.core.clients.elasticsearch7` package in preparation for the integration of the new Elasticsearch client.
 The were moved back to the `org.springframework.data.elasticsearch.core` package as we keep the classes use the old Elasticsearch client where they were.
 
+[[elasticsearch-migration-guide-4.3-4.4.breaking-changes.3]]
 === Behaviour change
 
 The `ReactiveElasticsearchTemplate`, when created directly or by Spring Boot configuration had a default refresh policy of IMMEDIATE.
@@ -46,6 +50,7 @@ Spring Data Elasticsearch 4.4 still uses the old client as the default client fo
 * There are still some bugs in the Elasticsearch client which need to be resolved
 * The implementation using the new client in Spring Data Elasticsearch is not yet complete, due to limited resources working on that - remember Spring Data Elasticsearch is a community driven project that lives from public contributions.
 
+[[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to]]
 === How to use the new client
 
 CAUTION: The implementation using the new client is not complete, some operations will throw a `java.lang.UnsupportedOperationException` or might throw NPE (for example when the Elasticsearch cannot parse a response from the server, this still happens sometimes) +
@@ -53,6 +58,7 @@ Use the new client to test the implementations but do not use it in productive c
 
 In order to try and use the new client the following steps are necessary:
 
+[[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to.not]]
 ==== Make sure not to configure the existing default client
 
 If using Spring Boot, exclude Spring Data Elasticsearch from the autoconfiguration
@@ -71,6 +77,7 @@ public class SpringdataElasticTestApplication {
 Remove Spring Data Elasticsearch related properties from your application configuration.
 If Spring Data Elasticsearch was configured using a programmatic configuration (see <<elasticsearch.clients>>), remove these beans from the Spring application context.
 
+[[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to.dependencies]]
 ==== Add dependencies
 
 The dependencies for the new Elasticsearch client are still optional in Spring Data Elasticsearch so they need to be added explicitly:
@@ -116,8 +123,10 @@ When using Spring Boot, it is necessary to set the following property in the _po
 ----
 ====
 
+[[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to.configuration]]
 ==== New configuration classes
 
+[[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to.configuration.imperative]]
 ===== Imperative style
 
 In order configure Spring Data Elasticsearch to use the new client, it is necessary to create a configuration bean that derives from `org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration`:
@@ -145,6 +154,7 @@ With this configuration, the following beans will be available in the Spring app
 * an `ElasticsearchClient` bean, this is the new client that uses the `RestClient`
 * an `ElasticsearchOperations` bean, available with the bean names _elasticsearchOperations_ and _elasticsearchTemplate_, this uses the `ElasticsearchClient`
 
+[[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to.configuration.reactive]]
 ===== Reactive style
 
 To use the new client in a reactive environment the only difference is the class from which to derive the configuration:

src/main/asciidoc/reference/elasticsearch-migration-guide-4.4-5.0.adoc

@@ -6,10 +6,18 @@ This section describes breaking changes from version 4.4.x to 5.0.x and how remo
 [[elasticsearch-migration-guide-4.4-4.5.deprecations]]
 == Deprecations
 
+=== Custom trace level logging
+
+Logging by setting the property `logging.level.org.springframework.data.elasticsearch.client.WIRE=trace` is 
+deprecated now, the Elasticsearch `RestClient` provides a better solution that can be activated by setting the 
+logging level of the `tracer` package to "trace".
+
+[[elasticsearch-migration-guide-4.4-4.5.deprecations.package]]
 === `org.springframework.data.elasticsearch.client.erhlc` package
 
 See <<elasticsearch-migration-guide-4.4-5.0.breaking-changes-packages>>, all classes in this package have been deprecated, as the default client implementations to use are the ones based on the new Java Client from Elasticsearch, see <<elasticsearch-migration-guide-4.4-5.0.new-clients>>
 
+[[elasticsearch-migration-guide-4.4-4.5.deprecations.code]]
 === Removal of deprecated code
 
 `DateFormat.none` and `DateFormat.custom` had been deprecated since version 4.2 and have been removed.
@@ -23,8 +31,10 @@ Use `@Document.dynamic` or `@Field.dynamic` instead.
 [[elasticsearch-migration-guide-4.4-5.0.breaking-changes]]
 == Breaking Changes
 
+[[elasticsearch-migration-guide-4.4-5.0.breaking-changes.deprecated-calls]]
 === Removal of deprecated calls
 
+[[elasticsearch-migration-guide-4.4-5.0.breaking-changes.deprecated-calls.1]]
 ==== suggest calls in operations interfaces have been removed
 
 Both `SearchOperations` and `ReactiveSearchOperations` had deprecated calls that were using Elasticsearch classes as parameters.
@@ -43,6 +53,7 @@ When working with the `NativeSearchQuery` class, you'll need to switch to the `N
 `Query` instance comign from the new Elasticsearch client libraries.
 You'll find plenty of examples in the test code.
 
+[[elasticsearch-migration-guide-4.4-5.0.breaking-changes-records]]
 === Conversion to Java 17 records
 
 The following classes have been converted to `Record`, you might need to adjust the use of getter methods from
@@ -55,26 +66,28 @@ The following classes have been converted to `Record`, you might need to adjust
 * `org.springframework.data.elasticsearch.core.query.ScriptData`
 * `org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm`
 
+[[elasticsearch-migration-guide-4.4-5.0.breaking-changes-http-headers]]
 === New HttpHeaders class
 
-Until version 4.4 the client configuration used the `HttpHeaders` class from the `org.springframework:spring-web` 
+Until version 4.4 the client configuration used the `HttpHeaders` class from the `org.springframework:spring-web`
 project.
 This introduces a dependency on that artifact.
 Users that do not use spring-web then face an error as this class cannot be found.
 
 In version 5.0 we introduce our own `HttpHeaders` to configure the clients.
 
-So if you are using headers in the client configuration, you need to replace `org.springframework.http.HttpHeaders` 
-with `org.springframework.data.elasticsearch.support.HttpHeaders`. 
+So if you are using headers in the client configuration, you need to replace `org.springframework.http.HttpHeaders`
+with `org.springframework.data.elasticsearch.support.HttpHeaders`.
 
 Hint: You can pass a `org.springframework.http
-.HttpHeaders` to the `addAll()` method of `org.springframework.data.elasticsearch.support.HttpHeaders`. 
+.HttpHeaders` to the `addAll()` method of `org.springframework.data.elasticsearch.support.HttpHeaders`.
 
 [[elasticsearch-migration-guide-4.4-5.0.new-clients]]
 == New Elasticsearch client
 
 Spring Data Elasticsearch now uses the new `ElasticsearchClient` and has deprecated the use of the previous `RestHighLevelClient`.
 
+[[elasticsearch-migration-guide-4.4-5.0.new-clients.imperative]]
 === Imperative style configuration
 
 To configure Spring Data Elasticsearch to use the new client, it is necessary to create a configuration bean that derives from `org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration`:
@@ -102,6 +115,7 @@ With this configuration, the following beans will be available in the Spring app
 * an `ElasticsearchClient` bean, this is the new client that uses the `RestClient`
 * an `ElasticsearchOperations` bean, available with the bean names _elasticsearchOperations_ and _elasticsearchTemplate_, this uses the `ElasticsearchClient`
 
+[[elasticsearch-migration-guide-4.4-5.0.new-clients.reactive]]
 === Reactive style configuration
 
 To use the new client in a reactive environment the only difference is the class from which to derive the configuration:
@@ -151,4 +165,4 @@ The old deprecated `RestHighLevelClient` can still be used, but you will need to
 ----
 ====
 
-Make sure to specify the version 7.17.5 explicitly, otherwise maven will resolve to 8.3.3, and this does not exist.
+Make sure to specify the version 7.17.6 explicitly, otherwise maven will resolve to 8.5.0, and this does not exist.

src/main/asciidoc/reference/elasticsearch-migration-guide-5.0-5.1.adoc

@@ -0,0 +1,16 @@
+[[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.

src/main/asciidoc/reference/elasticsearch-misc.adoc

@@ -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]
@@ -204,6 +201,7 @@ Sort.by(new GeoDistanceOrder("location", new GeoPoint(48.137154, 11.5761247)))
 From version 7.12 on Elasticsearch has added the feature of runtime fields (https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime.html).
 Spring Data Elasticsearch supports this in two ways:
 
+[[elasticsearch.misc.runtime-fields.index-mappings]]
 === Runtime field definitions in the index mappings
 
 The first way to define runtime fields is by adding the definitions to the index mappings (see https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-mapping-fields.html).
@@ -238,6 +236,7 @@ public class RuntimeFieldEntity {
 ----
 ====
 
+[[elasticsearch.misc.runtime-fields.query]]
 === Runtime fields definitions set on a Query
 
 The second way to define runtime fields is by adding the definitions to a search query (see https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-search-request.html).
@@ -279,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]
@@ -309,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.
+====

src/main/asciidoc/reference/elasticsearch-new.adoc

@@ -1,11 +1,17 @@
 [[new-features]]
 = What's new
 
+[[new-features.5-1-0]]
+== New in Spring Data Elasticsearch 5.1
+
+* Upgrade to Elasticsearch 8.6.1
+
 [[new-features.5-0-0]]
 == New in Spring Data Elasticsearch 5.0
 
 * Upgrade to Java 17 baseline
 * Upgrade to Spring Framework 6
+* Upgrade to Elasticsearch 8.5.0
 * Use the new Elasticsearch client library
 
 [[new-features.4-4-0]]

src/main/asciidoc/reference/elasticsearch-object-mapping.adoc

@@ -2,19 +2,8 @@
 = 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.
-
-Earlier versions of Spring Data Elasticsearch used a Jackson based conversion, Spring Data Elasticsearch 3.2.x introduced the <<elasticsearch.mapping.meta-model>>.
-As of version 4.0 only the Meta Object Mapping is used, the Jackson based mapper is not available anymore and the `MappingElasticsearchConverter` is used.
-
-The main reasons for the removal of the Jackson based mapper are:
-
-* Custom mappings of fields needed to be done with annotations like `@JsonFormat` or `@JsonInclude`.
-This often caused problems when the same object was used in different JSON based datastores or sent over a JSON based API.
-* Custom field types and formats also need to be stored into the Elasticsearch index mappings.
-The Jackson based annotations did not fully provide all the information that is necessary to represent the types of Elasticsearch.
-* Fields must be mapped not only when converting from and to entities, but also in query argument, returned data and on other places.
-
-Using the `MappingElasticsearchConverter` now covers all these cases.
+The class that is internally used for this mapping is the
+`MappingElasticsearchConverter`.
 
 [[elasticsearch.mapping.meta-model]]
 == Meta Model Object Mapping
@@ -31,17 +20,16 @@ The metadata is taken from the entity's properties which can be annotated.
 The following annotations are available:
 
 * `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database.
-The most important attributes are:
+The most important attributes are (check the API documentation for the complete list of attributes):
 ** `indexName`: the name of the index to store this entity in.
 This can contain a SpEL template expression like `"log-#{T(java.time.LocalDate).now().toString()}"`
 ** `createIndex`: flag whether to create an index on repository bootstrapping.
 Default value is _true_.
 See <<elasticsearch.repositories.autocreation>>
-** `versionType`: Configuration of version management.
-Default value is _EXTERNAL_.
+
 
 * `@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):
@@ -50,8 +38,8 @@ Constructor arguments are mapped by name to the key values in the retrieved Docu
 See https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html[Elasticsearch Mapping Types].
 If the field type is not specified, it defaults to `FieldType.Auto`.
 This means, that no mapping entry is written for the property and that Elasticsearch will add a mapping entry dynamically when the first data for this property is stored (check the Elasticsearch documentation for dynamic mapping rules).
-** `format`: One or more built-in date formats, see the next section <<elasticsearch.mapping.meta-model.date-formats>>.
-** `pattern`: One or more custom date formats, see the next section <<elasticsearch.mapping.meta-model.date-formats>>.
+** `format`: One or more built-in date formats, see the next section <<elasticsearch.mapping.meta-model.annotations.date-formats>>.
+** `pattern`: One or more custom date formats, see the next section <<elasticsearch.mapping.meta-model.annotations.date-formats>>.
 ** `store`: Flag whether the original field value should be store in Elasticsearch, default value is _false_.
 ** `analyzer`, `searchAnalyzer`, `normalizer` for specifying custom analyzers and normalizer.
 * `@GeoPoint`: Marks a field as _geo_point_ datatype.
@@ -61,7 +49,20 @@ 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.date-formats]]
+[[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
 
 Properties that derive from `TemporalAccessor` or are of type `java.util.Date` must either have a `@Field` annotation of type `FieldType.Date` or a custom converter must be registered for this type.
@@ -103,6 +104,9 @@ 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.
+
+[[elasticsearch.mapping.meta-model.annotations.range]]
 ==== Range types
 
 When a field is annotated with a type of one of _Integer_Range, Float_Range, Long_Range, Double_Range, Date_Range,_ or _Ip_Range_ the field must be an instance of a class that will be mapped to an Elasticsearch range, for example:
@@ -148,6 +152,7 @@ class SomePersonData {
 Supported classes for the type `<T>` are `Integer`, `Long`, `Float`, `Double`, `Date` and classes that implement the
 `TemporalAccessor` interface.
 
+[[elasticsearch.mapping.meta-model.annotations.mapped-names]]
 ==== Mapped field names
 
 Without further configuration, Spring Data Elasticsearch will use the property name of an object as field name in Elasticsearch.
@@ -157,9 +162,45 @@ It is also possible to define a `FieldNamingStrategy` in the configuration of th
 If for example a `SnakeCaseFieldNamingStrategy` is configured, the property _sampleProperty_ of the object would be mapped to _sample_property_ in Elasticsearch.
 A `FieldNamingStrategy` applies to all entities; it can be overwritten by setting a specific name with `@Field` on a property.
 
+[[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:
+
+====
+[source,java]
+----
+@Field(type = Keyword)
+@WriteOnlyProperty
+@AccessType(AccessType.Type.PROPERTY)
+public String getProperty() {
+	return "some value that is calculated here";
+}
+----
+====
+
+[[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
 
+[[elasticsearch.mapping.meta-model.rules.typehints]]
 ==== Type Hints
 
 Mapping uses _type hints_ embedded in the document sent to the server to allow generic type mapping.
@@ -170,7 +211,6 @@ Those type hints are represented as `_class` attributes within the document and
 [source,java]
 ----
 public class Person {              <1>
-
   @Id String id;
   String firstname;
   String lastname;
@@ -227,7 +267,7 @@ In this case, writing the type hint will produce an error, as the field cannot b
 
 Type hints can be disabled for the whole application by overriding the method `writeTypeHints()` in a configuration class derived from `AbstractElasticsearchConfiguration` (see <<elasticsearch.clients>>).
 
-As an alternativ they can be disabled for a single index with the `@Document` annotation:
+As an alternative they can be disabled for a single index with the `@Document` annotation:
 
 ====
 [source,java]
@@ -240,6 +280,7 @@ WARNING: We strongly advise against disabling Type Hints.
 Only do this if you are forced to.
 Disabling type hints can lead to documents not being retrieved correctly from Elasticsearch in case of polymorphic data or document retrieval may fail completely.
 
+[[elasticsearch.mapping.meta-model.rules.geospatial]]
 ==== Geospatial Types
 
 Geospatial types like `Point` & `GeoPoint` are converted into _lat/lon_ pairs.
@@ -249,7 +290,6 @@ Geospatial types like `Point` & `GeoPoint` are converted into _lat/lon_ pairs.
 [source,java]
 ----
 public class Address {
-
   String city, street;
   Point location;
 }
@@ -265,6 +305,7 @@ public class Address {
 ----
 ====
 
+[[elasticsearch.mapping.meta-model.rules.geojson]]
 ==== GeoJson Types
 
 Spring Data Elasticsearch supports the GeoJson types by providing an interface `GeoJson` and implementations for the different geometries.
@@ -305,6 +346,7 @@ The following GeoJson types are implemented:
 * `GeoJsonMultiPolygon`
 * `GeoJsonGeometryCollection`
 
+[[elasticsearch.mapping.meta-model.rules.collections]]
 ==== Collections
 
 For values inside Collections apply the same mapping rules as for aggregate roots when it comes to _type hints_ and <<elasticsearch.mapping.meta-model.conversions>>.
@@ -332,6 +374,7 @@ public class Person {
 ----
 ====
 
+[[elasticsearch.mapping.meta-model.rules.maps]]
 ==== Maps
 
 For values inside Maps apply the same mapping rules as for aggregate roots when it comes to _type hints_ and <<elasticsearch.mapping.meta-model.conversions>>.
@@ -376,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
@@ -392,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) {
 

src/main/asciidoc/reference/elasticsearch-operations.adoc

@@ -34,6 +34,7 @@ There is support for automatic creation of indices and writing the mappings when
 == Usage examples
 
 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
 ====
@@ -45,34 +46,29 @@ public class TestController {
 
   private  ElasticsearchOperations elasticsearchOperations;
 
-  public TestController(ElasticsearchOperations elasticsearchOperations) { <1>
+  public TestController(ElasticsearchOperations elasticsearchOperations) { <.>
     this.elasticsearchOperations = elasticsearchOperations;
   }
 
   @PostMapping("/person")
-  public String save(@RequestBody Person person) {                         <2>
-
-    IndexQuery indexQuery = new IndexQueryBuilder()
-      .withId(person.getId().toString())
-      .withObject(person)
-      .build();
-    String documentId = elasticsearchOperations.index(indexQuery);
-    return documentId;
+  public String save(@RequestBody Person person) {                         <.>
+    Person savedEntity = elasticsearchOperations.save(person);
+    return savedEntity.getId();
   }
 
   @GetMapping("/person/{id}")
-  public Person findById(@PathVariable("id")  Long id) {                   <3>
-    Person person = elasticsearchOperations
-      .queryForObject(GetQuery.getById(id.toString()), Person.class);
+  public Person findById(@PathVariable("id")  Long id) {                   <.>
+    Person person = elasticsearchOperations.get(id.toString(), Person.class);
     return person;
   }
 }
 
 ----
 
-<1> Let Spring inject the provided `ElasticsearchOperations` bean in the constructor.
-<2> Store some entity in the Elasticsearch cluster.
-<3> Retrieve the entity with a query by id.
+<.> 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.
+<.> Retrieve the entity with a get by id.
 ====
 
 To see the full possibilities of `ElasticsearchOperations` please refer to the API documentation.
@@ -151,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);
 ----
 ====
@@ -238,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.

src/main/asciidoc/reference/elasticsearch-repositories.adoc

@@ -40,6 +40,7 @@ include::reactive-elasticsearch-repositories.adoc[leveloffset=+1]
 [[elasticsearch.repositories.annotations]]
 == Annotations for repository methods
 
+[[elasticsearch.repositories.annotations.highlight]]
 === @Highlight
 
 The `@Highlight` annotation on a repository method defines for which fields of the returned entity highlighting should be included. To search for some text in a `Book` 's name or summary and have the found data highlighted, the following repository method can be used:
@@ -62,6 +63,7 @@ It is possible to define multiple fields to be highlighted like above, and both
 
 In the search results the highlight data can be retrieved from the `SearchHit` class.
 
+[[elasticsearch.repositories.annotations.sourcefilters]]
 === @SourceFilters
 
 Sometimes the user does not need to have all the properties of an entity returned from a search but only a subset.

src/main/asciidoc/reference/elasticsearch-repository-queries.adoc

@@ -6,6 +6,7 @@
 
 The Elasticsearch module supports all basic query building feature as string queries, native search queries, criteria based queries or have it being derived from the method name.
 
+[[elasticsearch.query-methods.finders.declared]]
 === Declared queries
 
 Deriving the query from the method name is not always sufficient and/or may result in unreadable method names.
@@ -298,6 +299,7 @@ A list of supported keywords for Elasticsearch is shown below.
 NOTE: Methods names to build Geo-shape queries taking `GeoJson` parameters are not supported.
 Use `ElasticsearchOperations` with `CriteriaQuery` in a custom repository implementation if you need to have such a function in a repository.
 
+[[elasticsearch.query-methods.return-types]]
 == Method return types
 
 Repository methods can be defined to have the following return types for returning multiple Elements:
@@ -359,4 +361,3 @@ would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/qu
 }
 ----
 ====
-

src/main/asciidoc/reference/elasticsearch-routing.adoc

@@ -1,4 +1,3 @@
-
 [[elasticsearch.routing]]
 = Routing values
 
@@ -8,6 +7,7 @@ For this Elasticsearch offers the possibility to define a routing, which is the
 
 Spring Data Elasticsearch supports routing definitions on storing and retrieving data in the following ways:
 
+[[elasticsearch.routing.join-types]]
 == Routing on join-types
 
 When using join-types (see <<elasticsearch.jointype>>), Spring Data Elasticsearch will automatically use the `parent` property of the entity's `JoinField` property as the value for the routing.
@@ -15,6 +15,7 @@ When using join-types (see <<elasticsearch.jointype>>), Spring Data Elasticsearc
 This is correct for all the use-cases where the parent-child relationship has just one level.
 If it is deeper, like a child-parent-grandparent relationship - like in the above example from _vote_ -> _answer_ -> _question_ - then the routing needs to explicitly specified by using the techniques described in the next section (the _vote_ needs the _question.id_ as routing value).
 
+[[elasticsearch.routing.custom]]
 == Custom routing values
 
 To define a custom routing for an entity, Spring Data Elasticsearch provides a `@Routing` annotation (reusing the `Statement` class from above):
@@ -103,4 +104,3 @@ operations.withRouting(RoutingResolver.just(routing)).delete(id);
 ----
 <.> `RoutingResolver.just(s)` returns a resolver that will just return the given String.
 ====
-

src/main/asciidoc/reference/reactive-elasticsearch-operations.adoc

@@ -5,80 +5,22 @@
 
 The `ReactiveElasticsearchTemplate` is the default implementation of `ReactiveElasticsearchOperations`.
 
-[[elasticsearch.reactive.template]]
-== Reactive Elasticsearch Template
+[[elasticsearch.reactive.operations]]
+== Reactive Elasticsearch Operations
 
-To get started the `ReactiveElasticsearchTemplate` needs to know about the actual client to work with.
-Please see <<elasticsearch.clients.reactive>> for details on the client.
+To get started the `ReactiveElasticsearchOperations` needs to know about the actual client to work with.
+Please see <<elasticsearch.clients.reactiverestclient>> for details on the client and how to configure it.
 
-[[elasticsearch.reactive.template.configuration]]
-=== Reactive Template Configuration
+[[elasticsearch.reactive.operations.usage]]
+=== Reactive Operations Usage
 
-The easiest way of setting up the `ReactiveElasticsearchTemplate` is via `AbstractReactiveElasticsearchConfiguration` providing
-dedicated configuration method hooks for `base package`, the `initial entity set` etc.
-
-.The AbstractReactiveElasticsearchConfiguration
-====
-[source,java]
-----
-@Configuration
-public class Config extends AbstractReactiveElasticsearchConfiguration {
-
-  @Bean <1>
-  @Override
-  public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-      // ...
-  }
-}
-----
-<1> Configure the client to use. This can be done by `ReactiveRestClients` or directly via `DefaultReactiveElasticsearchClient`.
-====
-
-NOTE: If applicable set default `HttpHeaders` via the `ClientConfiguration` of the `ReactiveElasticsearchClient`. See <<elasticsearch.clients.configuration>>.
-
-TIP: If needed the `ReactiveElasticsearchTemplate` can be configured with default `RefreshPolicy` and `IndicesOptions` that get applied to the related requests by overriding the defaults of `refreshPolicy()` and `indicesOptions()`.
-
-However one might want to be more in control over the actual components and use a more verbose approach.
-
-.Configure the ReactiveElasticsearchTemplate
-====
-[source,java]
-----
-@Configuration
-public class Config {
-
-  @Bean <1>
-  public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-    // ...
-  }
-  @Bean <2>
-  public ElasticsearchConverter elasticsearchConverter() {
-    return new MappingElasticsearchConverter(elasticsearchMappingContext());
-  }
-  @Bean <3>
-  public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
-    return new SimpleElasticsearchMappingContext();
-  }
-  @Bean <4>
-  public ReactiveElasticsearchOperations reactiveElasticsearchOperations() {
-    return new ReactiveElasticsearchTemplate(reactiveElasticsearchClient(), elasticsearchConverter());
-  }
-}
-----
-<1> Configure the client to use. This can be done by `ReactiveRestClients` or directly via `DefaultReactiveElasticsearchClient`.
-<2> Set up the `ElasticsearchConverter` used for domain type mapping utilizing metadata provided by the mapping context.
-<3> The Elasticsearch specific mapping context for domain type metadata.
-<4> The actual template based on the client and conversion infrastructure.
-====
-
-[[elasticsearch.reactive.template.usage]]
-=== Reactive Template Usage
-
-`ReactiveElasticsearchTemplate` lets you save, find and delete your domain objects and map those objects to documents stored in Elasticsearch.
+`ReactiveElasticsearchOperations` lets you save, find and delete your domain objects and map those objects to documents 
+stored
+in Elasticsearch.
 
 Consider the following:
 
-.Use the ReactiveElasticsearchTemplate
+.Use the ReactiveElasticsearchOperations
 ====
 [source,java]
 ----
@@ -94,15 +36,20 @@ public class Person {
 
 [source,java]
 ----
-template.save(new Person("Bruce Banner", 42))                    <1>
+
+ReactiveElasticsearchOperations operations;
+
+// ...
+
+operations.save(new Person("Bruce Banner", 42))                    <.>
   .doOnNext(System.out::println)
-  .flatMap(person -> template.findById(person.id, Person.class)) <2>
+  .flatMap(person -> operations.get(person.id, Person.class))      <.>
   .doOnNext(System.out::println)
-  .flatMap(person -> template.delete(person))                    <3>
+  .flatMap(person -> operations.delete(person))                    <.>
   .doOnNext(System.out::println)
-  .flatMap(id -> template.count(Person.class))                   <4>
+  .flatMap(id -> operations.count(Person.class))                   <.>
   .doOnNext(System.out::println)
-  .subscribe(); <5>
+  .subscribe();                                                    <.>
 ----
 
 The above outputs the following sequence on the console.
@@ -114,11 +61,10 @@ The above outputs the following sequence on the console.
 > QjWCWWcBXiLAnp77ksfR
 > 0
 ----
-<1> Insert a new `Person` document into the _marvel_ index under type _characters_. The `id` is generated on server side and set into the instance returned.
-<2> Lookup the `Person` with matching `id` in the _marvel_ index under type _characters_.
-<3> Delete the `Person` with matching `id`, extracted from the given instance, in the _marvel_ index under type _characters_.
-<4> Count the total number of documents in the _marvel_ index under type _characters_.
-<5> Don't forget to _subscribe()_.
+<.> Insert a new `Person` document into the _marvel_ index . The `id` is generated on server 
+side and set into the instance returned.
+<.> Lookup the `Person` with matching `id` in the _marvel_ index.
+<.> Delete the `Person` with matching `id`, extracted from the given instance, in the _marvel_ index.
+<.> Count the total number of documents in the _marvel_ index.
+<.> Don't forget to _subscribe()_.
 ====
-
-

src/main/asciidoc/reference/reactive-elasticsearch-repositories.adoc

@@ -79,7 +79,7 @@ interface ReactivePersonRepository extends ReactiveSortingRepository<Person, Str
 parameters.
 <9> Count all entities with matching `firstname`.
 <10> Check if at least one entity with matching `firstname` exists.
-<11> Delete all entites with matching `firstname`.
+<11> Delete all entities with matching `firstname`.
 ====
 
 [[elasticsearch.reactive.repositories.configuration]]

src/main/java/org/springframework/data/elasticsearch/BulkFailureException.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/ElasticsearchErrorCause.java

@@ -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,9 +15,9 @@
  */
 package org.springframework.data.elasticsearch;
 
-import java.util.List;
+import org.springframework.lang.Nullable;
 
-import javax.annotation.Nullable;
+import java.util.List;
 
 /**
  * Object describing an Elasticsearch error
@@ -26,7 +26,8 @@ import javax.annotation.Nullable;
  * @since 4.4
  */
 public class ElasticsearchErrorCause {
-	@Nullable private final String type;
+	@Nullable
+	private final String type;
 
 	private final String reason;
 

src/main/java/org/springframework/data/elasticsearch/NoSuchIndexException.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/ResourceFailureException.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/ResourceNotFoundException.java

@@ -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);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/RestStatusException.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/UncategorizedElasticsearchException.java

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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,14 @@ 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;
+
 	/**
 	 * @since 4.3
 	 */

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

@@ -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.
@@ -46,7 +46,7 @@ public enum Dynamic {
 	/**
 	 * Inherit the dynamic setting from their parent object or from the mapping type.
 	 */
-	INHERIT("nherit");
+	INHERIT("inherit");
 
 	private final String mappedName;
 

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

@@ -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.
@@ -39,7 +39,7 @@ import org.springframework.core.annotation.AliasFor;
  * @author Sascha Woo
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.METHOD })
 @Documented
 @Inherited
 public @interface Field {
@@ -140,7 +140,7 @@ public @interface Field {
 	/**
 	 * @since 4.0
 	 */
-	Similarity similarity() default Similarity.Default;
+	String similarity() default Similarity.Default;
 
 	/**
 	 * @since 4.0

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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 {
+}

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

@@ -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

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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";
 }

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -0,0 +1,35 @@
+/*
+ * 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.annotations;
+
+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 property that will be written to Elasticsearch, but not set when reading from Elasticsearch.
+ * This is needed for synthesized fields that may be used for search but that are not available in the entity.
+ *
+ * @author Peter-Josef Meisch
+ * @since 5.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.FIELD })
+@Documented
+public @interface WriteOnlyProperty {
+}

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

@@ -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.

src/main/java/org/springframework/data/elasticsearch/aot/ElasticsearchAotPredicates.java

@@ -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);
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/aot/ElasticsearchRuntimeHints.java

@@ -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");
+	}
+}

src/main/java/org/springframework/data/elasticsearch/aot/package-info.java

@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.aot;

src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/ClientLogger.java

@@ -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.
@@ -31,7 +31,9 @@ import org.springframework.util.ObjectUtils;
  * @author Peter-Josef Meisch
  * @author Oliver Drotbohm
  * @since 3.2
+ * @deprecated since 5.0, Elasticsearch's RestClient has a trace level logging available.
  */
+@Deprecated
 public abstract class ClientLogger {
 
 	private static final Log WIRE_LOGGER = LogFactory.getLog("org.springframework.data.elasticsearch.client.WIRE");

src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/ElasticsearchHost.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/InetSocketAddressParser.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/NoReachableHostException.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/UnsupportedBackendOperation.java

@@ -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.

src/main/java/org/springframework/data/elasticsearch/client/UnsupportedClientOperationException.java

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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);
 		}

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

@@ -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.
@@ -138,8 +138,8 @@ final class DocumentAdapters {
 		document.setPrimaryTerm(hit.primaryTerm() != null && hit.primaryTerm() > 0 ? hit.primaryTerm() : 0);
 
 		float score = hit.score() != null ? hit.score().floatValue() : Float.NaN;
-		return new SearchDocumentAdapter(document, score, hit.sort().toArray(new String[0]), documentFields,
-				highlightFields, innerHits, nestedMetaData, explanation, matchedQueries, hit.routing());
+		return new SearchDocumentAdapter(document, score, hit.sort().stream().map(TypeUtils::toString).toArray(),
+				documentFields, highlightFields, innerHits, nestedMetaData, explanation, matchedQueries, hit.routing());
 	}
 
 	public static SearchDocument from(CompletionSuggestOption<EntityAsMap> completionSuggestOption) {

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.
@@ -29,6 +29,7 @@ import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -250,23 +251,26 @@ public final class ElasticsearchClients {
 		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
 				: new RestClientOptions(RequestOptions.DEFAULT).toBuilder();
 
-		// need to add the compatibility header, this is only done automatically when not passing in custom options.
-		// code copied from RestClientTransport as it is not available outside the package
-		ContentType jsonContentType = null;
-		if (Version.VERSION == null) {
-			jsonContentType = ContentType.APPLICATION_JSON;
-		} else {
-			jsonContentType = ContentType.create("application/vnd.elasticsearch+json",
-					new BasicNameValuePair("compatible-with", String.valueOf(Version.VERSION.major())));
-		}
-		transportOptionsBuilder.addHeader("Accept", jsonContentType.toString());
+		ContentType jsonContentType = Version.VERSION == null ? ContentType.APPLICATION_JSON
+				: ContentType.create("application/vnd.elasticsearch+json",
+						new BasicNameValuePair("compatible-with", String.valueOf(Version.VERSION.major())));
+
+		Consumer<String> setHeaderIfNotPresent = header -> {
+			if (transportOptionsBuilder.build().headers().stream() //
+					.noneMatch((h) -> h.getKey().equalsIgnoreCase(header))) {
+				// need to add the compatibility header, this is only done automatically when not passing in custom options.
+				// code copied from RestClientTransport as it is not available outside the package
+				transportOptionsBuilder.addHeader(header, jsonContentType.toString());
+			}
+		};
+
+		setHeaderIfNotPresent.accept("Content-Type");
+		setHeaderIfNotPresent.accept("Accept");
 
 		TransportOptions transportOptionsWithHeader = transportOptionsBuilder
 				.addHeader(X_SPRING_DATA_ELASTICSEARCH_CLIENT, clientType).build();
 
-		ElasticsearchTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper(),
-				transportOptionsWithHeader);
-		return transport;
+		return new RestClientTransport(restClient, new JacksonJsonpMapper(), transportOptionsWithHeader);
 	}
 
 	private static List<String> formattedHosts(List<InetSocketAddress> hosts, boolean useSsl) {
@@ -286,7 +290,9 @@ public final class ElasticsearchClients {
 	 *
 	 * @see ClientLogger
 	 * @since 4.4
+	 * @deprecated since 5.0
 	 */
+	@Deprecated
 	private static class HttpLoggingInterceptor implements HttpResponseInterceptor, HttpRequestInterceptor {
 
 		@Override
@@ -333,7 +339,7 @@ public final class ElasticsearchClients {
 							+ ((header.getName().equals("Authorization")) ? ": *****" : ": " + header.getValue()))
 					.collect(Collectors.joining(", ", "[", "]"));
 
-			// no way of logging the body, in this callback, it is not read yset, later there is no callback possibility in
+			// no way of logging the body, in this callback, it is not read yet, later there is no callback possibility in
 			// RestClient or RestClientTransport
 			ClientLogger.logRawResponse(logId, response.getStatusLine().getStatusCode(), headers);
 		}

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

@@ -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.

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

@@ -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);

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

@@ -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 {
@@ -215,8 +218,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 +299,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 +309,7 @@ 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, clazz, index, true);
 
 		SearchResponse<EntityAsMap> searchResponse = execute(client -> client.search(searchRequest, EntityAsMap.class));
 
@@ -317,11 +320,21 @@ 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, 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 +342,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, 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) {
 
@@ -441,6 +466,29 @@ 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) {
 
@@ -513,6 +561,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 +652,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());
 
 	}

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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,13 @@
  */
 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;
 import co.elastic.clients.elasticsearch.core.search.FieldCollapse;
 import co.elastic.clients.elasticsearch.core.search.Suggester;
+import co.elastic.clients.json.JsonData;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -29,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
@@ -41,6 +44,7 @@ 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<>();
@@ -49,6 +53,9 @@ public class NativeQuery extends BaseQuery {
 	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);
 		this.query = builder.getQuery();
@@ -58,6 +65,14 @@ public class NativeQuery extends BaseQuery {
 		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) {
@@ -99,4 +114,29 @@ public class NativeQuery extends BaseQuery {
 	public List<SortOptions> getSortOptions() {
 		return sortOptions;
 	}
+
+	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;
+	}
 }

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

@@ -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,16 +15,17 @@
  */
 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;
 import co.elastic.clients.elasticsearch.core.search.FieldCollapse;
 import co.elastic.clients.elasticsearch.core.search.Suggester;
+import co.elastic.clients.json.JsonData;
 import co.elastic.clients.util.ObjectBuilder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,9 +50,12 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 	@Nullable private FieldCollapse fieldCollapse;
 	private final List<ScriptedField> scriptedFields = new ArrayList<>();
 	private List<SortOptions> sortOptions = new ArrayList<>();
+	private Map<String, JsonData> searchExtensions = new LinkedHashMap<>();
 
-	public NativeQueryBuilder() {
-	}
+	@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
+	@Nullable private KnnQuery knnQuery;
+
+	public NativeQueryBuilder() {}
 
 	@Nullable
 	public Query getQuery() {
@@ -85,6 +89,20 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 		return sortOptions;
 	}
 
+	public Map<String, JsonData> getSearchExtensions() {
+		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");
@@ -167,7 +185,45 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 		return this;
 	}
 
+	public NativeQueryBuilder withSearchExtension(String key, JsonData value) {
+
+		Assert.notNull(key, "key must not be null");
+		Assert.notNull(value, "value must not be null");
+
+		searchExtensions.put(key, value);
+		return this;
+	}
+
+	public NativeQueryBuilder withSearchExtensions(Map<String, JsonData> searchExtensions) {
+
+		Assert.notNull(searchExtensions, "searchExtensions must not be null");
+
+		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);
 	}
 }

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

@@ -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));
+	}
+}

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

@@ -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) {