Release version 5.2.2 (2023.1.2).

See #2804
Prepare 5.2.2 (2023.1.2).
2026-05-23 20:53:17 +00:00 · 2024-01-12 10:51:32 +01:00 · 2024-01-12 10:50:44 +01:00 · 2024-01-06 17:37:27 +01:00 · 2024-01-02 13:54:48 +01:00 · 2023-12-29 13:57:56 +01:00
758 changed files with 5722 additions and 27439 deletions
@@ -26,3 +26,11 @@ target
 /zap.env
 /localdocker.env
 .localdocker-env
+
+build/
+node_modules
+node
+package.json
+package-lock.json
+
+.mvn/.gradle-enterprise
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+	<extension>
+		<groupId>com.gradle</groupId>
+		<artifactId>gradle-enterprise-maven-extension</artifactId>
+		<version>1.19.2</version>
+	</extension>
+	<extension>
+		<groupId>com.gradle</groupId>
+		<artifactId>common-custom-user-data-maven-extension</artifactId>
+		<version>1.12.4</version>
+	</extension>
+</extensions>
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<gradleEnterprise
+		xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
+	<server>
+		<url>https://ge.spring.io</url>
+	</server>
+	<buildScan>
+		<backgroundBuildScanUpload>false</backgroundBuildScanUpload>
+		<captureGoalInputFiles>true</captureGoalInputFiles>
+		<publishIfAuthenticated>true</publishIfAuthenticated>
+		<obfuscation>
+			<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
+		</obfuscation>
+	</buildScan>
+	<buildCache>
+		<local>
+			<enabled>true</enabled>
+		</local>
+		<remote>
+			<server>
+				<credentials>
+					<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
+					<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
+				</credentials>
+			</server>
+			<enabled>true</enabled>
+			<storeEnabled>#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null}</storeEnabled>
+		</remote>
+	</buildCache>
+</gradleEnterprise>
@@ -1,3 +1,3 @@
-#Thu Dec 14 08:37:40 CET 2023
+#Thu Dec 14 08:34:15 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.9.6/apache-maven-3.9.6-bin.zip
@@ -8,7 +8,3 @@ Do not submit a Pull Request before having created an issue and having discussed
 == Running the test locally

 In order to run the tests locally with `./mvnw test` you need to have docker running because Spring Data Elasticsearch uses https://www.testcontainers.org/[Testcontainers] to start a local running Elasticsearch instance.
