Release version 5.0 M1 (2022.0.0).

See #2053

Jenkinsfile

@@ -12,10 +12,11 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (jdk8)") {
+		stage("test: baseline (jdk17)") {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -32,7 +33,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+						docker.image('openjdk:17-bullseye').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
 							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
 							sh 'PROFILE=none ci/verify.sh'
 							sh "ci/clean.sh"
@@ -42,68 +43,11 @@ pipeline {
 			}
 		}
 
-		stage("Test other configurations") {
-			when {
-				allOf {
-					branch 'main'
-					not { triggeredBy 'UpstreamCause' }
-				}
-			}
-			parallel {
-				stage("test: baseline (jdk11)") {
-					agent {
-						label 'data'
-					}
-					options { timeout(time: 30, unit: 'MINUTES') }
-
-					environment {
-						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-					}
-
-					steps {
-						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
-									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh 'PROFILE=java11 ci/verify.sh'
-									sh "ci/clean.sh"
-								}
-							}
-						}
-					}
-				}
-
-				stage("test: baseline (jdk17)") {
-					agent {
-						label 'data'
-					}
-					options { timeout(time: 30, unit: 'MINUTES') }
-
-					environment {
-						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-					}
-
-					steps {
-						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('openjdk:17-bullseye').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
-									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh 'PROFILE=java11 ci/verify.sh'
-									sh "ci/clean.sh"
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
 		stage('Release to artifactory') {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -119,7 +63,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+						docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
 							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} " +
@@ -133,6 +77,7 @@ pipeline {
 				}
 			}
 		}
+
 		stage('Publish documentation') {
 			when {
 				branch 'main'
@@ -149,7 +94,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+						docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
 							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +

README.adoc

@@ -4,14 +4,16 @@ image:https://spring.io/badges/spring-data-elasticsearch/ga.svg[Spring Data Elas
 
 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
-The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine. Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with a Elasticsearch Documents and easily writing a Repository style data access layer.
+The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine.
+Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with a Elasticsearch Documents and easily writing a Repository style data access layer.
 
 This project is lead and maintained by the community.
 
 == Features
 
 * Spring configuration support using Java based `@Configuration` classes or an XML namespace for a ES clients instances.
-* `ElasticsearchRestTemplate` helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
+* `ElasticsearchRestTemplate` helper class that increases productivity performing common ES operations.
+Includes integrated object mapping between documents and POJOs.
 * Feature Rich Object Mapping integrated with Spring’s Conversion Service
 * Annotation based mapping metadata
 * Automatic implementation of `Repository` interfaces including support for custom search methods.
@@ -19,7 +21,9 @@ This project is lead and maintained by the community.
 
 == Code of Conduct
 
-This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct].
+By participating, you are expected to uphold this code of conduct.
+Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 == Getting Started
 
@@ -58,31 +62,6 @@ public class MyService {
 }
 ----
 
-=== Using Transport Client
-
-NOTE: Usage of the TransportClient is deprecated as of version 4.0, use RestClient instead.
-
-
-[source,java]
-----
-@Configuration
-public class TransportClientConfig extends ElasticsearchConfigurationSupport {
-
-	@Bean
-	public Client elasticsearchClient() throws UnknownHostException {
-		Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();
-		TransportClient client = new PreBuiltTransportClient(settings);
-		client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
-		return client;
-	}
-
-	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-	public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-		return new ElasticsearchTemplate(elasticsearchClient());
-	}
-}
-----
-
 === Using the RestClient
 
 Provide a configuration like this:
@@ -161,7 +140,8 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 
 == Getting Help
 
-Having trouble with Spring Data? We’d love to help!
+Having trouble with Spring Data?
+We’d love to help!
 
 * Check the
 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].
@@ -174,14 +154,16 @@ You can also chat with the community on https://gitter.im/spring-projects/spring
 
 == Reporting Issues
 
-Spring Data uses GitHub as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below:
+Spring Data uses GitHub as issue tracking system to record bugs and feature requests.
+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].
 * 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. Attach a link to your code or a compressed file containing your code.
+* If possible try to create a test-case or project that replicates the issue.
+Attach a link to your code or a compressed file containing your code.
 
 == Building from Source
 
@@ -197,11 +179,8 @@ If you want to build with the regular `mvn` command, you will need https://maven
 
 _Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests, and in particular please sign the https://cla.pivotal.io/sign/spring[Contributor’s Agreement] before submitting your first pull request._
 
-IMPORTANT: When contributing, please make sure an issue exists in https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] and comment on this issue with how you want to address it. By this we not only know that someone is working on an issue, we can also align architectural questions and possible solutions before work is invested
-. We
-so
-can prevent that much work is put into Pull Requests that have little
-or no chances of being merged.
+IMPORTANT: When contributing, please make sure an issue exists in https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] and comment on this issue with how you want to address it.
+By this we not only know that someone is working on an issue, we can also align architectural questions and possible solutions before work is invested . We so can prevent that much work is put into Pull Requests that have little or no chances of being merged.
 
 
 === Building reference documentation

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.3.0-RC1</version>
+	<version>5.0.0-M1</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.6.0-RC1</version>
+		<version>3.0.0-M1</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,11 +18,11 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<elasticsearch>7.15.0</elasticsearch>
-		<log4j>2.14.1</log4j>
+		<elasticsearch>7.16.2</elasticsearch>
+		<log4j>2.17.0</log4j>
 		<netty>4.1.65.Final</netty>
-		<springdata.commons>2.6.0-RC1</springdata.commons>
-		<testcontainers>1.15.3</testcontainers>
+		<springdata.commons>3.0.0-M1</springdata.commons>
+		<testcontainers>1.16.2</testcontainers>
 		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 
@@ -101,12 +101,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -141,19 +135,6 @@
 		</dependency>
 
 		<!-- Elasticsearch -->
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>transport</artifactId>
-			<version>${elasticsearch}</version>
-		</dependency>
-
-		<dependency>
-			<!-- required by elasticsearch -->
-			<groupId>org.elasticsearch.plugin</groupId>
-			<artifactId>transport-netty4-client</artifactId>
-			<version>${elasticsearch}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>elasticsearch-rest-high-level-client</artifactId>
@@ -166,21 +147,6 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-			<version>${slf4j}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Jackson JSON Mapper -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -196,7 +162,7 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.0.1</version>
+			<version>1.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -208,23 +174,40 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
 			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>${jakarta-annotation-api}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<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>
@@ -242,13 +225,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-to-slf4j</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>io.projectreactor.tools</groupId>
 			<artifactId>blockhound-junit-platform</artifactId>
@@ -269,6 +245,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<!--suppress MavenPackageUpdate -->
 			<version>999999</version>
 			<scope>test</scope>
 		</dependency>
@@ -283,7 +260,7 @@
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock-jre8</artifactId>
-			<version>2.26.3</version>
+			<version>2.32.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- these exclusions are needed because of Elasticsearch JarHell-->
@@ -301,7 +278,7 @@
 		<dependency>
 			<groupId>io.specto</groupId>
 			<artifactId>hoverfly-java-junit5</artifactId>
