Release version 6.0 M1 (2025.1.0).

See #3006
Prepare 6.0 M1 (2025.1.0).
2026-07-06 18:20:01 +00:00 · 2025-01-24 10:48:55 +01:00 · 2025-01-24 10:48:00 +01:00 · 2025-01-14 10:51:18 +01:00 · 2025-01-14 10:51:18 +01:00 · 2025-01-14 10:51:18 +01:00
667 changed files with 12948 additions and 3464 deletions
@@ -26,3 +26,10 @@ target
 /zap.env
 /localdocker.env
 .localdocker-env
+
+build/
+node_modules
+node
+package-lock.json
+
+.mvn/.develocity
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+	<extension>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.19</version>
+	</extension>
+</extensions>
@@ -1,3 +1,3 @@
-#Mon Aug 14 08:53:29 EDT 2023
+#Thu Nov 07 09:47:28 CET 2024
 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.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
@@ -9,7 +9,7 @@ pipeline {

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

 	options {
@@ -33,13 +33,16 @@ pipeline {

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

 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-						sh 'PROFILE=none ci/verify.sh'
-						sh "ci/clean.sh"
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+							sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+							sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+						}
 					}
 				}
 			}
@@ -61,12 +64,15 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh 'PROFILE=none ci/verify.sh'
-								sh "ci/clean.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+									sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+								}
 							}
 						}
 					}
@@ -86,22 +92,26 @@ pipeline {
 				label 'data'
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
-
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.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=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
-								'-Dartifactory.server=https://repo.spring.io ' +
-								"-Dartifactory.username=${ARTIFACTORY_USR} " +
-								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-								"-Dartifactory.staging-repository=libs-snapshot-local " +
-								"-Dartifactory.build-name=spring-data-elasticsearch " +
-								"-Dartifactory.build-number=${BUILD_NUMBER} " +
-								'-Dmaven.test.skip=true clean deploy -U -B'
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+								sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+									"./mvnw -s settings.xml -Pci,artifactory " +
+									"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
+									"-Dartifactory.server=${p['artifactory.url']} " +
+									"-Dartifactory.username=${ARTIFACTORY_USR} " +
+									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+									"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
+									"-Dartifactory.build-name=spring-data-elasticsearch " +
+									"-Dartifactory.build-number=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch " +
+									"-Dmaven.test.skip=true clean deploy -U -B"
+						}
 					}
 				}
 			}
@@ -1,6 +1,4 @@
-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-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", 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.

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

 == Reporting Issues
@@ -137,7 +134,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.
@@ -168,10 +165,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/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,5 +2,7 @@

 set -euo pipefail

-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
+export JENKINS_USER=${JENKINS_USER_NAME}
+
+MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
+  ./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
@@ -1,21 +1,24 @@
 # Java versions
-java.main.tag=17.0.8_7-jdk-focal
-java.next.tag=20-jdk-jammy
+java.main.tag=17.0.13_11-jdk-focal
+java.next.tag=23.0.1_11-jdk-noble

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

 # Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.23
-docker.mongodb.5.0.version=5.0.19
-docker.mongodb.6.0.version=6.0.8
+docker.mongodb.4.4.version=4.4.25
+docker.mongodb.5.0.version=5.0.21
+docker.mongodb.6.0.version=6.0.10
+docker.mongodb.7.0.version=7.0.2
+docker.mongodb.8.0.version=8.0.0

 # Supported versions of Redis
 docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4

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

 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
@@ -24,4 +27,10 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
 # Credentials
 docker.registry=
 docker.credentials=hub.docker.com-springbuildmaster
+docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
+docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
+artifactory.url=https://repo.spring.io
+artifactory.repository.snapshot=libs-snapshot-local
+develocity.access-key=gradle_enterprise_secret_access_key
+jenkins.user.name=spring-builds+jenkins
@@ -3,8 +3,8 @@
 set -euo pipefail

 mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
-chown -R 1001:1001 .
+export JENKINS_USER=${JENKINS_USER_NAME}

-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
+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
+  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "antora": "3.2.0-alpha.6",
+        "@antora/atlas-extension": "1.0.0-alpha.2",
+        "@antora/collector-extension": "1.0.0-alpha.7",
+        "@asciidoctor/tabs": "1.0.0-beta.6",
+        "@springio/antora-extensions": "1.13.0",
+        "@springio/asciidoctor-extensions": "1.0.0-alpha.11"
+    }
+}
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.2.0-M2</version>
+	<version>6.0.0-M1</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.2.0-M2</version>
+		<version>4.0.0-M1</version>
 	</parent>

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

 	<properties>
-		<springdata.commons>3.2.0-M2</springdata.commons>
+		<springdata.commons>4.0.0-M1</springdata.commons>

 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>8.9.0</elasticsearch-java>
+		<elasticsearch-java>8.17.0</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>
+		<hoverfly>0.19.0</hoverfly>
+		<log4j>2.23.1</log4j>
+		<jsonassert>1.5.3</jsonassert>
+		<testcontainers>1.20.0</testcontainers>
+		<wiremock>3.9.1</wiremock>

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