-
-== Class names of the test classes
-
-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.
@@ -9,7 +9,7 @@ pipeline {

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

 	options {
@@ -33,6 +33,8 @@ pipeline {

 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}

 			steps {
@@ -61,6 +63,8 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -88,11 +92,16 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 			steps {
 				script {
 					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
 							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+								"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
+								"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
+								"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
 								"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root " +
 								"-Dartifactory.server=${p['artifactory.url']} " +
 								"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -1,17 +1,17 @@
 image:https://spring.io/badges/spring-data-elasticsearch/ga.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start] image:https://spring.io/badges/spring-data-elasticsearch/snapshot.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start]

-= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
+= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]

 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.

 The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine.
-Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with a Elasticsearch Documents and easily writing a Repository style data access layer.
+Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with Elasticsearch Documents and easily writing a Repository style data access layer.

 This project is lead and maintained by the community.

 == Features

-* Spring configuration support using Java based `@Configuration` classes or an XML namespace for a ES clients instances.
+* Spring configuration support using Java based `@Configuration` classes or an XML namespace for an ES client instances.
 * `ElasticsearchOperations` class and implementations that increases productivity performing common ES operations.
 Includes integrated object mapping between documents and POJOs.
 * Feature Rich Object Mapping integrated with Spring’s Conversion Service
@@ -19,28 +19,6 @@ Includes integrated object mapping between documents and POJOs.
 * Automatic implementation of `Repository` interfaces including support for custom search methods.
 * CDI support for repositories

-== About Elasticsearch versions and clients
-
-=== Elasticsearch 7.17 client libraries
-
-At the end of 2021 Elasticsearch with version 7.17 released the new version of their Java client and deprecated the `RestHighLevelCLient` which was the default way to access Elasticsearch up to then.
-
-Spring Data Elasticsearch will in version 4.4 offer the possibility to optionally use the new client as an alternative to the existing setup using the `RestHighLevelCLient`.
-The default client that is used still is the `RestHighLevelCLient`, first because the integration of the new client is not yet complete, the new client still has features missing and bugs which will hopefully be resolved soon.
-Second, and more important, the new Elasticsearch client forces users to switch from using `javax.json.spi.JsonProvider` to `jakarta.json.spi.JsonProvider`.
-Spring Data Elasticsearch cannot enforce this switch; Spring Boot will switch to `jakarta` with version 3 and then it's safe for Spring Data Elasticsearch to switch to the new client.
-
-So for version 4.4 Spring Data Elasticsearch will keep using the `RestHighLevelCLient` in version 7.17.x (as long as this will be available).
-
-=== Elasticsearch 8 client libraries
-
-In Elasticsearch 8, the `RestHighLevelCLient` has been removed.
-This means that a switch to this client version can only be done with the next major upgrade which will be Spring Data Elasticsearch 5, based on Spring Data 3, used by Spring Boot 3, based on Spring 6 and Java 17.
-
-=== Elasticsearch 8 cluster
-
-It should be possible to use the Elasticsearch 7 client to access a cluster running version 8 by setting the appropriate compatibility headers (see the documentation at https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration). but I encountered and heard of cases where the response from the server is not parseable by the client although the headers are set, so use with care.
-
 == Code of Conduct

 This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct].
@@ -86,25 +64,7 @@ public class MyService {

 === Using the RestClient

-Provide a configuration like this:
-
-[source,java]
----
-@Configuration
-public class RestClientConfig extends AbstractElasticsearchConfiguration {
-
-    @Override
-    @Bean
-    public RestHighLevelClient elasticsearchClient() {
-
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-            .connectedTo("localhost:9200")
-            .build();
-
-        return RestClients.create(clientConfiguration).rest();
-    }
-}
----
+Please check the [official documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration).

 === Maven configuration

@@ -119,9 +79,6 @@ Add the Maven dependency:
 </dependency>
 ----

-// NOTE: since Github does not support include directives, the content of
-// the src/main/asciidoc/reference/preface.adoc file is duplicated here
-// Always change both files!
 **Compatibility Matrix**

 The compatibility between Spring Data Elasticsearch, Elasticsearch client drivers and Spring Boot versions can be found in the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#preface.versions[reference documentation].
@@ -180,7 +137,7 @@ If you want to raise an issue, please follow the recommendations below:

 * Before you log a bug, please search the
 https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] to see if someone has already reported the problem.
-* If the issue doesn’t already exist, https://github.com/spring-projects/spring-data-elasticsearch/issues/new[create a new issue].
+* If the issue doesn't already exist, https://github.com/spring-projects/spring-data-elasticsearch/issues/new[create a new issue].
 * Please provide as much information as possible with the issue report, we like to know the version of Spring Data Elasticsearch that you are using and JVM version.
 * If you need to paste code, or include a stack trace use Markdown +++```+++ escapes before and after your text.
 * If possible try to create a test-case or project that replicates the issue.
@@ -211,10 +168,10 @@ Building the documentation builds also the project without running tests.

 [source,bash]
 ----
- $ ./mvnw clean install -Pdistribute
+ $ ./mvnw clean install -Pantora
 ----

-The generated documentation is available from `target/site/reference/html/index.html`.
+The generated documentation is available from `target/antora/site/index.html`.

 == Examples

@@ -18,24 +18,3 @@ is run. There must be _docker_ running, as the integration tests use docker to s

 Integration tests are tests that have the Junit5 Tag `@Tag("integration-test")` on the test class. Normally this should not be set explicitly, but the annotation `@SpringIntegrationTest` should be used. This not only marks the test as integration test, but integrates an automatic setup of an Elasticsearch Testcontainer and integrate this with Spring, so
 that the required Beans can be automatically injected. Check _src/test/java/org/springframework/data/elasticsearch/JUnit5SampleRestClientBasedTests.java_ as a reference setup
-
-== Mutation testing
-
-The pom includes a plugin dependency to run mutation tests using [pitest](https://pitest.org/). These tests must be explicitly configured and run, they are not included in the normal build steps. Before pitest can run, a normal `./mvnw test` must be executed. The configuration excludes integration tests, only unit tests are considered.
-
-
-pitest can be run directly from the commandline
----
-./mvnw org.pitest:pitest-maven:mutationCoverage
----
-This will output an html report to _target/pit-reports/YYYYMMDDHHMI_.
-
-To speed-up repeated analysis of the same codebase set the withHistory parameter to true.
----
-./mvnw -DwithHistory org.pitest:pitest-maven:mutationCoverage
----
-
-The classes to test are defined either in the pom.xml or can be set on the commandline:
----
-./mvnw -DwithHistory org.pitest:pitest-maven:mutationCoverage -DtargetClasses="org.springframework.data.elasticsearch.support.*"
----
@@ -2,7 +2,12 @@

 set -euo pipefail

+export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
+export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
 export JENKINS_USER=${JENKINS_USER_NAME}

+# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
+export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
+
 MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
-  ./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
+  ./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
@@ -1,6 +1,6 @@
 # Java versions
 java.main.tag=17.0.9_9-jdk-focal
-java.next.tag=20-jdk-jammy
+java.next.tag=21.0.1_12-jdk-jammy

 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
@@ -10,6 +10,7 @@ docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/ecli
 docker.mongodb.4.4.version=4.4.25
 docker.mongodb.5.0.version=5.0.21
 docker.mongodb.6.0.version=6.0.10
+docker.mongodb.7.0.version=7.0.2

 # Supported versions of Redis
 docker.redis.6.version=6.2.13
@@ -27,4 +28,6 @@ docker.credentials=hub.docker.com-springbuildmaster
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
 artifactory.url=https://repo.spring.io
 artifactory.repository.snapshot=libs-snapshot-local
+develocity.cache.credentials=gradle_enterprise_cache_user
+develocity.access-key=gradle_enterprise_secret_access_key
 jenkins.user.name=spring-builds+jenkins
@@ -5,8 +5,13 @@ set -euo pipefail
 mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
 chown -R 1001:1001 .

+export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
+export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
 export JENKINS_USER=${JENKINS_USER_NAME}

+# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
+export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
+
 MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
  ./mvnw -s settings.xml \
  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.1.7</version>
+	<version>5.2.2</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.2.2</version>
 	</parent>

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

 	<properties>
-		<springdata.commons>3.1.7</springdata.commons>
+		<springdata.commons>3.2.2</springdata.commons>

-		<!-- version of the RestHighLevelClient	-->
-		<elasticsearch-rhlc>7.17.15</elasticsearch-rhlc>
-		<!-- version of the new ElasticsearchClient	-->
-		<elasticsearch-java>8.7.1</elasticsearch-java>
-
-		<log4j>2.18.0</log4j>
-		<!-- netty dependency can be removed once the WebClient code is gone -->
-		<netty>4.1.90.Final</netty>
+		<!-- version of the ElasticsearchClient	-->
+		<elasticsearch-java>8.11.3</elasticsearch-java>

 		<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
 		<hoverfly>0.14.4</hoverfly>
+		<log4j>2.18.0</log4j>
 		<jsonassert>1.5.1</jsonassert>
 		<testcontainers>1.18.0</testcontainers>
-		<wiremock>2.35.0</wiremock>
+		<wiremock>2.35.1</wiremock>

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

@@ -93,18 +88,6 @@
 		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
 	</issueManagement>

-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-bom</artifactId>
-				<version>${netty}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>

 		<!-- Spring -->
@@ -132,33 +115,12 @@
 			<optional>true</optional>
 		</dependency>

-		<dependency>
-			<groupId>io.projectreactor.netty</groupId>
-			<artifactId>reactor-netty-http</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>

-		<!-- optional Elasticsearch RestHighLevelClient, deprecated in SDE 5.0 -->
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-high-level-client</artifactId>
-			<version>${elasticsearch-rhlc}</version>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- new Elasticsearch client, needs the low-level rest client and json api -->
 		<dependency>
 			<groupId>co.elastic.clients</groupId>
 			<artifactId>elasticsearch-java</artifactId>
@@ -204,7 +166,6 @@
 		<dependency>
 			<groupId>jakarta.enterprise</groupId>
 			<artifactId>jakarta.enterprise.cdi-api</artifactId>
-			<version>3.0.1</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -219,25 +180,33 @@
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-se</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>

+		<!-- Kotlin extension -->
 		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+			<optional>true</optional>
 		</dependency>

 		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-reflect</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jetbrains.kotlinx</groupId>
+			<artifactId>kotlinx-coroutines-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jetbrains.kotlinx</groupId>
+			<artifactId>kotlinx-coroutines-reactor</artifactId>
+			<optional>true</optional>
 		</dependency>

 		<!-- Test -->
@@ -253,6 +222,13 @@
 			</exclusions>
 		</dependency>

+		<dependency>
+			<groupId>org.jetbrains.kotlinx</groupId>
+			<artifactId>kotlinx-coroutines-test</artifactId>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
@@ -340,6 +316,14 @@
 			<scope>test</scope>
 		</dependency>

+		<!--we need Murmur3Hash in a test, before 5.2 we had it from the old Elasticsearch dependency	-->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>

 	<build>
@@ -408,8 +392,17 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.apache.logging.log4j</groupId>
+							<artifactId>log4j-core</artifactId>
+							<version>${log4j}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -461,6 +454,30 @@
 				</plugins>
 			</build>
 		</profile>
+
+		<profile>
+			<id>antora-process-resources</id>
+			<build>
+				<resources>
+					<resource>
+						<directory>src/main/antora/resources/antora-resources</directory>
+						<filtering>true</filtering>
+					</resource>
+				</resources>
+			</build>
+		</profile>
+
+		<profile>
+			<id>antora</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>io.spring.maven.antora</groupId>
+						<artifactId>antora-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>

 	<repositories>
@@ -0,0 +1,42 @@
+# PACKAGES antora@3.2.0-alpha.2 @antora/atlas-extension:1.0.0-alpha.1 @antora/collector-extension@1.0.0-alpha.3 @springio/antora-extensions@1.1.0-alpha.2 @asciidoctor/tabs@1.0.0-alpha.12 @opendevise/antora-release-line-extension@1.0.0-alpha.2
+#
+# The purpose of this Antora playbook is to build the docs in the current branch.
+antora:
+  extensions:
+    - '@antora/collector-extension'
+    - require: '@springio/antora-extensions/root-component-extension'
+      root_component_name: 'data-elasticsearch'
+site:
+  title: Spring Data Elasticsearch
+  url: https://docs.spring.io/spring-data-elasticsearch/reference/
+content:
+  sources:
+    - url: ./../../..
+      branches: HEAD
+      start_path: src/main/antora
+      worktrees: true
+    - url: https://github.com/spring-projects/spring-data-commons
+      # Refname matching:
+      # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
+      branches: [ main, 3.2.x ]
+      start_path: src/main/antora
+asciidoc:
+  attributes:
+    page-pagination: ''
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+    chomp: 'all'
+  extensions:
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
+  sourcemap: true
+urls:
+  latest_version_segment: ''
+runtime:
+  log:
+    failure_level: warn
+    format: pretty
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
+    snapshot: true
@@ -0,0 +1,12 @@
+name: data-elasticsearch
+version: true
+title: Spring Data Elasticsearch
+nav:
+  - modules/ROOT/nav.adoc
+ext:
+  collector:
+    - run:
+        command: ./mvnw validate process-resources -am -Pantora-process-resources
+        local: true
+      scan:
+        dir: target/classes/
@@ -0,0 +1,42 @@
+* xref:index.adoc[Overview]
+** xref:commons/upgrade.adoc[]
+** xref:migration-guides.adoc[]
+*** xref:migration-guides/migration-guide-3.2-4.0.adoc[]
+*** xref:migration-guides/migration-guide-4.0-4.1.adoc[]
+*** xref:migration-guides/migration-guide-4.1-4.2.adoc[]
+*** xref:migration-guides/migration-guide-4.2-4.3.adoc[]
+*** xref:migration-guides/migration-guide-4.3-4.4.adoc[]
+*** xref:migration-guides/migration-guide-4.4-5.0.adoc[]
+*** xref:migration-guides/migration-guide-5.0-5.1.adoc[]
+*** xref:migration-guides/migration-guide-5.1-5.2.adoc[]
+
+
+* xref:elasticsearch.adoc[]
+** xref:elasticsearch/clients.adoc[]
+** xref:elasticsearch/object-mapping.adoc[]
+** xref:elasticsearch/template.adoc[]
+** xref:elasticsearch/reactive-template.adoc[]
+** xref:elasticsearch/entity-callbacks.adoc[]
+** xref:elasticsearch/auditing.adoc[]
+** xref:elasticsearch/join-types.adoc[]
+** xref:elasticsearch/routing.adoc[]
+** xref:elasticsearch/misc.adoc[]
+** xref:elasticsearch/scripted-and-runtime-fields.adoc[]
+
+* xref:repositories.adoc[]
+** xref:repositories/core-concepts.adoc[]
+** xref:repositories/definition.adoc[]
+** xref:elasticsearch/repositories/elasticsearch-repositories.adoc[]
+** xref:elasticsearch/repositories/reactive-elasticsearch-repositories.adoc[]
+** xref:repositories/create-instances.adoc[]
+** xref:repositories/query-methods-details.adoc[]
+** xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc[]
+** xref:repositories/projections.adoc[]
+** xref:repositories/custom-implementations.adoc[]
+** xref:repositories/core-domain-events.adoc[]
+** xref:repositories/null-handling.adoc[]
+** xref:elasticsearch/repositories/cdi-integration.adoc[]
+** xref:repositories/query-keywords-reference.adoc[]
+** xref:repositories/query-return-types-reference.adoc[]
+
+* https://github.com/spring-projects/spring-data-commons/wiki[Wiki]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$upgrade.adoc[]
@@ -0,0 +1,16 @@
+[[elasticsearch.core]]
+= Elasticsearch Support
+:page-section-summary-toc: 1
+
+Spring Data support for Elasticsearch contains a wide range of features:
+
+* Spring configuration support for various xref:elasticsearch/clients.adoc[Elasticsearch clients].
+* The xref:elasticsearch/template.adoc[`ElasticsearchTemplate` and `ReactiveElasticsearchTemplate`] helper classes that provide object mapping between ES index operations and POJOs.
+* xref:elasticsearch/template.adoc#exception-translation[Exception translation] into Spring's portable {springDocsUrl}data-access.html#dao-exceptions[Data Access Exception Hierarchy].
+* Feature rich xref:elasticsearch/object-mapping.adoc[object mapping] integrated with _Spring's_ {springDocsUrl}core.html#core-convert[Conversion Service].
+* xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations[Annotation-based mapping] metadata that is extensible to support other metadata formats.
+* Java-based xref:elasticsearch/template.adoc#cassandra.template.query[query, criteria, and update DSLs].
+* Automatic implementation of xref:repositories.adoc[imperative and reactive `Repository` interfaces] including support for xref:repositories/custom-implementations.adoc[custom query methods].
+
+For most data-oriented tasks, you can use the `[Reactive]ElasticsearchTemplate` or the `Repository` support, both of which use the rich object-mapping functionality.
+Spring Data Elasticsearch uses consistent naming conventions on objects in various APIs to those found in the DataStax Java Driver so that they are familiar and so that you can map your existing knowledge onto the Spring APIs.
@@ -1,8 +1,8 @@
 [[elasticsearch.auditing]]
-== Elasticsearch Auditing
+= Elasticsearch Auditing

 [[elasticsearch.auditing.preparing]]
-=== Preparing entities
+== 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:

@@ -56,7 +56,7 @@ public class Person implements Persistable<Long> {
 <.> an object is new if it either has no `id` or none of fields containing creation attributes are set.

 [[elasticsearch.auditing.activating]]
-=== Activating auditing
+== 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:

@@ -3,10 +3,8 @@

 This chapter illustrates configuration and usage of supported Elasticsearch client implementations.

-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>>.
+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 xref:elasticsearch/template.adoc[Elasticsearch Operations] and xref:elasticsearch/repositories/elasticsearch-repositories.adoc[Elasticsearch Repositories].

 [[elasticsearch.clients.restclient]]
 == Imperative Rest Client
@@ -23,33 +21,41 @@ 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>>
+
+<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
 ====

+The `ElasticsearchConfiguration` class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
+
+
 The following beans can then be injected in other Spring components:

 ====
 [source,java]
 ----
-@Autowired
+import org.springframework.beans.factory.annotation.Autowired;@Autowired
 ElasticsearchOperations operations;      <.>

-@Autowired 
+@Autowired
 ElasticsearchClient elasticsearchClient; <.>

@Autowired
 RestClient restClient;                   <.>
+
+@Autowired
+JsonpMapper jsonpMapper;                 <.>
 ----

 <.> an implementation of `ElasticsearchOperations`
 <.> the `co.elastic.clients.elasticsearch.ElasticsearchClient` that is used.
 <.> the low level `RestClient` from the Elasticsearch libraries
+<.> the `JsonpMapper` user by the Elasticsearch `Transport`
 ====

 Basically one should just use the `ElasticsearchOperations` to interact with the Elasticsearch cluster.
@@ -71,14 +77,17 @@ public class MyClientConfig extends ReactiveElasticsearchConfiguration {
 	@Override
 	public ClientConfiguration clientConfiguration() {
 		return ClientConfiguration.builder()           <.>
-			.connectedTo("localhost:9200") 
+			.connectedTo("localhost:9200")
 			.build();
 	}
 }
 ----
-<.> for a detailed description of the builder methods see <<elasticsearch.clients.configuration>>
+
+<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
 ====

+The `ReactiveElasticsearchConfiguration` class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
+
 The following beans can then be injected in other Spring components:

 ====
@@ -87,11 +96,14 @@ The following beans can then be injected in other Spring components:
@Autowired
 ReactiveElasticsearchOperations operations;      <.>

-@Autowired 
+@Autowired
 ReactiveElasticsearchClient elasticsearchClient; <.>

@Autowired
 RestClient restClient;                           <.>
+
+@Autowired
+JsonpMapper jsonpMapper;                         <.>
 ----

 the following can be injected:
@@ -100,103 +112,12 @@ the following can be injected:
 <.> the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient` that is used.
 This is a reactive implementation based on the Elasticsearch client implementation.
 <.> the low level `RestClient` from the Elasticsearch libraries
+<.> the `JsonpMapper` user by the Elasticsearch `Transport`
 ====

 Basically one should just use the `ReactiveElasticsearchOperations` to interact with the Elasticsearch cluster.
 When using repositories, this instance is used under the hood as well.

-[[elasticsearch.clients.resthighlevelclient]]
-== High Level REST Client (deprecated)
-
-[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
-====
-[source,java]
----
-import org.springframework.data.elasticsearch.client.erhlc.AbstractElasticsearchConfiguration;
-
-@Configuration
-public class RestClientConfig extends AbstractElasticsearchConfiguration {
-
-    @Override
-    @Bean
-    public RestHighLevelClient elasticsearchClient() {
-
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder()  <1>
-            .connectedTo("localhost:9200")
-            .build();
-
-        return RestClients.create(clientConfiguration).rest();                         <2>
-    }
-}
-
-// ...
-
-  @Autowired
-  RestHighLevelClient highLevelClient;
-
-  RestClient lowLevelClient = highLevelClient.lowLevelClient();                        <3>
----
-
-<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-<2> Create the RestHighLevelClient.
-<3> It is also possible to obtain the `lowLevelRest()` client.
-====
-
-[[elasticsearch.clients.reactive]]
-== Reactive Client (deprecated)
-
-The `org.springframework.data.elasticsearch.client.erhlc.ReactiveElasticsearchClient` is a non official driver based on `WebClient`.
-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.
-
-[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)
-====
-[source,java]
----
-import org.springframework.data.elasticsearch.client.erhlc.AbstractReactiveElasticsearchConfiguration;
-
-@Configuration
-public class ReactiveRestClientConfig extends AbstractReactiveElasticsearchConfiguration {
-
-    @Override
-    @Bean
-    public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder() <.>
-            .connectedTo("localhost:9200") //
-            .build();
-        return ReactiveRestClients.create(clientConfiguration);
-
-    }
-}
-// ...
-
-Mono<IndexResponse> response = client.index(request ->
-
-  request.index("spring-data")
-    .id(randomID())
-    .source(singletonMap("feature", "reactive-client"));
-);
----
-
-<.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-====
-
 [[elasticsearch.clients.configuration]]
 == Client Configuration

@@ -240,7 +161,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()

 <.> Define default headers, if they need to be customized
 <.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-<.> Optionally enable SSL. There exist overloads of this function that can take a `SSLContext` or as an alternative the fingerprint of the certificate as it is output by Elasticsearch 8 on startup.
+<.> Optionally enable SSL.There exist overloads of this function that can take a `SSLContext` or as an alternative the fingerprint of the certificate as it is output by Elasticsearch 8 on startup.
 <.> Optionally set a proxy.
 <.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
 <.> Set the connection timeout.
@@ -248,8 +169,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()
 <.> Optionally set headers.
 <.> Add basic authentication.
 <.> 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.
+<.> a function to configure the created client (see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration.callbacks[Client 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.
@@ -258,8 +178,8 @@ If this is used in the reactive setup, the supplier function *must not* block!
 [[elasticsearch.clients.configuration.callbacks]]
 === Client configuration callbacks

-The `ClientConfiguration` class offers the most common parameters to configure the client. In the case this is not 
-enough, the user can add callback functions by using the `withClientConfigurer(ClientConfigurationCallback<?>)` method.
+The `ClientConfiguration` class offers the most common parameters to configure the client.
+In the case this is not enough, the user can add callback functions by using the `withClientConfigurer(ClientConfigurationCallback<?>)` method.

 The following callbacks are provided:

@@ -298,44 +218,11 @@ 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
-https://www.elastic.co/guide/en/elasticsearch/reference/8.0/rest-api-compatibility.html[see Elasticsearch 
-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]
----
-
-HttpHeaders compatibilityHeaders = new HttpHeaders();
-compatibilityHeaders.add("Accept", "application/vnd.elasticsearch+json;compatible-with=7");
-compatibilityHeaders.add("Content-Type", "application/vnd.elasticsearch+json;"
-    + "compatible-with=7");
-
-ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-    .connectedTo("localhost:9200")
-    .withProxy("localhost:8080")
-    .withBasicAuth("elastic","hcraescitsale")
-    .withDefaultHeaders(compatibilityHeaders)    // this variant for imperative code
-    .withHeaders(() -> compatibilityHeaders)     // this variant for reactive code
-    .build();
-		
----
-====
-
 [[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. This can be enabled in the Elasticsearch client by setting 
-the level of the `tracer` package to "trace" (see 
+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
@@ -1,11 +1,28 @@
 [[new-features]]
 = What's new

+[[new-features.5-2-2]]
+== New in Spring Data Elasticsearch 5.2.2
+* Upgrade to Elasticsearch 8.11.3
+
+[[new-features.5-2-0]]
+== New in Spring Data Elasticsearch 5.2
+
+* Upgrade to Elasticsearch 8.11.1
+* The `JsonpMapper` for Elasticsearch is now configurable and provided as bean.
+* Improved AOT runtime hints for Elasticsearch client library classes.
+* Add Kotlin extensions and repository coroutine support.
+* Introducing `VersionConflictException` class thrown in case thatElasticsearch reports an 409 error with a version conflict.
+* Enable MultiField annotation on property getter
+* Support nested sort option
+* Improved scripted und runtime field support
+* Improved refresh policy support
+
 [[new-features.5-1-0]]
 == New in Spring Data Elasticsearch 5.1

-* Upgrade to Elasticsearch 8.7.0
-* Allow specification of the TLS certificate when connecting to an Elasticsearch 8 cluster 
+* Upgrade to Elasticsearch 8.7.1
+* Allow specification of the TLS certificate when connecting to an Elasticsearch 8 cluster

 [[new-features.5-0-0]]
 == New in Spring Data Elasticsearch 5.0
@@ -54,7 +71,7 @@
 * Upgrade to Elasticsearch 7.6.2.
 * Deprecation of `TransportClient` usage.
 * Implements most of the mapping-types available for the index mappings.
-* Removal of the Jackson `ObjectMapper`, now using the <<elasticsearch.mapping.meta-model,MappingElasticsearchConverter>>
+* Removal of the Jackson `ObjectMapper`, now using the xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model[MappingElasticsearchConverter]
 * Cleanup of the API in the `*Operations` interfaces, grouping and renaming methods so that they match the Elasticsearch API, deprecating the old methods, aligning with other Spring Data modules.
 * Introduction of `SearchHit<T>` class to represent a found document together with the relevant result metadata for this document (i.e. _sortValues_).
 * Introduction of the `SearchHits<T>` class to represent a whole search result together with the metadata for the complete search result (i.e. _max_score_).
@@ -68,7 +85,7 @@

 * Secured Elasticsearch cluster support with Basic Authentication and SSL transport.
 * Upgrade to Elasticsearch 6.8.1.
-* Reactive programming support with <<elasticsearch.reactive.operations>> and <<elasticsearch.reactive.repositories>>.
-* Introduction of the <<elasticsearch.mapping.meta-model,ElasticsearchEntityMapper>> as an alternative to the Jackson `ObjectMapper`.
+* Reactive programming support with xref:elasticsearch/repositories/reactive-elasticsearch-repositories.adoc[Reactive Elasticsearch Repositories] and xref:.
+* Introduction of the xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model[ElasticsearchEntityMapper] as an alternative to the Jackson `ObjectMapper`.
 * Field name customization in `@Field`.
 * Support for Delete by Query.
@@ -1,5 +1,7 @@
+include::{commons}@data-commons::page$entity-callbacks.adoc[]
+
 [[elasticsearch.entity-callbacks]]
-= Elasticsearch EntityCallbacks
+== Store specific EntityCallbacks

 Spring Data Elasticsearch uses the `EntityCallback` API internally for its auditing support and reacts on the following callbacks:

@@ -112,7 +112,7 @@ public class Statement {
    }
 }
 ----
-<.> for routing related info see <<elasticsearch.routing>>
+<.> for routing related info see xref:elasticsearch/routing.adoc[Routing values]
 <.> a question can have answers and comments
 <.> an answer can have votes
 <.> the `JoinField` property is used to combine the name (_question_, _answer_, _comment_ or _vote_) of the relation with the parent id.
@@ -208,13 +208,13 @@ void init() {
 <2> the first answer to the question
 <3> the second answer
 <4> a comment to the question
-<5> a vote for the first answer, this needs to have the routing set to the weather document, see <<elasticsearch.routing>>.
+<5> a vote for the first answer, this needs to have the routing set to the weather document, see xref:elasticsearch/routing.adoc[Routing values].
 ====

 [[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.
+Currently native queries must be used to query the data, so there is no support from standard repository methods. xref:repositories/custom-implementations.adoc[] can be used instead.

 The following code shows as an example how to retrieve all entries that have a _vote_ (which must be _answers_, because only answers can have a vote) using an `ElasticsearchOperations` instance:

@@ -2,7 +2,7 @@
 = Miscellaneous Elasticsearch Operation Support

 This chapter covers additional support for Elasticsearch operations that cannot be directly accessed via the repository interface.
-It is recommended to add those operations as custom implementation as described in <<repositories.custom-implementations>> .
+It is recommended to add those operations as custom implementation as described in xref:repositories/custom-implementations.adoc[] .

 [[elasticsearc.misc.index.settings]]
 == Index settings
@@ -50,7 +50,7 @@ class Entity {
 [[elasticsearch.misc.mappings]]
 == Index Mapping

-When Spring Data Elasticsearch creates the index mapping with the `IndexOperations.createMapping()` methods, it uses the annotations described in <<elasticsearch.mapping.meta-model.annotations>>, especially the `@Field` annotation.
+When Spring Data Elasticsearch creates the index mapping with the `IndexOperations.createMapping()` methods, it uses the annotations described in xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations[Mapping Annotation Overview], especially the `@Field` annotation.
 In addition to that it is possible to add the `@Mapping` annotation to a class.
 This annotation has the following properties:

@@ -181,7 +181,7 @@ interface SampleEntityRepository extends Repository<SampleEntity, String> {
 [[elasticsearch.misc.sorts]]
 == Sort options

-In addition to the default sort options described in <<repositories.paging-and-sorting>>, Spring Data Elasticsearch provides the class `org.springframework.data.elasticsearch.core.query.Order` which derives from `org.springframework.data.domain.Sort.Order`.
+In addition to the default sort options described in xref:repositories/query-methods-details.adoc#repositories.paging-and-sorting[Paging and Sorting], Spring Data Elasticsearch provides the class `org.springframework.data.elasticsearch.core.query.Order` which derives from `org.springframework.data.domain.Sort.Order`.
 It offers additional parameters that can be sent to Elasticsearch when specifying the sorting of the result (see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/sort-search-results.html).

 There also is the  `org.springframework.data.elasticsearch.core.query.GeoDistanceOrder` class which can be used to have the result of a search operation ordered by geographical distance.
@@ -365,9 +365,8 @@ operations.putScript(                            <.>

 To use a search template in a search query, Spring Data Elasticsearch provides the `SearchTemplateQuery`, an implementation of the `org.springframework.data.elasticsearch.core.query.Query` interface.

-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.
+In the following code, we will add a call using a search template query to a custom repository implementation (see
+xref:repositories/custom-implementations.adoc[]) as an example how this can be integrated into a repository call.

 We first define the custom repository fragment interface:

@@ -399,7 +398,7 @@ public class PersonCustomRepositoryImpl implements PersonCustomRepository {
    var query = SearchTemplateQuery.builder()                               <.>
      .withId("person-firstname")                                           <.>
      .withParams(
-        Map.of(                                                             <.>                             
+        Map.of(                                                             <.>
          "firstName", firstName,
          "from", pageable.getOffset(),
          "size", pageable.getPageSize()
@@ -419,3 +418,35 @@ public class PersonCustomRepositoryImpl implements PersonCustomRepository {
 <.> The parameters are passed in a `Map<String,Object>`
 <.> Do the search in the same way as with the other query types.
 ====
+
+[[elasticsearch.misc.nested-sort]]
+== Nested sort
+Spring Data Elasticsearch supports sorting within nested objects (https://www.elastic.co/guide/en/elasticsearch/reference/8.9/sort-search-results.html#nested-sorting)
+
+The following example, taken from the `org.springframework.data.elasticsearch.core.query.sort.NestedSortIntegrationTests` class, shows how to define the nested sort.
+
+====
+[source,java]
+----
+var filter = StringQuery.builder("""
+	{ "term": {"movies.actors.sex": "m"} }
+	""").build();
+var order = new org.springframework.data.elasticsearch.core.query.Order(Sort.Direction.DESC,
+	"movies.actors.yearOfBirth")
+	.withNested(
+		Nested.builder("movies")
+			.withNested(
+				Nested.builder("movies.actors")
+					.withFilter(filter)
+					.build())
+			.build());
+
+var query = Query.findAll().addSort(Sort.by(order));
+
+----
+====
+
+About the filter query: It is not possible to use a `CriteriaQuery` here, as this query would be converted into a Elasticsearch nested query which does not work in the filter context. So only `StringQuery` or `NativeQuery` can be used here. When using one of these, like the term query above, the Elasticsearch field names must be used, so take care, when these are redefined with the `@Field(name="...")` definition.
+
+For the definition of the order path and the nested paths, the Java entity property names should be used.
+
@@ -25,11 +25,11 @@ The most important attributes are (check the API documentation for the complete
 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>>
+See xref:elasticsearch/repositories/elasticsearch-repositories.adoc#elasticsearch.repositories.autocreation[Automatic creation of indices with the corresponding mapping]


 * `@Id`: Applied at the field level to mark the field used for identity purpose.
-* `@Transient`, `@ReadOnlyProperty`, `@WriteOnlyProperty`: see the following section <<elasticsearch.mapping.meta-model.annotations.read-write>> for detailed information.
+* `@Transient`, `@ReadOnlyProperty`, `@WriteOnlyProperty`: see the following section xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations.read-write[Controlling which properties are written to and read from Elasticsearch] 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):
@@ -38,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.annotations.date-formats>>.
-** `pattern`: One or more custom date formats, see the next section <<elasticsearch.mapping.meta-model.annotations.date-formats>>.
+** `format`: One or more built-in date formats, see the next section xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations.date-formats[Date format mapping].
+** `pattern`: One or more custom date formats, see the next section xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations.date-formats[Date format mapping].
 ** `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.
@@ -56,10 +56,10 @@ This section details the annotations that define if the value of a property is w

 `@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.
+`@ReadOnlyProperty`: A property with this annotation will not have its value written to Elasticsearch, but when returning data, the property 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.
+`@WriteOnlyProperty`: A property with this annotation 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]]
@@ -71,7 +71,7 @@ This paragraph describes the use of

 There are two attributes of the `@Field` annotation that define which date format information is written to the mapping (also see https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#built-in-date-formats[Elasticsearch Built In Formats] and https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#custom-date-formats[Elasticsearch Custom Date Formats])

-The `format` attributes is used to define at least one of the predefined formats.
+The `format` attribute is used to define at least one of the predefined formats.
 If it is not defined, then a default value of __date_optional_time_ and _epoch_millis_ is used.

 The `pattern` attribute can be used to add additional custom format strings.
@@ -158,7 +158,7 @@ Supported classes for the type `<T>` are `Integer`, `Long`, `Float`, `Double`, `
 Without further configuration, Spring Data Elasticsearch will use the property name of an object as field name in Elasticsearch.
 This can be changed for individual field by using the `@Field` annotation on that property.

-It is also possible to define a `FieldNamingStrategy` in the configuration of the client (<<elasticsearch.clients>>).
+It is also possible to define a `FieldNamingStrategy` in the configuration of the client (xref:elasticsearch/clients.adoc[Elasticsearch Clients]).
 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.

@@ -187,11 +187,12 @@ public String getProperty() {
 [[elasticsearch.mapping.meta-model.annotations.misc]]
 ==== Other property annotations

+[[indexedindexname]]
 ===== @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 
+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.

@@ -260,12 +261,13 @@ public class Person {

 NOTE: Type hints will not be written for nested Objects unless the properties type is `Object`, an interface or the actual value type does not match the properties declaration.

+[[disabling-type-hints]]
 ===== Disabling Type Hints

 It may be necessary to disable writing of type hints when the index that should be used already exists without having the type hints defined in its mapping and with the mapping mode set to strict.
 In this case, writing the type hint will produce an error, as the field cannot be added automatically.

-Type hints can be disabled for the whole application by overriding the method `writeTypeHints()` in a configuration class derived from `AbstractElasticsearchConfiguration` (see <<elasticsearch.clients>>).
+Type hints can be disabled for the whole application by overriding the method `writeTypeHints()` in a configuration class derived from `AbstractElasticsearchConfiguration` (see xref:elasticsearch/clients.adoc[Elasticsearch Clients]).

 As an alternative they can be disabled for a single index with the `@Document` annotation:

@@ -349,7 +351,7 @@ The following GeoJson types are implemented:
 [[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>>.
+For values inside Collections apply the same mapping rules as for aggregate roots when it comes to _type hints_ and xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.conversions[Custom Conversions].

 .Collections
 ====
@@ -377,7 +379,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>>.
+For values inside Maps apply the same mapping rules as for aggregate roots when it comes to _type hints_ and xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.conversions[Custom Conversions].
 However the Map key needs to a String to be processed by Elasticsearch.

 .Collections
@@ -412,7 +414,7 @@ public class Person {
 [[elasticsearch.mapping.meta-model.conversions]]
 === Custom Conversions

-Looking at the `Configuration` from the <<elasticsearch.mapping.meta-model, previous section>> `ElasticsearchCustomConversions` allows registering specific rules for mapping domain and simple types.
+Looking at the `Configuration` from the xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model[previous section] `ElasticsearchCustomConversions` allows registering specific rules for mapping domain and simple types.

 .Meta Model Object Mapping Configuration
 ====
@@ -438,7 +440,7 @@ public class Config extends ElasticsearchConfiguration  {

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

@@ -5,18 +5,13 @@

 The `ReactiveElasticsearchTemplate` is the default implementation of `ReactiveElasticsearchOperations`.

-[[elasticsearch.reactive.operations]]
-== Reactive Elasticsearch Operations
-
 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.
+Please see xref:elasticsearch/clients.adoc#elasticsearch.clients.reactiverestclient[Reactive Rest Client] for details on the client and how to configure it.

 [[elasticsearch.reactive.operations.usage]]
-=== Reactive Operations Usage
+== Reactive Operations Usage

-`ReactiveElasticsearchOperations` 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:

@@ -61,8 +56,8 @@ The above outputs the following sequence on the console.
 > QjWCWWcBXiLAnp77ksfR
 > 0
 ----
-<.> Insert a new `Person` document into the _marvel_ index . The `id` is generated on server 
-side and set into the instance returned.
+
+<.> 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.
@@ -0,0 +1,35 @@
+[[elasticsearch.cdi]]
+= CDI Integration
+
+The Spring Data Elasticsearch repositories can also be set up using CDI functionality.
+
+.Spring Data Elasticsearch repositories using CDI
+====
+[source,java]
+----
+class ElasticsearchTemplateProducer {
+
+  @Produces
+  @ApplicationScoped
+  public ElasticsearchOperations createElasticsearchTemplate() {
+    // ...                               <1>
+  }
+}
+
+class ProductService {
+
+  private ProductRepository repository;  <2>
+  public Page<Product> findAvailableBookByName(String name, Pageable pageable) {
+    return repository.findByAvailableTrueAndNameStartingWith(name, pageable);
+  }
+  @Inject
+  public void setRepository(ProductRepository repository) {
+    this.repository = repository;
+  }
+}
+----
+
+<1> Create a component by using the same calls as are used in the xref:elasticsearch/template.adoc[Elasticsearch Operations] chapter.
+<2> Let the CDI framework inject the Repository into your class.
+
+====
@@ -29,13 +29,13 @@ class Book {
 [[elasticsearch.repositories.autocreation]]
 == Automatic creation of indices with the corresponding mapping

-The `@Document` annotation has an argument `createIndex`. If this argument is set to true - which is the default value  - Spring Data Elasticsearch will during bootstrapping the repository support on application startup check if the index defined by the `@Document` annotation exists.
+The `@Document` annotation has an argument `createIndex`.
+If this argument is set to true - which is the default value - Spring Data Elasticsearch will during bootstrapping the repository support on application startup check if the index defined by the `@Document` annotation exists.

-If it does not exist, the index will be created and the mappings derived from the entity's annotations (see <<elasticsearch.mapping>>) will be written to the newly created index. Details of the index that will be created can be set by using the `@Setting` annotation, refer to <<elasticsearc.misc.index.settings>> for further information.
+If it does not exist, the index will be created and the mappings derived from the entity's annotations (see xref:elasticsearch/object-mapping.adoc[Elasticsearch Object Mapping]) will be written to the newly created index.
+Details of the index that will be created can be set by using the `@Setting` annotation, refer to xref:elasticsearch/misc.adoc#elasticsearc.misc.index.settings[Index settings] for further information.

-include::elasticsearch-repository-queries.adoc[leveloffset=+1]

-include::reactive-elasticsearch-repositories.adoc[leveloffset=+1]

 [[elasticsearch.repositories.annotations]]
 == Annotations for repository methods
@@ -43,7 +43,7 @@ include::reactive-elasticsearch-repositories.adoc[leveloffset=+1]
 [[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:
+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:

 ====
 [source,java]
@@ -125,51 +125,17 @@ class ProductService {

 <1> The `EnableElasticsearchRepositories` annotation activates the Repository support.
 If no base package is configured, it will use the one of the configuration class it is put on.
-<2> Provide a Bean named `elasticsearchTemplate` of type `ElasticsearchOperations` by using one of the configurations shown in the <<elasticsearch.operations>> chapter.
+<2> Provide a Bean named `elasticsearchTemplate` of type `ElasticsearchOperations` by using one of the configurations shown in the xref:elasticsearch/template.adoc[Elasticsearch Operations] chapter.
 <3> Let Spring inject the Repository bean into your class.
 ====

-[[elasticsearch.cdi]]
-== Elasticsearch Repositories using CDI
-
-The Spring Data Elasticsearch repositories can also be set up using CDI functionality.
-
-.Spring Data Elasticsearch repositories using CDI
-====
-[source,java]
----
-class ElasticsearchTemplateProducer {
-
-  @Produces
-  @ApplicationScoped
-  public ElasticsearchOperations createElasticsearchTemplate() {
-    // ...                               <1>
-  }
-}
-
-class ProductService {
-
-  private ProductRepository repository;  <2>
-  public Page<Product> findAvailableBookByName(String name, Pageable pageable) {
-    return repository.findByAvailableTrueAndNameStartingWith(name, pageable);
-  }
-  @Inject
-  public void setRepository(ProductRepository repository) {
-    this.repository = repository;
-  }
-}
----
-<1> Create a component by using the same calls as are used in the <<elasticsearch.operations>> chapter.
-<2> Let the CDI framework inject the Repository into your class.
-
-====

 [[elasticsearch.namespace]]
 == Spring Namespace

 The Spring Data Elasticsearch module contains a custom namespace allowing definition of repository beans as well as elements for instantiating a `ElasticsearchServer` .

-Using the `repositories` element looks up Spring Data repositories as described in <<repositories.create-instances>> .
+Using the `repositories` element looks up Spring Data repositories as described in xref:repositories/create-instances.adoc[].

 .Setting up Elasticsearch repositories using Namespace
 ====
@@ -10,12 +10,12 @@ The Elasticsearch module supports all basic query building feature as string que
 === Declared queries

 Deriving the query from the method name is not always sufficient and/or may result in unreadable method names.
-In this case one might make use of the `@Query` annotation (see <<elasticsearch.query-methods.at-query>> ).
+In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using @Query Annotation] ).

 [[elasticsearch.query-methods.criterions]]
 == Query creation

-Generally the query creation mechanism for Elasticsearch works as described in <<repositories.query-methods>>.
+Generally the query creation mechanism for Elasticsearch works as described in xref:repositories/query-methods-details.adoc[].
 Here's a short example of what a Elasticsearch query method translates into:

 .Query creation from method names
@@ -137,7 +137,7 @@ A list of supported keywords for Elasticsearch is shown below.


 | `GreaterThanEqual`
-| `findByPriceGreaterThan`
+| `findByPriceGreaterThanEqual`
 | `{ "query" : {
 "bool" : {
 "must" : [
@@ -1,11 +1,9 @@
 [[elasticsearch.reactive.repositories]]
 = Reactive Elasticsearch Repositories

-Reactive Elasticsearch repository support builds on the core repository support explained in <<repositories>> utilizing
-operations provided via <<elasticsearch.reactive.operations>> executed by a <<elasticsearch.clients.reactive>>.
+Reactive Elasticsearch repository support builds on the core repository support explained in xref:repositories.adoc[] utilizing operations provided via xref:elasticsearch/reactive-template.adoc[] executed by a xref:elasticsearch/clients.adoc#elasticsearch.clients.reactiverestclient[Reactive REST Client].

-Spring Data Elasticsearch reactive repository support uses https://projectreactor.io/[Project Reactor] as its reactive
-composition library of choice.
+Spring Data Elasticsearch reactive repository support uses https://projectreactor.io/[Project Reactor] as its reactive composition library of choice.

 There are 3 main interfaces to be used:

@@ -10,7 +10,7 @@ Spring Data Elasticsearch supports routing definitions on storing and retrieving
 [[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.
+When using join-types (see xref:elasticsearch/join-types.adoc[Join-Type implementation]), Spring Data Elasticsearch will automatically use the `parent` property of the entity's `JoinField` property as the value for the routing.

 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).
@@ -0,0 +1,228 @@
+[[elasticsearch.misc.scripted-and-runtime-fields]]
+= Scripted and runtime fields
+
+Spring Data Elasticsearch supports scripted fields and runtime fields.
+Please refer to the Elasticsearch documentation about scripting (https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html) and runtime fields (https://www.elastic.co/guide/en/elasticsearch/reference/8.9/runtime.html) for detailed information about this.
+In the context of Spring Data Elasticsearch you can use
+
+* scripted fields that are used to return fields that are calculated on the result documents and added to the returned document.
+* runtime fields that are calculated on the stored documents and can be used in a query and/or be returned in the search result.
+
+The following code snippets will show what you can do (these show imperative code, but the reactive implementation works similar).
+
+[[the-person-entity]]
+== The person entity
+
+The enity that is used in these examples is a `Person` entity.
+This entity has a `birthDate` and an `age` property.
+Whereas the birthdate is fix, the age depends on the time when a query is issued and needs to be calculated dynamically.
+
+====
+[source,java]
+----
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.ScriptedField;
+import org.springframework.lang.Nullable;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import static org.springframework.data.elasticsearch.annotations.FieldType.*;
+
+import java.lang.Integer;
+
+@Document(indexName = "persons")
+public record Person(
+        @Id
+        @Nullable
+        String id,
+        @Field(type = Text)
+        String lastName,
+        @Field(type = Text)
+        String firstName,
+        @Field(type = Keyword)
+        String gender,
+        @Field(type = Date, format = DateFormat.basic_date)
+        LocalDate birthDate,
+        @Nullable
+        @ScriptedField Integer age                   <.>
+) {
+    public Person(String id,String lastName, String firstName, String gender, String birthDate) {
+        this(id,                                     <.>
+            lastName,
+            firstName,
+            LocalDate.parse(birthDate, DateTimeFormatter.ISO_LOCAL_DATE),
+            gender,
+            null);
+    }
+}
+
+----
+
+<.> the `age` property will be calculated and filled in search results.
+<.> a convenience constructor to set up the test data.
+====
+
+Note that the `age` property is annotated with `@ScriptedField`.
+This inhibits the writing of a corresponding entry in the index mapping and marks the property as a target to put a calculated field from a search response.
+
+[[the-repository-interface]]
+== The repository interface
+
+The repository used in this example:
+
+====
+[source,java]
+----
+public interface PersonRepository extends ElasticsearchRepository<Person, String> {
+
+    SearchHits<Person> findAllBy(ScriptedField scriptedField);
+
+    SearchHits<Person> findByGenderAndAgeLessThanEqual(String gender, Integer age, RuntimeField runtimeField);
+}
+
+----
+====
+
+[[the-service-class]]
+== The service class
+
+The service class has a repository injected and an `ElasticsearchOperations` instance to show several ways of populating and using the `age` property.
+We show the code split up in different pieces to put the explanations in
+
+====
+[source,java]
+----
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
+import org.springframework.data.elasticsearch.core.query.RuntimeField;
+import org.springframework.data.elasticsearch.core.query.ScriptData;
+import org.springframework.data.elasticsearch.core.query.ScriptType;
+import org.springframework.data.elasticsearch.core.query.ScriptedField;
+import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PersonService {
+    private final ElasticsearchOperations operations;
+    private final PersonRepository repository;
+
+    public PersonService(ElasticsearchOperations operations, SaRPersonRepository repository) {
+        this.operations = operations;
+        this.repository = repository;
+    }
+
+    public void save() { <.>
+        List<Person> persons = List.of(
+                new Person("1", "Smith", "Mary", "f", "1987-05-03"),
+                new Person("2", "Smith", "Joshua", "m", "1982-11-17"),
+                new Person("3", "Smith", "Joanna", "f", "2018-03-27"),
+                new Person("4", "Smith", "Alex", "m", "2020-08-01"),
+                new Person("5", "McNeill", "Fiona", "f", "1989-04-07"),
+                new Person("6", "McNeill", "Michael", "m", "1984-10-20"),
+                new Person("7", "McNeill", "Geraldine", "f", "2020-03-02"),
+                new Person("8", "McNeill", "Patrick", "m", "2022-07-04"));
+
+        repository.saveAll(persons);
+    }
+----
+
+<.> a utility method to store some data in Elasticsearch.
+====
+
+[[scripted-fields]]
+=== Scripted fields
+
+The next piece shows how to use a scripted field to calculate and return the age of the persons.
+Scripted fields can only add something to the returned data, the age cannot be used in the query (see runtime fields for that).
+
+====
+[source,java]
+----
+    public SearchHits<Person> findAllWithAge() {
+
+        var scriptedField = ScriptedField.of("age",                               <.>
+                ScriptData.of(b -> b
+                        .withType(ScriptType.INLINE)
+                        .withScript("""
+                                Instant currentDate = Instant.ofEpochMilli(new Date().getTime());
+                                Instant startDate = doc['birth-date'].value.toInstant();
+                                return (ChronoUnit.DAYS.between(startDate, currentDate) / 365);
+                                """)));
+
+        // version 1: use a direct query
+        var query = new StringQuery("""
+                { "match_all": {} }
+                """);
+        query.addScriptedField(scriptedField);                                    <.>
+        query.addSourceFilter(FetchSourceFilter.of(b -> b.withIncludes("*")));    <.>
+
+        var result1 = operations.search(query, Person.class);                     <.>
+
+        // version 2: use the repository
+        var result2 = repository.findAllBy(scriptedField);                        <.>
+
+        return result1;
+    }
+----
+
+<.> define the `ScriptedField` that calculates the age of a person.
+<.> when using a `Query`, add the scripted field to the query.
+<.> when adding a scripted field to a `Query`, an additional source filter is needed to also retrieve the _normal_ fields from the document source.
+<.> get the data where the `Person` entities now have the values set in their `age` property.
+<.> when using the repository, all that needs to be done is adding the scripted field as method parameter.
+====
+
+[[runtime-fields]]
+=== Runtime fields
+
+When using runtime fields, the calculated value can be used in the query itself.
+In the following code this is used to run a query for a given gender and maximum age of persons:
+
+====
+[source,java]
+----
+    public SearchHits<Person> findWithGenderAndMaxAge(String gender, Integer maxAge) {
+
+        var runtimeField = new RuntimeField("age", "long", """                    <.>
+                                Instant currentDate = Instant.ofEpochMilli(new Date().getTime());
+                                Instant startDate = doc['birth-date'].value.toInstant();
+                                emit (ChronoUnit.DAYS.between(startDate, currentDate) / 365);
+                """);
+
+        // variant 1 : use a direct query
+        var query = CriteriaQuery.builder(Criteria
+                        .where("gender").is(gender)
+                        .and("age").lessThanEqual(maxAge))
+                .withRuntimeFields(List.of(runtimeField))                         <.>
+                .withFields("age")                                                <.>
+                .withSourceFilter(FetchSourceFilter.of(b -> b.withIncludes("*"))) <.>
+                .build();
+
+        var result1 = operations.search(query, Person.class);                     <.>
+
+        // variant 2: use the repository                                          <.>
+        var result2 = repository.findByGenderAndAgeLessThanEqual(gender, maxAge, runtimeField);
+
+        return result1;
+    }
+}
+----
+
+<.> define the runtime field that calculates the age of a person. // see https://asciidoctor.org/docs/user-manual/#builtin-attributes for builtin attributes.
+<.> when using `Query`, add the runtime field.
+<.> when adding a scripted field to a `Query`, an additional field parameter is needed to have the calculated value returned.
+<.> when adding a scripted field to a `Query`, an additional source filter is needed to also retrieve the _normal_ fields from the document source.
+<.> get the data filtered with the query and where the returned entites have the age property set.
+<.> when using the repository, all that needs to be done is adding the runtime field as method parameter.
+====
+
+In addition to define a runtime fields on a query, they can also be defined in the index by setting the `runtimeFieldsPath` property of the `@Mapping` annotation to point to a JSON file that contains the runtime field definitions.
@@ -1,7 +1,7 @@
 [[elasticsearch.operations]]
 = Elasticsearch Operations

-Spring Data Elasticsearch uses several interfaces to define the operations that can be called against an Elasticsearch index (for a description of the reactive interfaces see <<elasticsearch.reactive.operations>>).
+Spring Data Elasticsearch uses several interfaces to define the operations that can be called against an Elasticsearch index (for a description of the reactive interfaces see xref:elasticsearch/reactive-template.adoc[]).

 * `IndexOperations` defines actions on index level like creating or deleting an index.
 * `DocumentOperations` defines actions to store, update and retrieve entities based on their id.
@@ -21,12 +21,12 @@ The default implementations of the interfaces offer:
 ====
 .Index management and automatic creation of indices and mappings.
 The `IndexOperations` interface and the provided implementation which can be obtained from an `ElasticsearchOperations` instance - for example with a call to `operations.indexOps(clazz)`- give the user the ability to create indices, put mappings or store template and alias information in the Elasticsearch cluster.
-Details of the index that will be created can be set by using the `@Setting` annotation, refer to <<elasticsearc.misc.index.settings>> for further information.
+Details of the index that will be created can be set by using the `@Setting` annotation, refer to xref:elasticsearch/misc.adoc#elasticsearc.misc.index.settings[Index settings] for further information.

 **None of these operations are done automatically** by the implementations of `IndexOperations` or `ElasticsearchOperations`.
 It is the user's responsibility to call the methods.

-There is support for automatic creation of indices and writing the mappings when using Spring Data Elasticsearch repositories, see <<elasticsearch.repositories.autocreation>>
+There is support for automatic creation of indices and writing the mappings when using Spring Data Elasticsearch repositories, see xref:elasticsearch/repositories/elasticsearch-repositories.adoc#elasticsearch.repositories.autocreation[Automatic creation of indices with the corresponding mapping]

 ====

@@ -34,7 +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>>).
+The example assumes that `Person` is a class that is annotated with `@Document`, `@Id` etc (see xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations[Mapping Annotation Overview]).

 .ElasticsearchOperations usage
 ====
@@ -73,7 +73,6 @@ The id is read from the returned entity, as it might have been null in the `pers

 To see the full possibilities of `ElasticsearchOperations` please refer to the API documentation.

-include::reactive-elasticsearch-operations.adoc[leveloffset=+1]

 [[elasticsearch.operations.searchresulttypes]]
 == Search Result Types
@@ -126,7 +125,7 @@ Almost all of the methods defined in the `SearchOperations` and `ReactiveSearchO
 === CriteriaQuery

 `CriteriaQuery` based queries allow the creation of queries to search for data without knowing the syntax or basics of Elasticsearch queries.
-They allow the user to build queries by simply chaining and combining `Criteria` objects that specifiy the criteria the searched documents must fulfill.
+They allow the user to build queries by simply chaining and combining `Criteria` objects that specify the criteria the searched documents must fulfill.

 NOTE: when talking about AND or OR when combining criteria keep in mind, that in Elasticsearch AND are converted to a **must** condition and OR to a **should**

@@ -214,14 +213,14 @@ Using `StringQuery` may be appropriate if you already have an Elasticsearch quer
 `NativeQuery` is the class to use when you have a complex query, or a query that cannot be expressed by using the `Criteria` API, for example when building queries and using aggregates.
 It allows to use all the different `co.elastic.clients.elasticsearch._types.query_dsl.Query` implementations from the Elasticsearch library therefore named "native".

-The following code shows how to search for persons with a given firstname and for the found documents have a terms aggregation that counts the number of occurences of the lastnames for these persons:
+The following code shows how to search for persons with a given `firstName` and for the found documents have a terms aggregation that counts the number of occurrences of the `lastName` for these persons:

 ====
 [source,java]
 ----
 Query query = NativeQuery.builder()
 	.withAggregation("lastNames", Aggregation.of(a -> a
-		.terms(ta -> ta.field("last-name").size(10)))) 
+		.terms(ta -> ta.field("lastName").size(10))))
 	.withQuery(q -> q
 		.match(m -> m
 			.field("firstName")
@@ -235,8 +234,8 @@ SearchHits<Person> searchHits = operations.search(query, Person.class);
 ----
 ====

-[[elasticsearch.operations.searchtemplateScOp§query]]
+[[elasticsearch.operations.searchtemplatequery]]
 === 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.
+This is a special implementation of the `Query` interface to be used in combination with a stored search template.
+See xref:elasticsearch/misc.adoc#elasticsearch.misc.searchtemplates[Search Template support] for further information.
@@ -0,0 +1,23 @@
+[[preface.versions]]
+= Versions
+
+The following table shows the Elasticsearch and Spring versions that are used by Spring Data release trains and the version of Spring Data Elasticsearch included in that.
+
+[cols="^,^,^,^",options="header"]
+|===
+| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
+| 2023.1 (Vaughan) | 5.2.x | 8.11.3 | 6.1.x
+| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x
+| 2022.0 (Turing) | 5.0.xfootnote:oom[Out of maintenance] | 8.5.3 | 6.0.x
+| 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x
+| 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x
+| 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x
+| 2020.0 (Ockham) | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2
+| Neumann | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12
+| Moore | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12
+| Lovelace | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19
+| Kay | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13
+| Ingalls | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25
+|===
+
+Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming the usage of the xref:elasticsearch/template.adoc[ElasticsearchOperations interface].
@@ -0,0 +1,22 @@
+[[spring-data-elasticsearch-reference-documentation]]
+= Spring Data Elasticsearch
+:revnumber: {version}
+:revdate: {localdate}
+:feature-scroll: true
+
+_Spring Data Elasticsearch provides repository support for the Elasticsearch database.
+It eases development of applications with a consistent programming model that need to access Elasticsearch data sources._
+
+[horizontal]
+xref:elasticsearch/versions.adoc[Versions] :: Version Compatibility Matrix
+xref:elasticsearch/clients.adoc[Clients] :: Elasticsearch Client Configuration
+xref:elasticsearch.adoc[Elasticsearch] :: Elasticsearch support
+xref:repositories.adoc[Repositories] :: Elasticsearch Repositories
+xref:migration-guides.adoc[Migration] :: Migration Guides
+https://github.com/spring-projects/spring-data-commons/wiki[Wiki] :: What's New, Upgrade Notes, Supported Versions, additional cross-version information.
+
+BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Strobl; Peter-Josef Meisch
+
+(C) 2008-{copyright-year} VMware, Inc.
+
+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.
@@ -0,0 +1,8 @@
+[[elasticsearch.migration]]
+= Migration Guides
+:page-section-summary-toc: 1
+
+This section contains version-specific migration guides explaining how to upgrade across versions.
+
+
+
@@ -6,9 +6,12 @@ This section describes breaking changes from version 3.2.x to 4.0.x and how remo
 [[elasticsearch-migration-guide-3.2-4.0.jackson-removal]]
 == Removal of the used Jackson Mapper

-One of the changes in version 4.0.x is that Spring Data Elasticsearch does not use the Jackson Mapper anymore to map an entity to the JSON representation needed for Elasticsearch (see <<elasticsearch.mapping>>). In version 3.2.x the Jackson Mapper was the default that was used. It was possible to switch to the meta-model based converter (named `ElasticsearchEntityMapper`) by explicitly configuring it (<<elasticsearch.mapping.meta-model>>).
+One of the changes in version 4.0.x is that Spring Data Elasticsearch does not use the Jackson Mapper anymore to map an entity to the JSON representation needed for Elasticsearch (see xref:elasticsearch/object-mapping.adoc[Elasticsearch Object Mapping]).
+In version 3.2.x the Jackson Mapper was the default that was used.
+It was possible to switch to the meta-model based converter (named `ElasticsearchEntityMapper`) by explicitly configuring it (xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model[Meta Model Object Mapping]).

-In version 4.0.x the meta-model based converter is the only one that is available and does not need to be configured explicitly. If you had a custom configuration to enable the meta-model converter by providing a bean like this:
+In version 4.0.x the meta-model based converter is the only one that is available and does not need to be configured explicitly.
+If you had a custom configuration to enable the meta-model converter by providing a bean like this:

 [source,java]
 ----
@@ -28,13 +31,16 @@ public EntityMapper entityMapper() {
 You now have to remove this bean, the `ElasticsearchEntityMapper` interface has been removed.

 .Entity configuration
-Some users had custom Jackson annotations on the entity class, for example in order to define a custom name for the mapped document in Elasticsearch or to configure date conversions. These are not taken into account anymore. The needed functionality is now provided with Spring Data Elasticsearch's `@Field` annotation. Please see <<elasticsearch.mapping.meta-model.annotations>> for detailed information.
+Some users had custom Jackson annotations on the entity class, for example in order to define a custom name for the mapped document in Elasticsearch or to configure date conversions.
+These are not taken into account anymore.
+The needed functionality is now provided with Spring Data Elasticsearch's `@Field` annotation.
+Please see xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations[Mapping Annotation Overview] for detailed information.

 [[elasticsearch-migration-guide-3.2-4.0.implicit-index-name]]
 == Removal of implicit index name from query objects

-In 3.2.x the different query classes like `IndexQuery` or `SearchQuery` had properties that were taking the index name or index names that they were operating upon. If these were not set, the passed in entity was inspected to retrieve the index name that was set in the `@Document` annotation. +
-In 4.0.x the index name(s) must now be provided in an additional parameter of type `IndexCoordinates`. By separating this, it now is possible to use one query object against different indices.
+In 3.2.x the different query classes like `IndexQuery` or `SearchQuery` had properties that were taking the index name or index names that they were operating upon.If these were not set, the passed in entity was inspected to retrieve the index name that was set in the `@Document` annotation. +
+In 4.0.x the index name(s) must now be provided in an additional parameter of type `IndexCoordinates`.By separating this, it now is possible to use one query object against different indices.

 So for example the following code:

@@ -130,6 +136,9 @@ Mapping types were removed from Elasticsearch 7, they still exist as deprecated

 * The `SearchQuery` interface has been merged into it's base interface `Query`, so it's occurrences can just be replaced with `Query`.

-* The method `org.springframework.data.elasticsearch.core.ElasticsearchOperations.query(SearchQuery query, ResultsExtractor<T> resultsExtractor);` and the `org.springframework.data.elasticsearch.core.ResultsExtractor` interface have been removed. These could be used to parse the result from Elasticsearch for cases in which the response mapping done with the Jackson based mapper was not enough. Since version 4.0, there are the new <<elasticsearch.operations.searchresulttypes>>  to return the information from an Elasticsearch response, so there is no need to expose this low level functionality.
+* The method `org.springframework.data.elasticsearch.core.ElasticsearchOperations.query(SearchQuery query, ResultsExtractor<T> resultsExtractor);` and the `org.springframework.data.elasticsearch.core.ResultsExtractor` interface have been removed.
+These could be used to parse the result from Elasticsearch for cases in which the response mapping done with the Jackson based mapper was not enough.
+Since version 4.0, there are the new xref:elasticsearch/template.adoc#elasticsearch.operations.searchresulttypes[Search Result Types]  to return the information from an Elasticsearch response, so there is no need to expose this low level functionality.

-* The low level methods `startScroll`, `continueScroll` and `clearScroll` have been removed from the `ElasticsearchOperations` interface. For low level scroll API access, there now are `searchScrollStart`, `searchScrollContinue` and `searchScrollClear` methods on the `ElasticsearchRestTemplate` class.
+* The low level methods `startScroll`, `continueScroll` and `clearScroll` have been removed from the `ElasticsearchOperations` interface.
+For low level scroll API access, there now are `searchScrollStart`, `searchScrollContinue` and `searchScrollClear` methods on the `ElasticsearchRestTemplate` class.
@@ -54,7 +54,7 @@ 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`.
+When configuring Spring Data Elasticsearch like described in xref:elasticsearch/clients.adoc[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]]
@@ -15,7 +15,7 @@ For the user that means, that some enum classes that were used are replaced by e

 Places where classes are used that cannot easily be replaced, this usage is marked as deprecated, we are working on replacements.

-Check the sections on <<elasticsearch-migration-guide-4.2-4.3.deprecations>> and <<elasticsearch-migration-guide-4.2-4.3.breaking-changes>> for further details.
+Check the sections on xref:migration-guides/migration-guide-4.2-4.3.adoc#elasticsearch-migration-guide-4.2-4.3.deprecations[Deprecations] and xref:migration-guides/migration-guide-4.2-4.3.adoc#elasticsearch-migration-guide-4.2-4.3.breaking-changes[Breaking Changes] for further details.
 ====

 [[elasticsearch-migration-guide-4.2-4.3.deprecations]]
@@ -18,6 +18,7 @@ As there now are multiple implementations using different client libraries the `
 [[elasticsearch-migration-guide-4.3-4.4.breaking-changes.1]]
 === Removal of deprecated classes

+[[org-springframework-data-elasticsearch-core-elasticsearchtemplate-has-been-removed]]
 ==== `org.springframework.data.elasticsearch.core.ElasticsearchTemplate` has been removed

 As of version 4.4 Spring Data Elasticsearch does not use the `TransportClient` from Elasticsearch anymore (which itself is deprecated since Elasticsearch 7.0).
@@ -38,7 +39,7 @@ The `ReactiveElasticsearchTemplate`, when created directly or by Spring Boot con
 This could cause performance issues on heavy indexing and was different than the default behaviour of Elasticsearch.
 This has been changed to that now the default refresh policy is NONE.
 When the
-`ReactiveElasticsearchTemplate` was provided by using the configuration like described in <<elasticsearch.clients.reactive>> the default refresh policy already was set to NONE.
+`ReactiveElasticsearchTemplate` was provided by using the configuration like described in xref:elasticsearch/clients.adoc#elasticsearch.clients.reactiverestclient[Reactive REST Client] the default refresh policy already was set to NONE.

 [[elasticsearch-migration-guide-4.3-4.4.new-clients]]
 == New Elasticsearch client
@@ -75,7 +76,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.
+If Spring Data Elasticsearch was configured using a programmatic configuration (see xref:elasticsearch/clients.adoc[Elasticsearch Clients]), remove these beans from the Spring application context.

 [[elasticsearch-migration-guide-4.3-4.4.new-clients.how-to.dependencies]]
 ==== Add dependencies
@@ -6,16 +6,15 @@ 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]]
 === 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".
+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>>
+See xref:migration-guides/migration-guide-4.4-5.0.adoc#elasticsearch-migration-guide-4.4-5.0.breaking-changes-packages[Package changes], 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 xref:migration-guides/migration-guide-4.4-5.0.adoc#elasticsearch-migration-guide-4.4-5.0.new-clients[New Elasticsearch client]

 [[elasticsearch-migration-guide-4.4-4.5.deprecations.code]]
 === Removal of deprecated code
@@ -18,9 +18,10 @@ Adaptions are necessary when this enum was used at other places than as a proper
 [[elasticsearch-migration-guide-5.0-5.1.deprecations]]
 == Deprecations

+[[template-functions]]
 === template functions

 The functions in the `IndexOperations` and `ReactiverIndexOperations` to manage index templates that were introduced in Spring Data Elasticsearch 4.1
 have been deprecated. They were using the old Elasticsearch API that was deprecated in Elasticsearch version 7.8. 

-Please use the new functions that are based on the compsable index template API instead.
+Please use the new functions that are based on the composable index template API instead.
@@ -0,0 +1,40 @@
+[[elasticsearch-migration-guide-5.1-5.2]]
+= Upgrading from 5.1.x to 5.2.x
+
+This section describes breaking changes from version 5.1.x to 5.2.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.1-5.2.breaking-changes]]
+== Breaking Changes
+
+[[bulk-failures]]
+=== Bulk failures
+In the `org.springframework.data.elasticsearch.BulkFailureException` class, the return type of the `getFailedDocuments` is changed from `Map<String, String>`
+to `Map<String, FailureDetails>`, which allows to get additional details about failure reasons.
+
+The definition of the `FailureDetails` class (inner to `BulkFailureException`):
+[source,java]
+public record FailureDetails(Integer status, String errorMessage) {
+}
+
+[[scripted-and-runtime-fields]]
+=== scripted and runtime fields
+
+The classes `org.springframework.data.elasticsearch.core.RuntimeField` and `org.springframework.data.elasticsearch.core.query.ScriptType` have been moved to the subpackage `org.springframework.data.elasticsearch.core.query`.
+
+The `type` parameter of the `ScriptData` constructor is not nullable any longer.
+
+[[elasticsearch-migration-guide-5.1-5.2.deprecations]]
+== Deprecations
+
+[[removal-of-deprecated-code]]
+=== Removal of deprecated code
+
+* All the code using the old deprecated `RestHighLevelClient` has been removed.
+The default Elasticsearch client used since version 5.0 is the (not so) new Elasticsearch Java client.
+* The `org.springframework.data.elasticsearch.client.ClientLogger` class has been removed.
+This logger was configured with the `org.springframework.data.elasticsearch.client.WIRE` setting, but was not working with all clients.
+From version 5 on, use the trace logger available in the Elasticsearch Java client, see xref:elasticsearch/clients.adoc#elasticsearch.clients.logging[Client Logging].
+* The method `org.springframework.data.elasticsearch.core.ElasticsearchOperations.stringIdRepresentation(Object)` has been removed, use the `convertId(Object)` method defined in the same interface instead.
+* The class `org.springframework.data.elasticsearch.core.Range` has been removed, use `org.springframework.data.domain.Range` instead.
+* The methods `org.springframework.data.elasticsearch.core.query.IndexQuery.getParentId() and `setParentId(String)` have been removed, they weren't used anymore and were no-ops.
+It has been removed from the `org.springframework.data.elasticsearch.core.query.IndexQuery` class as well.
@@ -0,0 +1,8 @@
+[[elasticsearch.repositories]]
+= Repositories
+:page-section-summary-toc: 1
+
+This chapter explains the basic foundations of Spring Data repositories and Elasticsearch specifics.
+Before continuing to the Elasticsearch specifics, make sure you have a sound understanding of the basic concepts.
+
+The goal of the Spring Data repository abstraction is to significantly reduce the amount of boilerplate code required to implement data access layers for various persistence stores.
@@ -0,0 +1,4 @@
+include::{commons}@data-commons::page$repositories/core-concepts.adoc[]
+
+[[elasticsearch.entity-persistence.state-detection-strategies]]
+include::{commons}@data-commons::page$is-new-state-detection.adoc[leveloffset=+1]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/core-domain-events.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/core-extensions.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/create-instances.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/custom-implementations.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/definition.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/null-handling.adoc[]
@@ -0,0 +1,4 @@
+[[elasticsearch.projections]]
+= Projections
+
+include::{commons}@data-commons::page$repositories/projections.adoc[leveloffset=+1]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/query-keywords-reference.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/query-methods-details.adoc[]
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/query-return-types-reference.adoc[]
@@ -0,0 +1,21 @@
+version: ${antora-component.version}
+prerelease: ${antora-component.prerelease}
+
+asciidoc:
+  attributes:
+    copyright-year: ${current.year}
+    version: ${project.version}
+    springversionshort: ${spring.short}
+    springversion: ${spring}
+    attribute-missing: 'warn'
+    commons: ${springdata.commons.docs}
+    include-xml-namespaces: false
+    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference
+    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
+    springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
+    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
+    spring-framework-docs: '{springdocsurl}'
+    spring-framework-javadoc: '{springjavadocurl}'
+    springhateoasversion: ${spring-hateoas}
+    releasetrainversion: ${releasetrain}
+    store: Elasticsearch
@@ -1,52 +0,0 @@
-= Spring Data Elasticsearch - Reference Documentation
-BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Strobl; Peter-Josef Meisch
-:revnumber: {version}
-:revdate: {localdate}
-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-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[]
-:leveloffset: -1
-
-[[reference]]
-= Reference Documentation
-
-:leveloffset: +1
-include::reference/elasticsearch-clients.adoc[]
-include::reference/elasticsearch-object-mapping.adoc[]
-include::reference/elasticsearch-operations.adoc[]
-
-include::reference/elasticsearch-repositories.adoc[]
-
-include::{spring-data-commons-docs}/auditing.adoc[]
-include::reference/elasticsearch-auditing.adoc[]
-
-include::{spring-data-commons-docs}/entity-callbacks.adoc[]
-include::reference/elasticsearch-entity-callbacks.adoc[leveloffset=+1]
-
-include::reference/elasticsearch-join-types.adoc[]
-include::reference/elasticsearch-routing.adoc[]
-include::reference/elasticsearch-misc.adoc[]
-:leveloffset: -1
-
-[[appendix]]
-= Appendix
-:numbered!:
-:leveloffset: +1
-include::{spring-data-commons-docs}/repository-namespace-reference.adoc[]
-include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[]
-include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[]
-include::{spring-data-commons-docs}/repository-query-return-types-reference.adoc[]
-include::reference/migration-guides.adoc[]
-:leveloffset: -1
@@ -1,54 +0,0 @@
-[[preface]]
-= Preface
-
-The Spring Data Elasticsearch project applies core Spring concepts to the development of solutions using the Elasticsearch Search Engine.
-It provides:
-
-* _Templates_ as a high-level abstraction for storing, searching, sorting documents and building aggregations.
-* _Repositories_ which for example enable the user to express queries by defining interfaces having customized method names (for basic information about repositories see <<repositories>>).
-
-You will notice similarities to the Spring data solr and mongodb support in the Spring Framework.
-
-include::reference/elasticsearch-new.adoc[leveloffset=+1]
-
-[[preface.metadata]]
-== Project Metadata
-
-* Version Control - https://github.com/spring-projects/spring-data-elasticsearch
-* API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
-* Bugtracker - https://github.com/spring-projects/spring-data-elasticsearch/issues
-* Release repository - https://repo1.maven.org/maven2/
-* Milestone repository - https://repo.spring.io/milestone/
-* Snapshot repository - https://repo.spring.io/snapshot/
-
-[[preface.requirements]]
-== Requirements
-
-Requires an installation of https://www.elastic.co/products/elasticsearch[Elasticsearch].
-
-[[preface.versions]]
-=== Versions
-
-The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of
-Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring
-Data release train. The Elasticsearch version given shows with which client libraries Spring Data Elasticsearch was
-built and tested.
-
-[cols="^,^,^,^,^",options="header"]
-|===
-| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x | 3.1.x
-| 2022.0 (Turing) | 5.0.x | 8.5.3 | 6.0.x | 3.0.x
-| 2021.2 (Raj) | 4.4.xfootnote:oom[Out of maintenance] | 7.17.3 | 5.3.x | 2.7.x
-| 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x | 2.6.x
-| 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x | 2.5.x
-| 2020.0 (Ockham) | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
-| Neumann | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
-| Moore | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
-| Lovelace | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
-| Kay | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
-| Ingalls | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
-|===
-
-Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming
-the usage of the <<elasticsearch.operations,ElasticsearchOperations interface>>.
@@ -1,20 +0,0 @@
-[[elasticsearch.migration]]
-= Appendix E: Migration Guides
-
-// line breaks required otherwise the TOC breaks due to joining of first/last lines.
-:leveloffset: +1
-include::elasticsearch-migration-guide-3.2-4.0.adoc[]
-
-include::elasticsearch-migration-guide-4.0-4.1.adoc[]
-
-include::elasticsearch-migration-guide-4.1-4.2.adoc[]
-
-include::elasticsearch-migration-guide-4.2-4.3.adoc[]
-
-include::elasticsearch-migration-guide-4.3-4.4.adoc[]
-
-include::elasticsearch-migration-guide-4.4-5.0.adoc[]
-
-include::elasticsearch-migration-guide-5.0-5.1.adoc[]
-
-:leveloffset: -1
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,17 +21,27 @@ import java.util.Map;

 /**
 * @author Peter-Josef Meisch
+ * @author Illia Ulianov
 * @since 4.1
 */
 public class BulkFailureException extends DataRetrievalFailureException {
-	private final Map<String, String> failedDocuments;
+	private final Map<String, FailureDetails> failedDocuments;

-	public BulkFailureException(String msg, Map<String, String> failedDocuments) {
+	public BulkFailureException(String msg, Map<String, FailureDetails> failedDocuments) {
 		super(msg);
 		this.failedDocuments = failedDocuments;
 	}

-	public Map<String, String> getFailedDocuments() {
+	public Map<String, FailureDetails> getFailedDocuments() {
 		return failedDocuments;
 	}
+
+	/**
+	 * Details about a document saving failure.
+	 *
+	 * @author Illia Ulianov
+	 * @since 5.2
+	 */
+	public record FailureDetails(Integer status, String errorMessage) {
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,18 +15,20 @@
 */
 package org.springframework.data.elasticsearch;

+import org.springframework.dao.DataIntegrityViolationException;
+
 /**
- * TODO remove when the new Elasticsearch client is fully working and the old client is removed
+ * Exception that is thrown when a version conflict from the server is detected.
 *
 * @author Peter-Josef Meisch
+ * @since 5.2
 */
-public interface NewElasticsearchClientDevelopment {
-
-	default boolean newElasticsearchClient() {
-		return false;
+public class VersionConflictException extends DataIntegrityViolationException {
+	public VersionConflictException(String msg) {
+		super(msg);
 	}

-	default boolean oldElasticsearchClient() {
-		return !newElasticsearchClient();
+	public VersionConflictException(String msg, Throwable cause) {
+		super(msg, cause);
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ public enum DateFormat {
 	date_hour_minute_second_fraction("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
 	date_hour_minute_second_millis("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
 	date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
+	strict_date_optional_time_nanos("uuuu-MM-dd['T'HH:mm:ss.SSSSSSXXX]"), //
 	date_time("uuuu-MM-dd'T'HH:mm:ss.SSSXXX"), //
 	date_time_no_millis("uuuu-MM-dd'T'HH:mm:ssVV"), // here Elasticsearch uses the zone-id in its implementation
 	epoch_millis("epoch_millis"), //
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -58,6 +58,13 @@ public @interface Document {
 	 */
 	boolean createIndex() default true;

+	/**
+	 * If true, the index mapping will be written on repository bootstrapping even when the index already exists. This
+	 * allows for automatically updating the mapping with new properties. Changes on existing properties will lead to an
+	 * error from the Elasticsearch server.
+	 */
+	boolean alwaysWriteMapping() default false;
+
 	/**
 	 * Configuration of version management.
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -61,7 +61,31 @@ public enum FieldType {
 	/** since 4.2 */
 	Wildcard("wildcard"), //
 	/** @since 4.2 */
-	Dense_Vector("dense_vector") //
+	Dense_Vector("dense_vector"), //
+	/**
+	 * @since 5.2
+	 */
+	Constant_Keyword("constant_keyword"), //
+	/**
+	 * @since 5.2
+	 */
+	Alias("alias"), //
+	/**
+	 * @since 5.2
+	 */
+	Version("version"), //
+	/**
+	 * @since 5.2
+	 */
+	Murmur3("murmur3"), //
+	/**
+	 * @since 5.2
+	 */
+	Match_Only_Text("match_only_text"), //
+	/**
+	 * @since 5.2
+	 */
+	Annotated_Text("annotated_text") //
 	;

 	private final String mappedName;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
 * @author Peter-Josef Meisch
 */
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.METHOD })
@Documented
 public @interface MultiField {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -3,6 +3,7 @@ package org.springframework.data.elasticsearch.annotations;
 import java.lang.annotation.*;

 /**
+ * Marks a property to be populated with the result of a scripted field retrieved from an Elasticsearch response.
 * @author Ryan Murfitt
 */
@Retention(RetentionPolicy.RUNTIME)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,21 +27,18 @@ 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 {
+public class SpringDataElasticsearchRuntimeHints implements RuntimeHintsRegistrar {

 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
@@ -70,6 +67,5 @@ public class ElasticsearchRuntimeHints implements RuntimeHintsRegistrar {

 		// properties needed to log the different versions
 		hints.resources().registerPattern("versions.properties");
-		hints.resources().registerPattern("co/elastic/clients/version.properties");
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	27011d382b	Release version 5.2.2 (2023.1.2). See #2804	2024-01-12 10:51:32 +01:00
Mark Paluch	489a2605b4	Prepare 5.2.2 (2023.1.2). See #2804	2024-01-12 10:50:44 +01:00
Peter-Josef Meisch	953f840d7c	Upgrade to Elasticsearch 8.11.3. Original Pull Request #2823 Closes #2821	2024-01-06 17:37:27 +01:00
Mark Paluch	d905a4b25f	Extend license header copyright years to 2024. See #2818	2024-01-02 13:54:48 +01:00
Peter-Josef Meisch	e2e6b5005b	Make org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchTemplate.ClientCallback public. Original Pull Request #2815 Closes #2814 (cherry picked from commit `260dadd4d6`)	2023-12-29 13:57:56 +01:00
Peter-Josef Meisch	0d4e8ad6eb	Upgrade to Elasticsearch 8.11.2. Original Pull Request #2809	2023-12-24 14:31:20 +01:00
Mark Paluch	a9bacd23b0	After release cleanups. See #2771	2023-12-15 14:15:21 +01:00
Mark Paluch	031f7c8c78	Prepare next development iteration. See #2771	2023-12-15 14:15:19 +01:00
Mark Paluch	76187a4934	Release version 5.2.1 (2023.1.1). See #2771	2023-12-15 14:11:53 +01:00
Mark Paluch	b693494e17	Prepare 5.2.1 (2023.1.1). See #2771	2023-12-15 14:11:23 +01:00
Mark Paluch	b324935d22	Update CI properties. See #2771	2023-12-14 08:49:56 +01:00
Mark Paluch	920f7c029f	Upgrade to Maven Wrapper 3.9.6. See #2799	2023-12-14 08:34:15 +01:00
Peter-Josef Meisch	051777ee25	Removed junk characters from code. (cherry picked from commit `415d5e0385`)	2023-11-30 20:44:26 +01:00
Peter-Josef Meisch	0fb98eda39	Fix type of returned sort values. Original Pull Request #2786 Closes #2777 (cherry picked from commit `3833975a1a`)	2023-11-30 20:44:25 +01:00
Mark Paluch	df76b43cb4	Introduce property for Jenkins user and Artifactory server details. Closes #2781	2023-11-27 14:23:49 +01:00
Runbing	b681197d0f	Fixed the URL for the Spring Data Commons documentation. I fixed broken links in the Spring Data Elasticsearch documentation for Spring Data Commons. Closes #2776	2023-11-20 11:31:58 +01:00
Mark Paluch	8a1323c11a	Update CI trigger versions. See #2737	2023-11-17 14:53:43 +01:00
Mark Paluch	033d71ccb6	After release cleanups. See #2737	2023-11-17 14:33:56 +01:00
Mark Paluch	0ae2a52de8	Prepare next development iteration. See #2737	2023-11-17 14:33:54 +01:00
Mark Paluch	7408bf5d18	Release version 5.2 GA (2023.1.0). See #2737	2023-11-17 14:29:59 +01:00
Mark Paluch	426dee7041	Prepare 5.2 GA (2023.1.0). See #2737	2023-11-17 14:28:30 +01:00
Peter-Josef Meisch	559953a43c	Update versions.adoc	2023-11-15 08:54:27 +01:00
Peter-Josef Meisch	d21f9f70f0	Update versions.adoc	2023-11-15 08:53:19 +01:00
Peter-Josef Meisch	d25fd52fac	Update to Elasticsearch 8.11.1. Original Pull Request #2763 Closes #2762	2023-11-15 08:49:41 +01:00
Peter-Josef Meisch	2f6fae632b	Fix handling of @ID property in Java records. Original Pull Request #2757 Closes #2756	2023-11-08 07:42:16 +01:00
Peter-Josef Meisch	9abcacb2e9	Use routing info on delete operations. Original Pull Request #2755 Closes #2754	2023-11-06 21:11:35 +01:00
Peter-Josef Meisch	3b93b6aea9	Use correct overload of Flux.bufferTimeout(). Original Pull Request #2753 Closes #2607	2023-11-03 13:51:23 +01:00
Gonçalo Montalvão Marques	d281df74d1	docs: Fix typos in documentation (#2752 ) * docs: Fix typos in documentation * docs: Address PR remarks	2023-11-02 20:52:27 +01:00
Peter-Josef Meisch	73fe0869e6	Fix reactive native sort. Original Pull Request #2746 Closes #2745	2023-10-23 21:48:44 +02:00
mawen12	a0b04a346e	The parameter in Criteria#assertNoBlankInWildcardQuery is set incorrectly. Original Pull Request #2744 Closes #2743	2023-10-21 07:32:51 +02:00
Eric Haag	62686f3b38	Connect build to ge.spring.io. This change publishes a build scan to ge.spring.io for every local build from an authenticated Spring committer and for CI where appropriate access tokens are available. The build will not fail if publishing fails. This change also allows the build to benefit from local and remote build caching, providing faster builds for all contributors. Additionally, the project will have access to all features of Gradle Enterprise such as: - Dashboards to view all historical build scans, along with performance trends over time - Build failure analytics for enhanced investigation and diagnosis of build failures - Test failure analytics to better understand trends and causes around slow, failing, and flaky tests See #2718	2023-10-20 13:48:36 -05:00
Greg L. Turnquist	dda9e9974d	Update CI properties. See #2737	2023-10-19 09:38:56 -05:00
Junghoon Ban	ba446845e3	Use pattern matching instead of type casting. Original Pull Request #2742 Closes #2741	2023-10-17 18:06:48 +02:00
Greg L. Turnquist	64ada11462	Update CI properties. See #2737	2023-10-16 13:28:22 -05:00
Peter-Josef Meisch	bdcd7c82c4	Polishing.	2023-10-13 20:47:04 +02:00
mawen12	6180f596d8	Use ExistsRequest instead of GetRequest to check if documents exists. Original Pull Re1uest #2728 Closes #2726	2023-10-13 20:42:39 +02:00
John Blum	db3ad1338c	After release cleanups. See #2700	2023-10-13 08:52:01 -07:00
John Blum	64c5fb16da	Prepare next development iteration. See #2700	2023-10-13 08:51:59 -07:00
John Blum	377a08cdbc	Release version 5.2 RC1 (2023.1.0). See #2700	2023-10-13 08:44:26 -07:00
John Blum	2d87d25707	Prepare 5.2 RC1 (2023.1.0). See #2700	2023-10-13 08:43:56 -07:00
Peter-Josef Meisch	cab94b0207	Upgrade to elasticsearch 8.10.3 (#2731 ) Closes #2729	2023-10-13 08:33:35 +02:00
Peter-Josef Meisch	9f42ec965c	Enhance refresh policy handling. Original Pull Request #2725 Closes #2722	2023-10-11 21:54:38 +02:00
Peter-Josef Meisch	0b33d7fe57	Introduce IndexOperationsAdapter. Original Pull Request #2724 Closes #2723	2023-10-08 13:13:09 +02:00
Peter-Josef Meisch	ccb7d2387f	Consider Pageable in stream repository method. Original Pull Request #2721 Closes #2720	2023-10-06 21:38:30 +02:00
Peter-Josef Meisch	d905c813c7	Upgrade to Elasticsearch 8.10.2. Original Pull Request #2719 Closes #2713	2023-10-05 22:29:35 +02:00
John Blum	8e32868fb1	Update CI properties. See #2700	2023-10-04 17:24:11 -07:00
John Blum	df31d1b7db	Upgrade to Maven Wrapper 3.9.5. See #2714	2023-10-04 16:58:13 -07:00
Mark Paluch	fb989db635	Upgrade to OpenWebBeans 4.0. Closes #2712	2023-09-29 10:25:06 +02:00
Peter-Josef Meisch	092306aeea	Allow explicit index mapping writing on repository startup. Original Pull Request #2708 Closes #2465	2023-09-23 17:34:36 +02:00
Peter-Josef Meisch	3330d65edf	Fix converting of Range<?> in Lists. Original Pull Request #2707 Closes #2706	2023-09-23 10:43:17 +02:00
Peter-Josef Meisch	bbfb6ff463	Allow providing a custom ElasticsearchTransport in the configuration classes. Original Pull Request #2703 Closes #2702	2023-09-17 15:30:06 +02:00
Mark Paluch	de87dd42ee	After release cleanups. See #2675	2023-09-15 11:33:23 +02:00
Mark Paluch	9902729d90	Prepare next development iteration. See #2675	2023-09-15 11:33:20 +02:00
Mark Paluch	764b1f6faf	Release version 5.2 M3 (2023.1.0). See #2675	2023-09-15 11:30:15 +02:00
Mark Paluch	87523d7f68	Prepare 5.2 M3 (2023.1.0). See #2675	2023-09-15 11:29:22 +02:00
Peter-Josef Meisch	2d0aee08ce	Fix refresh policy in UpdateQuery. Original Pull Request #2696 Closes #2692	2023-09-13 21:47:19 +02:00
Peter-Josef Meisch	50317d648e	Upgrade to Elasticsearch 8.10.0. Original Pull Request #2693 Closes #2687	2023-09-13 19:01:40 +02:00
Mark Paluch	ddd7e67d1d	Polishing. Use dynamic copyright year. See #2685	2023-09-11 09:05:33 +02:00
dependabot[bot]	d97e8eca41	Bump com.github.tomakehurst:wiremock-jre8 from 2.35.0 to 2.35.1 Original Pull Request #2686	2023-09-10 19:08:50 +02:00
Peter-Josef Meisch	e6338f95c2	Update TESTING.adoc Removed the section about mutation testing as this dependency has never really been used and was already removed	2023-09-09 08:31:35 +02:00
Greg L. Turnquist	f4a5796694	Update CI properties. See #2675	2023-09-05 13:25:24 -05:00
Mark Paluch	1a0e147119	Migrate documentation site to Antora. Closes #2685	2023-09-04 10:41:26 +02:00
Peter-Josef Meisch	a82952b124	Polishing.	2023-09-03 14:39:49 +02:00
Sébastien Comeau	7c466395c4	Fix: missing PhraseSuggestion.Entry.Option's score and collateMatch values. Original Pull Request #2680 Closes #2681	2023-09-03 14:35:36 +02:00
Peter-Josef Meisch	17a09eaba7	Add strict_date_optional_time_nanos field type. Original Pull Request #2684 Closes #2676	2023-09-03 13:53:50 +02:00
Peter-Josef Meisch	b99ca1816a	Fix adaption to PersistentProperty change.	2023-09-01 23:41:54 +02:00
Mark Paluch	1a24c3c989	Adapt to changed `PersistentProperty` interface. Closes #2682	2023-08-31 09:52:45 +02:00
Peter-Josef Meisch	9adc4d2b36	Fix search_after field values (#2679 ) Closes #2678	2023-08-28 19:51:41 +02:00
Peter-Josef Meisch	922c7dd4a7	Add support for parameters for runtime fields. Original Pull Request #2677 Closes #2303	2023-08-26 22:13:26 +02:00
Julia Lee	ed898431ab	After release cleanups. See #2630	2023-08-18 08:59:40 -04:00
Julia Lee	db2ec86185	Prepare next development iteration. See #2630	2023-08-18 08:59:37 -04:00
Julia Lee	c39a1911d7	Release version 5.2 M2 (2023.1.0). See #2630	2023-08-18 08:50:32 -04:00
Julia Lee	f79b010407	Prepare 5.2 M2 (2023.1.0). See #2630	2023-08-18 08:49:40 -04:00
Julia Lee	7092e04feb	Update CI properties. See #2630	2023-08-14 12:15:34 -04:00
Julia Lee	dcabdb19d0	Upgrade to Maven Wrapper 3.9.4. See #2670	2023-08-14 08:53:29 -04:00
Peter-Josef Meisch	8c5ff92cd2	Fix similarity field mapping. Original Pull Request #2666 Closes #2659	2023-08-13 21:18:35 +02:00
JKatzwinkel	a7185b1b84	Fix some typos in scripted and runtime fields doc. Original Pull Request: #2665 Closes: #2664	2023-08-13 17:33:16 +02:00
Junghoon Ban	034bea6bb6	Fix incorrect schema version info in spring.schemas. Original Pull Request #2662 Closes #2661	2023-08-13 07:34:28 +02:00
Peter-Josef Meisch	e23c059126	Polishing.	2023-08-11 17:00:19 +02:00
Peter-Josef Meisch	1fb034a9a8	Scripted and runtime fields improvements. Original Pull Request #2663 Closes #2035	2023-08-11 16:12:52 +02:00
Peter-Josef Meisch	82ae11833a	Polishing.	2023-08-01 17:43:18 +02:00
Peter-Josef Meisch	412a2e2ea1	Upgrade to Elasticsearch 8.9.0. Original Pull Request #2656 Closes #2650	2023-07-31 19:13:53 +02:00
Peter-Josef Meisch	bd71a9311c	Add support for nested sort. Original Pull Request #2653 Closes #1783	2023-07-30 18:29:52 +02:00
Peter-Josef Meisch	076f261a7d	Enable MultiField annotation on entity getter. Original Pull Request #2649 Closes #2600	2023-07-27 20:42:51 +02:00
Peter-Josef Meisch	ad67c00a79	Add VersionConflictException. Original Pull Request #2643 Closes #2467	2023-07-21 14:57:52 +02:00
Peter-Josef Meisch	4e9bbe5045	Add IndicesOptions to search request. Original Pull Request #2642 Closes #2641 Closes #2639	2023-07-21 13:52:42 +02:00
Peter-Josef Meisch	0028d7d550	fix typos in method and docs. Original Pull Request #2640 Closes #2638	2023-07-21 08:36:36 +02:00
Peter-Josef Meisch	d9bb9911f9	Fix MappingElasticsearchConverter. Original Pull Request #2637 Closes #2627	2023-07-18 22:49:46 +02:00
Peter-Josef Meisch	1921d3a45e	Polishing	2023-07-18 18:31:42 +02:00
ILLIA ULIANOV	c7000fc004	Extend BulkFailureException.failedDocuments return type to show more details about failure. Original Pull Request #2633 Related tickets #2619	2023-07-18 18:27:31 +02:00
Junghoon Ban	341518d0cc	Refactoring to use spring jcl module instead of slf4j. Original Pull Request #2635 Closes #2634	2023-07-16 21:06:38 +02:00
Mark Paluch	5b4ab0c86e	After release cleanups. See #2549	2023-07-14 14:57:13 +02:00
Mark Paluch	ac158fd4b4	Prepare next development iteration. See #2549	2023-07-14 14:57:11 +02:00
Mark Paluch	0ff436aad2	Release version 5.2 M1 (2023.1.0). See #2549	2023-07-14 14:53:19 +02:00
Mark Paluch	69bafdeebe	Prepare 5.2 M1 (2023.1.0). See #2549	2023-07-14 14:52:14 +02:00
Peter-Josef Meisch	9202f81567	Upgrade to Elasticsearch 8.8.2. Original Pull Request #2626 Closes #2621	2023-07-12 20:32:39 +02:00
Peter-Josef Meisch	60d735c553	Add FieldTypes. Original Pull Request #2616 Closes #2592	2023-07-03 21:59:11 +02:00
Mark Paluch	bae30ec757	Update CI properties. See #2549	2023-07-03 09:50:19 +02:00
Mark Paluch	dca6faae95	Upgrade to Maven Wrapper 3.9.3. See #2615	2023-07-03 09:49:51 +02:00
Hoseok	e67bb210b9	Correcting a typo in elasticsearch-repository-queries document. Original Pull Request #2610 Closes #2611	2023-07-01 11:34:44 +02:00
Peter-Josef Meisch	b52af37879	Upgrade to Elasticsearch 8.8.1. Original Pull Request #2609 Closes #2608	2023-06-28 21:24:07 +02:00
Peter-Josef Meisch	d9fd722bb6	Fix IndicesBoost error. Original Pull Request #2606 Closes #2598	2023-06-27 22:26:10 +02:00
Greg L. Turnquist	e202772744	Stop posting build status on internal Slack. See #2603	2023-06-26 13:37:46 -05:00
Peter-Josef Meisch	b7570ffa95	Polishing	2023-06-24 09:39:22 +02:00
seunghyun.cheong	8a164b1039	Adding GeoDistanceOrder's direction in request. Original Pull Request #2602 Closes #2601	2023-06-24 09:34:04 +02:00
Łukasz Jernaś	a2cbca57f6	Fix some typos in object mapping doc. Original Pull Request #2596 Closes #2597	2023-06-19 19:09:03 +02:00
Mark Paluch	9f6d3f7e61	Upgrade to Maven Wrapper 3.9.2. See #2589	2023-06-13 08:55:08 +02:00
Mark Paluch	384e95d187	Reformat pom.xml. See #2585	2023-06-06 10:56:23 +02:00
Mark Paluch	1833feab6b	Use snapshot and milestone repositories instead of libs-snapshot and libs-milestone. Closes #2585	2023-06-06 10:56:10 +02:00
Peter-Josef Meisch	8ad2ea9a5d	Documentation update. Original Pull Request #2584 Closes #2583	2023-06-04 12:34:07 +02:00
Peter-Josef Meisch	1b290f6847	Upgrade to Elasticsearch 8.8.0. Original Pull Request #2582 Closes #2577	2023-06-04 12:16:02 +02:00
Peter-Josef Meisch	d6b5540614	Fix reactive save of Flux. Original Pull Request #2581 Closes #2576	2023-06-02 15:54:57 +02:00
Peter-Josef Meisch	11fc22566e	Polishing	2023-06-01 15:44:21 +02:00
Peter-Josef Meisch	1d8867be60	Make JsonpMapper a customizable bean. Original Pull Request #2580 Closes #2566	2023-06-01 12:24:59 +02:00
Peter-Josef Meisch	f558822545	Extend AOT runtime hints. Original Pull Request #2579 Closes #2575	2023-05-31 17:57:51 +02:00
Peter-Josef Meisch	cf09e57736	Add Kotlin extensions for several interfaces and CoroutineElasticsearchRepository. Original Pull Request #2573 Closes #2545	2023-05-21 19:56:19 +00:00
Peter-Josef Meisch	f973236588	Test code cleanup. Original Pull Request #2572 Closes #2571	2023-05-20 23:49:45 +02:00
Peter-Josef Meisch	36e3b93ea9	Make SearchType in query nullable, set to null in NativeQuery with knnQuery. Original Pull Request #2570 Closes #2569	2023-05-20 17:31:30 +02:00
Peter-Josef Meisch	6edd3cf1fe	Polishing	2023-05-17 19:27:37 +02:00
Pierre Mazieres @Semarchy	7b527c4451	"BaseQuery" class : the "build" method does not apply to the "runtimeFields" field. Original Pull Request #2568 Closes #2567	2023-05-17 18:52:01 +02:00
Peter-Josef Meisch	5b02364384	Remove deprecated code. Original Pull Request #2564 Closes #2563	2023-05-13 13:29:06 +02:00
Peter-Josef Meisch	34b0181014	Fix Javadoc. Original Pull Request: #2562 Closes #2561	2023-05-13 09:44:48 +02:00
Peter-Josef Meisch	f464f77985	Remove the integration of the deprecated RestHighLevelClient. Original Pull Request #2560 Closes #2558	2023-05-13 09:07:52 +02:00
Peter-Josef Meisch	73e9a6f5c5	Refactoring to prepare for removal of the old deprecated RestHighLevelClient integration. Original Pull Request #2559 Closes #2557	2023-05-13 08:22:10 +02:00
Peter-Josef Meisch	f897dd4318	Upgrade to Elasticsearch 8.7.1. Original Pull Request #2555 Closes #2541	2023-05-12 22:20:10 +02:00
Peter-Josef Meisch	0b0640b509	Add documentation for the new 5.2 version in main branch. Original Pull Request #2552 Closes #2551	2023-05-12 18:50:16 +02:00
Christoph Strobl	5ab1c2505c	After release cleanups. See #2532	2023-05-12 14:18:54 +02:00
Christoph Strobl	85aaff9d6e	Prepare next development iteration. See #2532	2023-05-12 14:18:52 +02:00
				`@@ -0,0 +1 @@`
				`include::{commons}@data-commons::page$upgrade.adoc[]`
				`@@ -0,0 +1 @@`
				`include::{commons}@data-commons::page$repositories/core-domain-events.adoc[]`