-			<version>0.13.1</version>
+			<version>0.14.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -461,7 +438,9 @@
 								</module>
 							</checkstyleRules>
 							<includes>**/*</includes>
-							<excludes>.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy</excludes>
+							<excludes>
+								.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy
+							</excludes>
 							<sourceDirectories>./</sourceDirectories>
 						</configuration>
 					</plugin>

src/main/asciidoc/preface.adoc

@@ -34,12 +34,13 @@ The following table shows the Elasticsearch versions that are used by Spring Dat
 [cols="^,^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2021.1 (Q)footnote:cdv[Currently in development] | 4.3.xfootnote:cdv[] | 7.15.0 | 5.3.xfootnote:cdv[] | 2.5 .xfootnote:cdv[]
+| 2022.0 (Raj) | 4.4.x | 7.16.2 | 5.3.x | 2.7.x
+| 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x
 | 2021.0 (Pascal) | 4.2.x | 7.12.0 | 5.3.x | 2.5.x
-| 2020.0 (Ockham) | 4.1.x | 7.9.3 | 5.3.2 | 2.4.x
-| Neumann | 4.0.x | 7.6.2 | 5.2.12 |2.3.x
-| Moore | 3.2.x |6.8.12 | 5.2.12| 2.2.x
-| Lovelacefootnote:oom[Out of maintenance] | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
+| 2020.0 (Ockham)footnote:oom[Out of maintenance] | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
+| Neumannfootnote:oom[] | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
+| Moorefootnote:oom[] | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
+| Lovelacefootnote:oom[] | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
 | Kayfootnote:oom[] | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
 | Ingallsfootnote:oom[] | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
 |===

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

@@ -6,58 +6,10 @@ This chapter illustrates configuration and usage of supported Elasticsearch clie
 Spring Data Elasticsearch operates upon an Elasticsearch client that is connected to a single Elasticsearch node or a cluster.
 Although the Elasticsearch Client can be used to work with the cluster, applications using Spring Data Elasticsearch normally use the higher level abstractions of <<elasticsearch.operations>> and <<elasticsearch.repositories>>.
 
-[[elasticsearch.clients.transport]]
-== Transport Client
-
-WARNING: The `TransportClient` is deprecated as of Elasticsearch 7 and will be removed in Elasticsearch 8. (https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/transport-client.html[see the Elasticsearch documentation]).
-Spring Data Elasticsearch will support the `TransportClient` as long as it is available in the used Elasticsearch <<elasticsearch.versions,version>> but has deprecated the classes using it since version 4.0.
-
-We strongly recommend to use the <<elasticsearch.clients.rest>> instead of the `TransportClient`.
-
-.Transport Client
-====
-[source,java]
-----
-@Configuration
-public class TransportClientConfig extends ElasticsearchConfigurationSupport {
-
-    @Bean
-    public Client elasticsearchClient() throws UnknownHostException {
-        Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();        <.>
-        TransportClient client = new PreBuiltTransportClient(settings);
-        client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300)); <.>
-        return client;
-    }
-
-    @Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-    public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-
-		ElasticsearchTemplate template = new ElasticsearchTemplate(elasticsearchClient, elasticsearchConverter);
-		template.setRefreshPolicy(refreshPolicy());                                                 <.>
-
-		return template;
-    }
-}
-
-// ...
-
-IndexRequest request = new IndexRequest("spring-data")
- .id(randomID())
- .source(someObject);
-
-IndexResponse response = client.index(request);
-----
-
-<.> The `TransportClient` must be configured with the cluster name.
-<.> The host and port to connect the client to.
-<.> the RefreshPolicy must be set in the `ElasticsearchTemplate` (override `refreshPolicy()` to not use the default)
-====
-
 [[elasticsearch.clients.rest]]
 == High Level REST Client
 
-The Java High Level REST Client is the default client of Elasticsearch, it provides a straight forward replacement for the `TransportClient` as it accepts and returns the very same request/response objects and therefore depends on the Elasticsearch core project.
-Asynchronous calls are operated upon a client managed thread pool and require a callback to be notified when the request is done.
+The Java High Level REST Client is the default client of Elasticsearch, it is configured like shown:
 
 .High Level REST Client
 ====
@@ -210,4 +162,4 @@ To see what is actually sent to and received from the server `Request` / `Respon
 <logger name="org.springframework.data.elasticsearch.client.WIRE" level="trace"/>
 ----
 
-NOTE: The above applies to both the `RestHighLevelClient` and `ReactiveElasticsearchClient` when obtained via `RestClients` respectively `ReactiveRestClients`, is not available for the `TransportClient`.
+NOTE: The above applies to both the `RestHighLevelClient` and `ReactiveElasticsearchClient` when obtained via `RestClients` respectively `ReactiveRestClients`.

src/main/asciidoc/reference/elasticsearch-entity-callbacks.adoc

@@ -13,7 +13,13 @@ Spring Data Elasticsearch uses the `EntityCallback` API internally for its audit
 
 | Reactive/BeforeConvertCallback
 | `onBeforeConvert(T entity, IndexCoordinates index)`
-| Invoked before a domain object is converted to `org.springframework.data.elasticsearch.core.document.Document`. Can return the `entity` or a modified entity which then will be converted.
+| Invoked before a domain object is converted to `org.springframework.data.elasticsearch.core.document.Document`.
+Can return the `entity` or a modified entity which then will be converted.
+| `Ordered.LOWEST_PRECEDENCE`
+
+| Reactive/AfterLoadCallback
+| `onAfterLoad(Document document, Class<T> type, IndexCoordinates indexCoordinates)`
+| Invoked after the result from Elasticsearch has been read into a `org.springframework.data.elasticsearch.core.document.Document`.
 | `Ordered.LOWEST_PRECEDENCE`
 
 | Reactive/AfterConvertCallback
@@ -32,4 +38,3 @@ Spring Data Elasticsearch uses the `EntityCallback` API internally for its audit
 | `Ordered.LOWEST_PRECEDENCE`
 
 |===
-

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

@@ -0,0 +1,19 @@
+[[elasticsearch-migration-guide-4.3-4.4]]
+= Upgrading from 4.3.x to 4.4.x
+
+This section describes breaking changes from version 4.3.x to 4.4.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-4.3-4.4.deprecations]]
+== Deprecations
+
+[[elasticsearch-migration-guide-4.3-4.4.breaking-changes]]
+== Breaking Changes
+
+=== Removal of deprecated classes
+
+==== `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).
+This means that the `ElasticsearchTemplate` class which was deprecated since Spring Data Elasticsearch 4.0 has been removed.
+This was the implementation of the `ElasticsearchOperations` interface that was using the `TransportClient`.
+Connections to Elasticsearch must be made using either the imperative `ElasticsearchRestTemplate` or the reactive `ReactiveElasticsearchTemplate`.

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

@@ -183,3 +183,81 @@ If the class to be retrieved has a `GeoPoint` property named _location_, the fol
 Sort.by(new GeoDistanceOrder("location", new GeoPoint(48.137154, 11.5761247)))
 ----
 ====
+
+[[elasticsearch.misc.runtime-fields]]
+== Runtime Fields
+
+From version 7.12 on Elasticsearch has added the feature of runtime fields (https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime.html).
+Spring Data Elasticsearch supports this in two ways:
+
+=== Runtime field definitions in the index mappings
+
+The first way to define runtime fields is by adding the definitions to the index mappings (see https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-mapping-fields.html).
+To use this approach in Spring Data Elasticsearch the user must provide a JSON file that contains the corresponding definition, for example:
+
+.runtime-fields.json
+====
+[source,json]
+----
+{
+  "day_of_week": {
+    "type": "keyword",
+    "script": {
+      "source": "emit(doc['@timestamp'].value.dayOfWeekEnum.getDisplayName(TextStyle.FULL, Locale.ROOT))"
+    }
+  }
+}
+----
+====
+
+The path to this JSON file, which must be present on the classpath, must then be set in the `@Mapping` annotation of the entity:
+
+====
+[source,java]
+----
+@Document(indexName = "runtime-fields")
+@Mapping(runtimeFieldsPath = "/runtime-fields.json")
+public class RuntimeFieldEntity {
+	// properties, getter, setter,...
+}
+
+----
+====
+
+=== Runtime fields definitions set on a Query
+
+The second way to define runtime fields is by adding the definitions to a search query (see https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-search-request.html).
+The following code example shows how to do this with Spring Data Elasticsearch :
+
+The entity used is a simple object that has a `price` property:
+
+====
+[source,java]
+----
+@Document(indexName = "some_index_name")
+public class SomethingToBuy {
+
+	private @Id @Nullable String id;
+	@Nullable @Field(type = FieldType.Text) private String description;
+	@Nullable @Field(type = FieldType.Double) private Double price;
+
+	// getter and setter
+}
+
+----
+====
+
+The following query uses a runtime field that calculates a `priceWithTax` value by adding 19% to the price and uses this value in the search query to find all entities where `priceWithTax` is higher or equal than a given value:
+
+====
+[source,java]
+----
+RuntimeField runtimeField = new RuntimeField("priceWithTax", "double", "emit(doc['price'].value * 1.19)");
+Query query = new CriteriaQuery(new Criteria("priceWithTax").greaterThanEqual(16.5));
+query.addRuntimeField(runtimeField);
+
+SearchHits<SomethingToBuy> searchHits = operations.search(query, SomethingToBuy.class);
+----
+====
+
+This works with every implementation of the `Query` interface.

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

@@ -1,10 +1,15 @@
 [[new-features]]
 = What's new
 
+[[new-features.4-4-0]]
+== New in Spring Data Elasticsearch 4.4
+
+* Upgrade to Elasticsearch 7.16.2.
+
 [[new-features.4-3-0]]
 == New in Spring Data Elasticsearch 4.3
 
-* Upgrade to Elasticsearch 7.15.0.
+* Upgrade to Elasticsearch 7.15.2.
 * Allow runtime_fields to be defined in the index mapping.
 * Add native support for range field types by using a range object.
 * Add repository search for nullable or empty properties.

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

@@ -30,40 +30,6 @@ There is support for automatic creation of indices and writing the mappings when
 
 ====
 
-[[elasticsearch.operations.template]]
-== ElasticsearchTemplate
-
-NOTE: Usage of the ElasticsearchTemplate is deprecated as of version 4.0, use ElasticsearchRestTemplate instead.
-
-The `ElasticsearchTemplate` is an implementation of the `ElasticsearchOperations` interface using the <<elasticsearch.clients.transport>>.
-
-.ElasticsearchTemplate configuration
-====
-[source,java]
-----
-@Configuration
-public class TransportClientConfig extends ElasticsearchConfigurationSupport {
-
-  @Bean
-  public Client elasticsearchClient() throws UnknownHostException {                 <1>
-    Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();
-    TransportClient client = new PreBuiltTransportClient(settings);
-    client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
-    return client;
-  }
-
-  @Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
-  public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException { <2>
-  	return new ElasticsearchTemplate(elasticsearchClient());
-  }
-}
-----
-
-<1> Setting up the <<elasticsearch.clients.transport>>.
-Deprecated as of version 4.0.
-<2> Creating the `ElasticsearchTemplate` bean, offering both names, _elasticsearchOperations_ and _elasticsearchTemplate_.
-====
-
 [[elasticsearch.operations.resttemplate]]
 == ElasticsearchRestTemplate
 
@@ -178,6 +144,9 @@ Returned by the low level scroll API functions in `ElasticsearchRestTemplate`, i
 .SearchHitsIterator<T>
 An Iterator returned by the streaming functions of the `SearchOperations` interface.
 
+.ReactiveSearchHits
+`ReactiveSearchOperations` has methods returning a `Mono<ReactiveSearchHits<T>>`, this contains the same information as a `SearchHits<T>` object, but will provide the contained `SearchHit<T>` objects as a `Flux<SearchHit<T>>` and not as a list.
+
 [[elasticsearch.operations.queries]]
 == Queries
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,16 @@ public @interface CompletionContext {
 	 * @since 4.3
 	 */
 	enum ContextMappingType {
-		CATEGORY, GEO
+		CATEGORY("category"), GEO("geo");
+
+		private final String mappedName;
+
+		ContextMappingType(String mappedName) {
+			this.mappedName = mappedName;
+		}
+
+		public String getMappedName() {
+			return mappedName;
+		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 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.
@@ -17,7 +17,7 @@ package org.springframework.data.elasticsearch.annotations;
 
 /**
  * Values for the {@code dynamic} mapping parameter.
- * 
+ *
  * @author Sascha Woo
  * @since 4.3
  */
@@ -25,26 +25,36 @@ public enum Dynamic {
 	/**
 	 * New fields are added to the mapping.
 	 */
-	TRUE,
+	TRUE("true"),
 	/**
 	 * New fields are added to the mapping as
 	 * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/runtime.html">runtime fields</a>. These
 	 * fields are not indexed, and are loaded from {@code _source} at query time.
 	 */
-	RUNTIME,
+	RUNTIME("runtime"),
 	/**
 	 * New fields are ignored. These fields will not be indexed or searchable, but will still appear in the
 	 * {@code _source} field of returned hits. These fields will not be added to the mapping, and new fields must be added
 	 * explicitly.
 	 */
-	FALSE,
+	FALSE("false"),
 	/**
 	 * If new fields are detected, an exception is thrown and the document is rejected. New fields must be explicitly
 	 * added to the mapping.
 	 */
-	STRICT,
+	STRICT("strict"),
 	/**
 	 * Inherit the dynamic setting from their parent object or from the mapping type.
 	 */
-	INHERIT
+	INHERIT("nherit");
+
+	private final String mappedName;
+
+	Dynamic(String mappedName) {
+		this.mappedName = mappedName;
+	}
+
+	public String getMappedName() {
+		return mappedName;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 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.
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 /**
  * Annotation to set the dynamic mapping mode
  * {@see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic.html">elasticsearch doc</a>}
- * 
+ *
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @since 4.0

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 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.
@@ -17,13 +17,23 @@ package org.springframework.data.elasticsearch.annotations;
 
 /**
  * values for the {@link DynamicMapping annotation}
- * 
+ *
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @since 4.0
- * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead. 
+ * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead.
  */
 @Deprecated
 public enum DynamicMappingValue {
-	True, False, Strict
+	True("true"), False("false"), Strict("strict");
+
+	private final String mappedName;
+
+	DynamicMappingValue(String mappedName) {
+		this.mappedName = mappedName;
+	}
+
+	public String getMappedName() {
+		return mappedName;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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.
@@ -206,7 +206,7 @@ public @interface Field {
 
 	/**
 	 * marks this field to be excluded from the _source in Elasticsearch
-	 * (https://www.elastic.co/guide/en/elasticsearch/reference/7.15.0/mapping-source-field.html#include-exclude)
+	 * (https://www.elastic.co/guide/en/elasticsearch/reference/7.15/mapping-source-field.html#include-exclude)
 	 *
 	 * @since 4.3
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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.
@@ -26,40 +26,51 @@ package org.springframework.data.elasticsearch.annotations;
  * @author Morgan Lutz
  */
 public enum FieldType {
-	Auto, //
-	Text, //
-	Keyword, //
-	Long, //
-	Integer, //
-	Short, //
-	Byte, //
-	Double, //
-	Float, //
-	Half_Float, //
-	Scaled_Float, //
-	Date, //
-	Date_Nanos, //
-	Boolean, //
-	Binary, //
-	Integer_Range, //
-	Float_Range, //
-	Long_Range, //
-	Double_Range, //
-	Date_Range, //
-	Ip_Range, //
-	Object, //
-	Nested, //
-	Ip, //
-	TokenCount, //
-	Percolator, //
-	Flattened, //
-	Search_As_You_Type, //
+	Auto("auto"), //
+	Text("text"), //
+	Keyword("keyword"), //
+	Long("long"), //
+	Integer("integer"), //
+	Short("short"), //
+	Byte("byte"), //
+	Double("double"), //
+	Float("float"), //
+	Half_Float("half_float"), //
+	Scaled_Float("scaled_float"), //
+	Date("date"), //
+	Date_Nanos("date_nanos"), //
+	Boolean("boolean"), //
+	Binary("binary"), //
+	Integer_Range("integer_range"), //
+	Float_Range("float_range"), //
+	Long_Range("long_range"), //
+	Double_Range("double_range"), //
+	Date_Range("date_range"), //
+	Ip_Range("ip_range"), //
+	Object("object"), //
+	Nested("nested"), //
+	Ip("ip"), //
+	TokenCount("token_count"), //
+	Percolator("percolator"), //
+	Flattened("flattened"), //
+	Search_As_You_Type("search_as_you_type"), //
 	/** @since 4.1 */
-	Rank_Feature, //
+	Rank_Feature("rank_feature"), //
 	/** @since 4.1 */
-	Rank_Features, //
+	Rank_Features("rank_features"), //
 	/** since 4.2 */
-	Wildcard, //
+	Wildcard("wildcard"), //
 	/** @since 4.2 */
-	Dense_Vector //
+	Dense_Vector("dense_vector") //
+	;
+
+	private final String mappedName;
+
+	FieldType(String mappedName) {
+		this.mappedName = mappedName;
+	}
+
+	public String getMappedName() {
+		return mappedName;
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -128,7 +128,7 @@ public @interface InnerField {
 
 	/**
 	 * to be used in combination with {@link FieldType#Rank_Feature}
-	 * 
+	 *
 	 * @since 4.1
 	 */
 	boolean positiveScoreImpact() default true;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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.
@@ -28,7 +28,7 @@ import java.lang.annotation.*;
  */
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Documented
 @QueryAnnotation
 public @interface Query {
@@ -53,4 +53,3 @@ public @interface Query {
 	 */
 	boolean count() default false;
 }
-

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -54,7 +54,6 @@ public interface ClientConfiguration {
 
 	/**
 	 * Creates a new {@link ClientConfiguration} instance configured to localhost.
-	 * <p/>
 	 *
 	 * <pre class="code">
 	 * // "localhost:9200"
@@ -70,7 +69,6 @@ public interface ClientConfiguration {
 
 	/**
 	 * Creates a new {@link ClientConfiguration} instance configured to a single host given {@code hostAndPort}.
-	 * <p/>
 	 * For example given the endpoint http://localhost:9200
 	 *
 	 * <pre class="code">
@@ -85,7 +83,6 @@ public interface ClientConfiguration {
 
 	/**
 	 * Creates a new {@link ClientConfiguration} instance configured to a single host given {@link InetSocketAddress}.
-	 * <p/>
 	 * For example given the endpoint http://localhost:9200
 	 *
 	 * <pre class="code">

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -17,16 +17,15 @@ package org.springframework.data.elasticsearch.client;
 
 import java.util.function.Supplier;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
  * Logging Utility to log client requests and responses. Logs client requests and responses to Elasticsearch to a
- * dedicated logger: {@code org.springframework.data.elasticsearch.client.WIRE} on {@link org.slf4j.event.Level#TRACE}
- * level.
+ * dedicated logger: {@code org.springframework.data.elasticsearch.client.WIRE} on trace level.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
@@ -35,8 +34,7 @@ import org.springframework.util.ObjectUtils;
 public abstract class ClientLogger {
 
 	private static final String lineSeparator = System.getProperty("line.separator");
-	private static final Logger WIRE_LOGGER = LoggerFactory
-			.getLogger("org.springframework.data.elasticsearch.client.WIRE");
+	private static final Log WIRE_LOGGER = LogFactory.getLog("org.springframework.data.elasticsearch.client.WIRE");
 
 	private ClientLogger() {}
 
@@ -52,7 +50,7 @@ public abstract class ClientLogger {
 	/**
 	 * Log an outgoing HTTP request.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param method HTTP method
 	 * @param endpoint URI
 	 * @param parameters optional parameters.
@@ -60,16 +58,15 @@ public abstract class ClientLogger {
 	public static void logRequest(String logId, String method, String endpoint, Object parameters) {
 
 		if (isEnabled()) {
-
-			WIRE_LOGGER.trace("[{}] Sending request {} {} with parameters: {}", logId, method.toUpperCase(), endpoint,
-					parameters);
+			WIRE_LOGGER.trace(String.format("[%s] Sending request %s %s with parameters: %s", logId, method.toUpperCase(),
+					endpoint, parameters));
 		}
 	}
 
 	/**
 	 * Log an outgoing HTTP request with a request body.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param method HTTP method
 	 * @param endpoint URI
 	 * @param parameters optional parameters.
@@ -79,43 +76,43 @@ public abstract class ClientLogger {
 			Supplier<Object> body) {
 
 		if (isEnabled()) {
-
-			WIRE_LOGGER.trace("[{}] Sending request {} {} with parameters: {}{}Request body: {}", logId, method.toUpperCase(),
-					endpoint, parameters, lineSeparator, body.get());
+			WIRE_LOGGER.trace(String.format("[%s] Sending request %s %s with parameters: %s%sRequest body: %s", logId,
+					method.toUpperCase(), endpoint, parameters, lineSeparator, body.get()));
 		}
 	}
 
 	/**
 	 * Log a raw HTTP response without logging the body.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param statusCode the HTTP status code.
 	 */
 	public static void logRawResponse(String logId, @Nullable HttpStatus statusCode) {
 
 		if (isEnabled()) {
-			WIRE_LOGGER.trace("[{}] Received raw response: {}", logId, statusCode);
+			WIRE_LOGGER.trace(String.format("[%s] Received raw response: %s", logId, statusCode));
 		}
 	}
 
 	/**
 	 * Log a raw HTTP response along with the body.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param statusCode the HTTP status code.
 	 * @param body body content.
 	 */
 	public static void logResponse(String logId, HttpStatus statusCode, String body) {
 
 		if (isEnabled()) {
-			WIRE_LOGGER.trace("[{}] Received response: {}{}Response body: {}", logId, statusCode, lineSeparator, body);
+			WIRE_LOGGER.trace(
+					String.format("[%s] Received response: %s%sResponse body: %s", logId, statusCode, lineSeparator, body));
 		}
 	}
 
 	/**
-	 * Creates a new, unique correlation Id to improve tracing across log events.
+	 * Creates a new, unique correlation id to improve tracing across log events.
 	 *
-	 * @return a new, unique correlation Id.
+	 * @return a new, unique correlation id.
 	 */
 	public static String newLogId() {
 

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

@@ -1,104 +0,0 @@
-/*
- * Copyright 2018-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.elasticsearch.common.transport.TransportAddress;
-import org.springframework.data.util.Streamable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Value object to represent a list of cluster nodes.
- *
- * @author Oliver Gierke
- * @since 3.1
- * @deprecated only used in {@link TransportClientFactoryBean}.
- */
-@SuppressWarnings("DeprecatedIsStillUsed")
-@Deprecated
-class ClusterNodes implements Streamable<TransportAddress> {
-
-	public static ClusterNodes DEFAULT = ClusterNodes.of("127.0.0.1:9300");
-
-	private static final String COLON = ":";
-	private static final String COMMA = ",";
-
-	private final List<TransportAddress> clusterNodes;
-
-	/**
-	 * Creates a new {@link ClusterNodes} by parsing the given source.
-	 *
-	 * @param source must not be {@literal null} or empty.
-	 */
-	private ClusterNodes(String source) {
-
-		Assert.hasText(source, "Cluster nodes source must not be null or empty!");
-
-		String[] nodes = StringUtils.delimitedListToStringArray(source, COMMA);
-
-		this.clusterNodes = Arrays.stream(nodes).map(node -> {
-
-			String[] segments = StringUtils.delimitedListToStringArray(node, COLON);
-
-			Assert.isTrue(segments.length == 2,
-					() -> String.format("Invalid cluster node %s in %s! Must be in the format host:port!", node, source));
-
-			String host = segments[0].trim();
-			String port = segments[1].trim();
-
-			Assert.hasText(host, () -> String.format("No host name given cluster node %s!", node));
-			Assert.hasText(port, () -> String.format("No port given in cluster node %s!", node));
-
-			return new TransportAddress(toInetAddress(host), Integer.parseInt(port));
-
-		}).collect(Collectors.toList());
-	}
-
-	/**
-	 * Creates a new {@link ClusterNodes} by parsing the given source. The expected format is a comma separated list of
-	 * host-port-combinations separated by a colon: {@code host:port,host:port,…}.
-	 *
-	 * @param source must not be {@literal null} or empty.
-	 */
-	public static ClusterNodes of(String source) {
-		return new ClusterNodes(source);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
-	@Override
-	public Iterator<TransportAddress> iterator() {
-		return clusterNodes.iterator();
-	}
-
-	private static InetAddress toInetAddress(String host) {
-
-		try {
-			return InetAddress.getByName(host);
-		} catch (UnknownHostException o_O) {
-			throw new IllegalArgumentException(o_O);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -129,6 +129,7 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return webClientConfigurer;
 	}
 
+	@Deprecated
 	@Override
 	public HttpClientConfigCallback getHttpClientConfigurer() {
 		return httpClientConfigurer;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -18,11 +18,11 @@ package org.springframework.data.elasticsearch.client;
 import java.net.URL;
 import java.util.ArrayList;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.FactoryBeanNotInitializedException;
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
  */
 public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RestClientFactoryBean.class);
+	private static final Log LOGGER = LogFactory.getLog(RestClientFactoryBean.class);
 
 	private @Nullable RestHighLevelClient client;
 	private String hosts = "http://localhost:9200";

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,158 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client;
-
-import java.util.Properties;
-
-import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.FactoryBeanNotInitializedException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
-
-/**
- * TransportClientFactoryBean
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Jakub Vavrik
- * @author Piotr Betkier
- * @author Ilkang Na
- * @author Oliver Gierke
- * @author Peter-Josef Meisch
- * @deprecated as of 4.0
- */
-@Deprecated
-public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
-	private ClusterNodes clusterNodes = ClusterNodes.of("127.0.0.1:9300");
-	private String clusterName = "elasticsearch";
-	private Boolean clientTransportSniff = true;
-	private Boolean clientIgnoreClusterName = Boolean.FALSE;
-	private String clientPingTimeout = "5s";
-	private String clientNodesSamplerInterval = "5s";
-	private @Nullable TransportClient client;
-	private @Nullable Properties properties;
-
-	@Override
-	public void destroy() {
-		try {
-			logger.info("Closing elasticSearch  client");
-			if (client != null) {
-				client.close();
-			}
-		} catch (final Exception e) {
-			logger.error("Error closing ElasticSearch client: ", e);
-		}
-	}
-
-	@Override
-	public TransportClient getObject() {
-
-		if (clientTransportSniff == null) {
-			throw new FactoryBeanNotInitializedException();
-		}
-		return client;
-	}
-
-	@Override
-	public Class<TransportClient> getObjectType() {
-		return TransportClient.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		buildClient();
-	}
-
-	protected void buildClient() {
-
-		client = new PreBuiltTransportClient(settings());
-
-		clusterNodes.stream() //
-				.peek(it -> logger.info("Adding transport node : " + it.toString())) //
-				.forEach(client::addTransportAddress);
-
-		client.connectedNodes();
-	}
-
-	private Settings settings() {
-		if (properties != null) {
-			Settings.Builder builder = Settings.builder();
-
-			properties.forEach((key, value) -> {
-				builder.put(key.toString(), value.toString());
-			});
-
-			return builder.build();
-		}
-		return Settings.builder().put("cluster.name", clusterName).put("client.transport.sniff", clientTransportSniff)
-				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)
-				.put("client.transport.ping_timeout", clientPingTimeout)
-				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval).build();
-	}
-
-	public void setClusterNodes(String clusterNodes) {
-		this.clusterNodes = ClusterNodes.of(clusterNodes);
-	}
-
-	public void setClusterName(String clusterName) {
-		this.clusterName = clusterName;
-	}
-
-	public void setClientTransportSniff(Boolean clientTransportSniff) {
-		this.clientTransportSniff = clientTransportSniff;
-	}
-
-	public String getClientNodesSamplerInterval() {
-		return clientNodesSamplerInterval;
-	}
-
-	public void setClientNodesSamplerInterval(String clientNodesSamplerInterval) {
-		this.clientNodesSamplerInterval = clientNodesSamplerInterval;
-	}
-
-	public String getClientPingTimeout() {
-		return clientPingTimeout;
-	}
-
-	public void setClientPingTimeout(String clientPingTimeout) {
-		this.clientPingTimeout = clientPingTimeout;
-	}
-
-	public Boolean getClientIgnoreClusterName() {
-		return clientIgnoreClusterName;
-	}
-
-	public void setClientIgnoreClusterName(Boolean clientIgnoreClusterName) {
-		this.clientIgnoreClusterName = clientIgnoreClusterName;
-	}
-
-	public void setProperties(Properties properties) {
-		this.properties = properties;
-	}
-}

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -83,10 +83,6 @@ import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.GetAliasesResponse;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.indices.*;
-import org.elasticsearch.common.xcontent.DeprecationHandler;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
@@ -100,9 +96,14 @@ import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.suggest.Suggest;
+import org.elasticsearch.xcontent.DeprecationHandler;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentType;
 import org.reactivestreams.Publisher;
 import org.springframework.data.elasticsearch.RestStatusException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
+import org.springframework.data.elasticsearch.core.ResponseConverter;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.ClientLogger;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
@@ -112,7 +113,6 @@ import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsea
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Indices;
 import org.springframework.data.elasticsearch.client.util.NamedXContents;
 import org.springframework.data.elasticsearch.client.util.ScrollState;
-import org.springframework.data.elasticsearch.core.ResponseConverter;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.util.Lazy;
 import org.springframework.http.HttpHeaders;
@@ -147,6 +147,7 @@ import org.springframework.web.reactive.function.client.WebClient.RequestBodySpe
  * @see ClientConfiguration
  * @see ReactiveRestClients
  */
+// todo package private after refactoring
 public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearchClient, Indices, Cluster {
 
 	private final HostProvider<?> hostProvider;

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultRequestCreator.java

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

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultWebClientProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/HostProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/MultiNodeHostProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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,8 +29,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
@@ -48,7 +48,7 @@ import org.springframework.web.reactive.function.client.WebClient;
  */
 class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 
-	private final static Logger LOG = LoggerFactory.getLogger(MultiNodeHostProvider.class);
+	private final static Log LOGGER = LogFactory.getLog(MultiNodeHostProvider.class);
 
 	private final WebClientProvider clientProvider;
 	private final Map<InetSocketAddress, ElasticsearchHost> hosts;
@@ -61,7 +61,9 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 			this.hosts.put(endpoint, new ElasticsearchHost(endpoint, State.UNKNOWN));
 		}
 
-		LOG.debug("initialized with " + hosts);
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug("initialized with " + hosts);
+		}
 	}
 
 	/*
@@ -90,19 +92,27 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	@Override
 	public Mono<InetSocketAddress> lookupActiveHost(Verification verification) {
 
-		LOG.trace("lookupActiveHost " + verification + " from " + hosts());
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("lookupActiveHost " + verification + " from " + hosts());
+		}
 
 		if (Verification.LAZY.equals(verification)) {
 			for (ElasticsearchHost entry : hosts()) {
 				if (entry.isOnline()) {
-					LOG.trace("lookupActiveHost returning " + entry);
+					if (LOGGER.isTraceEnabled()) {
+						LOGGER.trace("lookupActiveHost returning " + entry);
+					}
 					return Mono.just(entry.getEndpoint());
 				}
 			}
-			LOG.trace("no online host found with LAZY");
+			if (LOGGER.isTraceEnabled()) {
+				LOGGER.trace("no online host found with LAZY");
+			}
 		}
 
-		LOG.trace("searching for active host");
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("searching for active host");
+		}
 		return findActiveHostInKnownActives() //
 				.switchIfEmpty(findActiveHostInUnresolved()) //
 				.switchIfEmpty(findActiveHostInDead()) //
@@ -127,13 +137,17 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 
 	private Mono<InetSocketAddress> findActiveForState(State state) {
 
-		LOG.trace("findActiveForState state " + state + ", current hosts: " + hosts);
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("findActiveForState state " + state + ", current hosts: " + hosts);
+		}
 
 		return checkNodes(state) //
 				.map(this::updateNodeState) //
 				.filter(ElasticsearchHost::isOnline) //
 				.map(elasticsearchHost -> {
-					LOG.trace("findActiveForState returning host " + elasticsearchHost);
+					if (LOGGER.isTraceEnabled()) {
+						LOGGER.trace("findActiveForState returning host " + elasticsearchHost);
+					}
 					return elasticsearchHost;
 				}).map(ElasticsearchHost::getEndpoint) //
 				.takeLast(1) //
@@ -150,21 +164,27 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 
 	private Flux<Tuple2<InetSocketAddress, State>> checkNodes(@Nullable State state) {
 
-		LOG.trace("checkNodes() with state " + state);
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace("checkNodes() with state " + state);
+		}
 
 		return Flux.fromIterable(hosts()) //
 				.filter(entry -> state == null || entry.getState().equals(state)) //
 				.map(ElasticsearchHost::getEndpoint) //
 				.concatMap(host -> {
 
-					LOG.trace("checking host " + host);
+					if (LOGGER.isTraceEnabled()) {
+						LOGGER.trace("checking host " + host);
+					}
 
 					Mono<ClientResponse> clientResponseMono = createWebClient(host) //
 							.head().uri("/") //
 							.exchangeToMono(Mono::just) //
 							.timeout(Duration.ofSeconds(1)) //
 							.doOnError(throwable -> {
-								LOG.trace("error checking host " + host + ", " + throwable.getMessage());
+								if (LOGGER.isTraceEnabled()) {
+									LOGGER.trace("error checking host " + host + ", " + throwable.getMessage());
+								}
 								hosts.put(host, new ElasticsearchHost(host, State.OFFLINE));
 								clientProvider.getErrorListener().accept(throwable);
 							});
@@ -174,7 +194,9 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 									.thenReturn(it.statusCode().isError() ? State.OFFLINE : State.ONLINE)));
 				}) //
 				.map(tuple -> {
-					LOG.trace("check result " + tuple);
+					if (LOGGER.isTraceEnabled()) {
+						LOGGER.trace("check result " + tuple);
+					}
 					return tuple;
 				}).onErrorContinue((throwable, o) -> clientProvider.getErrorListener().accept(throwable));
 	}

src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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,7 +21,6 @@ import java.io.IOException;
 
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamOutput;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.reactive.ClientHttpResponse;
 import org.springframework.web.reactive.function.BodyExtractor;
@@ -72,8 +71,7 @@ class RawActionResponse extends ActionResponse {
 	 * until Elasticsearch 7.4 this empty implementation was available in the abstract base class
 	 */
 	@Override
-	public void writeTo(StreamOutput out) throws IOException {
-	}
+	public void writeTo(StreamOutput out) throws IOException {}
 
 	/**
 	 * Ensure the response body is released to properly release the underlying connection.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveRestClients.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestBodyEncodingException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.data.elasticsearch.client.reactive;
 
 import java.io.IOException;

src/main/java/org/springframework/data/elasticsearch/client/reactive/SingleNodeHostProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -28,8 +28,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 /**
  * Provider for {@link WebClient}s using a pre-configured {@code scheme}. This class returns {@link WebClient} for a
  * specific {@link InetSocketAddress endpoint} and encapsulates common configuration aspects of {@link WebClient} so
- * that code using {@link WebClient} is not required to apply further configuration to the actual client.
- * <p/>
+ * that code using {@link WebClient} is not required to apply further configuration to the actual client. <br/>
  * Client instances are typically cached allowing reuse of pooled connections if configured on the
  * {@link ClientHttpConnector}.
  *

src/main/java/org/springframework/data/elasticsearch/client/util/NamedXContents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 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.
@@ -26,9 +26,6 @@ import org.elasticsearch.client.analytics.ParsedStringStats;
 import org.elasticsearch.client.analytics.ParsedTopMetrics;
 import org.elasticsearch.client.analytics.StringStatsAggregationBuilder;
 import org.elasticsearch.client.analytics.TopMetricsAggregationBuilder;
-import org.elasticsearch.common.xcontent.ContextParser;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.common.xcontent.ParseField;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.adjacency.ParsedAdjacencyMatrix;
@@ -78,6 +75,9 @@ import org.elasticsearch.search.suggest.phrase.PhraseSuggestion;
 import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder;
 import org.elasticsearch.search.suggest.term.TermSuggestion;
 import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
+import org.elasticsearch.xcontent.ContextParser;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.ParseField;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 
 /**

src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -80,14 +80,7 @@ import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.lucene.uid.Versions;
-import org.elasticsearch.common.xcontent.DeprecationHandler;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentHelper;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.VersionType;
@@ -101,6 +94,13 @@ import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.script.mustache.SearchTemplateRequest;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.xcontent.DeprecationHandler;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.ToXContent;
+import org.elasticsearch.xcontent.XContent;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentType;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 import org.springframework.http.HttpMethod;
 import org.springframework.lang.Nullable;
@@ -1232,7 +1232,12 @@ public class RequestConverters {
 			return this;
 		}
 
-		Params withIndicesOptions(IndicesOptions indicesOptions) {
+		Params withIndicesOptions(@Nullable IndicesOptions indicesOptions) {
+
+			if (indicesOptions == null) {
+				return this;
+			}
+
 			withIgnoreUnavailable(indicesOptions.ignoreUnavailable());
 			putParam("allow_no_indices", Boolean.toString(indicesOptions.allowNoIndices()));
 			String expandWildcards;

src/main/java/org/springframework/data/elasticsearch/client/util/ScrollState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/AbstractElasticsearchConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/AbstractReactiveElasticsearchConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchAuditingBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchAuditingRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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.
@@ -35,7 +35,6 @@ public class ElasticsearchNamespaceHandler extends NamespaceHandlerSupport {
 		RepositoryBeanDefinitionParser parser = new RepositoryBeanDefinitionParser(extension);
 
 		registerBeanDefinitionParser("repositories", parser);
-		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
 		registerBeanDefinitionParser("rest-client", new RestClientBeanDefinitionParser());
 	}
 }

src/main/java/org/springframework/data/elasticsearch/config/EnableElasticsearchAuditing.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/EnableReactiveElasticsearchAuditing.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/PersistentEntitiesFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/ReactiveElasticsearchAuditingRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/org/springframework/data/elasticsearch/config/RestClientBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.springframework.data.elasticsearch.config;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.data.elasticsearch.client.RestClientFactoryBean;
 import org.w3c.dom.Element;

src/main/java/org/springframework/data/elasticsearch/config/TransportClientBeanDefinitionParser.java

@@ -1,57 +0,0 @@
-/*
- * Copyright 2013-2021 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.config;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
-import org.w3c.dom.Element;
-
-/**
- * TransportClientBeanDefinitionParser
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @deprecated as of 4.0
- */
-@Deprecated
-public class TransportClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(TransportClientFactoryBean.class);
-		setConfigurations(element, builder);
-		return getSourcedBeanDefinition(builder, element, parserContext);
-	}
-
-	private void setConfigurations(Element element, BeanDefinitionBuilder builder) {
-		builder.addPropertyValue("clusterNodes", element.getAttribute("cluster-nodes"));
-		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
-		builder.addPropertyValue("clientTransportSniff", Boolean.valueOf(element.getAttribute("client-transport-sniff")));
-		builder.addPropertyValue("clientIgnoreClusterName", Boolean.valueOf(element.getAttribute("client-transport-ignore-cluster-name")));
-		builder.addPropertyValue("clientPingTimeout", element.getAttribute("client-transport-ping-timeout"));
-		builder.addPropertyValue("clientNodesSamplerInterval", element.getAttribute("client-transport-nodes-sampler-interval"));
-	}
-
-	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
-															ParserContext context) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(source));
-		return definition;
-	}
-}

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

@@ -1,219 +0,0 @@
-/*
- * Copyright 2021 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.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.elasticsearch.Version;
-import org.elasticsearch.action.DocWriteResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.search.MultiSearchRequest;
-import org.elasticsearch.action.search.MultiSearchResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.suggest.SuggestBuilder;
-import org.springframework.data.elasticsearch.BulkFailureException;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.util.Assert;
-
-/**
- * This class contains methods that are common the implementations derived from {@link AbstractElasticsearchTemplate}
- * using either the {@link org.elasticsearch.client.transport.TransportClient} or the
- * {@link org.elasticsearch.client.RestHighLevelClient} and that use Elasticsearch specific libraries.
- * <p>
- * <strong>Note:</strong> Although this class is public, it is not considered to be part of the official Spring Data
- * Elasticsearch API and so might change at any time.
- *
- * @author Peter-Josef Meisch
- */
-public abstract class AbstractElasticsearchRestTransportTemplate extends AbstractElasticsearchTemplate {
-
-	// region DocumentOperations
-	/**
-	 * @param bulkResponse
-	 * @return the list of the item id's
-	 */
-	protected List<IndexedObjectInformation> checkForBulkOperationFailure(BulkResponse bulkResponse) {
-
-		if (bulkResponse.hasFailures()) {
-			Map<String, String> failedDocuments = new HashMap<>();
-			for (BulkItemResponse item : bulkResponse.getItems()) {
-
-				if (item.isFailed())
-					failedDocuments.put(item.getId(), item.getFailureMessage());
-			}
-			throw new BulkFailureException(
-					"Bulk operation has failures. Use ElasticsearchException.getFailedDocuments() for detailed messages ["
-							+ failedDocuments + ']',
-					failedDocuments);
-		}
-
-		return Stream.of(bulkResponse.getItems()).map(bulkItemResponse -> {
-			DocWriteResponse response = bulkItemResponse.getResponse();
-			if (response != null) {
-				return IndexedObjectInformation.of(response.getId(), response.getSeqNo(), response.getPrimaryTerm(),
-						response.getVersion());
-			} else {
-				return IndexedObjectInformation.of(bulkItemResponse.getId(), null, null, null);
-			}
-
-		}).collect(Collectors.toList());
-	}
-
-	// endregion
-
-	// region SearchOperations
-	protected <T> SearchHits<T> doSearch(MoreLikeThisQuery query, Class<T> clazz, IndexCoordinates index) {
-		MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = requestFactory.moreLikeThisQueryBuilder(query, index);
-		return search(
-				new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).withPageable(query.getPageable()).build(),
-				clazz, index);
-	}
-
-	@Override
-	public <T> List<SearchHits<T>> multiSearch(List<? extends Query> queries, Class<T> clazz, IndexCoordinates index) {
-		MultiSearchRequest request = new MultiSearchRequest();
-		for (Query query : queries) {
-			request.add(requestFactory.searchRequest(query, clazz, index));
-		}
-
-		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
-
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
-		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
-		List<SearchHits<T>> res = new ArrayList<>(queries.size());
-		int c = 0;
-		for (Query query : queries) {
-			res.add(callback.doWith(SearchDocumentResponse.from(items[c++].getResponse(), documentCallback::doWith)));
-		}
-		return res;
-	}
-
-	@Override
-	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes) {
-
-		Assert.notNull(queries, "queries must not be null");
-		Assert.notNull(classes, "classes must not be null");
-		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
-
-		MultiSearchRequest request = new MultiSearchRequest();
-		Iterator<Class<?>> it = classes.iterator();
-		for (Query query : queries) {
-			Class<?> clazz = it.next();
-			request.add(requestFactory.searchRequest(query, clazz, getIndexCoordinatesFor(clazz)));
-		}
-
-		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
-
-		List<SearchHits<?>> res = new ArrayList<>(queries.size());
-		int c = 0;
-		Iterator<Class<?>> it1 = classes.iterator();
-		for (Query query : queries) {
-			Class entityClass = it1.next();
-
-			IndexCoordinates index = getIndexCoordinatesFor(entityClass);
-			ReadDocumentCallback<?> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, entityClass, index);
-			SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(entityClass,
-					index);
-
-			SearchResponse response = items[c++].getResponse();
-			res.add(callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith)));
-		}
-		return res;
-	}
-
-	@Override
-	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes,
-			IndexCoordinates index) {
-
-		Assert.notNull(queries, "queries must not be null");
-		Assert.notNull(classes, "classes must not be null");
-		Assert.notNull(index, "index must not be null");
-		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
-
-		MultiSearchRequest request = new MultiSearchRequest();
-		Iterator<Class<?>> it = classes.iterator();
-		for (Query query : queries) {
-			request.add(requestFactory.searchRequest(query, it.next(), index));
-		}
-
-		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
-
-		List<SearchHits<?>> res = new ArrayList<>(queries.size());
-		int c = 0;
-		Iterator<Class<?>> it1 = classes.iterator();
-		for (Query query : queries) {
-			Class entityClass = it1.next();
-
-			ReadDocumentCallback<?> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, entityClass, index);
-			SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(entityClass,
-					index);
-
-			SearchResponse response = items[c++].getResponse();
-			res.add(callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith)));
-		}
-		return res;
-	}
-
-	abstract protected MultiSearchResponse.Item[] getMultiSearchResult(MultiSearchRequest request);
-
-	// endregion
-
-	// region helper
-	@Override
-	public Query matchAllQuery() {
-		return new NativeSearchQueryBuilder().withQuery(QueryBuilders.matchAllQuery()).build();
-	}
-
-	@Override
-	public Query idsQuery(List<String> ids) {
-
-		Assert.notNull(ids, "ids must not be null");
-
-		return new NativeSearchQueryBuilder().withQuery(QueryBuilders.idsQuery().addIds(ids.toArray(new String[] {})))
-				.build();
-	}
-
-	@Override
-	protected String getVendor() {
-		return "Elasticsearch";
-	}
-
-	@Override
-	protected String getRuntimeLibraryVersion() {
-		return Version.CURRENT.toString();
-	}
-
-	@Override
-	@Deprecated
-	public SearchResponse suggest(SuggestBuilder suggestion, Class<?> clazz) {
-		return suggest(suggestion, getIndexCoordinatesFor(clazz));
-	}
-
-	// endregion
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,17 +20,19 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.convert.EntityReader;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.event.AfterConvertCallback;
+import org.springframework.data.elasticsearch.core.event.AfterLoadCallback;
 import org.springframework.data.elasticsearch.core.event.AfterSaveCallback;
 import org.springframework.data.elasticsearch.core.event.BeforeConvertCallback;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