@@ -132,17 +131,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
-			<version>${elasticsearch-java}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>

 		<!-- Jackson JSON Mapper -->
 		<dependency>
@@ -166,7 +154,6 @@
 		<dependency>
 			<groupId>jakarta.enterprise</groupId>
 			<artifactId>jakarta.enterprise.cdi-api</artifactId>
-			<version>3.0.1</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -181,23 +168,6 @@
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-se</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
@@ -266,13 +236,6 @@
 			<scope>test</scope>
 		</dependency>

-		<dependency>
-			<groupId>io.projectreactor.tools</groupId>
-			<artifactId>blockhound-junit-platform</artifactId>
-			<version>${blockhound-junit}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
@@ -281,8 +244,8 @@
 		</dependency>

 		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8</artifactId>
+			<groupId>org.wiremock</groupId>
+			<artifactId>wiremock</artifactId>
 			<version>${wiremock}</version>
 			<scope>test</scope>
 			<exclusions>
@@ -342,6 +305,13 @@
 			<scope>test</scope>
 		</dependency>

+		<dependency>
+			<groupId>com.tngtech.archunit</groupId>
+			<artifactId>archunit-junit5</artifactId>
+			<version>${archunit}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>

 	<build>
@@ -410,8 +380,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>
@@ -446,19 +425,24 @@
 		</profile>

 		<profile>
-			<id>jdk13+</id>
-			<!-- on jDK13+, Blockhound needs this JVM flag set -->
-			<activation>
-				<jdk>[13,)</jdk>
-			</activation>
+			<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>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<argLine>-XX:+AllowRedefinitionToAddDeleteMethods</argLine>
-						</configuration>
+						<groupId>org.antora</groupId>
+						<artifactId>antora-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
 			</build>
@@ -466,10 +450,8 @@
 	</profiles>

 	<repositories>
-		<repository>
-			<id>spring-milestone</id>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
+		
+		
 	</repositories>

 </project>
@@ -0,0 +1,40 @@
+# 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:
+    - require: '@springio/antora-extensions'
+      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.4.x, 3.3.x ]
+      start_path: src/main/antora
+asciidoc:
+  attributes:
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+  extensions:
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
+    - '@springio/asciidoctor-extensions/javadoc-extension'
+  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.4.16/ui-bundle.zip
+    snapshot: true
@@ -0,0 +1,17 @@
+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/
+    - run:
+        command: ./mvnw package -Pdistribute
+        local: true
+      scan:
+        dir: target/antora
@@ -0,0 +1,46 @@
+* 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:migration-guides/migration-guide-5.2-5.3.adoc[]
+*** xref:migration-guides/migration-guide-5.3-5.4.adoc[]
+*** xref:migration-guides/migration-guide-5.4-5.5.adoc[]
+
+
+* xref:elasticsearch.adoc[]
+** 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[]
+
+* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank]
+* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank]
@@ -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,16 +21,17 @@ 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 javadoc:org.springframework.data.elasticsearch.client.elc.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:
@@ -43,23 +42,23 @@ The following beans can then be injected in other Spring components:
 import org.springframework.beans.factory.annotation.Autowired;@Autowired
 ElasticsearchOperations operations;      <.>

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

@Autowired
 RestClient restClient;                   <.>

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

-<.> an implementation of `ElasticsearchOperations`
+<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.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.
+Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
 When using repositories, this instance is used under the hood as well.

 [[elasticsearch.clients.reactiverestclient]]
@@ -78,15 +77,16 @@ 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 javadoc:org.springframework.data.elasticsearch.client.elc.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:

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

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

@Autowired
 RestClient restClient;                           <.>

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

 the following can be injected:

-<.> an implementation of `ReactiveElasticsearchOperations`
+<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[]
 <.> 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.
+Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[] to interact with the Elasticsearch cluster.
 When using repositories, this instance is used under the hood as well.

 [[elasticsearch.clients.configuration]]
 == Client Configuration

-Client behaviour can be changed via the `ClientConfiguration` that allows to set options for SSL, connect and socket timeouts, headers and other parameters.
+Client behaviour can be changed via the javadoc:org.springframework.data.elasticsearch.client.ClientConfiguration[] that allows to set options for SSL, connect and socket timeouts, headers and other parameters.

 .Client Configuration
 ====