@@ -58,9 +60,9 @@ import org.springframework.util.Assert;
 
 /**
  * This class contains methods that are common to different implementations of the {@link ElasticsearchOperations}
- * interface that use different clients, like TransportClient, RestHighLevelClient and the next Java client from
- * Elasticsearch or some future implementation that might use an Opensearch client. This class must not contain imports
- * or use classes that are specific to one of these implementations.
+ * interface that use different clients, like RestHighLevelClient and the next Java client from Elasticsearch or some
+ * future implementation that might use an Opensearch client. This class must not contain imports or use classes that
+ * are specific to one of these implementations.
  * <p>
  * <strong>Note:</strong> Although this class is public, it is not considered to be part of the official Spring Data
  * Elasticsearch API and so might change at any time.
@@ -70,28 +72,31 @@ import org.springframework.util.Assert;
  * @author Roman Puchkovskiy
  * @author Subhobrata Dey
  * @author Steven Pearce
+ * @author Anton Naydenov
  */
 public abstract class AbstractElasticsearchTemplate implements ElasticsearchOperations, ApplicationContextAware {
 
-	@Nullable protected ElasticsearchConverter elasticsearchConverter;
-	@Nullable protected RequestFactory requestFactory;
-	@Nullable protected EntityOperations entityOperations;
+	protected ElasticsearchConverter elasticsearchConverter;
+	protected RequestFactory requestFactory;
+	protected EntityOperations entityOperations;
 	@Nullable protected EntityCallbacks entityCallbacks;
 	@Nullable protected RefreshPolicy refreshPolicy;
-	@Nullable protected RoutingResolver routingResolver;
+	protected RoutingResolver routingResolver;
 
-	// region Initialization
-	protected void initialize(ElasticsearchConverter elasticsearchConverter) {
+	public AbstractElasticsearchTemplate() {
+		this(null);
+	}
 
-		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null.");
+	public AbstractElasticsearchTemplate(@Nullable ElasticsearchConverter elasticsearchConverter) {
 
-		this.elasticsearchConverter = elasticsearchConverter;
+		this.elasticsearchConverter = elasticsearchConverter != null ? elasticsearchConverter
+				: createElasticsearchConverter();
 		MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext = this.elasticsearchConverter
 				.getMappingContext();
 		this.entityOperations = new EntityOperations(mappingContext);
-		this.routingResolver = new DefaultRoutingResolver((SimpleElasticsearchMappingContext) mappingContext);
+		this.routingResolver = new DefaultRoutingResolver(mappingContext);
 
-		requestFactory = new RequestFactory(elasticsearchConverter);
+		requestFactory = new RequestFactory(this.elasticsearchConverter);
 
 		// initialize the VersionInfo class in the initialization phase
 		// noinspection ResultOfMethodCallIgnored
@@ -110,13 +115,18 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		}
 
 		copy.setRoutingResolver(routingResolver);
+		copy.setRefreshPolicy(refreshPolicy);
 
 		return copy;
 	}
 
+	/**
+	 * must return a copy of this instance that will for example be used to set a custom routing resolver without
+	 * modifying the original object.
+	 */
 	protected abstract AbstractElasticsearchTemplate doCopy();
 
-	protected ElasticsearchConverter createElasticsearchConverter() {
+	private ElasticsearchConverter createElasticsearchConverter() {
 		MappingElasticsearchConverter mappingElasticsearchConverter = new MappingElasticsearchConverter(
 				new SimpleElasticsearchMappingContext());
 		mappingElasticsearchConverter.afterPropertiesSet();
@@ -138,7 +148,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	/**
 	 * Set the {@link EntityCallbacks} instance to use when invoking {@link EntityCallbacks callbacks} like the
 	 * {@link org.springframework.data.elasticsearch.core.event.BeforeConvertCallback}.
-	 * <p />
 	 * Overrides potentially existing {@link EntityCallbacks}.
 	 *
 	 * @param entityCallbacks must not be {@literal null}.
@@ -192,9 +201,8 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		IndexQuery query = getIndexQuery(entityAfterBeforeConvert);
 		doIndex(query, index);
 
-		T entityAfterAfterSave = (T) maybeCallbackAfterSave(query.getObject(), index);
-
-		return entityAfterAfterSave;
+		// noinspection unchecked
+		return (T) maybeCallbackAfterSave(Objects.requireNonNull(query.getObject()), index);
 	}
 
 	@Override
@@ -223,8 +231,8 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 			return Collections.emptyList();
 		}
 
-		List<IndexedObjectInformation> indexedObjectInformations = bulkIndex(indexQueries, index);
-		Iterator<IndexedObjectInformation> iterator = indexedObjectInformations.iterator();
+		List<IndexedObjectInformation> indexedObjectInformationList = bulkIndex(indexQueries, index);
+		Iterator<IndexedObjectInformation> iterator = indexedObjectInformationList.iterator();
 
 		// noinspection unchecked
 		return indexQueries.stream() //
@@ -233,8 +241,9 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 				.collect(Collectors.toList()); //
 	}
 
+	@SafeVarargs
 	@Override
-	public <T> Iterable<T> save(T... entities) {
+	public final <T> Iterable<T> save(T... entities) {
 		return save(Arrays.asList(entities));
 	}
 
@@ -296,7 +305,9 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 
 	@Override
 	public String delete(Object entity, IndexCoordinates index) {
-		return this.delete(getEntityId(entity), index);
+		String entityId = getEntityId(entity);
+		Assert.notNull(entityId, "entity must have an if that is notnull");
+		return this.delete(entityId, index);
 	}
 
 	@Override
@@ -345,11 +356,11 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 
 		maybeCallbackBeforeConvertWithQueries(queries, index);
 
-		List<IndexedObjectInformation> indexedObjectInformations = doBulkOperation(queries, bulkOptions, index);
+		List<IndexedObjectInformation> indexedObjectInformationList = doBulkOperation(queries, bulkOptions, index);
 
 		maybeCallbackAfterSaveWithQueries(queries, index);
 
-		return indexedObjectInformations;
+		return indexedObjectInformationList;
 	}
 
 	public abstract List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
@@ -447,9 +458,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	 * @since 4.0
 	 */
 	public RequestFactory getRequestFactory() {
-
-		Assert.notNull(requestFactory, "requestfactory not initialized");
-
 		return requestFactory;
 	}
 
@@ -498,8 +506,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 			}
 
 			// noinspection unchecked
-			T updatedEntity = (T) propertyAccessor.getBean();
-			return updatedEntity;
+			return (T) propertyAccessor.getBean();
 		}
 		return entity;
 	}
@@ -556,6 +563,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 			id = elasticsearchConverter.convertId(id);
 		}
 
+		// noinspection ConstantConditions
 		IndexQueryBuilder builder = new IndexQueryBuilder() //
 				.withId(id) //
 				.withObject(entity);
@@ -566,6 +574,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 			builder.withSeqNoPrimaryTerm(seqNoPrimaryTerm);
 		} else {
 			// version cannot be used together with seq_no and primary_term
+			// noinspection ConstantConditions
 			builder.withVersion(getEntityVersion(entity));
 		}
 
@@ -680,10 +689,19 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		return entity;
 	}
 
+	protected <T> Document maybeCallbackAfterLoad(Document document, Class<T> type, IndexCoordinates indexCoordinates) {
+
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(AfterLoadCallback.class, document, type, indexCoordinates);
+		}
+
+		return document;
+	}
+
 	// endregion
 
 	protected void updateIndexedObjectsWithQueries(List<?> queries,
-			List<IndexedObjectInformation> indexedObjectInformations) {
+			List<IndexedObjectInformation> indexedObjectInformationList) {
 
 		for (int i = 0; i < queries.size(); i++) {
 			Object query = queries.get(i);
@@ -693,7 +711,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 				Object queryObject = indexQuery.getObject();
 
 				if (queryObject != null) {
-					indexQuery.setObject(updateIndexedObject(queryObject, indexedObjectInformations.get(i)));
+					indexQuery.setObject(updateIndexedObject(queryObject, indexedObjectInformationList.get(i)));
 				}
 			}
 		}