@@ -150,7 +150,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()
    return headers;
  })
  .withClientConfigurer(                                                <.>
-    ElasticsearchClientConfigurationCallback.from(clientBuilder -> {
+    ElasticsearchHttpClientConfigurationCallback.from(clientBuilder -> {
  	  // ...
      return clientBuilder;
  	}))
@@ -161,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.
@@ -169,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.
@@ -179,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 javadoc:org.springframework.data.elasticsearch.client.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:

@@ -193,6 +192,7 @@ This callback provides a `org.elasticsearch.client.RestClientBuilder` that can b
 [source,java]
 ----
 ClientConfiguration.builder()
+    .connectedTo("localhost:9200", "localhost:9291")
    .withClientConfigurer(ElasticsearchClients.ElasticsearchRestClientConfigurationCallback.from(restClientBuilder -> {
        // configure the Elasticsearch RestClient
        return restClientBuilder;
@@ -211,6 +211,7 @@ used by the `RestClient`.
 [source,java]
 ----
 ClientConfiguration.builder()
+    .connectedTo("localhost:9200", "localhost:9291")
    .withClientConfigurer(ElasticsearchClients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
        // configure the HttpAsyncClient
        return httpAsyncClientBuilder;
@@ -222,9 +223,8 @@ ClientConfiguration.builder()
 [[elasticsearch.clients.logging]]
 == Client Logging

-To see what is actually sent to and received from the server `Request` / `Response` logging on the transport level 
-needs to be turned on as outlined in the snippet below. 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,10 +1,33 @@
 [[new-features]]
 = What's new

+[[new-features.5-5-0]]
+== New in Spring Data Elasticsearch 5.5
+* Upgrade to Elasticsearch 8.17.0.
+
+[[new-features.5-4-0]]
+== New in Spring Data Elasticsearch 5.4
+
+* Upgrade to Elasticsearch 8.15.3.
+* Allow to customize the mapped type name for `@InnerField` and `@Field` annotations.
+* Support for Elasticsearch SQL.
+* Add support for retrieving request executionDuration.
+
+[[new-features.5-3-0]]
+== New in Spring Data Elasticsearch 5.3
+
+* Upgrade to Elasticsearch 8.13.2.
+* Add support for highlight queries in highlighting.
+* Add shard statistics to the `SearchHit` class.
+* Add support for multi search template API.
+* Add support for SpEL in @Query.
+* Add support for field aliases in the index mapping.
+* Add support for has_child and has_parent queries.
+
 [[new-features.5-2-0]]
 == New in Spring Data Elasticsearch 5.2

-* Upgrade to Elasticsearch 8.9.0
+* 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.
@@ -12,6 +35,7 @@
 * 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
@@ -66,7 +90,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_).
@@ -80,7 +104,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:

@@ -52,7 +52,7 @@ public class Statement {
        return routing;
    }

-    public void setRouting(Routing routing) {
+    public void setRouting(String routing) {
        this.routing = routing;
    }

@@ -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.
@@ -199,7 +199,7 @@ void init() {
    repository.save(
        Statement.builder()
            .withText("+1 for the sun")
-            ,withRouting(savedWeather.getId())
+            .withRouting(savedWeather.getId())
            .withRelation(new JoinField<>("vote", sunnyAnswer.getId()))         <5>
            .build());
 }
@@ -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:

@@ -226,6 +226,7 @@ SearchHits<Statement> hasVotes() {
 	Query query = NativeQuery.builder()
 		.withQuery(co.elastic.clients.elasticsearch._types.query_dsl.Query.of(qb -> qb
 			.hasChild(hc -> hc
+				.type("answer")
 				.queryName("vote")
 				.query(matchAllQueryAsQuery())
 				.scoreMode(ChildScoreMode.None)
@@ -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.
@@ -366,8 +366,7 @@ 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.
+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:

@@ -451,4 +450,3 @@ About the filter query: It is not possible to use a `CriteriaQuery` here, as thi

 For the definition of the order path and the nested paths, the Java entity property names should be used.

-include::elasticsearch-misc-scripted-and-runtime-fields.adoc[leveloffset=+1]
@@ -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.
@@ -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,12 +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
-returned from that call will contain the name of the index that an entity was saved to in that property.
+After an entity is persisted, for example with a call to `ElasticsearchOperations.save(T entity)`, the entity returned from that call will contain the name of the index that an entity was saved to in that property.
 This is useful when the index name is dynamically set by a bean, or when writing to a write alias.

 Putting some value into such a property does not set the index into which an entity is stored!
@@ -260,12 +260,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 +350,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 +378,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 +413,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
 ====
@@ -421,7 +422,6 @@ Looking at the `Configuration` from the <<elasticsearch.mapping.meta-model, prev
@Configuration
 public class Config extends ElasticsearchConfiguration  {

-	@NonNull
 	@Override
 	public ClientConfiguration clientConfiguration() {
 		return ClientConfiguration.builder() //
@@ -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.
+
+====
@@ -12,10 +12,10 @@ class Book {
    @Id
    private String id;

-    @Field(type = FieldType.text)
+    @Field(type = FieldType.Text)
    private String name;

-    @Field(type = FieldType.text)
+    @Field(type = FieldType.Text)
    private String summary;

    @Field(type = FieldType.Integer)
@@ -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
@@ -316,7 +316,7 @@ Repository methods can be defined to have the following return types for returni

 .Declare query on the method using the `@Query` annotation.
 ====
-The arguments passed to the method can be inserted into placeholders in the query string. the placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
+The arguments passed to the method can be inserted into placeholders in the query string. The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -361,3 +361,202 @@ would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/qu
 }
 ----
 ====
+
+[[elasticsearch.query-methods.at-query.spel]]
+=== Using SpEL Expressions
+
+.Declare query on the method using the `@Query` annotation with SpEL expression.
+====
+https://docs.spring.io/spring-framework/reference/core/expressions.html[SpEL expression] is also supported when defining query in `@Query`.
+
+
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("""
+        {
+          "bool":{
+            "must":[
+              {
+                "term":{
+                  "name": "#{#name}"
+                }
+              }
+            ]
+          }
+        }
+        """)
+    Page<Book> findByName(String name, Pageable pageable);
+}
+----
+
+If for example the function is called with the parameter _John_, it would produce the following query body:
+
+[source,json]
+----
+{
+  "bool":{
+    "must":[
+      {
+        "term":{
+          "name": "John"
+        }
+      }
+    ]
+  }
+}
+----
+====
+
+.accessing parameter property.
+====
+Supposing that we have the following class as query parameter type:
+[source,java]
+----
+public record QueryParameter(String value) {
+}
+----
+
+It's easy to access the parameter by `#` symbol, then reference the property `value` with a simple `.`:
+
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("""
+            {
+              "bool":{
+                "must":[
+                  {
+                    "term":{
+                      "name": "#{#parameter.value}"
+                    }
+                  }
+                ]
+              }
+            }
+            """)
+    Page<Book> findByName(QueryParameter parameter, Pageable pageable);
+}
+----
+
+We can pass `new QueryParameter("John")` as the parameter now, and it will produce the same query string as above.
+====
+
+.accessing bean property.
+====
+https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access. Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("""
+            {
+              "bool":{
+                "must":[
+                  {
+                    "term":{
+                      "name": "#{@queryParameter.value}"
+                    }
+                  }
+                ]
+              }
+            }
+            """)
+    Page<Book> findByName(Pageable pageable);
+}
+----
+====
+
+.SpEL and `Collection` param.
+====
+`Collection` parameter is also supported and is as easy to use as normal `String`, such as the following `terms` query:
+
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("""
+            {
+              "bool":{
+                "must":[
+                  {
+                    "terms":{
+                      "name": #{#names}
+                    }
+                  }
+                ]
+              }
+            }
+            """)
+    Page<Book> findByName(Collection<String> names, Pageable pageable);
+}
+----
+
+NOTE: collection values should not be quoted when declaring the elasticsearch json query.
+
+A collection of `names` like `List.of("name1", "name2")` will produce the following terms query:
+[source,json]
+----
+{
+  "bool":{
+    "must":[
+      {
+        "terms":{
+          "name": ["name1", "name2"]
+        }
+      }
+    ]
+  }
+}
+----
+====
+
+.access property in the `Collection` param.
+====
+https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/collection-projection.html[SpEL Collection Projection] is convenient to use when values in the `Collection` parameter is not plain `String`:
+
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("""
+            {
+              "bool":{
+                "must":[
+                  {
+                    "terms":{
+                      "name": #{#parameters.![value]}
+                    }
+                  }
+                ]
+              }
+            }
+            """)
+    Page<Book> findByName(Collection<QueryParameter> parameters, Pageable pageable);
+}
+----
+This will extract all the `value` property values as a new `Collection` from `QueryParameter` collection, thus takes the same effect as above.
+====
+
+.alter parameter name by using `@Param`
+====
+When accessing the parameter by SpEL, it's also useful to alter the parameter name to another one by `@Param` annotation in Sping Data:
+
+[source,java]
+----
+interface BookRepository extends ElasticsearchRepository<Book, String> {
+    @Query("""
+            {
+              "bool":{
+                "must":[
+                  {
+                    "terms":{
+                      "name": #{#another.![value]}
+                    }
+                  }
+                ]
+              }
+            }
+            """)
+    Page<Book> findByName(@Param("another") Collection<QueryParameter> parameters, Pageable pageable);
+}
+----
+
+====
@@ -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).
@@ -10,6 +10,7 @@ In the context of Spring Data Elasticsearch you can use

 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.
@@ -68,6 +69,7 @@ public record Person(
 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:
@@ -85,6 +87,7 @@ public interface PersonRepository extends ElasticsearchRepository<Person, String
 ----
 ====

+[[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.
@@ -135,6 +138,7 @@ public class PersonService {
 <.> 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.
@@ -177,6 +181,7 @@ Scripted fields can only add something to the returned data, the age cannot be u
 <.> 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.
@@ -189,7 +194,7 @@ In the following code this is used to run a query for a given gender and maximum

        var runtimeField = new RuntimeField("age", "long", """                    <.>
                                Instant currentDate = Instant.ofEpochMilli(new Date().getTime());
-                                Instant startDate = doc['birth-date'].value.toInstant();
+                                Instant startDate = doc['birthDate'].value.toInstant();
                                emit (ChronoUnit.DAYS.between(startDate, currentDate) / 365);
                """);

@@ -1,12 +1,12 @@
 [[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.
-* `SearchOperations` define the actions to search for multiple entities using queries
-* `ElasticsearchOperations` combines the `DocumentOperations` and `SearchOperations` interfaces.
+* javadoc:org.springframework.data.elasticsearch.core.IndexOperations[] defines actions on index level like creating or deleting an index.
+* javadoc:org.springframework.data.elasticsearch.core.DocumentOperations[] defines actions to store, update and retrieve entities based on their id.
+* javadoc:org.springframework.data.elasticsearch.core.SearchOperations[] define the actions to search for multiple entities using queries
+* javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] combines the `DocumentOperations` and `SearchOperations` interfaces.

 These interfaces correspond to the structuring of the https://www.elastic.co/guide/en/elasticsearch/reference/current/rest-apis.html[Elasticsearch API].

@@ -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
@@ -82,7 +81,7 @@ When a document is retrieved with the methods of the  `DocumentOperations` inter
 When searching with the methods of the `SearchOperations` interface, additional information is available for each entity, for example the _score_ or the _sortValues_ of the found entity.

 In order to return this information, each entity is wrapped in a `SearchHit` object that contains this entity-specific additional information.
-These `SearchHit` objects themselves are returned within a `SearchHits` object which additionally contains informations about the whole search like the _maxScore_ or requested aggregations.
+These `SearchHit` objects themselves are returned within a `SearchHits` object which additionally contains informations about the whole search like the _maxScore_ or requested aggregations or the execution duration it took to complete the request.
 The following classes and interfaces are now available:

 .SearchHit<T>
@@ -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,27 @@
+[[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
+| 2025.1 (in development) | 6.0.x | 8.17.0 | 6.2.x
+| 2025.0 (in development) | 5.5.x | 8.17.0 | 6.2.x
+| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
+| 2024.0 | 5.3.x | 8.13.4 | 6.1.x
+| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x
+| 2023.0 (Ullmann) | 5.1.xfootnote:oom[] | 8.7.1 | 6.0.x
+| 2022.0 (Turing) | 5.0.xfootnote:oom[] | 8.5.3 | 6.0.x
+| 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x
+| 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
@@ -50,7 +49,7 @@ Also the reactive implementation that was provided up to now has been moved here
 If you are using `ElasticsearchRestTemplate` directly and not the `ElasticsearchOperations` interface you'll need to adjust your imports as well.

 When working with the `NativeSearchQuery` class, you'll need to switch to the `NativeQuery` class, which can take a
-`Query` instance comign from the new Elasticsearch client libraries.
+`Query` instance coming from the new Elasticsearch client libraries.
 You'll find plenty of examples in the test code.

 [[elasticsearch-migration-guide-4.4-5.0.breaking-changes-records]]
@@ -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.
@@ -6,6 +6,7 @@ This section describes breaking changes from version 5.1.x to 5.2.x and how remo
 [[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.
@@ -15,22 +16,25 @@ The definition of the `FailureDetails` class (inner to `BulkFailureException`):
 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` constructir is not nullable any longer.
+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 <<elasticsearch.clients.logging>>.
+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 werent used anymore and were no-ops. It has been removed from the `org.springframework.data.elasticsearch.core.query.IndexQuery` class as well.
+* 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,21 @@
+[[elasticsearch-migration-guide-5.2-5.3]]
+= Upgrading from 5.2.x to 5.3.x
+
+This section describes breaking changes from version 5.2.x to 5.3.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.2-5.3.breaking-changes]]
+== Breaking Changes
+
+During the parameter replacement in `@Query` annotated repository methods previous versions wrote the String `"null"` into the query that was sent to Elasticsearch when the actual parameter value was `null`.
+As Elasticsearch does not store `null` values, this behaviour could lead to problems, for example whent the fields to be searched contains the string `"null"`.
+In Version 5.3 a `null` value in a parameter will cause a `ConversionException` to be thrown.
+If you are using `"null"` as the
+`null_value` defined in a field mapping, then pass that string into the query instead of a Java `null`.
+
+[[elasticsearch-migration-guide-5.2-5.3.deprecations]]
+== Deprecations
+
+=== Removals
+
+The deprecated classes `org.springframework.data.elasticsearch.ELCQueries`
+and `org.springframework.data.elasticsearch.client.elc.QueryBuilders` have been removed, use `org.springframework.data.elasticsearch.client.elc.Queries` instead.
@@ -0,0 +1,23 @@
+[[elasticsearch-migration-guide-5.3-5.4]]
+= Upgrading from 5.3.x to 5.4.x
+
+This section describes breaking changes from version 5.3.x to 5.4.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.3-5.4.breaking-changes]]
+== Breaking Changes
+
+[[elasticsearch-migration-guide-5.3-5.4.breaking-changes.knn-search]]
+=== knn search
+The `withKnnQuery` method in `NativeQueryBuilder` has been replaced with `withKnnSearches` to build a `NativeQuery` with knn search.
+
+`KnnQuery` and `KnnSearch` are two different classes in elasticsearch java client and are used for different queries, with different parameters supported:
+
+- `KnnSearch`: is https://www.elastic.co/guide/en/elasticsearch/reference/8.13/search-search.html#search-api-knn[the top level `knn` query] in the elasticsearch request;
+- `KnnQuery`: is https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-knn-query.html[the `knn` query inside `query` clause];
+
+If `KnnQuery` is still preferable, please be sure to construct it inside `query` clause manually, by means of `withQuery(co.elastic.clients.elasticsearch._types.query_dsl.Query query)` clause in `NativeQueryBuilder`.
+
+[[elasticsearch-migration-guide-5.3-5.4.deprecations]]
+== Deprecations
+
+=== Removals
@@ -0,0 +1,12 @@
+[[elasticsearch-migration-guide-5.4-5.5]]
+= Upgrading from 5.4.x to 5.5.x
+
+This section describes breaking changes from version 5.4.x to 5.5.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.4-5.5.breaking-changes]]
+== Breaking Changes
+
+[[elasticsearch-migration-guide-5.4-5.5.deprecations]]
+== Deprecations
+
+=== Removals
@@ -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,55 +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.1 (Vaughan) | 5.2.x | 8.9.0 | 6.0.x | 3.1.x
-| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x | 3.1.x
-| 2022.0 (Turing) | 5.0.x | 8.5.3 | 6.0.x | 3.0.x
-| 2021.2 (Raj) | 4.4.xfootnote:oom[Out of maintenance] | 7.17.3 | 5.3.x | 2.7.x
-| 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x | 2.6.x
-| 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x | 2.5.x
-| 2020.0 (Ockham) | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
-| Neumann | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
-| Moore | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
-| Lovelace | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
-| Kay | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
-| Ingalls | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
-|===
-
-Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming
-the usage of the <<elasticsearch.operations,ElasticsearchOperations interface>>.
@@ -1,22 +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[]
-
-include::elasticsearch-migration-guide-5.1-5.2.adoc[]
-
-:leveloffset: -1
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * Identifies an alias for the index.
+ *
+ * @author Youssef Aouichaoui
+ * @since 5.4
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+@Repeatable(Aliases.class)
+public @interface Alias {
+	/**
+	 * @return Index alias name. Alias for {@link #alias}.
+	 */
+	@AliasFor("alias")
+	String value() default "";
+
+	/**
+	 * @return Index alias name. Alias for {@link #value}.
+	 */
+	@AliasFor("value")
+	String alias() default "";
+
+	/**
+	 * @return Query used to limit documents the alias can access.
+	 */
+	Filter filter() default @Filter;
+
+	/**
+	 * @return Used to route indexing operations to a specific shard.
+	 */
+	String indexRouting() default "";
+
+	/**
+	 * @return Used to route indexing and search operations to a specific shard.
+	 */
+	String routing() default "";
+
+	/**
+	 * @return Used to route search operations to a specific shard.
+	 */
+	String searchRouting() default "";
+
+	/**
+	 * @return Is the alias hidden?
+	 */
+	boolean isHidden() default false;
+
+	/**
+	 * @return Is it the 'write index' for the alias?
+	 */
+	boolean isWriteIndex() default false;
+}
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Container annotation that aggregates several {@link Alias} annotations.
+ *
+ * @author Youssef Aouichaoui
+ * @see Alias
+ * @since 5.4
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+public @interface Aliases {
+	Alias[] value();
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,40 +39,173 @@ public enum DateFormat {
 	basic_t_time("'T'HHmmss.SSSXXX"), //
 	basic_t_time_no_millis("'T'HHmmssXXX"), //
 	basic_week_date("YYYY'W'wwe"), // week-based-year!
+	/**
+	 * @since 5.3
+	 */
+	strict_basic_week_date("YYYY'W'wwe"), // week-based-year!
 	basic_week_date_time("YYYY'W'wwe'T'HHmmss.SSSX"), // here Elasticsearch uses a different zone format
+	/**
+	 * @since 5.3
+	 */
+	strict_basic_week_date_time("YYYY'W'wwe'T'HHmmss.SSSX"), // here Elasticsearch uses a different zone format
 	basic_week_date_time_no_millis("YYYY'W'wwe'T'HHmmssX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_basic_week_date_time_no_millis("YYYY'W'wwe'T'HHmmssX"), //
 	date("uuuu-MM-dd"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_date("uuuu-MM-dd"), //
 	date_hour("uuuu-MM-dd'T'HH"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_date_hour("uuuu-MM-dd'T'HH"), //
 	date_hour_minute("uuuu-MM-dd'T'HH:mm"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_date_hour_minute("uuuu-MM-dd'T'HH:mm"), //
 	date_hour_minute_second("uuuu-MM-dd'T'HH:mm:ss"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_date_hour_minute_second("uuuu-MM-dd'T'HH:mm:ss"), //
 	date_hour_minute_second_fraction("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_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"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_date_hour_minute_second_millis("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
 	date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_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"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_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
+	/**
+	 * @since 5.3
+	 */
+	strict_date_time_no_millis("uuuu-MM-dd'T'HH:mm:ssVV"), // here Elasticsearch uses the zone-id in its implementation
 	epoch_millis("epoch_millis"), //
 	epoch_second("epoch_second"), //
 	hour("HH"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_hour("HH"), //
 	hour_minute("HH:mm"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_hour_minute("HH:mm"), //
 	hour_minute_second("HH:mm:ss"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_hour_minute_second("HH:mm:ss"), //
 	hour_minute_second_fraction("HH:mm:ss.SSS"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_hour_minute_second_fraction("HH:mm:ss.SSS"), //
 	hour_minute_second_millis("HH:mm:ss.SSS"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_hour_minute_second_millis("HH:mm:ss.SSS"), //
 	ordinal_date("uuuu-DDD"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_ordinal_date("uuuu-DDD"), //
 	ordinal_date_time("uuuu-DDD'T'HH:mm:ss.SSSXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_ordinal_date_time("uuuu-DDD'T'HH:mm:ss.SSSXXX"), //
 	ordinal_date_time_no_millis("uuuu-DDD'T'HH:mm:ssXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_ordinal_date_time_no_millis("uuuu-DDD'T'HH:mm:ssXXX"), //
 	time("HH:mm:ss.SSSXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_time("HH:mm:ss.SSSXXX"), //
 	time_no_millis("HH:mm:ssXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_time_no_millis("HH:mm:ssXXX"), //
 	t_time("'T'HH:mm:ss.SSSXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_t_time("'T'HH:mm:ss.SSSXXX"), //
 	t_time_no_millis("'T'HH:mm:ssXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_t_time_no_millis("'T'HH:mm:ssXXX"), //
 	week_date("YYYY-'W'ww-e"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_week_date("YYYY-'W'ww-e"), //
 	week_date_time("YYYY-'W'ww-e'T'HH:mm:ss.SSSXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_week_date_time("YYYY-'W'ww-e'T'HH:mm:ss.SSSXXX"), //
 	week_date_time_no_millis("YYYY-'W'ww-e'T'HH:mm:ssXXX"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_week_date_time_no_millis("YYYY-'W'ww-e'T'HH:mm:ssXXX"), //
 	weekyear(""), // no TemporalAccessor available for these 3
+	/**
+	 * @since 5.3
+	 */
+	strict_weekyear(""), // no TemporalAccessor available for these 3
 	weekyear_week(""), //
+	/**
+	 * @since 5.3
+	 */
+	strict_weekyear_week(""), //
 	weekyear_week_day(""), //
+	/**
+	 * @since 5.3
+	 */
+	strict_strict_weekyear_week_day(""), //
 	year("uuuu"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_year("uuuu"), //
 	year_month("uuuu-MM"), //
-	year_month_day("uuuu-MM-dd"); //
+	/**
+	 * @since 5.3
+	 */
+	strict_year_month("uuuu-MM"), //
+	year_month_day("uuuu-MM-dd"), //
+	/**
+	 * @since 5.3
+	 */
+	strict_year_month_day("uuuu-MM-dd"); //

 	private final String pattern;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -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.
 	 */
@@ -93,6 +100,13 @@ public @interface Document {
 	 */
 	boolean storeVersionInSource() default true;

+	/**
+	 * Aliases for the index.
+	 *
+	 * @since 5.4
+	 */
+	Alias[] aliases() default {};
+
 	/**
 	 * @since 4.3
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@ import org.springframework.core.annotation.AliasFor;
 * @author Brian Kimmig
 * @author Morgan Lutz
 * @author Sascha Woo
+ * @author Haibo Liu
+ * @author Andriy Redko
 */
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.METHOD })
@@ -128,6 +130,10 @@ public @interface Field {
 	boolean norms() default true;

 	/**
+	 * NOte that null_value setting are not supported in Elasticsearch for all types. For example setting a null_value on
+	 * a field with type text will throw an exception in the server when the mapping is written to Elasticsearch. Alas,
+	 * the Elasticsearch documentation does not specify on which types it is allowed on which it is not.
+	 *
 	 * @since 4.0
 	 */
 	String nullValue() default "";
@@ -195,6 +201,27 @@ public @interface Field {
 	 */
 	int dims() default -1;

+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	String elementType() default FieldElementType.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnSimilarity knnSimilarity() default KnnSimilarity.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnIndexOptions[] knnIndexOptions() default {};
+
 	/**
 	 * Controls how Elasticsearch dynamically adds fields to the inner object within the document.<br>
 	 * To be used in combination with {@link FieldType#Object} or {@link FieldType#Nested}
@@ -218,4 +245,11 @@ public @interface Field {
 	 * @since 5.1
 	 */
 	boolean storeEmptyValue() default true;
+
+	/**
+	 * overrides the field type in the mapping which otherwise will be taken from corresponding {@link FieldType}
+	 *
+	 * @since 5.4
+	 */
+	String mappedTypeName() default "";
 }
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public final class FieldElementType {
+	public final static String DEFAULT = "";
+	public final static String FLOAT = "float";
+	public final static String BYTE = "byte";
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * Query used to limit documents.
+ *
+ * @author Youssef Aouichaoui
+ * @since 5.4
+ */
+public @interface Filter {
+	/**
+	 * @return Query used to limit documents. Alias for {@link #query}.
+	 */
+	@AliasFor("query")
+	String value() default "";
+
+	/**
+	 * @return Query used to limit documents. Alias for {@link #value}.
+	 */
+	@AliasFor("value")
+	String query() default "";
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.lang.annotation.RetentionPolicy;

 /**
 * @author Peter-Josef Meisch
+ * @author Haibo Liu
 * @since 4.0
 */
@Documented
@@ -59,6 +60,8 @@ public @interface HighlightParameters {

 	int numberOfFragments() default -1;

+	Query highlightQuery() default @Query;
+
 	String order() default "";

 	int phraseLimit() default -1;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
 */
 package org.springframework.data.elasticsearch.annotations;

-import org.springframework.data.annotation.ReadOnlyProperty;
-import org.springframework.data.annotation.Transient;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,10 +22,10 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

 /**
- * Annotation to mark a String property of an entity to be filled with the name of the index where the entity was
- * stored after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created
- * or when a document was indexed into a write alias.
- *
+ * Annotation to mark a String property of an entity to be filled with the name of the index where the entity was stored
+ * after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created or when a
+ * document was indexed into a write alias.
+ * <p>
 * This can not be used to specify the index where an entity should be written to.
 *
 * @author Peter-Josef Meisch
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,6 +29,8 @@ import java.lang.annotation.Target;
 * @author Aleksei Arsenev
 * @author Brian Kimmig
 * @author Morgan Lutz
+ * @author Haibo Liu
+ * @author Andriy Redko
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.ANNOTATION_TYPE)
@@ -149,4 +151,32 @@ public @interface InnerField {
 	 * @since 4.2
 	 */
 	int dims() default -1;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	String elementType() default FieldElementType.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnSimilarity knnSimilarity() default KnnSimilarity.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnIndexOptions[] knnIndexOptions() default {};
+
+	/**
+	 * overrides the field type in the mapping which otherwise will be taken from corresponding {@link FieldType}
+	 *
+	 * @since 5.4
+	 */
+	String mappedTypeName() default "";
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public enum KnnAlgorithmType {
+	HNSW("hnsw"),
+	INT8_HNSW("int8_hnsw"),
+	FLAT("flat"),
+	INT8_FLAT("int8_flat"),
+	DEFAULT("");
+
+	private final String type;
+
+	KnnAlgorithmType(String type) {
+		this.type = type;
+	}
+
+	public String getType() {
+		return type;
+	}
+}
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public @interface KnnIndexOptions {
+
+	KnnAlgorithmType type() default KnnAlgorithmType.DEFAULT;
+
+	/**
+	 * Only applicable to {@link KnnAlgorithmType#HNSW} and {@link KnnAlgorithmType#INT8_HNSW} index types.
+	 */
+	int m() default -1;
+
+	/**
+	 * Only applicable to {@link KnnAlgorithmType#HNSW} and {@link KnnAlgorithmType#INT8_HNSW} index types.
+	 */
+	int efConstruction() default -1;
+
+	/**
+	 * Only applicable to {@link KnnAlgorithmType#INT8_HNSW} and {@link KnnAlgorithmType#INT8_FLAT} index types.
+	 */
+	float confidenceInterval() default -1F;
+}
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public enum KnnSimilarity {
+	L2_NORM("l2_norm"),
+	DOT_PRODUCT("dot_product"),
+	COSINE("cosine"),
+	MAX_INNER_PRODUCT("max_inner_product"),
+	DEFAULT("");
+
+	private final String similarity;
+
+	KnnSimilarity(String similarity) {
+		this.similarity = similarity;
+	}
+
+	public String getSimilarity() {
+		return similarity;
+	}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -74,7 +74,14 @@ public @interface Mapping {
 	 */
 	String runtimeFieldsPath() default "";

+	/**
+	 * field alias definitions to be written to the index mapping
+	 *
+	 * @since 5.3
+	 */
+	MappingAlias[] aliases() default {};
+
 	enum Detection {
-		DEFAULT, TRUE, FALSE;
+		DEFAULT, TRUE, FALSE
 	}
 }
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Defines a field alias in the index mapping.
+ *
+ * @author Peter-Josef Meisch
+ * @since 5.3
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Documented
+@Inherited
+public @interface MappingAlias {
+	/**
+	 * the name of the alias.
+	 */
+	String name();
+
+	/**
+	 * the path of the alias.
+	 */
+	String path();
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`include::{commons}@data-commons::page$upgrade.adoc[]`
				`@@ -0,0 +1 @@`
				`include::{commons}@data-commons::page$repositories/core-domain-events.adoc[]`