@@ -726,13 +744,18 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 			if (document == null) {
 				return null;
 			}
+			Document documentAfterLoad = maybeCallbackAfterLoad(document, type, index);
 
-			T entity = reader.read(type, document);
-			IndexedObjectInformation indexedObjectInformation = IndexedObjectInformation.of(
-					document.hasId() ? document.getId() : null, document.getSeqNo(), document.getPrimaryTerm(),
-					document.getVersion());
+			T entity = reader.read(type, documentAfterLoad);
+
+			IndexedObjectInformation indexedObjectInformation = IndexedObjectInformation.of( //
+					documentAfterLoad.hasId() ? documentAfterLoad.getId() : null, //
+					documentAfterLoad.getSeqNo(), //
+					documentAfterLoad.getPrimaryTerm(), //
+					documentAfterLoad.getVersion()); //
 			entity = updateIndexedObject(entity, indexedObjectInformation);
-			return maybeCallbackAfterConvert(entity, document, index);
+
+			return maybeCallbackAfterConvert(entity, documentAfterLoad, index);
 		}
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ import org.springframework.util.Assert;
  * @author Sascha Woo
  * @since 4.0
  */
-abstract class AbstractIndexTemplate implements IndexOperations {
+public abstract class AbstractIndexTemplate implements IndexOperations {
 
 	protected final ElasticsearchConverter elasticsearchConverter;
 	protected final RequestFactory requestFactory;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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
+ *      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,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 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.
@@ -44,6 +44,7 @@ import org.springframework.util.Assert;
  * @author Rasmus Faber-Espensen
  * @author James Bodkin
  * @author Peter-Josef Meisch
+ * @since 4.4
  */
 class CriteriaQueryProcessor {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 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.
@@ -164,6 +164,7 @@ public interface DocumentOperations {
 	 * @param queries the queries to execute in bulk
 	 * @param clazz the entity class
 	 * @return the information about the indexed objects
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 * @since 4.1
 	 */
 	default List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, Class<?> clazz) {
@@ -175,6 +176,7 @@ public interface DocumentOperations {
 	 *
 	 * @param queries the queries to execute in bulk
 	 * @return the information about of the indexed objects
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 */
 	default List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, IndexCoordinates index) {
 		return bulkIndex(queries, BulkOptions.defaultOptions(), index);
@@ -187,6 +189,7 @@ public interface DocumentOperations {
 	 * @param bulkOptions options to be added to the bulk request
 	 * @param clazz the entity class
 	 * @return the information about of the indexed objects
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 * @since 4.1
 	 */
 	List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions, Class<?> clazz);
@@ -197,6 +200,7 @@ public interface DocumentOperations {
 	 * @param queries the queries to execute in bulk
 	 * @param bulkOptions options to be added to the bulk request
 	 * @return the information about of the indexed objects
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 */
 	List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions, IndexCoordinates index);
 
@@ -204,6 +208,7 @@ public interface DocumentOperations {
 	 * Bulk update all objects. Will do update.
 	 *
 	 * @param queries the queries to execute in bulk
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 */
 	default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
 		bulkUpdate(queries, BulkOptions.defaultOptions(), index);
@@ -214,6 +219,7 @@ public interface DocumentOperations {
 	 *
 	 * @param clazz the entity class
 	 * @param queries the queries to execute in bulk
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 * @since 4.1
 	 */
 	void bulkUpdate(List<UpdateQuery> queries, Class<?> clazz);
@@ -223,6 +229,7 @@ public interface DocumentOperations {
 	 *
 	 * @param queries the queries to execute in bulk
 	 * @param bulkOptions options to be added to the bulk request
+	 * @throws org.springframework.data.elasticsearch.BulkFailureException with information about the failed operation
 	 */
 	void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 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.
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.clients.elasticsearch7;
+package org.springframework.data.elasticsearch.core;
 
 import org.elasticsearch.search.aggregations.Aggregation;
-import org.springframework.data.elasticsearch.core.AggregationContainer;
 import org.springframework.lang.NonNull;
 
 /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 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.
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.clients.elasticsearch7;
+package org.springframework.data.elasticsearch.core;
 
 import org.elasticsearch.search.aggregations.Aggregations;
-import org.springframework.data.elasticsearch.core.AggregationsContainer;
 import org.springframework.lang.NonNull;
 
 /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -64,9 +64,9 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 			}
 
 			if (elasticsearchException instanceof ElasticsearchStatusException) {
-				ElasticsearchStatusException restStatusException = (ElasticsearchStatusException) elasticsearchException;
-				return new RestStatusException(restStatusException.status().getStatus(), restStatusException.getMessage(),
-						restStatusException.getCause());
+				ElasticsearchStatusException elasticsearchStatusException = (ElasticsearchStatusException) elasticsearchException;
+				return new RestStatusException(elasticsearchStatusException.status().getStatus(),
+						elasticsearchStatusException.getMessage(), elasticsearchStatusException);
 			}
 
 			return new UncategorizedElasticsearchException(ex.getMessage(), ex);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,21 @@
 package org.springframework.data.elasticsearch.core;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.elasticsearch.Version;
+import org.elasticsearch.action.DocWriteResponse;
+import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
@@ -38,14 +49,16 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.index.reindex.UpdateByQueryRequest;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.search.suggest.SuggestBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.data.elasticsearch.BulkFailureException;
 import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
+import org.springframework.data.elasticsearch.core.cluster.ElasticsearchClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
 import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
@@ -53,10 +66,11 @@ import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
-import org.springframework.data.elasticsearch.support.SearchHitsUtil;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -92,10 +106,11 @@ import org.springframework.util.Assert;
  * @author Gyula Attila Csorogi
  * @author Massimiliano Poggi
  * @author Farid Faoudi
+ * @since 4.4
  */
-public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTransportTemplate {
+public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchRestTemplate.class);
+	private static final Log LOGGER = LogFactory.getLog(ElasticsearchRestTemplate.class);
 
 	private final RestHighLevelClient client;
 	private final ElasticsearchExceptionTranslator exceptionTranslator = new ElasticsearchExceptionTranslator();
@@ -106,24 +121,21 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 		Assert.notNull(client, "Client must not be null!");
 
 		this.client = client;
-
-		initialize(createElasticsearchConverter());
 	}
 
 	public ElasticsearchRestTemplate(RestHighLevelClient client, ElasticsearchConverter elasticsearchConverter) {
 
+		super(elasticsearchConverter);
+
 		Assert.notNull(client, "Client must not be null!");
 
 		this.client = client;
-
-		initialize(elasticsearchConverter);
 	}
 
 	@Override
 	protected AbstractElasticsearchTemplate doCopy() {
 		return new ElasticsearchRestTemplate(client, elasticsearchConverter);
 	}
-
 	// endregion
 
 	// region IndexOperations
@@ -147,7 +159,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 	// region ClusterOperations
 	@Override
 	public ClusterOperations cluster() {
-		return ClusterOperations.forTemplate(this);
+		return ElasticsearchClusterOperations.forTemplate(this);
 	}
 	// endregion
 
@@ -275,11 +287,11 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 	}
 
 	/**
-	 * Pre process the write request before it is sent to the server, eg. by setting the
+	 * Preprocess the write request before it is sent to the server, e.g. by setting the
 	 * {@link WriteRequest#setRefreshPolicy(String) refresh policy} if applicable.
 	 *
 	 * @param request must not be {@literal null}.
-	 * @param <R>
+	 * @param <R> the request type
 	 * @return the processed {@link WriteRequest}.
 	 */
 	protected <R extends WriteRequest<R>> R prepareWriteRequest(R request) {
@@ -291,6 +303,39 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 		return request.setRefreshPolicy(RequestFactory.toElasticsearchRefreshPolicy(refreshPolicy));
 	}
 
+	/**
+	 * extract the list of {@link IndexedObjectInformation} from a {@link BulkResponse}.
+	 *
+	 * @param bulkResponse the response to evaluate
+	 * @return the list of the {@link IndexedObjectInformation}s
+	 */
+	protected List<IndexedObjectInformation> checkForBulkOperationFailure(BulkResponse bulkResponse) {
+
+		if (bulkResponse.hasFailures()) {
+			Map<String, String> failedDocuments = new HashMap<>();
+			for (BulkItemResponse item : bulkResponse.getItems()) {
+
+				if (item.isFailed())
+					failedDocuments.put(item.getId(), item.getFailureMessage());
+			}
+			throw new BulkFailureException(
+					"Bulk operation has failures. Use BulkFailureException.getFailedDocuments() for detailed messages ["
+							+ failedDocuments + ']',
+					failedDocuments);
+		}
+
+		return Stream.of(bulkResponse.getItems()).map(bulkItemResponse -> {
+			DocWriteResponse response = bulkItemResponse.getResponse();
+			if (response != null) {
+				return IndexedObjectInformation.of(response.getId(), response.getSeqNo(), response.getPrimaryTerm(),
+						response.getVersion());
+			} else {
+				return IndexedObjectInformation.of(bulkItemResponse.getId(), null, null, null);
+			}
+
+		}).collect(Collectors.toList());
+	}
+
 	// endregion
 
 	// region SearchOperations
@@ -316,12 +361,19 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 		SearchRequest searchRequest = requestFactory.searchRequest(query, clazz, index);
 		SearchResponse response = execute(client -> client.search(searchRequest, RequestOptions.DEFAULT));
 
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
+		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
 		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
 
 		return callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith));
 	}
 
+	protected <T> SearchHits<T> doSearch(MoreLikeThisQuery query, Class<T> clazz, IndexCoordinates index) {
+		MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = requestFactory.moreLikeThisQueryBuilder(query, index);
+		return search(
+				new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).withPageable(query.getPageable()).build(),
+				clazz, index);
+	}
+
 	@Override
 	public <T> SearchScrollHits<T> searchScrollStart(long scrollTimeInMillis, Query query, Class<T> clazz,
 			IndexCoordinates index) {
@@ -333,7 +385,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 
 		SearchResponse response = execute(client -> client.search(searchRequest, RequestOptions.DEFAULT));
 
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
+		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
 		SearchDocumentResponseCallback<SearchScrollHits<T>> callback = new ReadSearchScrollDocumentResponseCallback<>(clazz,
 				index);
 		return callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith));
@@ -348,7 +400,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 
 		SearchResponse response = execute(client -> client.scroll(request, RequestOptions.DEFAULT));
 
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
+		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
 		SearchDocumentResponseCallback<SearchScrollHits<T>> callback = new ReadSearchScrollDocumentResponseCallback<>(clazz,
 				index);
 		return callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith));
@@ -361,7 +413,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 			request.scrollIds(scrollIds);
 			execute(client -> client.clearScroll(request, RequestOptions.DEFAULT));
 		} catch (Exception e) {
-			LOGGER.warn("Could not clear scroll: {}", e.getMessage());
+			LOGGER.warn(String.format("Could not clear scroll: %s", e.getMessage()));
 		}
 	}
 
@@ -372,8 +424,91 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 	}
 
 	@Override
+	public <T> List<SearchHits<T>> multiSearch(List<? extends Query> queries, Class<T> clazz, IndexCoordinates index) {
+		MultiSearchRequest request = new MultiSearchRequest();
+		for (Query query : queries) {
+			request.add(requestFactory.searchRequest(query, clazz, index));
+		}
+
+		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
+
+		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
+		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
+		List<SearchHits<T>> res = new ArrayList<>(queries.size());
+		for (int i = 0; i < queries.size(); i++) {
+			res.add(callback.doWith(SearchDocumentResponse.from(items[i].getResponse(), documentCallback::doWith)));
+		}
+		return res;
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(classes, "classes must not be null");
+		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
+
+		MultiSearchRequest request = new MultiSearchRequest();
+		Iterator<Class<?>> it = classes.iterator();
+		for (Query query : queries) {
+			Class<?> clazz = it.next();
+			request.add(requestFactory.searchRequest(query, clazz, getIndexCoordinatesFor(clazz)));
+		}
+
+		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
+
+		List<SearchHits<?>> res = new ArrayList<>(queries.size());
+		Iterator<Class<?>> it1 = classes.iterator();
+		for (int i = 0; i < queries.size(); i++) {
+			Class entityClass = it1.next();
+
+			IndexCoordinates index = getIndexCoordinatesFor(entityClass);
+			ReadDocumentCallback<?> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, entityClass, index);
+			SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(entityClass,
+					index);
+
+			SearchResponse response = items[i].getResponse();
+			res.add(callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith)));
+		}
+		return res;
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes,
+			IndexCoordinates index) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(classes, "classes must not be null");
+		Assert.notNull(index, "index must not be null");
+		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
+
+		MultiSearchRequest request = new MultiSearchRequest();
+		Iterator<Class<?>> it = classes.iterator();
+		for (Query query : queries) {
+			request.add(requestFactory.searchRequest(query, it.next(), index));
+		}
+
+		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
+
+		List<SearchHits<?>> res = new ArrayList<>(queries.size());
+		Iterator<Class<?>> it1 = classes.iterator();
+		for (int i = 0; i < queries.size(); i++) {
+			Class entityClass = it1.next();
+
+			ReadDocumentCallback<?> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, entityClass, index);
+			SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(entityClass,
+					index);
+
+			SearchResponse response = items[i].getResponse();
+			res.add(callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith)));
+		}
+		return res;
+	}
+
 	protected MultiSearchResponse.Item[] getMultiSearchResult(MultiSearchRequest request) {
-		MultiSearchResponse response = execute(client -> client.multiSearch(request, RequestOptions.DEFAULT));
+		MultiSearchResponse response = execute(client -> client.msearch(request, RequestOptions.DEFAULT));
 		MultiSearchResponse.Item[] items = response.getResponses();
 		Assert.isTrue(items.length == request.requests().size(), "Response should has same length with queries");
 		return items;
@@ -439,5 +574,36 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchRestTranspor
 		} catch (Exception ignored) {}
 		return null;
 	}
+
+	@Override
+	public Query matchAllQuery() {
+		return new NativeSearchQueryBuilder().withQuery(QueryBuilders.matchAllQuery()).build();
+	}
+
+	@Override
+	public Query idsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		return new NativeSearchQueryBuilder().withQuery(QueryBuilders.idsQuery().addIds(ids.toArray(new String[] {})))
+				.build();
+	}
+
+	@Override
+	protected String getVendor() {
+		return "Elasticsearch";
+	}
+
+	@Override
+	protected String getRuntimeLibraryVersion() {
+		return Version.CURRENT.toString();
+	}
+
+	@Override
+	@Deprecated
+	public SearchResponse suggest(SuggestBuilder suggestion, Class<?> clazz) {
+		return suggest(suggestion, getIndexCoordinatesFor(clazz));
+	}
+
 	// endregion
 }

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

@@ -1,473 +0,0 @@
-/*
- * Copyright 2013-2021 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.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.elasticsearch.action.ActionFuture;
-import org.elasticsearch.action.admin.cluster.node.info.NodesInfoAction;
-import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequestBuilder;
-import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.get.GetRequestBuilder;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.get.MultiGetRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.MultiSearchRequest;
-import org.elasticsearch.action.search.MultiSearchResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.support.WriteRequest;
-import org.elasticsearch.action.support.WriteRequestBuilder;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.index.reindex.BulkByScrollResponse;
-import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder;
-import org.elasticsearch.search.suggest.SuggestBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.document.DocumentAdapters;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
-import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.data.elasticsearch.core.query.UpdateQuery;
-import org.springframework.data.elasticsearch.core.query.UpdateResponse;
-import org.springframework.data.elasticsearch.support.SearchHitsUtil;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * ElasticsearchTemplate
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- * @author Kevin Leturc
- * @author Mason Chan
- * @author Young Gu
- * @author Oliver Gierke
- * @author Mark Janssen
- * @author Chris White
- * @author Mark Paluch
- * @author Ilkang Na
- * @author Alen Turkovic
- * @author Sascha Woo
- * @author Ted Liang
- * @author Jean-Baptiste Nizet
- * @author Zetang Zeng
- * @author Ivan Greene
- * @author Christoph Strobl
- * @author Dmitriy Yakovlev
- * @author Peter-Josef Meisch
- * @author Martin Choraine
- * @author Farid Azaza
- * @author Gyula Attila Csorogi
- * @author Roman Puchkovskiy
- * @author Farid Faoudi
- * @deprecated as of 4.0
- */
-@Deprecated
-public class ElasticsearchTemplate extends AbstractElasticsearchRestTransportTemplate {
-	private static final Logger QUERY_LOGGER = LoggerFactory
-			.getLogger("org.springframework.data.elasticsearch.core.QUERY");
-	private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchTemplate.class);
-
-	private Client client;
-	@Nullable private String searchTimeout;
-
-	private final ElasticsearchExceptionTranslator exceptionTranslator = new ElasticsearchExceptionTranslator();
-
-	// region Initialization
-	public ElasticsearchTemplate(Client client) {
-		this.client = client;
-		initialize(client, createElasticsearchConverter());
-	}
-
-	public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter) {
-		this.client = client;
-		initialize(client, elasticsearchConverter);
-	}
-
-	private void initialize(Client client, ElasticsearchConverter elasticsearchConverter) {
-
-		Assert.notNull(client, "Client must not be null!");
-
-		this.client = client;
-		initialize(elasticsearchConverter);
-	}
-
-	@Override
-	protected AbstractElasticsearchTemplate doCopy() {
-		ElasticsearchTemplate elasticsearchTemplate = new ElasticsearchTemplate(client, elasticsearchConverter);
-		elasticsearchTemplate.setSearchTimeout(searchTimeout);
-		return elasticsearchTemplate;
-	}
-
-	// endregion
-
-	// region IndexOperations
-	@Override
-	public IndexOperations indexOps(Class<?> clazz) {
-
-		Assert.notNull(clazz, "clazz must not be null");
-
-		return new TransportIndexTemplate(client, elasticsearchConverter, clazz);
-	}
-
-	@Override
-	public IndexOperations indexOps(IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		return new TransportIndexTemplate(client, elasticsearchConverter, index);
-	}
-	// endregion
-
-	// region ClusterOperations
-	@Override
-	public ClusterOperations cluster() {
-		return ClusterOperations.forTemplate(this);
-	}
-	// endregion
-
-	// region getter/setter
-	@Nullable
-	public String getSearchTimeout() {
-		return searchTimeout;
-	}
-
-	public void setSearchTimeout(String searchTimeout) {
-		this.searchTimeout = searchTimeout;
-	}
-	// endregion
-
-	// region DocumentOperations
-	public String doIndex(IndexQuery query, IndexCoordinates index) {
-
-		IndexRequestBuilder indexRequestBuilder = requestFactory.indexRequestBuilder(client, query, index);
-		indexRequestBuilder = prepareWriteRequestBuilder(indexRequestBuilder);
-		ActionFuture<IndexResponse> future = indexRequestBuilder.execute();
-		IndexResponse response;
-		try {
-			response = future.actionGet();
-		} catch (RuntimeException e) {
-			throw translateException(e);
-		}
-		String documentId = response.getId();
-
-		Object queryObject = query.getObject();
-		if (queryObject != null) {
-			query.setObject(updateIndexedObject(queryObject, IndexedObjectInformation.of(documentId, response.getSeqNo(),
-					response.getPrimaryTerm(), response.getVersion())));
-		}
-
-		return documentId;
-	}
-
-	@Override
-	@Nullable
-	public <T> T get(String id, Class<T> clazz, IndexCoordinates index) {
-
-		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, id, routingResolver.getRouting(),
-				index);
-		GetResponse response = getRequestBuilder.execute().actionGet();
-
-		DocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
-		return callback.doWith(DocumentAdapters.from(response));
-	}
-
-	@Override
-	public <T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		MultiGetRequestBuilder builder = requestFactory.multiGetRequestBuilder(client, query, clazz, index);
-
-		DocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
-
-		return DocumentAdapters.from(builder.execute().actionGet()).stream() //
-				.map(multiGetItem -> MultiGetItem.of(multiGetItem.isFailed() ? null : callback.doWith(multiGetItem.getItem()),
-						multiGetItem.getFailure()))
-				.collect(Collectors.toList());
-	}
-
-	@Override
-	protected boolean doExists(String id, IndexCoordinates index) {
-
-		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, id, routingResolver.getRouting(),
-				index);
-		getRequestBuilder.setFetchSource(false);
-		return getRequestBuilder.execute().actionGet().isExists();
-	}
-
-	@Override
-	public void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index) {
-
-		Assert.notNull(queries, "List of UpdateQuery must not be null");
-		Assert.notNull(bulkOptions, "BulkOptions must not be null");
-
-		doBulkOperation(queries, bulkOptions, index);
-	}
-
-	@Override
-	protected String doDelete(String id, @Nullable String routing, IndexCoordinates index) {
-
-		Assert.notNull(id, "id must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		DeleteRequestBuilder deleteRequestBuilder = prepareWriteRequestBuilder(
-				requestFactory.deleteRequestBuilder(client, elasticsearchConverter.convertId(id), routing, index));
-		return deleteRequestBuilder.execute().actionGet().getId();
-	}
-
-	@Override
-	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
-		return ResponseConverter
-				.byQueryResponseOf(requestFactory.deleteByQueryRequestBuilder(client, query, clazz, index).get());
-	}
-
-	@Override
-	public String delete(Object entity, IndexCoordinates index) {
-		return super.delete(entity, index);
-	}
-
-	@Override
-	public UpdateResponse update(UpdateQuery query, IndexCoordinates index) {
-
-		UpdateRequestBuilder updateRequestBuilder = requestFactory.updateRequestBuilderFor(client, query, index);
-
-		if (query.getRefreshPolicy() == null && getRefreshPolicy() != null) {
-			updateRequestBuilder.setRefreshPolicy(RequestFactory.toElasticsearchRefreshPolicy(getRefreshPolicy()));
-		}
-
-		if (query.getRouting() == null && routingResolver.getRouting() != null) {
-			updateRequestBuilder.setRouting(routingResolver.getRouting());
-		}
-
-		org.elasticsearch.action.update.UpdateResponse updateResponse = updateRequestBuilder.execute().actionGet();
-		UpdateResponse.Result result = UpdateResponse.Result.valueOf(updateResponse.getResult().name());
-		return new UpdateResponse(result);
-	}
-
-	@Override
-	public ByQueryResponse updateByQuery(UpdateQuery query, IndexCoordinates index) {
-
-		Assert.notNull(query, "query must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		final UpdateByQueryRequestBuilder updateByQueryRequestBuilder = requestFactory.updateByQueryRequestBuilder(client,
-				query, index);
-
-		if (query.getRefreshPolicy() == null && getRefreshPolicy() != null) {
-			updateByQueryRequestBuilder.refresh(getRefreshPolicy() == RefreshPolicy.IMMEDIATE);
-		}
-
-		// UpdateByQueryRequestBuilder has not parameters to set a routing value
-
-		final BulkByScrollResponse bulkByScrollResponse = updateByQueryRequestBuilder.execute().actionGet();
-		return ResponseConverter.byQueryResponseOf(bulkByScrollResponse);
-	}
-
-	public List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
-			IndexCoordinates index) {
-
-		// do it in batches; test code on some machines kills the transport node when the size gets too much
-		Collection<? extends List<?>> queryLists = partitionBasedOnSize(queries, 2500);
-		List<IndexedObjectInformation> allIndexedObjectInformations = new ArrayList<>(queries.size());
-
-		queryLists.forEach(queryList -> {
-			BulkRequestBuilder bulkRequestBuilder = requestFactory.bulkRequestBuilder(client, queryList, bulkOptions, index);
-			bulkRequestBuilder = prepareWriteRequestBuilder(bulkRequestBuilder);
-			final List<IndexedObjectInformation> indexedObjectInformations = checkForBulkOperationFailure(
-					bulkRequestBuilder.execute().actionGet());
-			updateIndexedObjectsWithQueries(queryList, indexedObjectInformations);
-			allIndexedObjectInformations.addAll(indexedObjectInformations);
-		});
-
-		return allIndexedObjectInformations;
-	}
-
-	/**
-	 * Pre process the write request before it is sent to the server, eg. by setting the
-	 * {@link WriteRequest#setRefreshPolicy(String) refresh policy} if applicable.
-	 *
-	 * @param requestBuilder must not be {@literal null}.
-	 * @param <R>
-	 * @return the processed {@link WriteRequest}.
-	 */
-	protected <R extends WriteRequestBuilder<R>> R prepareWriteRequestBuilder(R requestBuilder) {
-
-		if (refreshPolicy == null) {
-			return requestBuilder;
-		}
-
-		return requestBuilder.setRefreshPolicy(RequestFactory.toElasticsearchRefreshPolicy(refreshPolicy));
-	}
-
-	// endregion
-
-	// region SearchOperations
-	@Override
-	public long count(Query query, @Nullable Class<?> clazz, IndexCoordinates index) {
-
-		Assert.notNull(query, "query must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		final Boolean trackTotalHits = query.getTrackTotalHits();
-		query.setTrackTotalHits(true);
-		SearchRequestBuilder searchRequestBuilder = requestFactory.searchRequestBuilder(client, query, clazz, index);
-		query.setTrackTotalHits(trackTotalHits);
-		searchRequestBuilder.setSize(0);
-
-		return SearchHitsUtil.getTotalCount(getSearchResponse(searchRequestBuilder).getHits());
-	}
-
-	@Override
-	public <T> SearchHits<T> search(Query query, Class<T> clazz, IndexCoordinates index) {
-		SearchRequestBuilder searchRequestBuilder = requestFactory.searchRequestBuilder(client, query, clazz, index);
-		SearchResponse response = getSearchResponse(searchRequestBuilder);
-
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
-		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
-		return callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith));
-	}
-
-	@Override
-	public <T> SearchScrollHits<T> searchScrollStart(long scrollTimeInMillis, Query query, Class<T> clazz,
-			IndexCoordinates index) {
-
-		Assert.notNull(query.getPageable(), "pageable of query must not be null.");
-
-		ActionFuture<SearchResponse> action = requestFactory.searchRequestBuilder(client, query, clazz, index) //
-				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)) //
-				.execute();
-
-		SearchResponse response = getSearchResponseWithTimeout(action);
-
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
-		SearchDocumentResponseCallback<SearchScrollHits<T>> callback = new ReadSearchScrollDocumentResponseCallback<>(clazz,
-				index);
-		return callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith));
-	}
-
-	@Override
-	public <T> SearchScrollHits<T> searchScrollContinue(@Nullable String scrollId, long scrollTimeInMillis,
-			Class<T> clazz, IndexCoordinates index) {
-
-		ActionFuture<SearchResponse> action = client //
-				.prepareSearchScroll(scrollId) //
-				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)) //
-				.execute();
-
-		SearchResponse response = getSearchResponseWithTimeout(action);
-
-		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<T>(elasticsearchConverter, clazz, index);
-		SearchDocumentResponseCallback<SearchScrollHits<T>> callback = new ReadSearchScrollDocumentResponseCallback<>(clazz,
-				index);
-		return callback.doWith(SearchDocumentResponse.from(response, documentCallback::doWith));
-	}
-
-	@Override
-	public void searchScrollClear(List<String> scrollIds) {
-		try {
-			client.prepareClearScroll().setScrollIds(scrollIds).execute().actionGet();
-		} catch (Exception e) {
-			LOGGER.warn("Could not clear scroll: {}", e.getMessage());
-		}
-	}
-
-	@Override
-	public SearchResponse suggest(SuggestBuilder suggestion, IndexCoordinates index) {
-		SearchRequestBuilder searchRequestBuilder = requestFactory.searchRequestBuilder(client, suggestion, index);
-		return searchRequestBuilder.get();
-	}
-
-	@Override
-	protected MultiSearchResponse.Item[] getMultiSearchResult(MultiSearchRequest request) {
-		ActionFuture<MultiSearchResponse> future = client.multiSearch(request);
-		MultiSearchResponse response = future.actionGet();
-		MultiSearchResponse.Item[] items = response.getResponses();
-		Assert.isTrue(items.length == request.requests().size(), "Response should have same length with queries");
-		return items;
-	}
-
-	private SearchResponse getSearchResponse(SearchRequestBuilder requestBuilder) {
-
-		if (QUERY_LOGGER.isDebugEnabled()) {
-			QUERY_LOGGER.debug(requestBuilder.toString());
-		}
-		return getSearchResponseWithTimeout(requestBuilder.execute());
-	}
-
-	private SearchResponse getSearchResponseWithTimeout(ActionFuture<SearchResponse> response) {
-		return searchTimeout == null ? response.actionGet() : response.actionGet(searchTimeout);
-	}
-	// endregion
-
-	// region helper methods
-	@Override
-	protected String getClusterVersion() {
-
-		try {
-			NodesInfoResponse nodesInfoResponse = client.admin().cluster()
-					.nodesInfo(new NodesInfoRequestBuilder(client, NodesInfoAction.INSTANCE).request()).actionGet();
-			if (!nodesInfoResponse.getNodes().isEmpty()) {
-				return nodesInfoResponse.getNodes().get(0).getVersion().toString();
-			}
-		} catch (Exception ignored) {}
-		return null;
-	}
-
-	public Client getClient() {
-		return client;
-	}
-
-	<T> Collection<List<T>> partitionBasedOnSize(List<T> inputList, int size) {
-		final AtomicInteger counter = new AtomicInteger(0);
-		return inputList.stream().collect(Collectors.groupingBy(s -> counter.getAndIncrement() / size)).values();
-	}
-	// endregion
-
-	/**
-	 * translates an Exception if possible. Exceptions that are no {@link RuntimeException}s are wrapped in a
-	 * RuntimeException
-	 *
-	 * @param exception the Exception to map
-	 * @return the potentially translated RuntimeException.
-	 * @since 4.0
-	 */
-	private RuntimeException translateException(Exception exception) {
-
-		RuntimeException runtimeException = exception instanceof RuntimeException ? (RuntimeException) exception
-				: new RuntimeException(exception.getMessage(), exception);
-		RuntimeException potentiallyTranslatedException = exceptionTranslator
-				.translateExceptionIfPossible(runtimeException);
-
-		return potentiallyTranslatedException != null ? potentiallyTranslatedException : runtimeException;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
  * @author Roman Puchkovskiy
  * @since 3.2
  */
-class EntityOperations {
+public class EntityOperations {
 
 	private static final String ID_FIELD = "id";
 
@@ -81,7 +81,8 @@ class EntityOperations {
 	 * @return the {@link AdaptibleEntity}
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	<T> AdaptibleEntity<T> forEntity(T entity, ConversionService conversionService, RoutingResolver routingResolver) {
+	public <T> AdaptibleEntity<T> forEntity(T entity, ConversionService conversionService,
+			RoutingResolver routingResolver) {
 
 		Assert.notNull(entity, "Bean must not be null!");
 		Assert.notNull(conversionService, "ConversionService must not be null!");
@@ -198,7 +199,7 @@ class EntityOperations {
 	 * @author Mark Paluch
 	 * @author Christoph Strobl
 	 */
-	interface AdaptibleEntity<T> extends Entity<T> {
+	public interface AdaptibleEntity<T> extends Entity<T> {
 
 		/**
 		 * Populates the identifier of the backing entity if it has an identifier property and there's no identifier

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 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.