Release version 4.1.3 (2020.0.3).

See #1572
Prepare 4.1.3 (2020.0.3).
2026-05-24 05:03:17 +00:00 · 2021-01-13 14:18:34 +01:00 · 2021-01-13 14:17:43 +01:00 · 2021-01-13 14:17:43 +01:00 · 2021-01-07 22:13:38 +01:00 · 2020-12-17 08:41:33 -06:00
475 changed files with 6387 additions and 19011 deletions
@@ -6,7 +6,7 @@ Make sure that:
 -->

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

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

 	options {
@@ -15,7 +15,7 @@ pipeline {
 		stage("test: baseline (jdk8)") {
 			when {
 				anyOf {
-					branch 'master'
+					branch '4.1.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -44,7 +44,7 @@ pipeline {
 		stage("Test other configurations") {
 			when {
 				allOf {
-					branch 'master'
+					branch '4.1.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -72,7 +72,7 @@ pipeline {
 					}
 				}

-				stage("test: baseline (jdk16)") {
+				stage("test: baseline (jdk15)") {
 					agent {
 						label 'data'
 					}
@@ -85,7 +85,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk16: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('adoptopenjdk/openjdk15: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"
@@ -100,7 +100,7 @@ pipeline {
 		stage('Release to artifactory') {
 			when {
 				anyOf {
-					branch 'master'
+					branch '4.1.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -132,7 +132,7 @@ pipeline {
 		}
 		stage('Publish documentation') {
 			when {
-				branch 'master'
+				branch '4.1.x'
 			}
 			agent {
 				label 'data'
@@ -114,7 +114,7 @@ Add the Maven dependency:
 <dependency>
  <groupId>org.springframework.data</groupId>
  <artifactId>spring-data-elasticsearch</artifactId>
-  <version>${version}</version>
+  <version>${version}.RELEASE</version>
 </dependency>
 ----

@@ -149,7 +149,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 <dependency>
  <groupId>org.springframework.data</groupId>
  <artifactId>spring-data-elasticsearch</artifactId>
-  <version>${version}-SNAPSHOT</version>
+  <version>${version}.BUILD-SNAPSHOT</version>
 </dependency>

 <repository>
@@ -170,17 +170,17 @@ If you are just starting out with Spring, try one of the https://spring.io/guide
 * If you are upgrading, check out the https://docs.spring.io/spring-data/elasticsearch/docs/current/changelog.txt[changelog] for "`new and noteworthy`" features.
 * Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data-elasticsearch`].
 You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
-* Report bugs with Spring Data for Elasticsearch at https://github.com/spring-projects/spring-data-elasticsearch/issues[https://github.com/spring-projects/spring-data-elasticsearch/issues].
+* Report bugs with Spring Data for Elasticsearch at https://jira.spring.io/browse/DATAES[jira.spring.io/browse/DATAES].

 == 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 JIRA 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.
+https://jira.spring.io/browse/DATAES[issue tracker] to see if someone has already reported the problem.
+* If the issue doesn’t already exist, https://jira.spring.io/browse/DATAES[create a new issue].
+* Please provide as much information as possible with the issue report, we like to know the version of Spring Data that you are using and JVM version.
+* If you need to paste code, or include a stack trace use JIRA `{code}…{code}` 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.

 == Building from Source
@@ -197,10 +197,7 @@ 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
+IMPORTANT: When contributing, please make sure an issue exists in Jira 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.


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

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.2.0</version>
+	<version>4.1.3</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.4.3</version>
 	</parent>

 	<name>Spring Data Elasticsearch</name>
@@ -19,11 +19,11 @@

 	<properties>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>7.12.0</elasticsearch>
+		<elasticsearch>7.9.3</elasticsearch>
 		<log4j>2.13.3</log4j>
 		<netty>4.1.52.Final</netty>
-		<springdata.commons>2.5.0</springdata.commons>
-		<testcontainers>1.15.1</testcontainers>
+        <springdata.commons>2.4.3</springdata.commons>
+        <testcontainers>1.15.1</testcontainers>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>

@@ -70,8 +70,8 @@
 	</ciManagement>

 	<issueManagement>
-		<system>GitHub</system>
-		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
+		<system>JIRA</system>
+		<url>https://jira.spring.io/browse/DATAES</url>
 	</issueManagement>

 	<dependencyManagement>
@@ -173,7 +173,6 @@
 			</exclusions>
 		</dependency>

-		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
@@ -199,21 +198,6 @@
 		</dependency>

 		<!-- CDI -->
-		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.0.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
@@ -222,20 +206,6 @@
 			<optional>true</optional>
 		</dependency>

-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-se</artifactId>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -256,23 +226,6 @@
 			<scope>test</scope>
 		</dependency>

-		<!--
-		  we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
-		  lombok compiler stuff is executed regardless of the fact that we don't need it.
-		  On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
-		  Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
-		  src/test/resources/local-maven-repo/
-		  It was installed with
-		   mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
-		-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>999999</version>
-			<scope>test</scope>
-		</dependency>
-
-<!--
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
@@ -289,7 +242,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-->

 		<dependency>
 			<groupId>org.skyscreamer</groupId>
@@ -316,13 +268,6 @@
 			</exclusions>
 		</dependency>

-		<dependency>
-			<groupId>io.specto</groupId>
-			<artifactId>hoverfly-java-junit5</artifactId>
-			<version>0.13.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
 		<dependency>
 			<groupId>org.apache.xbean</groupId>
@@ -415,26 +360,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.pitest</groupId>
-				<artifactId>pitest-maven</artifactId>
-				<version>1.5.2</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.pitest</groupId>
-						<artifactId>pitest-junit5-plugin</artifactId>
-						<version>0.12</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<excludedGroups>integration-test</excludedGroups>
-					<targetClasses>
-						<param>org.springframework.data.elasticsearch.core.geo.*</param>
-					</targetClasses>
-					<excludedMethods>toString</excludedMethods>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -483,12 +408,6 @@
 			<id>spring-libs-release</id>
 			<url>https://repo.spring.io/libs-release</url>
 		</repository>
-
-			<repository>
-				<id>local-maven-repo</id>
-				<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
-			</repository>
-
 	</repositories>

 	<pluginRepositories>
@@ -5,7 +5,7 @@ BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Stro
 ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
 :spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc

-(C) 2013-2021 The original author(s).
+(C) 2013-2020 The original author(s).

 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.

@@ -33,8 +33,6 @@ include::reference/elasticsearch-auditing.adoc[]
 include::{spring-data-commons-docs}/entity-callbacks.adoc[]
 include::reference/elasticsearch-entity-callbacks.adoc[leveloffset=+1]

-include::reference/elasticsearch-join-types.adoc[]
-include::reference/elasticsearch-routing.adoc[]
 include::reference/elasticsearch-misc.adoc[]
 :leveloffset: -1

@@ -16,7 +16,7 @@ include::reference/elasticsearch-new.adoc[leveloffset=+1]

 * Version Control - https://github.com/spring-projects/spring-data-elasticsearch
 * API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
-* Bugtracker - https://github.com/spring-projects/spring-data-elasticsearch/issues
+* Bugtracker - https://jira.spring.io/browse/DATAES
 * Release repository - https://repo.spring.io/libs-release
 * Milestone repository - https://repo.spring.io/libs-milestone
 * Snapshot repository - https://repo.spring.io/libs-snapshot
@@ -31,16 +31,15 @@ Requires an installation of https://www.elastic.co/products/elasticsearch[Elasti

 The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring Data release train:

-[cols="^,^,^,^,^",options="header"]
+[cols="^,^,^,^",options="header"]
 |===
-| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2021.0 (Pascal)footnote:cdv[Currently in development] | 4.2.xfootnote:cdv[] | 7.12.0 | 5.3.xfootnote:cdv[] | 2.4.xfootnote:cdv[]
-| 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
-| 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
+| Spring Data Release Train |Spring Data Elasticsearch |Elasticsearch | Spring Boot
+| 2020.0.0footnote:cdv[Currently in development] |4.1.xfootnote:cdv[]|7.9.3 |2.4.xfootnote:cdv[]
+| Neumann | 4.0.x | 7.6.2 |2.3.x
+| Moore | 3.2.x |6.8.12 | 2.2.x
+| Lovelace | 3.1.x | 6.2.2 |2.1.x
+| Kayfootnote:oom[Out of maintenance] | 3.0.xfootnote:oom[] | 5.5.0 | 2.0.xfootnote:oom[]
+| Ingallsfootnote:oom[] | 2.1.xfootnote:oom[] | 2.4.0 | 1.5.xfootnote:oom[]
 |===

 Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming the usage of the <<elasticsearch.clients.rest,high-level REST client>>.
@@ -8,7 +8,7 @@ Spring Data Elasticsearch operates upon an Elasticsearch client that is connecte
 [[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
+WARNING: The well known `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`.
@@ -22,33 +22,28 @@ public class TransportClientConfig extends ElasticsearchConfigurationSupport {

    @Bean
    public Client elasticsearchClient() throws UnknownHostException {
-        Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();        <.>
+        Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();        <1>
        TransportClient client = new PreBuiltTransportClient(settings);
-        client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300)); <.>
+        client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300)); <2>
        return client;
    }

    @Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
    public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-
-		ElasticsearchTemplate template = new ElasticsearchTemplate(elasticsearchClient, elasticsearchConverter);
-		template.setRefreshPolicy(refreshPolicy());                                                 <.>
-
-		return template;
+        return new ElasticsearchTemplate(elasticsearchClient());
    }
 }

 // ...

-IndexRequest request = new IndexRequest("spring-data")
- .id(randomID())
- .source(someObject);
+IndexRequest request = new IndexRequest("spring-data", "elasticsearch", randomID())
+ .source(someObject)
+ .setRefreshPolicy(IMMEDIATE);

 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)
+<1> The `TransportClient` must be configured with the cluster name.
+<2> The host and port to connect the client to.
 ====

 [[elasticsearch.clients.rest]]
@@ -86,12 +81,11 @@ public class RestClientConfig extends AbstractElasticsearchConfiguration {

 // ...

-IndexRequest request = new IndexRequest("spring-data")
-  .id(randomID())
+IndexRequest request = new IndexRequest("spring-data", "elasticsearch", randomID())
  .source(singletonMap("feature", "high-level-rest-client"))
  .setRefreshPolicy(IMMEDIATE);

-IndexResponse response = highLevelClient.index(request,RequestOptions.DEFAULT);
+IndexResponse response = highLevelClient.index(request);
 ----
 <1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
 <2> Create the RestHighLevelClient.
@@ -109,29 +103,39 @@ Calls are directly operated on the reactive stack, **not** wrapping async (threa
 ====
 [source,java]
 ----
-@Configuration
-public class ReactiveRestClientConfig extends AbstractReactiveElasticsearchConfiguration {
+static class Config {

-    @Override
-    @Bean
-    public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder() <.>
-            .connectedTo("localhost:9200") //
+  @Bean
+  ReactiveElasticsearchClient client() {
+
+    ClientConfiguration clientConfiguration = ClientConfiguration.builder()   <1>
+      .connectedTo("localhost:9200", "localhost:9291")
+      .withWebClientConfigurer(webClient -> {                                 <2>
+        ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder()
+            .codecs(configurer -> configurer.defaultCodecs()
+                .maxInMemorySize(-1))
            .build();
-        return ReactiveRestClients.create(clientConfiguration);
+        return webClient.mutate().exchangeStrategies(exchangeStrategies).build();
+       })
+      .build();

-    }
+    return ReactiveRestClients.create(clientConfiguration);
+  }
 }
+
 // ...

 Mono<IndexResponse> response = client.index(request ->

  request.index("spring-data")
+    .type("elasticsearch")
    .id(randomID())
-    .source(singletonMap("feature", "reactive-client"));
+    .source(singletonMap("feature", "reactive-client"))
+    .setRefreshPolicy(IMMEDIATE);
 );
 ----
-<.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<2> when configuring a reactive client, the `withWebClientConfigurer` hook can be used to customize the WebClient.
 ====

 NOTE: The ReactiveClient response, especially for search operations, is bound to the `from` (offset) & `size` (limit) options of the request.
@@ -146,46 +150,36 @@ Client behaviour can be changed via the `ClientConfiguration` that allows to set
 [source,java]
 ----
 HttpHeaders httpHeaders = new HttpHeaders();
-httpHeaders.add("some-header", "on every request")                      <.>
+httpHeaders.add("some-header", "on every request")                      <1>

 ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-  .connectedTo("localhost:9200", "localhost:9291")                      <.>
-  .usingSsl()                                                           <.>
-  .withProxy("localhost:8888")                                          <.>
-  .withPathPrefix("ela")                                                <.>
-  .withConnectTimeout(Duration.ofSeconds(5))                            <.>
-  .withSocketTimeout(Duration.ofSeconds(3))                             <.>
-  .withDefaultHeaders(defaultHeaders)                                   <.>
-  .withBasicAuth(username, password)                                    <.>
-  .withHeaders(() -> {                                                  <.>
+  .connectedTo("localhost:9200", "localhost:9291")                      <2>
+  .useSsl()                                                             <3>
+  .withProxy("localhost:8888")                                          <4>
+  .withPathPrefix("ela")                                                <5>
+  .withConnectTimeout(Duration.ofSeconds(5))                            <6>
+  .withSocketTimeout(Duration.ofSeconds(3))                             <7>
+  .withDefaultHeaders(defaultHeaders)                                   <8>
+  .withBasicAuth(username, password)                                    <9>
+  .withHeaders(() -> {                                                  <10>
    HttpHeaders headers = new HttpHeaders();
    headers.add("currentTime", LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
    return headers;
  })
-  .withWebClientConfigurer(webClient -> {                               <.>
-    //...
-    return webClient;
-  })
-  .withHttpClientConfigurer(clientBuilder -> {                          <.>
-      //...
-      return clientBuilder;
-  })
  . // ... other options
  .build();

 ----
-<.> Define default headers, if they need to be customized
-<.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-<.> Optionally enable SSL.
-<.> Optionally set a proxy.
-<.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
-<.> Set the connection timeout. Default is 10 sec.
-<.> Set the socket timeout. Default is 5 sec.
-<.> Optionally set headers.
-<.> Add basic authentication.
-<.> A `Supplier<Header>` function can be specified which is called every time before a request is sent to Elasticsearch - here, as an example, the current time is written in a header.
-<.> for reactive setup a function configuring the `WebClient`
-<.> for non-reactive setup a function configuring the REST client
+<1> Define default headers, if they need to be customized
+<2> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<3> Optionally enable SSL.
+<4> Optionally set a proxy.
+<5> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
+<6> Set the connection timeout. Default is 10 sec.
+<7> Set the socket timeout. Default is 5 sec.
+<8> Optionally set headers.
+<9> Add basic authentication.
+<10> A `Supplier<Header>` function can be specified which is called every time before a request is sent to Elasticsearch - here, as an example, the current time is written in a header.
 ====

 IMPORTANT: Adding a Header supplier as shown in above example allows to inject headers that may change over the time, like authentication JWT tokens. If this is used in the reactive setup, the supplier function *must not* block!
@@ -1,229 +0,0 @@
-[[elasticsearch.jointype]]
-= Join-Type implementation
-
-Spring Data Elasticsearch supports the https://www.elastic.co/guide/en/elasticsearch/reference/current/parent-join.html[Join data type] for creating the corresponding index mappings and for storing the relevant information.
-
-== Setting up the data
-
-For an entity to be used in a parent child join relationship, it must have a property of type `JoinField` which must be annotated.
-Let's assume a `Statement` entity where a statement may be a _question_, an _answer_, a _comment_ or a _vote_ (a _Builder_ is also shown in this example, it's not necessary, but later used in the sample code):
-
-====
-[source,java]
----
-@Document(indexName = "statements")
-@Routing("routing")                                                                       <.>
-public class Statement {
-    @Id
-    private String id;
-
-    @Field(type = FieldType.Text)
-    private String text;
-
-    @Field(type = FieldType.Keyword)
-    private String routing;
-
-    @JoinTypeRelations(
-        relations =
-            {
-                @JoinTypeRelation(parent = "question", children = {"answer", "comment"}), <.>
-                @JoinTypeRelation(parent = "answer", children = "vote")                   <.>
-            }
-    )
-    private JoinField<String> relation;                                                   <.>
-
-    private Statement() {
-    }
-
-    public static StatementBuilder builder() {
-        return new StatementBuilder();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getRouting() {
-        return routing;
-    }
-
-    public void setRouting(Routing routing) {
-        this.routing = routing;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public JoinField<String> getRelation() {
-        return relation;
-    }
-
-    public void setRelation(JoinField<String> relation) {
-        this.relation = relation;
-    }
-
-    public static final class StatementBuilder {
-        private String id;
-        private String text;
-        private String routing;
-        private JoinField<String> relation;
-
-        private StatementBuilder() {
-        }
-
-        public StatementBuilder withId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public StatementBuilder withRouting(String routing) {
-            this.routing = routing;
-            return this;
-        }
-
-        public StatementBuilder withText(String text) {
-            this.text = text;
-            return this;
-        }
-
-        public StatementBuilder withRelation(JoinField<String> relation) {
-            this.relation = relation;
-            return this;
-        }
-
-        public Statement build() {
-            Statement statement = new Statement();
-            statement.setId(id);
-            statement.setRouting(routing);
-            statement.setText(text);
-            statement.setRelation(relation);
-            return statement;
-        }
-    }
-}
----
-<.> for routing related info see <<elasticsearch.routing>>
-<.> a question can have answers and comments
-<.> an answer can have votes
-<.> the `JoinField` property is used to combine the name (_question_, _answer_, _comment_ or _vote_) of the relation with the parent id.
-The generic type must be the same as the `@Id` annotated property.
-====
-
-Spring Data Elasticsearch will build the following mapping for this class:
-
-====
-[source,json]
----
-{
-  "statements": {
-    "mappings": {
-      "properties": {
-        "_class": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
-          }
-        },
-        "routing": {
-          "type": "keyword"
-        },
-        "relation": {
-          "type": "join",
-          "eager_global_ordinals": true,
-          "relations": {
-            "question": [
-              "answer",
-              "comment"
-            ],
-            "answer": "vote"
-          }
-        },
-        "text": {
-          "type": "text"
-        }
-      }
-    }
-  }
-}
----
-====
-
-==  Storing data
-
-Given a repository for this class the following code inserts a question, two answers, a comment and a vote:
-
-====
-[source,java]
----
-void init() {
-    repository.deleteAll();
-
-    Statement savedWeather = repository.save(
-        Statement.builder()
-            .withText("How is the weather?")
-            .withRelation(new JoinField<>("question"))                          <1>
-            .build());
-
-    Statement sunnyAnswer = repository.save(
-        Statement.builder()
-            .withText("sunny")
-            .withRelation(new JoinField<>("answer", savedWeather.getId()))      <2>
-            .build());
-
-    repository.save(
-        Statement.builder()
-            .withText("rainy")
-            .withRelation(new JoinField<>("answer", savedWeather.getId()))      <3>
-            .build());
-
-    repository.save(
-        Statement.builder()
-            .withText("I don't like the rain")
-            .withRelation(new JoinField<>("comment", savedWeather.getId()))     <4>
-            .build());
-
-    repository.save(
-        Statement.builder()
-            .withText("+1 for the sun")
-            ,withRouting(savedWeather.getId())
-            .withRelation(new JoinField<>("vote", sunnyAnswer.getId()))         <5>
-            .build());
-}
----
-<1> create a question statement
-<2> the first answer to the question
-<3> the second answer
-<4> a comment to the question
-<5> a vote for the first answer, this needs to have the routing set to the weather document, see <<elasticsearch.routing>>.
-====
-
-==  Retrieving data
-
-Currently native search queries must be used to query the data, so there is no support from standard repository methods. <<repositories.custom-implementations>> can be used instead.
-
-The following code shows as an example how to retrieve all entries that have a _vote_ (which must be _answers_, because only answers can have a vote) using an `ElasticsearchOperations` instance:
-
-====
-[source,java]
----
-SearchHits<Statement> hasVotes() {
-    NativeSearchQuery query = new NativeSearchQueryBuilder()
-        .withQuery(hasChildQuery("vote", matchAllQuery(), ScoreMode.None))
-        .build();
-
-    return operations.search(query, Statement.class);
-}
----
-====
@@ -1,66 +0,0 @@
-[[elasticsearch-migration-guide-4.1-4.2]]
-= Upgrading from 4.1.x to 4.2.x
-
-This section describes breaking changes from version 4.1.x to 4.2.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-4.1-4.2.deprecations]]
-== Deprecations
-
-=== @Document parameters
-
-The parameters of the `@Document` annotation that are relevant for  the index settings (`useServerConfiguration`, `shards`. `replicas`, `refreshIntervall` and `indexStoretype`) have been moved to the `@Setting` annotation. Use in `@Document` is still possible but deprecated.
-
-[[elasticsearch-migration-guide-4.1-4.2.removal]]
-== Removals
-
-The `@Score` annotation that was used to set the score return value in an entity was deprecated in version 4.0 and has been removed.
-Scroe values are returned in the `SearchHit` instances that encapsulate the returned entities.
-
-The `org.springframework.data.elasticsearch.ElasticsearchException` class has been removed.
-The remaining usages have been replaced with `org.springframework.data.mapping.MappingException` and `org.springframework.dao.InvalidDataAccessApiUsageException`.
-
-The deprecated `ScoredPage`, `ScrolledPage` `@AggregatedPage` and implementations has been removed.
-
-The deprecated `GetQuery` and `DeleteQuery` have been removed.
-
-The deprecated `find` methods from `ReactiveSearchOperations` and `ReactiveDocumentOperations` have been removed.
-
-[[elasticsearch-migration-guide-4.1-4.2.breaking-changes]]
-== Breaking Changes
-
-=== RefreshPolicy
-
-==== Enum package changed
-
-It was possible in 4.1 to configure the refresh policy for the `ReactiveElasticsearchTemplate` by overriding the method `AbstractReactiveElasticsearchConfiguration.refreshPolicy()` in a custom configuration class.
-The return value of this method was an instance of the class `org.elasticsearch.action.support.WriteRequest.RefreshPolicy`.
-
-Now the configuration must return `org.springframework.data.elasticsearch.core.RefreshPolicy`.
-This enum has the same values and triggers the same behaviour as before, so only the `import` statement has to be adjusted.
-
-==== Refresh behaviour
-
-`ElasticsearchOperations` and `ReactiveElasticsearchOperations` now explicitly use the `RefreshPolicy` set on the template for write requests if not null.
-If the refresh policy is null, then nothing special is done, so the cluster defaults are used. `ElasticsearchOperations` was always using the cluster default before this version.
-
-The provided implementations for `ElasticsearchRepository` and `ReactiveElasticsearchRepository` will do an explicit refresh when the refresh policy is null.
-This is the same behaviour as in previous versions.
-If a refresh policy is set, then it will be used by the repositories as well.
-
-==== Refresh configuration
-
-When configuring Spring Data Elasticsearch like described in <<elasticsearch.clients>> by using `ElasticsearchConfigurationSupport`, `AbstractElasticsearchConfiguration` or `AbstractReactiveElasticsearchConfiguration` the refresh policy will be initialized to `null`.
-Previously the reactive code initialized this to `IMMEDIATE`, now reactive and non-reactive code show the same behaviour.
-
-=== Method return types
-
-==== delete methods that take a Query
-
-The reactive methods previously returned a `Mono<Long>` with the number of deleted documents, the non reactive versions were void. They now return a `Mono<ByQueryResponse>` which contains much more detailed information about the deleted documents and errors that might have occurred.
-
-==== multiget methods
-
-The implementations of _multiget_ previousl only returned the found entities in a `List<T>` for non-reactive implementations and in a `Flux<T>` for reactive implementations. If the request contained ids that were not found, the information that these are missing was not available. The user needed to compare the returned ids to the requested ones to find
-which ones were missing.
-
-Now the `multiget` methods return a `MultiGetItem` for every requested id. This contains information about failures (like non existing indices) and the information if the item existed (then it is contained in the `MultiGetItem) or not.
@@ -1,50 +1,7 @@
 [[elasticsearch.misc]]
 = Miscellaneous Elasticsearch Operation Support

-This chapter covers additional support for Elasticsearch operations that cannot be directly accessed via the repository interface.
-It is recommended to add those operations as custom implementation as described in <<repositories.custom-implementations>> .
-
-[[elasticsearc.misc.index.settings]]
-== Index settings
-
-When creating Elasticsearch indices with Spring Data Elasticsearch different index settings can be defined by using the `@Setting` annotation. The following arguments are available:
-
-* `useServerConfiguration` does not send any settings parameters, so the Elasticsearch server configuration determines them.
-* `settingPath` refers to a JSON file defining the settings that must be resolvable in the classpath
-* `shards` the number of shards to use, defaults to _1_
-* `replicas` the number of replicas, defaults to _1_
-* `refreshIntervall`, defaults to _"1s"_
-* `indexStoreType`, defaults to _"fs"_
-
-
-It is as well possible to define https://www.elastic.co/guide/en/elasticsearch/reference/7.11/index-modules-index-sorting.html[index sorting] (check the linked Elasticsearch documentation for the possible field types and values):
-
-====
-[source,java]
----
-@Document(indexName = "entities")
-@Setting(
-  sortFields = { "secondField", "firstField" },                                  <.>
-  sortModes = { Setting.SortMode.max, Setting.SortMode.min },                    <.>
-  sortOrders = { Setting.SortOrder.desc, Setting.SortOrder.asc },
-  sortMissingValues = { Setting.SortMissing._last, Setting.SortMissing._first })
-class Entity {
-    @Nullable
-    @Id private String id;
-
-    @Nullable
-    @Field(name = "first_field", type = FieldType.Keyword)
-    private String firstField;
-
-    @Nullable @Field(name = "second_field", type = FieldType.Keyword)
-    private String secondField;
-
-    // getter and setter...
-}
----
-<.> when defining sort fields, use the name of the Java property (_firstField_), not the name that might be defined for Elasticsearch (_first_field_)
-<.> `sortModes`, `sortOrders` and `sortMissingValues` are optional, but if they are set, the number of entries must match the number of `sortFields` elements
-====
+This chapter covers additional support for Elasticsearch operations that cannot be directly accessed via the repository interface. It is recommended to add those operations as custom implementation as described in <<repositories.custom-implementations>> .

 [[elasticsearch.misc.filter]]
 == Filter Builder
@@ -62,7 +19,7 @@ SearchQuery searchQuery = new NativeSearchQueryBuilder()
  .withQuery(matchAllQuery())
  .withFilter(boolFilter().must(termFilter("id", documentId)))
  .build();
-
+  
 Page<SampleEntity> sampleEntities = operations.searchForPage(searchQuery, SampleEntity.class, index);
 ----
 ====
@@ -70,10 +27,8 @@ Page<SampleEntity> sampleEntities = operations.searchForPage(searchQuery, Sample
 [[elasticsearch.scroll]]
 == Using Scroll For Big Result Set

-Elasticsearch has a scroll API for getting big result set in chunks.
-This is internally used by Spring Data Elasticsearch to provide the implementations of the `<T> SearchHitsIterator<T> SearchOperations.searchForStream(Query query, Class<T> clazz, IndexCoordinates index)` method.
+Elasticsearch has a scroll API for getting big result set in chunks. This is internally used by Spring Data Elasticsearch to provide the implementations of the `<T> SearchHitsIterator<T> SearchOperations.searchForStream(Query query, Class<T> clazz, IndexCoordinates index)` method.

-====
 [source,java]
 ----
 IndexCoordinates index = IndexCoordinates.of("sample-index");
@@ -93,11 +48,9 @@ while (stream.hasNext()) {

 stream.close();
 ----
-====

 There are no methods in the `SearchOperations` API to access the scroll id, if it should be necessary to access this, the following methods of the `ElasticsearchRestTemplate` can be used:

-====
 [source,java]
 ----

@@ -122,12 +75,9 @@ while (scroll.hasSearchHits()) {
 }
 template.searchScrollClear(scrollId);
 ----
-====

-To use the Scroll API with repository methods, the return type must defined as `Stream` in the Elasticsearch Repository.
-The implementation of the method will then use the scroll methods from the ElasticsearchTemplate.
+To use the Scroll API with repository methods, the return type must defined as `Stream` in the Elasticsearch Repository. The implementation of the method will then use the scroll methods from the ElasticsearchTemplate.

-====
 [source,java]
 ----
 interface SampleEntityRepository extends Repository<SampleEntity, String> {
@@ -136,7 +86,6 @@ interface SampleEntityRepository extends Repository<SampleEntity, String> {

 }
 ----
-====

 [[elasticsearch.misc.sorts]]
 == Sort options
@@ -145,9 +94,213 @@ In addition to the default sort options described <<repositories.paging-and-sort

 If the class to be retrieved has a `GeoPoint` property named _location_, the following `Sort` would sort the results by distance to the given point:

-====
 [source,java]
 ----
 Sort.by(new GeoDistanceOrder("location", new GeoPoint(48.137154, 11.5761247)))
 ----
+
+[[elasticsearch.misc.jointype]]
+== Join-Type implementation
+
+Spring Data Elasticsearch supports the https://www.elastic.co/guide/en/elasticsearch/reference/current/parent-join.html[Join data type] for creating the corresponding index mappings and for storing the relevant information.
+
+=== Setting up the data
+
+For an entity to be used in a parent child join relationship, it must have a property of type `JoinField` which must be annotated.
+Let's assume a `Statement` entity where a statement may be a _question_, an _answer_, a _comment_ or a _vote_ (a _Builder_ is also shown in this example, it's not necessary, but later used in the sample code):
+
 ====
+[source,java]
+----
+@Document(indexName = "statements")
+public class Statement {
+    @Id
+    private String id;
+
+    @Field(type = FieldType.Text)
+    private String text;
+
+    @JoinTypeRelations(
+        relations =
+            {
+                @JoinTypeRelation(parent = "question", children = {"answer", "comment"}), <1>
+                @JoinTypeRelation(parent = "answer", children = "vote")                   <2>
+            }
+    )
+    private JoinField<String> relation;                                                   <3>
+
+    private Statement() {
+    }
+
+    public static StatementBuilder builder() {
+        return new StatementBuilder();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public JoinField<String> getRelation() {
+        return relation;
+    }
+
+    public void setRelation(JoinField<String> relation) {
+        this.relation = relation;
+    }
+
+    public static final class StatementBuilder {
+        private String id;
+        private String text;
+        private JoinField<String> relation;
+
+        private StatementBuilder() {
+        }
+
+        public StatementBuilder withId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public StatementBuilder withText(String text) {
+            this.text = text;
+            return this;
+        }
+
+        public StatementBuilder withRelation(JoinField<String> relation) {
+            this.relation = relation;
+            return this;
+        }
+
+        public Statement build() {
+            Statement statement = new Statement();
+            statement.setId(id);
+            statement.setText(text);
+            statement.setRelation(relation);
+            return statement;
+        }
+    }
+}
+----
+<1> a question can have answers and comments
+<2> an answer can have votes
+<3> the `JoinField` property is used to combine the name (_question_, _answer_, _comment_ or _vote_) of the relation with the parent id. The generic type must be the same as the `@Id` annotated property.
+====
+
+Spring Data Elasticsearch will build the following mapping for this class:
+
+====
+[source,json]
+----
+{
+  "statements": {
+    "mappings": {
+      "properties": {
+        "_class": {
+          "type": "text",
+          "fields": {
+            "keyword": {
+              "type": "keyword",
+              "ignore_above": 256
+            }
+          }
+        },
+        "relation": {
+          "type": "join",
+          "eager_global_ordinals": true,
+          "relations": {
+            "question": [
+              "answer",
+              "comment"
+            ],
+            "answer": "vote"
+          }
+        },
+        "text": {
+          "type": "text"
+        }
+      }
+    }
+  }
+}
+----
+====
+
+=== Storing data
+
+Given a repository for this class the following code inserts a question, two answers, a comment and a vote:
+
+====
+[source,java]
+----
+void init() {
+    repository.deleteAll();
+
+    Statement savedWeather = repository.save(
+        Statement.builder()
+            .withText("How is the weather?")
+            .withRelation(new JoinField<>("question"))                          <1>
+            .build());
+
+    Statement sunnyAnswer = repository.save(
+        Statement.builder()
+            .withText("sunny")
+            .withRelation(new JoinField<>("answer", savedWeather.getId()))      <2>
+            .build());
+
+    repository.save(
+        Statement.builder()
+            .withText("rainy")
+            .withRelation(new JoinField<>("answer", savedWeather.getId()))      <3>
+            .build());
+
+    repository.save(
+        Statement.builder()
+            .withText("I don't like the rain")
+            .withRelation(new JoinField<>("comment", savedWeather.getId()))     <4>
+            .build());
+
+    repository.save(
+        Statement.builder()
+            .withText("+1 for the sun")
+            .withRelation(new JoinField<>("vote", sunnyAnswer.getId()))         <5>
+            .build());
+}
+----
+<1> create a question statement
+<2> the first answer to the question
+<3> the second answer
+<4> a comment to the question
+<5> a vote for the first answer
+====
+
+=== Retrieving data
+
+Currently native search queries must be used to query the data, so there is no support from standard repository methods. <<repositories.custom-implementations>> can be used instead.
+
+The following code shows as an example how to retrieve all entries that have a _vote_ (which must be _answers_, because only answers can have a vote) using an `ElasticsearchOperations` instance:
+
+====
+[source,java]
+----
+SearchHits<Statement> hasVotes() {
+    NativeSearchQuery query = new NativeSearchQueryBuilder()
+        .withQuery(hasChildQuery("vote", matchAllQuery(), ScoreMode.None))
+        .build();
+
+    return operations.search(query, Statement.class);
+}
+----
+====
+
@@ -1,12 +1,6 @@
 [[new-features]]
 = What's new

-[[new-features.4-2-0]]
-== New in Spring Data Elasticsearch 4.2
-
-* Upgrade to Elasticsearch 7.10.0.
-* Support for custom routing values
-
 [[new-features.4-1-0]]
 == New in Spring Data Elasticsearch 4.1

@@ -36,6 +36,14 @@ The most important attributes are:
 This can contain a SpEL template expression like `"log-#{T(java.time.LocalDate).now().toString()}"`
 ** `type`: [line-through]#the mapping type.
 If not set, the lowercased simple name of the class is used.# (deprecated since version 4.0)
+** `shards`: the number of shards for the index.
+** `replicas`: the number of replicas for the index.
+** `refreshIntervall`: Refresh interval for the index.
+Used for index creation.
+Default value is _"1s"_.
+** `indexStoreType`: Index storage type for the index.
+Used for index creation.
+Default value is _"fs"_.
 ** `createIndex`: flag whether to create an index on repository bootstrapping.
 Default value is _true_.
 See <<elasticsearch.repositories.autocreation>>
@@ -48,66 +56,20 @@ Default value is _EXTERNAL_.
 Constructor arguments are mapped by name to the key values in the retrieved Document.
 * `@Field`: Applied at the field level and defines properties of the field, most of the attributes map to the respective https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html[Elasticsearch Mapping] definitions (the following list is not complete, check the annotation Javadoc for a complete reference):
 ** `name`: The name of the field as it will be represented in the Elasticsearch document, if not set, the Java field name is used.
-** `type`: The field type, can be one of _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_.
+** `type`: the field type, can be one of _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_.
 See https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html[Elasticsearch Mapping Types]
-** `format`: One or more built-in date formats, see the next section <<elasticsearch.mapping.meta-model.date-formats>>.
-** `pattern`: One or more custom date formats, see the next section <<elasticsearch.mapping.meta-model.date-formats>>.
+** `format` and `pattern` definitions for the _Date_ type.
 ** `store`: Flag whether the original field value should be store in Elasticsearch, default value is _false_.
 ** `analyzer`, `searchAnalyzer`, `normalizer` for specifying custom analyzers and normalizer.
-* `@GeoPoint`: Marks a field as _geo_point_ datatype.
+* `@GeoPoint`: marks a field as _geo_point_ datatype.
 Can be omitted if the field is an instance of the `GeoPoint` class.

-The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.
-
-[[elasticsearch.mapping.meta-model.date-formats]]
-==== Date format mapping
-
-Properties that derive from `TemporalAccessor` or are of type `java.util.Date` must either have a `@Field` annotation
-of type `FieldType.Date` or a custom converter must be registered for this type. This paragraph describes the use of
-`FieldType.Date`.
-
-There are two attributes of the `@Field` annotation that define which date format information is written to the
-mapping (also see https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#built-in-date-formats[Elasticsearch Built In Formats] and https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#custom-date-formats[Elasticsearch Custom Date Formats])
-
-The `format` attributes is used to define at least one of the predefined formats. If it is not defined, then a
-default value of  __date_optional_time_ and _epoch_millis_ is used.
-
-The `pattern` attribute can be used to add additional custom format strings. If you want to use only custom date formats, you must set the `format` property to empty `{}`.
-
-The following table shows the different attributes and the mapping created from their values:
-
-
-[cols=2*,options=header]
-|===
-| annotation
-| format string in Elasticsearch mapping
-
-| @Field(type=FieldType.Date)
-| "date_optional_time\|\|epoch_millis",
-
-| @Field(type=FieldType.Date, format=DateFormat.basic_date)
-| "basic_date"
-
-| @Field(type=FieldType.Date, format={DateFormat.basic_date, DateFormat.basic_time})
-| "basic_date\|\|basic_time"
-
-| @Field(type=FieldType.Date, pattern="dd.MM.uuuu")
-| "date_optional_time\|\|epoch_millis\|\|dd.MM.uuuu",
-
-| @Field(type=FieldType.Date, format={}, pattern="dd.MM.uuuu")
-| "dd.MM.uuuu"
-
-|===
-
-NOTE: If you are using a custom date format, you need to use _uuuu_ for the year instead of _yyyy_.
+NOTE: Properties that derive from `TemporalAccessor` or are of type `java.util.Date` must either have a `@Field` annotation of type `FieldType.Date` and a
+format different from `DateFormat.none` or a custom converter must be registered for this type. +
+If you are using a custom date format, you need to use _uuuu_ for the year instead of _yyyy_.
 This is due to a https://www.elastic.co/guide/en/elasticsearch/reference/current/migrate-to-java-time.html#java-time-migration-incompatible-date-formats[change in Elasticsearch 7].

-==== Mapped field names
-
-Without further configuration, Spring Data Elasticsearch will use the property name of an object as field name in Elasticsearch. This can be changed for individual field by using the `@Field` annotation on that property.
-
-It is also possible to define a `FieldNamingStrategy` in the configuration of the client (<<elasticsearch.clients>>). If for example a `SnakeCaseFieldNamingStrategy` is configured, the property _sampleProperty_ of the object would be mapped to _sample_property_ in Elasticsearch. A `FieldNamingStrategy` applies to all entities; it can be overwritten by
-setting a specific name with `@Field` on a property.
+The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.

 [[elasticsearch.mapping.meta-model.rules]]
 === Mapping Rules
@@ -21,8 +21,7 @@ The default implementations of the interfaces offer:
 ====
 .Index management and automatic creation of indices and mappings.

-The `IndexOperations` interface and the provided implementation which can be obtained from an `ElasticsearchOperations` instance - for example with a call to `operations.indexOps(clazz)`- give the user the ability to create indices, put mappings or store template and alias information in the Elasticsearch cluster. Details of the index that will be created
-can be set by using the `@Setting` annotation, refer to <<elasticsearc.misc.index.settings>> for further information.
+The `IndexOperations` interface and the provided implementation which can be obtained from an `ElasticsearchOperations` instance - for example with a call to `operations.indexOps(clazz)`- give the user the ability to create indices, put mappings or store template and alias information in the Elasticsearch cluster.

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

@@ -174,12 +173,10 @@ Returned by the low level scroll API functions in `ElasticsearchRestTemplate`, i
 .SearchHitsIterator<T>
 An Iterator returned by the streaming functions of the `SearchOperations` interface.

-[[elasticsearch.operations.queries]]
 == Queries

 Almost all of the methods defined in the `SearchOperations` and `ReactiveSearchOperations` interface take a `Query` parameter that defines the query to execute for searching. `Query` is an interface and Spring Data Elasticsearch provides three implementations: `CriteriaQuery`, `StringQuery` and `NativeSearchQuery`.

-[[elasticsearch.operations.criteriaquery]]
 === CriteriaQuery

 `CriteriaQuery` based queries allow the creation of queries to search for data without knowing the syntax or basics of Elasticsearch queries. They allow the user to build queries by simply chaining and combining `Criteria` objects that specifiy the criteria the searched documents must fulfill.
@@ -244,7 +241,6 @@ Query query = new CriteriaQuery(criteria);

 Please refer to the API documentation of the `Criteria` class for a complete overview of the different available operations.

-[[elasticsearch.operations.stringquery]]
 === StringQuery

 This class takes an Elasticsearch query as JSON String.
@@ -262,7 +258,6 @@ SearchHits<Person> searchHits = operations.search(query, Person.class);

 Using `StringQuery` may be appropriate if you already have an Elasticsearch query to use.

-[[elasticsearch.operations.nativesearchquery]]
 === NativeSearchQuery

 `NativeSearchQuery` is the class to use when you have a complex query, or a query that cannot be expressed by using the `Criteria` API, for example when building queries and using aggregates.
@@ -31,7 +31,7 @@ class Book {

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

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

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

@@ -131,7 +131,7 @@ class ProductService {
  public void setRepository(ProductRepository repository) {
    this.repository = repository;
  }
-}
+}                
 ----
 <1> Create a component by using the same calls as are used in the <<elasticsearch.operations>> chapter.
 <2> Let the CDI framework inject the Repository into your class.
@@ -1,106 +0,0 @@
-
-[[elasticsearch.routing]]
-= Routing values
-
-When Elasticsearch stores a document in an index that has multiple shards, it determines the shard to you use based on the _id_ of the document.
-Sometimes it is necessary to predefine that multiple documents should be indexed on the same shard (join-types, faster search for related data).
-For this Elasticsearch offers the possibility to define a routing, which is the value that should be used to calculate the shard from instead of the _id_.
-
-Spring Data Elasticsearch supports routing definitions on storing and retrieving data in the following ways:
-
-== Routing on join-types
-
-When using join-types (see <<elasticsearch.jointype>>), Spring Data Elasticsearch will automatically use the `parent` property of the entity's `JoinField` property as the value for the routing.
-
-This is correct for all the use-cases where the parent-child relationship has just one level.
-If it is deeper, like a child-parent-grandparent relationship - like in the above example from _vote_ -> _answer_ -> _question_ - then the routing needs to explicitly specified by using the techniques described in the next section (the _vote_ needs the _question.id_ as routing value).
-
-== Custom routing values
-
-To define a custom routing for an entity, Spring Data Elasticsearch provides a `@Routing` annotation (reusing the `Statement` class from above):
-
-====
-[source,java]
----
-@Document(indexName = "statements")
-@Routing("routing")                  <.>
-public class Statement {
-    @Id
-    private String id;
-
-    @Field(type = FieldType.Text)
-    private String text;
-
-    @JoinTypeRelations(
-        relations =
-            {
-                @JoinTypeRelation(parent = "question", children = {"answer", "comment"}),
-                @JoinTypeRelation(parent = "answer", children = "vote")
-            }
-    )
-    private JoinField<String> relation;
-
-    @Nullable
-    @Field(type = FieldType.Keyword)
-    private String routing;          <.>
-
-    // getter/setter...
-}
----
-<.> This defines _"routing"_ as routing specification
-<.> a property with the name _routing_
-====
-
-If the `routing` specification of the annotation is a plain string and not a SpEL expression, it is interpreted as the name of a property of the entity, in the example it's the _routing_ property.
-The value of this property will then be used as the routing value for all requests that use the entity.
-
-It is also possible to us a SpEL expression in the `@Document` annotation like this:
-
-====
-[source,java]
----
-@Document(indexName = "statements")
-@Routing("@myBean.getRouting(#entity)")
-public class Statement{
-    // all the needed stuff
-}
----
-====
-
-In this case the user needs to provide a bean with the name _myBean_ that has a method `String getRouting(Object)`. To reference the entity _"#entity"_ must be used in the SpEL expression, and the return value must be `null` or the routing value as a String.
-
-If plain property's names and SpEL expressions are not enough to customize the routing definitions, it is possible to define provide an implementation of the `RoutingResolver` interface. This can then be set on the `ElasticOperations` instance:
-
-====
-[source,java]
----
-RoutingResolver resolver = ...;
-
-ElasticsearchOperations customOperations= operations.withRouting(resolver);
-
----
-====
-
-The `withRouting()` functions return a copy of the original `ElasticsearchOperations` instance with the customized routing set.
-
-
-When a routing has been defined on an entity when it is stored in Elasticsearch, the same value must be provided when doing a _get_ or _delete_ operation. For methods that do not use an entity - like `get(ID)` or `delete(ID)` - the `ElasticsearchOperations.withRouting(RoutingResolver)` method can be used like this:
-
-====
-[source,java]
----
-String id = "someId";
-String routing = "theRoutingValue";
-
-// get an entity
-Statement s = operations
-                .withRouting(RoutingResolver.just(routing))       <.>
-                .get(id, Statement.class);
-
-// delete an entity
-operations.withRouting(RoutingResolver.just(routing)).delete(id);
-
----
-<.> `RoutingResolver.just(s)` returns a resolver that will just return the given String.
-====
-
@@ -6,6 +6,4 @@
 include::elasticsearch-migration-guide-3.2-4.0.adoc[]

 include::elasticsearch-migration-guide-4.0-4.1.adoc[]
-
-include::elasticsearch-migration-guide-4.1-4.2.adoc[]
 :leveloffset: -1
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch;
+
+import java.util.Map;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * ElasticsearchException
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Peter-Josef Meisch
+ * @deprecated since 4.0, use {@link UncategorizedElasticsearchException}
+ */
+@Deprecated
+public class ElasticsearchException extends RuntimeException {
+
+	@Nullable private Map<String, String> failedDocuments;
+
+	public ElasticsearchException(String message) {
+		super(message);
+	}
+
+	public ElasticsearchException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public ElasticsearchException(String message, Throwable cause, Map<String, String> failedDocuments) {
+		super(message, cause);
+		this.failedDocuments = failedDocuments;
+	}
+
+	public ElasticsearchException(String message, Map<String, String> failedDocuments) {
+		super(message);
+		this.failedDocuments = failedDocuments;
+	}
+
+	@Nullable
+	public Map<String, String> getFailedDocuments() {
+		return failedDocuments;
+	}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,39 +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.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-/**
- * Alias for a @Query annotation with the count parameter set to true.
- *
- * @author Peter-Josef Meisch
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-@Documented
-@Query(count = true)
-public @interface CountQuery {
-
-	@AliasFor(annotation = Query.class)
-	String value() default "";
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author 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,85 +16,58 @@
 package org.springframework.data.elasticsearch.annotations;

 /**
- * Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/. The patterns are taken
- * from this documentation and slightly adapted so that a Java {@link java.time.format.DateTimeFormatter} produces the
- * same values as the Elasticsearch formatter.
- *
+ * Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
+ * 
 * @author Jakub Vavrik
 * @author Tim te Beek
 * @author Peter-Josef Meisch
- * @author Sascha Woo
 */
 public enum DateFormat {
-	/**
-	 * @deprecated since 4.2, will be removed in a future version. Use <code>format = {}</code> to disable built-in date
-	 *             formats in the @Field annotation.
-	 */
-	@Deprecated
-	none(""), //
-	/**
-	 * @deprecated since 4.2, will be removed in a future version.It is no longer required for using a custom date format
-	 *             pattern. If you want to use only a custom date format pattern, you must set the <code>format</code>
-	 *             property to empty <code>{}</code>.
-	 */
-	@Deprecated
-	custom(""), //
-	basic_date("uuuuMMdd"), //
-	basic_date_time("uuuuMMdd'T'HHmmss.SSSXXX"), //
-	basic_date_time_no_millis("uuuuMMdd'T'HHmmssXXX"), //
-	basic_ordinal_date("uuuuDDD"), //
-	basic_ordinal_date_time("yyyyDDD'T'HHmmss.SSSXXX"), //
-	basic_ordinal_date_time_no_millis("yyyyDDD'T'HHmmssXXX"), //
-	basic_time("HHmmss.SSSXXX"), //
-	basic_time_no_millis("HHmmssXXX"), //
-	basic_t_time("'T'HHmmss.SSSXXX"), //
-	basic_t_time_no_millis("'T'HHmmssXXX"), //
-	basic_week_date("YYYY'W'wwe"), // week-based-year!
-	basic_week_date_time("YYYY'W'wwe'T'HHmmss.SSSX"), // here Elasticsearch uses a different zone format
-	basic_week_date_time_no_millis("YYYY'W'wwe'T'HHmmssX"), //
-	date("uuuu-MM-dd"), //
-	date_hour("uuuu-MM-dd'T'HH"), //
-	date_hour_minute("uuuu-MM-dd'T'HH:mm"), //
-	date_hour_minute_second("uuuu-MM-dd'T'HH:mm:ss"), //
-	date_hour_minute_second_fraction("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
-	date_hour_minute_second_millis("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
-	date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
-	date_time("uuuu-MM-dd'T'HH:mm:ss.SSSXXX"), //
-	date_time_no_millis("uuuu-MM-dd'T'HH:mm:ssVV"), // here Elasticsearch uses the zone-id in it's implementation
-	epoch_millis("epoch_millis"), //
-	epoch_second("epoch_second"), //
-	hour("HH"), //
-	hour_minute("HH:mm"), //
-	hour_minute_second("HH:mm:ss"), //
-	hour_minute_second_fraction("HH:mm:ss.SSS"), //
-	hour_minute_second_millis("HH:mm:ss.SSS"), //
-	ordinal_date("uuuu-DDD"), //
-	ordinal_date_time("uuuu-DDD'T'HH:mm:ss.SSSXXX"), //
-	ordinal_date_time_no_millis("uuuu-DDD'T'HH:mm:ssXXX"), //
-	time("HH:mm:ss.SSSXXX"), //
-	time_no_millis("HH:mm:ssXXX"), //
-	t_time("'T'HH:mm:ss.SSSXXX"), //
-	t_time_no_millis("'T'HH:mm:ssXXX"), //
-	week_date("YYYY-'W'ww-e"), //
-	week_date_time("YYYY-'W'ww-e'T'HH:mm:ss.SSSXXX"), //
-	week_date_time_no_millis("YYYY-'W'ww-e'T'HH:mm:ssXXX"), //
-	weekyear(""), // no TemporalAccessor available for these 3
-	weekyear_week(""), //
-	weekyear_week_day(""), //
-	year("uuuu"), //
-	year_month("uuuu-MM"), //
-	year_month_day("uuuu-MM-dd"); //
-
-	private final String pattern;
-
-	DateFormat(String pattern) {
-		this.pattern = pattern;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	public String getPattern() {
-		return pattern;
-	}
+	none, //
+	custom, //
+	basic_date, //
+	basic_date_time, //
+	basic_date_time_no_millis, //
+	basic_ordinal_date, //
+	basic_ordinal_date_time, //
+	basic_ordinal_date_time_no_millis, //
+	basic_time, //
+	basic_time_no_millis, //
+	basic_t_time, //
+	basic_t_time_no_millis, //
+	basic_week_date, //
+	basic_week_date_time, //
+	basic_week_date_time_no_millis, //
+	date, //
+	date_hour, //
+	date_hour_minute, //
+	date_hour_minute_second, //
+	date_hour_minute_second_fraction, //
+	date_hour_minute_second_millis, //
+	date_optional_time, //
+	date_time, //
+	date_time_no_millis, //
+	epoch_millis, //
+	epoch_second, //
+	hour, //
+	hour_minute, //
+	hour_minute_second, //
+	hour_minute_second_fraction, //
+	hour_minute_second_millis, //
+	ordinal_date, //
+	ordinal_date_time, //
+	ordinal_date_time_no_millis, //
+	time, //
+	time_no_millis, //
+	t_time, //
+	t_time_no_millis, //
+	week_date, //
+	week_date_time, //
+	week_date_time_no_millis, //
+	weekyear, //
+	weekyear_week, //
+	weekyear_week_day, //
+	year, //
+	year_month, //
+	year_month_day //
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -55,45 +55,29 @@ public @interface Document {

 	/**
 	 * Use server-side settings when creating the index.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	boolean useServerConfiguration() default false;

 	/**
 	 * Number of shards for the index {@link #indexName()}. Used for index creation. <br/>
 	 * With version 4.0, the default value is changed from 5 to 1 to reflect the change in the default settings of
 	 * Elasticsearch which changed to 1 as well in Elasticsearch 7.0.
-	 * ComposableAnnotationsUnitTest.documentAnnotationShouldBeComposable:60
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	short shards() default 1;

 	/**
 	 * Number of replicas for the index {@link #indexName()}. Used for index creation.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	short replicas() default 1;

 	/**
 	 * Refresh interval for the index {@link #indexName()}. Used for index creation.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	String refreshInterval() default "1s";

 	/**
 	 * Index storage type for the index {@link #indexName()}. Used for index creation.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	String indexStoreType() default "fs";

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,12 +34,9 @@ import org.springframework.core.annotation.AliasFor;
 * @author Peter-Josef Meisch
 * @author Xiao Yu
 * @author Aleksei Arsenev
- * @author Brian Kimmig
- * @author Morgan Lutz
- * @author Sascha Woo
 */
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Target(ElementType.FIELD)
@Documented
@Inherited
 public @interface Field {
@@ -66,9 +63,9 @@ public @interface Field {

 	boolean index() default true;

-	DateFormat[] format() default { DateFormat.date_optional_time, DateFormat.epoch_millis };
+	DateFormat format() default DateFormat.none;

-	String[] pattern() default {};
+	String pattern() default "";

 	boolean store() default false;

@@ -160,14 +157,14 @@ public @interface Field {

 	/**
 	 * if true, the field will be stored in Elasticsearch even if it has a null value
-	 *
+	 * 
 	 * @since 4.1
 	 */
 	boolean storeNullValue() default false;

 	/**
 	 * to be used in combination with {@link FieldType#Rank_Feature}
-	 *
+	 * 
 	 * @since 4.1
 	 */
 	boolean positiveScoreImpact() default true;
@@ -188,11 +185,4 @@ public @interface Field {
 	 * @since 4.1
 	 */
 	NullValueType nullValueType() default NullValueType.String;
-
-	/**
-	 * to be used in combination with {@link FieldType#Dense_Vector}
-	 *
-	 * @since 4.2
-	 */
-	int dims() default -1;
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@ package org.springframework.data.elasticsearch.annotations;
 * @author Zeng Zetang
 * @author Peter-Josef Meisch
 * @author Aleksei Arsenev
- * @author Brian Kimmig
- * @author Morgan Lutz
 */
 public enum FieldType {
 	Auto, //
@@ -57,9 +55,5 @@ public enum FieldType {
 	/** @since 4.1 */
 	Rank_Feature, //
 	/** @since 4.1 */
-	Rank_Features, //
-	/** since 4.2 */
-	Wildcard, //
-	/** @since 4.2 */
-	Dense_Vector //
+	Rank_Features //
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,8 +27,6 @@ import java.lang.annotation.Target;
 * @author Xiao Yu
 * @author Peter-Josef Meisch
 * @author Aleksei Arsenev
- * @author Brian Kimmig
- * @author Morgan Lutz
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.ANNOTATION_TYPE)
@@ -40,9 +38,9 @@ public @interface InnerField {

 	boolean index() default true;

-	DateFormat[] format() default { DateFormat.date_optional_time, DateFormat.epoch_millis };
+	DateFormat format() default DateFormat.none;

-	String[] pattern() default {};
+	String pattern() default "";

 	boolean store() default false;

@@ -142,11 +140,4 @@ public @interface InnerField {
 	 * @since 4.1
 	 */
 	NullValueType nullValueType() default NullValueType.String;
-
-	/**
-	 * to be used in combination with {@link FieldType#Dense_Vector}
-	 *
-	 * @since 4.2
-	 */
-	int dims() default -1;
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,12 +15,7 @@
 */
 package org.springframework.data.elasticsearch.annotations;

-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
+import java.lang.annotation.*;
 import org.springframework.data.annotation.Persistent;

 /**
@@ -31,15 +26,9 @@ import org.springframework.data.annotation.Persistent;
@Persistent
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.FIELD })
+@Target({ElementType.TYPE, ElementType.FIELD})
 public @interface Mapping {

 	String mappingPath() default "";

-	/**
-	 * whether mappings are enabled
-	 * 
-	 * @since 4.2
-	 */
-	boolean enabled() default true;
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,10 +27,9 @@ import java.lang.annotation.Target;
 * @author Artur Konczak
 * @author Jonathan Yan
 * @author Xiao Yu
- * @author Peter-Josef Meisch
 */
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Target(ElementType.FIELD)
@Documented
 public @interface MultiField {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,32 +22,24 @@ import java.lang.annotation.*;
 *
 * @author Rizwan Idrees
 * @author Mohsin Husen
- * @author Peter-Josef Meisch
 */

@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.METHOD)
@Documented
 public @interface Query {

 	/**
-	 * @return Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
+	 * Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
+	 *
+	 * @return
 	 */
 	String value() default "";

 	/**
 	 * Named Query Named looked up by repository.
 	 *
-	 * @deprecated since 4.2, not implemented and used anywhere
+	 * @return
 	 */
 	String name() default "";
-
-	/**
-	 * Returns whether the query defined should be executed as count projection.
-	 *
-	 * @return {@literal false} by default.
-	 * @since 4.2
-	 */
-	boolean count() default false;
 }
-
@@ -1,43 +0,0 @@
-/*
- * Copyright2020-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.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.data.annotation.Persistent;
-
-/**
- * Annotation to enable custom routing values for an entity.
- *
- * @author Peter-Josef Meisch
- * @since 4.2
- */
-@Persistent
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
-public @interface Routing {
-
-	/**
-	 * defines how the routing is determined. Can be either the name of a property or a SpEL expression. See the reference
-	 * documentation for examples how to use this annotation.
-	 */
-	String value();
-}
@@ -0,0 +1,28 @@
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.elasticsearch.core.SearchHit;
+
+/**
+ * Specifies that this field is used for storing the document score.
+ * 
+ * @author Sascha Woo
+ * @author Peter-Josef Meisch
+ * @since 3.1
+ * @deprecated since 4.0, use {@link SearchHit#getScore()} instead
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Documented
+@Inherited
+@ReadOnlyProperty
+@Deprecated
+public @interface Score {
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,11 +15,7 @@
 */
 package org.springframework.data.elasticsearch.annotations;

-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;

 import org.springframework.data.annotation.Persistent;

@@ -27,84 +23,14 @@ import org.springframework.data.annotation.Persistent;
 * Elasticsearch Setting
 *
 * @author Mohsin Husen
- * @author Peter-Josef Meisch
 */

@Persistent
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
+@Target({ElementType.TYPE})
 public @interface Setting {

-	/**
-	 * Resource path for a settings configuration
-	 */
 	String settingPath() default "";

-	/**
-	 * Use server-side settings when creating the index.
-	 */
-	boolean useServerConfiguration() default false;
-
-	/**
-	 * Number of shards for the index. Used for index creation. <br/>
-	 * With version 4.0, the default value is changed from 5 to 1 to reflect the change in the default settings of
-	 * Elasticsearch which changed to 1 as well in Elasticsearch 7.0.
-	 */
-	short shards() default 1;
-
-	/**
-	 * Number of replicas for the index. Used for index creation.
-	 */
-	short replicas() default 1;
-
-	/**
-	 * Refresh interval for the index. Used for index creation.
-	 */
-	String refreshInterval() default "1s";
-
-	/**
-	 * Index storage type for the index. Used for index creation.
-	 */
-	String indexStoreType() default "fs";
-
-	/**
-	 * fields to define an index sorting
-	 *
-	 * @since 4.2
-	 */
-	String[] sortFields() default {};
-
-	/**
-	 * defines the order for {@link #sortFields()}. If present, it must have the same number of elements
-	 *
-	 * @since 4.2
-	 */
-	SortOrder[] sortOrders() default {};
-
-	/**
-	 * defines the mode for {@link #sortFields()}. If present, it must have the same number of elements
-	 *
-	 * @since 4.2
-	 */
-	SortMode[] sortModes() default {};
-
-	/**
-	 * defines the missing value for {@link #sortFields()}. If present, it must have the same number of elements
-	 *
-	 * @since 4.2
-	 */
-	SortMissing[] sortMissingValues() default {};
-
-	enum SortOrder {
-		asc, desc
-	}
-
-	enum SortMode {
-		min, max
-	}
-
-	enum SortMissing {
-		_last, _first
-	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author 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,7 +26,6 @@ import java.util.function.Supplier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -172,12 +171,6 @@ public interface ClientConfiguration {
 	 */
 	Function<WebClient, WebClient> getWebClientConfigurer();

-	/**
-	 * @return the client configuration callback.
-	 * @since 4.2
-	 */
-	HttpClientConfigCallback getHttpClientConfigurer();
-
 	/**
 	 * @return the supplier for custom headers.
 	 */
@@ -348,22 +341,13 @@ public interface ClientConfiguration {
 		 */
 		TerminalClientConfigurationBuilder withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);

-		/**
-		 * Register a {HttpClientConfigCallback} to configure the non-reactive REST client.
-		 * 
-		 * @param httpClientConfigurer configuration callback, must not be null.
-		 * @return the {@link TerminalClientConfigurationBuilder}.
-		 * @since 4.2
-		 */
-		TerminalClientConfigurationBuilder withHttpClientConfigurer(HttpClientConfigCallback httpClientConfigurer);
-
 		/**
 		 * set a supplier for custom headers. This is invoked for every HTTP request to Elasticsearch to retrieve headers
 		 * that should be sent with the request. A common use case is passing in authentication headers that may change.
 		 * <br/>
 		 * Note: When used in a reactive environment, the calling of {@link Supplier#get()} function must not do any
 		 * blocking operations. It may return {@literal null}.
-		 *
+		 * 
 		 * @param headers supplier function for headers, must not be {@literal null}
 		 * @return the {@link TerminalClientConfigurationBuilder}.
 		 * @since 4.0
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
@@ -62,7 +61,6 @@ class ClientConfigurationBuilder
 	private @Nullable String proxy;
 	private Function<WebClient, WebClient> webClientConfigurer = Function.identity();
 	private Supplier<HttpHeaders> headersSupplier = () -> HttpHeaders.EMPTY;
-	private HttpClientConfigCallback httpClientConfigurer = httpClientBuilder -> httpClientBuilder;

 	/*
 	 * (non-Javadoc)
@@ -209,15 +207,6 @@ class ClientConfigurationBuilder
 		return this;
 	}

-	@Override
-	public TerminalClientConfigurationBuilder withHttpClientConfigurer(HttpClientConfigCallback httpClientConfigurer) {
-
-		Assert.notNull(httpClientConfigurer, "httpClientConfigurer must not be null");
-
-		this.httpClientConfigurer = httpClientConfigurer;
-		return this;
-	}
-
 	@Override
 	public TerminalClientConfigurationBuilder withHeaders(Supplier<HttpHeaders> headers) {

@@ -242,7 +231,7 @@ class ClientConfigurationBuilder
 		}

 		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix,
-				hostnameVerifier, proxy, webClientConfigurer, httpClientConfigurer, headersSupplier);
+				hostnameVerifier, proxy, webClientConfigurer, headersSupplier);
 	}

 	private static InetSocketAddress parse(String hostAndPort) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import java.util.function.Supplier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -53,14 +52,12 @@ class DefaultClientConfiguration implements ClientConfiguration {
 	private final @Nullable HostnameVerifier hostnameVerifier;
 	private final @Nullable String proxy;
 	private final Function<WebClient, WebClient> webClientConfigurer;
-	private final HttpClientConfigCallback httpClientConfigurer;
 	private final Supplier<HttpHeaders> headersSupplier;

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

 		this.hosts = Collections.unmodifiableList(new ArrayList<>(hosts));
 		this.headers = new HttpHeaders(headers);
@@ -72,7 +69,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		this.hostnameVerifier = hostnameVerifier;
 		this.proxy = proxy;
 		this.webClientConfigurer = webClientConfigurer;
-		this.httpClientConfigurer = httpClientConfigurer;
 		this.headersSupplier = headersSupplier;
 	}

@@ -127,11 +123,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return webClientConfigurer;
 	}

-	@Override
-	public HttpClientConfigCallback getHttpClientConfigurer() {
-		return httpClientConfigurer;
-	}
-
 	@Override
 	public Supplier<HttpHeaders> getHeadersSupplier() {
 		return headersSupplier;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -119,8 +119,6 @@ public final class RestClients {

 			clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);

-			clientBuilder = clientConfiguration.getHttpClientConfigurer().customizeHttpClient(clientBuilder);
-
 			return clientBuilder;
 		});

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -45,14 +45,17 @@ import javax.net.ssl.SSLContext;
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
+import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
@@ -65,7 +68,6 @@ import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.get.MultiGetItemResponse;
 import org.elasticsearch.action.get.MultiGetRequest;
 import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.index.IndexRequest;
@@ -82,7 +84,10 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.GetAliasesResponse;
 import org.elasticsearch.client.Request;
-import org.elasticsearch.client.indices.*;
+import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
+import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
+import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
+import org.elasticsearch.client.indices.PutIndexTemplateRequest;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.DeprecationHandler;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
@@ -91,11 +96,8 @@ import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import org.elasticsearch.index.reindex.UpdateByQueryRequest;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.script.mustache.SearchTemplateRequest;
-import org.elasticsearch.script.mustache.SearchTemplateResponse;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregation;
@@ -107,11 +109,9 @@ import org.springframework.data.elasticsearch.client.ClientLogger;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
 import org.springframework.data.elasticsearch.client.reactive.HostProvider.Verification;
-import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Cluster;
 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.query.ByQueryResponse;
 import org.springframework.data.util.Lazy;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -139,15 +139,13 @@ import org.springframework.web.reactive.function.client.WebClient.RequestBodySpe
 * @author Russell Parry
 * @author Thomas Geese
 * @author Brian Clozel
- * @author Farid Faoudi
- * @author George Popides
 * @since 3.2
 * @see ClientConfiguration
 * @see ReactiveRestClients
 */
-public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearchClient, Indices, Cluster {
+public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearchClient, Indices {

-	private final HostProvider<?> hostProvider;
+	private final HostProvider hostProvider;
 	private final RequestCreator requestCreator;
 	private Supplier<HttpHeaders> headersSupplier = () -> HttpHeaders.EMPTY;

@@ -157,7 +155,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 	 *
 	 * @param hostProvider must not be {@literal null}.
 	 */
-	public DefaultReactiveElasticsearchClient(HostProvider<?> hostProvider) {
+	public DefaultReactiveElasticsearchClient(HostProvider hostProvider) {
 		this(hostProvider, new DefaultRequestCreator());
 	}

@@ -168,7 +166,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 	 * @param hostProvider must not be {@literal null}.
 	 * @param requestCreator must not be {@literal null}.
 	 */
-	public DefaultReactiveElasticsearchClient(HostProvider<?> hostProvider, RequestCreator requestCreator) {
+	public DefaultReactiveElasticsearchClient(HostProvider hostProvider, RequestCreator requestCreator) {

 		Assert.notNull(hostProvider, "HostProvider must not be null");
 		Assert.notNull(requestCreator, "RequestCreator must not be null");
@@ -226,7 +224,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch

 		WebClientProvider provider = getWebClientProvider(clientConfiguration);

-		HostProvider<?> hostProvider = HostProvider.provider(provider, clientConfiguration.getHeadersSupplier(),
+		HostProvider hostProvider = HostProvider.provider(provider, clientConfiguration.getHeadersSupplier(),
 				clientConfiguration.getEndpoints().toArray(new InetSocketAddress[0]));

 		DefaultReactiveElasticsearchClient client = new DefaultReactiveElasticsearchClient(hostProvider, requestCreator);
@@ -300,6 +298,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 		this.headersSupplier = headersSupplier;
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders)
+	 */
 	@Override
 	public Mono<Boolean> ping(HttpHeaders headers) {

@@ -308,6 +310,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.onErrorResume(NoReachableHostException.class, error -> Mono.just(false)).next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#info(org.springframework.http.HttpHeaders)
+	 */
 	@Override
 	public Mono<MainResponse> info(HttpHeaders headers) {

@@ -315,6 +321,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#get(org.springframework.http.HttpHeaders, org.elasticsearch.action.get.GetRequest)
+	 */
 	@Override
 	public Mono<GetResult> get(HttpHeaders headers, GetRequest getRequest) {

@@ -324,14 +334,24 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#multiGet(org.springframework.http.HttpHeaders, org.elasticsearch.action.get.MultiGetRequest)
+	 */
 	@Override
-	public Flux<MultiGetItemResponse> multiGet(HttpHeaders headers, MultiGetRequest multiGetRequest) {
+	public Flux<GetResult> multiGet(HttpHeaders headers, MultiGetRequest multiGetRequest) {

 		return sendRequest(multiGetRequest, requestCreator.multiGet(), MultiGetResponse.class, headers)
 				.map(MultiGetResponse::getResponses) //
-				.flatMap(Flux::fromArray); //
+				.flatMap(Flux::fromArray) //
+				.filter(it -> !it.isFailed() && it.getResponse().isExists()) //
+				.map(it -> DefaultReactiveElasticsearchClient.getResponseToGetResult(it.getResponse()));
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#exists(org.springframework.http.HttpHeaders, org.elasticsearch.action.get.GetRequest)
+	 */
 	@Override
 	public Mono<Boolean> exists(HttpHeaders headers, GetRequest getRequest) {

@@ -340,26 +360,37 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.action.index.IndexRequest)
+	 */
 	@Override
 	public Mono<IndexResponse> index(HttpHeaders headers, IndexRequest indexRequest) {
 		return sendRequest(indexRequest, requestCreator.index(), IndexResponse.class, headers).next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#indices()
+	 */
 	@Override
 	public Indices indices() {
 		return this;
 	}

-	@Override
-	public Cluster cluster() {
-		return this;
-	}
-
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.action.update.UpdateRequest)
+	 */
 	@Override
 	public Mono<UpdateResponse> update(HttpHeaders headers, UpdateRequest updateRequest) {
 		return sendRequest(updateRequest, requestCreator.update(), UpdateResponse.class, headers).next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.action.delete.DeleteRequest)
+	 */
 	@Override
 	public Mono<DeleteResponse> delete(HttpHeaders headers, DeleteRequest deleteRequest) {

@@ -367,6 +398,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#count(org.springframework.http.HttpHeaders, org.elasticsearch.action.search.SearchRequest)
+	 */
 	@Override
 	public Mono<Long> count(HttpHeaders headers, SearchRequest searchRequest) {
 		searchRequest.source().trackTotalHits(true);
@@ -378,12 +413,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}

-	@Override
-	public Flux<SearchHit> searchTemplate(HttpHeaders headers, SearchTemplateRequest searchTemplateRequest) {
-		return sendRequest(searchTemplateRequest, requestCreator.searchTemplate(), SearchTemplateResponse.class, headers)
-				.map(response -> response.getResponse().getHits()).flatMap(Flux::fromIterable);
-	}
-
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.action.search.SearchRequest)
+	 */
 	@Override
 	public Flux<SearchHit> search(HttpHeaders headers, SearchRequest searchRequest) {

@@ -403,6 +436,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.map(SearchResponse::getSuggest);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#aggregate(org.springframework.http.HttpHeaders, org.elasticsearch.action.search.SearchRequest)
+	 */
 	@Override
 	public Flux<Aggregation> aggregate(HttpHeaders headers, SearchRequest searchRequest) {

@@ -417,6 +454,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.flatMap(Flux::fromIterable);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#scroll(org.springframework.http.HttpHeaders, org.elasticsearch.action.search.SearchRequest)
+	 */
 	@Override
 	public Flux<SearchHit> scroll(HttpHeaders headers, SearchRequest searchRequest) {

@@ -466,6 +507,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 		return sendRequest(clearScrollRequest, requestCreator.clearScroll(), ClearScrollResponse.class, headers);
 	}

+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.http.HttpHeaders, org.elasticsearch.index.reindex.DeleteByQueryRequest)
+	 */
 	@Override
 	public Mono<BulkByScrollResponse> deleteBy(HttpHeaders headers, DeleteByQueryRequest deleteRequest) {

@@ -473,13 +518,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}

-	@Override
-	public Mono<ByQueryResponse> updateBy(HttpHeaders headers, UpdateByQueryRequest updateRequest) {
-		return sendRequest(updateRequest, requestCreator.updateByQuery(), BulkByScrollResponse.class, headers) //
-				.next() //
-				.map(ByQueryResponse::of);
-	}
-
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#bulk(org.springframework.http.HttpHeaders, org.elasticsearch.action.bulk.BulkRequest)
+	 */
 	@Override
 	public Mono<BulkResponse> bulk(HttpHeaders headers, BulkRequest bulkRequest) {
 		return sendRequest(bulkRequest, requestCreator.bulk(), BulkResponse.class, headers) //
@@ -493,7 +535,8 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.flatMap(callback::doWithClient) //
 				.onErrorResume(throwable -> {

-					if (isCausedByConnectionException(throwable)) {
+					if (throwable instanceof ConnectException) {
+
 						return hostProvider.getActive(Verification.ACTIVE) //
 								.flatMap(callback::doWithClient);
 					}
@@ -502,27 +545,6 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				});
 	}

-	/**
-	 * checks if the given throwable is a {@link ConnectException} or has one in it's cause chain
-	 *
-	 * @param throwable the throwable to check
-	 * @return true if throwable is caused by a {@link ConnectException}
-	 */
-	private boolean isCausedByConnectionException(Throwable throwable) {
-
-		Throwable t = throwable;
-		do {
-
-			if (t instanceof ConnectException) {
-				return true;
-			}
-
-			t = t.getCause();
-		} while (t != null);
-
-		return false;
-	}
-
 	@Override
 	public Mono<Status> status() {

@@ -609,19 +631,10 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 	}

 	// region indices operations
-	@Override
-	public Mono<Boolean> createIndex(HttpHeaders headers,
-			org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) {
-
-		return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) //
-				.map(AcknowledgedResponse::isAcknowledged) //
-				.next();
-	}
-
 	@Override
 	public Mono<Boolean> createIndex(HttpHeaders headers, CreateIndexRequest createIndexRequest) {

-		return sendRequest(createIndexRequest, requestCreator.createIndexRequest(), AcknowledgedResponse.class, headers) //
+		return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) //
 				.map(AcknowledgedResponse::isAcknowledged) //
 				.next();
 	}
@@ -634,21 +647,13 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 	}

 	@Override
-	public Mono<Boolean> existsIndex(HttpHeaders headers,
-			org.elasticsearch.action.admin.indices.get.GetIndexRequest request) {
+	public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {

 		return sendRequest(request, requestCreator.indexExists(), RawActionResponse.class, headers) //
 				.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
 				.next();
 	}

-	@Override
-	public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {
-		return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) //
-				.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
-				.next();
-	}
-
 	@Override
 	public Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest request) {

@@ -664,25 +669,9 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.then();
 	}

-	@Override
-	@Deprecated
-	public Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(HttpHeaders headers,
-			org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
-		return sendRequest(getMappingsRequest, requestCreator.getMapping(),
-				org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next();
-	}
-
 	@Override
 	public Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest) {
-		return sendRequest(getMappingsRequest, requestCreator.getMappingRequest(), GetMappingsResponse.class, headers) //
-				.next();
-	}
-
-	@Override
-	public Mono<GetFieldMappingsResponse> getFieldMapping(HttpHeaders headers,
-			GetFieldMappingsRequest getFieldMappingsRequest) {
-		return sendRequest(getFieldMappingsRequest, requestCreator.getFieldMapping(), GetFieldMappingsResponse.class,
-				headers).next();
+		return sendRequest(getMappingsRequest, requestCreator.getMapping(), GetMappingsResponse.class, headers).next();
 	}

 	@Override
@@ -691,21 +680,13 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 	}

 	@Override
-	public Mono<Boolean> putMapping(HttpHeaders headers,
-			org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
+	public Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {

 		return sendRequest(putMappingRequest, requestCreator.putMapping(), AcknowledgedResponse.class, headers) //
 				.map(AcknowledgedResponse::isAcknowledged) //
 				.next();
 	}

-	@Override
-	public Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
-		return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) //
-				.map(AcknowledgedResponse::isAcknowledged) //
-				.next();
-	}
-
 	@Override
 	public Mono<Void> openIndex(HttpHeaders headers, OpenIndexRequest request) {

@@ -757,19 +738,6 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.map(AcknowledgedResponse::isAcknowledged).next();
 	}

-	@Override
-	public Mono<GetIndexResponse> getIndex(HttpHeaders headers, GetIndexRequest getIndexRequest) {
-		return sendRequest(getIndexRequest, requestCreator.getIndex(), GetIndexResponse.class, headers).next();
-	}
-
-	// endregion
-
-	// region cluster operations
-	@Override
-	public Mono<ClusterHealthResponse> health(HttpHeaders headers, ClusterHealthRequest clusterHealthRequest) {
-		return sendRequest(clusterHealthRequest, requestCreator.clusterHealth(), ClusterHealthResponse.class, headers)
-				.next();
-	}
 	// endregion

 	// region helper functions
@@ -855,9 +823,6 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 		String mediaType = response.headers().contentType().map(MediaType::toString).orElse(XContentType.JSON.mediaType());

 		return response.body(BodyExtractors.toMono(byte[].class)) //
-				.switchIfEmpty(Mono.error(
-						new ElasticsearchStatusException(String.format("%s request to %s returned error code %s and no body.",
-								request.getMethod(), request.getEndpoint(), statusCode), status)))
 				.map(bytes -> new String(bytes, StandardCharsets.UTF_8)) //
 				.flatMap(content -> contentOrError(content, mediaType, status))
 				.flatMap(unused -> Mono
@@ -925,7 +890,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 			} while (token == XContentParser.Token.FIELD_NAME);

 			return null;
-		} catch (Exception e) {
+		} catch (IOException e) {
 			return new ElasticsearchStatusException(content, status);
 		}
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClient.Builder;
-import org.springframework.web.util.DefaultUriBuilderFactory;

 /**
 * Default {@link WebClientProvider} that uses cached {@link WebClient} instances per {@code hostAndPort}.
@@ -46,7 +45,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 	private final @Nullable ClientHttpConnector connector;
 	private final Consumer<Throwable> errorListener;
 	private final HttpHeaders headers;
-	private final @Nullable String pathPrefix;
+	private final String pathPrefix;
 	private final Function<WebClient, WebClient> webClientConfigurer;

 	/**
@@ -62,11 +61,11 @@ class DefaultWebClientProvider implements WebClientProvider {
 	/**
 	 * Create new {@link DefaultWebClientProvider} with empty {@link HttpHeaders} and no-op {@literal error listener}.
 	 *
+	 * @param pathPrefix can be {@literal null}
 	 * @param scheme must not be {@literal null}.
 	 * @param connector can be {@literal null}.
 	 * @param errorListener must not be {@literal null}.
 	 * @param headers must not be {@literal null}.
-	 * @param pathPrefix can be {@literal null}
 	 * @param webClientConfigurer must not be {@literal null}.
 	 */
 	private DefaultWebClientProvider(String scheme, @Nullable ClientHttpConnector connector,
@@ -146,6 +145,7 @@ class DefaultWebClientProvider implements WebClientProvider {

 	}

+
 	protected WebClient createWebClientForSocketAddress(InetSocketAddress socketAddress) {

 		Builder builder = WebClient.builder().defaultHeaders(it -> it.addAll(getDefaultHeaders()));
@@ -156,16 +156,7 @@ class DefaultWebClientProvider implements WebClientProvider {

 		String baseUrl = String.format("%s://%s:%d%s", this.scheme, socketAddress.getHostString(), socketAddress.getPort(),
 				pathPrefix == null ? "" : '/' + pathPrefix);
-
-		DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(baseUrl);
-		// the template will already be encoded by the RequestConverters methods
-		uriBuilderFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.VALUES_ONLY);
-		builder.uriBuilderFactory(uriBuilderFactory); //
-
-		WebClient webClient = builder //
-				.filter((request, next) -> next.exchange(request) //
-						.doOnError(errorListener)) //
-				.build(); //
+		WebClient webClient = builder.baseUrl(baseUrl).filter((request, next) -> next.exchange(request).doOnError(errorListener)).build();
 		return webClientConfigurer.apply(webClient);
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,20 +34,19 @@ import org.springframework.web.reactive.function.client.WebClient;
 *
 * @author Christoph Strobl
 * @author Mark Paluch
- * @author Peter-Josef Meisch
 * @since 3.2
 */
-public interface HostProvider<T extends HostProvider<T>> {
+public interface HostProvider {

 	/**
 	 * Create a new {@link HostProvider} best suited for the given {@link WebClientProvider} and number of hosts.
 	 *
 	 * @param clientProvider must not be {@literal null} .
-	 * @param headersSupplier to supply custom headers, must not be {@literal null}
+	 * @param headersSupplier  to supply custom headers, must not be {@literal null}
 	 * @param endpoints must not be {@literal null} nor empty.
 	 * @return new instance of {@link HostProvider}.
 	 */
-	static HostProvider<?> provider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
+	static HostProvider provider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
 			InetSocketAddress... endpoints) {

 		Assert.notNull(clientProvider, "WebClientProvider must not be null");
@@ -56,7 +55,7 @@ public interface HostProvider<T extends HostProvider<T>> {
 		if (endpoints.length == 1) {
 			return new SingleNodeHostProvider(clientProvider, headersSupplier, endpoints[0]);
 		} else {
-			return new MultiNodeHostProvider(clientProvider, headersSupplier, endpoints);
+			return new MultiNodeHostProvider(clientProvider,headersSupplier, endpoints);
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;

 import java.net.InetSocketAddress;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,8 +29,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
@@ -45,19 +42,15 @@ import org.springframework.web.reactive.function.client.WebClient;
 *
 * @author Christoph Strobl
 * @author Mark Paluch
- * @author Peter-Josef Meisch
 * @since 3.2
 */
-class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
-
-	private final static Logger LOG = LoggerFactory.getLogger(MultiNodeHostProvider.class);
+class MultiNodeHostProvider implements HostProvider {

 	private final WebClientProvider clientProvider;
 	private final Supplier<HttpHeaders> headersSupplier;
 	private final Map<InetSocketAddress, ElasticsearchHost> hosts;

-	MultiNodeHostProvider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
-			InetSocketAddress... endpoints) {
+	MultiNodeHostProvider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier, InetSocketAddress... endpoints) {

 		this.clientProvider = clientProvider;
 		this.headersSupplier = headersSupplier;
@@ -65,8 +58,6 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 		for (InetSocketAddress endpoint : endpoints) {
 			this.hosts.put(endpoint, new ElasticsearchHost(endpoint, State.UNKNOWN));
 		}
-
-		LOG.debug("initialized with " + hosts);
 	}

 	/*
@@ -75,7 +66,7 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	 */
 	@Override
 	public Mono<ClusterInformation> clusterInfo() {
-		return checkNodes(null).map(this::updateNodeState).buffer(hosts.size())
+		return nodes(null).map(this::updateNodeState).buffer(hosts.size())
 				.then(Mono.just(new ClusterInformation(new LinkedHashSet<>(this.hosts.values()))));
 	}

@@ -95,19 +86,14 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	@Override
 	public Mono<InetSocketAddress> lookupActiveHost(Verification verification) {

-		LOG.trace("lookupActiveHost " + verification + " from " + hosts());
-
 		if (Verification.LAZY.equals(verification)) {
 			for (ElasticsearchHost entry : hosts()) {
 				if (entry.isOnline()) {
-					LOG.trace("lookupActiveHost returning " + entry);
 					return Mono.just(entry.getEndpoint());
 				}
 			}
-			LOG.trace("no online host found with LAZY");
 		}

-		LOG.trace("searching for active host");
 		return findActiveHostInKnownActives() //
 				.switchIfEmpty(findActiveHostInUnresolved()) //
 				.switchIfEmpty(findActiveHostInDead()) //
@@ -119,30 +105,20 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	}

 	private Mono<InetSocketAddress> findActiveHostInKnownActives() {
-		return findActiveForState(State.ONLINE);
+		return findActiveForSate(State.ONLINE);
 	}

 	private Mono<InetSocketAddress> findActiveHostInUnresolved() {
-		return findActiveForState(State.UNKNOWN);
+		return findActiveForSate(State.UNKNOWN);
 	}

 	private Mono<InetSocketAddress> findActiveHostInDead() {
-		return findActiveForState(State.OFFLINE);
+		return findActiveForSate(State.OFFLINE);
 	}

-	private Mono<InetSocketAddress> findActiveForState(State state) {
-
-		LOG.trace("findActiveForState state " + state + ", current hosts: " + hosts);
-
-		return checkNodes(state) //
-				.map(this::updateNodeState) //
-				.filter(ElasticsearchHost::isOnline) //
-				.map(elasticsearchHost -> {
-					LOG.trace("findActiveForState returning host " + elasticsearchHost);
-					return elasticsearchHost;
-				}).map(ElasticsearchHost::getEndpoint) //
-				.takeLast(1) //
-				.next();
+	private Mono<InetSocketAddress> findActiveForSate(State state) {
+		return nodes(state).map(this::updateNodeState).filter(ElasticsearchHost::isOnline)
+				.map(ElasticsearchHost::getEndpoint).next();
 	}

 	private ElasticsearchHost updateNodeState(Tuple2<InetSocketAddress, State> tuple2) {
@@ -153,36 +129,25 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 		return elasticsearchHost;
 	}

-	private Flux<Tuple2<InetSocketAddress, State>> checkNodes(@Nullable State state) {
-
-		LOG.trace("checkNodes() with state " + state);
+	private Flux<Tuple2<InetSocketAddress, State>> nodes(@Nullable State state) {

 		return Flux.fromIterable(hosts()) //
 				.filter(entry -> state == null || entry.getState().equals(state)) //
 				.map(ElasticsearchHost::getEndpoint) //
-				.concatMap(host -> {
+				.flatMap(host -> {

-					LOG.trace("checking host " + host);
-
-					Mono<ClientResponse> clientResponseMono = createWebClient(host) //
+					Mono<ClientResponse> exchange = createWebClient(host) //
 							.head().uri("/") //
 							.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
-							.exchangeToMono(Mono::just) //
-							.timeout(Duration.ofSeconds(1)) //
-							.doOnError(throwable -> {
-								LOG.trace("error checking host " + host + ", " + throwable.getMessage());
+							.exchange().doOnError(throwable -> {
 								hosts.put(host, new ElasticsearchHost(host, State.OFFLINE));
 								clientProvider.getErrorListener().accept(throwable);
 							});

-					return Mono.just(host) //
-							.zipWith(clientResponseMono.flatMap(it -> it.releaseBody() //
-									.thenReturn(it.statusCode().isError() ? State.OFFLINE : State.ONLINE)));
+					return Mono.just(host).zipWith(exchange
+							.flatMap(it -> it.releaseBody().thenReturn(it.statusCode().isError() ? State.OFFLINE : State.ONLINE)));
 				}) //
-				.map(tuple -> {
-					LOG.trace("check result " + tuple);
-					return tuple;
-				}).onErrorContinue((throwable, o) -> clientProvider.getErrorListener().accept(throwable));
+				.onErrorContinue((throwable, o) -> clientProvider.getErrorListener().accept(throwable));
 	}

 	private List<ElasticsearchHost> hosts() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,13 +22,16 @@ import java.net.ConnectException;
 import java.util.Collection;
 import java.util.function.Consumer;

-import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
+import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
@@ -39,7 +42,6 @@ import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.MultiGetItemResponse;
 import org.elasticsearch.action.get.MultiGetRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
@@ -49,18 +51,18 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.GetAliasesResponse;
-import org.elasticsearch.client.indices.*;
+import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
+import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
+import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
+import org.elasticsearch.client.indices.PutIndexTemplateRequest;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import org.elasticsearch.index.reindex.UpdateByQueryRequest;
-import org.elasticsearch.script.mustache.SearchTemplateRequest;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.suggest.Suggest;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
-import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -75,7 +77,6 @@ import org.springframework.web.reactive.function.client.WebClient;
 * @author Peter-Josef Meisch
 * @author Henrique Amaral
 * @author Thomas Geese
- * @author Farid Faoudi
 * @since 3.2
 * @see ClientConfiguration
 * @see ReactiveRestClients
@@ -160,9 +161,9 @@ public interface ReactiveElasticsearchClient {
 	 * @param consumer never {@literal null}.
 	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-multi-get.html">Multi Get API on
 	 *      elastic.co</a>
-	 * @return the {@link Flux} emitting the {@link MultiGetItemResponse result}.
+	 * @return the {@link Flux} emitting the {@link GetResult result}.
 	 */
-	default Flux<MultiGetItemResponse> multiGet(Consumer<MultiGetRequest> consumer) {
+	default Flux<GetResult> multiGet(Consumer<MultiGetRequest> consumer) {

 		MultiGetRequest request = new MultiGetRequest();
 		consumer.accept(request);
@@ -176,9 +177,9 @@ public interface ReactiveElasticsearchClient {
 	 * @param multiGetRequest must not be {@literal null}.
 	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-multi-get.html">Multi Get API on
 	 *      elastic.co</a>
-	 * @return the {@link Flux} emitting the {@link MultiGetItemResponse result}.
+	 * @return the {@link Flux} emitting the {@link GetResult result}.
 	 */
-	default Flux<MultiGetItemResponse> multiGet(MultiGetRequest multiGetRequest) {
+	default Flux<GetResult> multiGet(MultiGetRequest multiGetRequest) {
 		return multiGet(HttpHeaders.EMPTY, multiGetRequest);
 	}

@@ -190,9 +191,9 @@ public interface ReactiveElasticsearchClient {
 	 * @param multiGetRequest must not be {@literal null}.
 	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-multi-get.html">Multi Get API on
 	 *      elastic.co</a>
-	 * @return the {@link Flux} emitting the {@link MultiGetItemResponse result}.
+	 * @return the {@link Flux} emitting the {@link GetResult result}.
 	 */
-	Flux<MultiGetItemResponse> multiGet(HttpHeaders headers, MultiGetRequest multiGetRequest);
+	Flux<GetResult> multiGet(HttpHeaders headers, MultiGetRequest multiGetRequest);

 	/**
 	 * Checks for the existence of a document. Emits {@literal true} if it exists, {@literal false} otherwise.
@@ -271,14 +272,6 @@ public interface ReactiveElasticsearchClient {
 	 */
 	Indices indices();

-	/**
-	 * Gain Access to cluster related commands.
-	 *
-	 * @return Cluster implementations
-	 * @since 4.2
-	 */
-	Cluster cluster();
-
 	/**
 	 * Execute an {@link UpdateRequest} against the {@literal update} API to alter a document.
 	 *
@@ -396,43 +389,6 @@ public interface ReactiveElasticsearchClient {
 	 */
 	Mono<Long> count(HttpHeaders headers, SearchRequest searchRequest);

-	/**
-	 * Executes a {@link SearchTemplateRequest} against the {@literal search template} API.
-	 *
-	 * @param consumer must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html">Search Template
-	 *      API on elastic.co</a>
-	 * @return the {@link Flux} emitting {@link SearchHit hits} one by one.
-	 */
-	default Flux<SearchHit> searchTemplate(Consumer<SearchTemplateRequest> consumer) {
-		SearchTemplateRequest request = new SearchTemplateRequest();
-		consumer.accept(request);
-		return searchTemplate(request);
-	}
-
-	/**
-	 * Executes a {@link SearchTemplateRequest} against the {@literal search template} API.
-	 *
-	 * @param searchTemplateRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html">Search Template
-	 *      API on elastic.co</a>
-	 * @return the {@link Flux} emitting {@link SearchHit hits} one by one.
-	 */
-	default Flux<SearchHit> searchTemplate(SearchTemplateRequest searchTemplateRequest) {
-		return searchTemplate(HttpHeaders.EMPTY, searchTemplateRequest);
-	}
-
-	/**
-	 * Executes a {@link SearchTemplateRequest} against the {@literal search template} API.
-	 *
-	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-	 * @param searchTemplateRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html">Search Template
-	 *      API on elastic.co</a>
-	 * @return the {@link Flux} emitting {@link SearchHit hits} one by one.
-	 */
-	Flux<SearchHit> searchTemplate(HttpHeaders headers, SearchTemplateRequest searchTemplateRequest);
-
 	/**
 	 * Execute a {@link SearchRequest} against the {@literal search} API.
 	 *
@@ -637,44 +593,6 @@ public interface ReactiveElasticsearchClient {
 	 */
 	Mono<BulkByScrollResponse> deleteBy(HttpHeaders headers, DeleteByQueryRequest deleteRequest);

-	/**
-	 * Execute a {@link UpdateByQueryRequest} against the {@literal update by query} API.
-	 *
-	 * @param consumer must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">Update By
-	 *      * Query API on elastic.co</a>
-	 * @return a {@link Mono} emitting operation response.
-	 */
-	default Mono<ByQueryResponse> updateBy(Consumer<UpdateByQueryRequest> consumer) {
-
-		final UpdateByQueryRequest request = new UpdateByQueryRequest();
-		consumer.accept(request);
-		return updateBy(request);
-	}
-
-	/**
-	 * Execute a {@link UpdateByQueryRequest} against the {@literal update by query} API.
-	 *
-	 * @param updateRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">Update By
-	 *      * Query API on elastic.co</a>
-	 * @return a {@link Mono} emitting operation response.
-	 */
-	default Mono<ByQueryResponse> updateBy(UpdateByQueryRequest updateRequest) {
-		return updateBy(HttpHeaders.EMPTY, updateRequest);
-	}
-
-	/**
-	 * Execute a {@link UpdateByQueryRequest} against the {@literal update by query} API.
-	 *
-	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-	 * @param updateRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">Update By
-	 *      * Query API on elastic.co</a>
-	 * @return a {@link Mono} emitting operation response.
-	 */
-	Mono<ByQueryResponse> updateBy(HttpHeaders headers, UpdateByQueryRequest updateRequest);
-
 	/**
 	 * Execute a {@link BulkRequest} against the {@literal bulk} API.
 	 *
@@ -786,53 +704,20 @@ public interface ReactiveElasticsearchClient {
 	interface Indices {

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.get.GetIndexRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link GetIndexRequest} against the {@literal indices} API.
 		 *
 		 * @param consumer never {@literal null}.
 		 * @return the {@link Mono} emitting {@literal true} if the index exists, {@literal false} otherwise.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-exists.html"> Indices
 		 *      Exists API on elastic.co</a>
-		 * @deprecated since 4.2
 		 */
-		@Deprecated
-		default Mono<Boolean> existsIndex(Consumer<org.elasticsearch.action.admin.indices.get.GetIndexRequest> consumer) {
+		default Mono<Boolean> existsIndex(Consumer<GetIndexRequest> consumer) {

-			org.elasticsearch.action.admin.indices.get.GetIndexRequest request = new org.elasticsearch.action.admin.indices.get.GetIndexRequest();
+			GetIndexRequest request = new GetIndexRequest();
 			consumer.accept(request);
 			return existsIndex(request);
 		}

-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.get.GetIndexRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param getIndexRequest must not be {@literal null}.
-		 * @return the {@link Mono} emitting {@literal true} if the index exists, {@literal false} otherwise.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-exists.html"> Indices
-		 *      Exists API on elastic.co</a>
-		 * @deprecated since 4.2, use {@link #existsIndex(GetIndexRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> existsIndex(org.elasticsearch.action.admin.indices.get.GetIndexRequest getIndexRequest) {
-			return existsIndex(HttpHeaders.EMPTY, getIndexRequest);
-		}
-
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.get.GetIndexRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getIndexRequest must not be {@literal null}.
-		 * @return the {@link Mono} emitting {@literal true} if the index exists, {@literal false} otherwise.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-exists.html"> Indices
-		 *      Exists API on elastic.co</a>
-		 * @deprecated since 4.2, use {@link #existsIndex(HttpHeaders, GetIndexRequest)}
-		 */
-		@Deprecated
-		Mono<Boolean> existsIndex(HttpHeaders headers,
-				org.elasticsearch.action.admin.indices.get.GetIndexRequest getIndexRequest);
-
 		/**
 		 * Execute the given {@link GetIndexRequest} against the {@literal indices} API.
 		 *
@@ -840,7 +725,6 @@ public interface ReactiveElasticsearchClient {
 		 * @return the {@link Mono} emitting {@literal true} if the index exists, {@literal false} otherwise.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-exists.html"> Indices
 		 *      Exists API on elastic.co</a>
-		 * @since 4.2
 		 */
 		default Mono<Boolean> existsIndex(GetIndexRequest getIndexRequest) {
 			return existsIndex(HttpHeaders.EMPTY, getIndexRequest);
@@ -854,7 +738,6 @@ public interface ReactiveElasticsearchClient {
 		 * @return the {@link Mono} emitting {@literal true} if the index exists, {@literal false} otherwise.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-exists.html"> Indices
 		 *      Exists API on elastic.co</a>
-		 * @since 4.2
 		 */
 		Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest getIndexRequest);

@@ -900,58 +783,21 @@ public interface ReactiveElasticsearchClient {
 		Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest deleteIndexRequest);

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.create.CreateIndexRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link CreateIndexRequest} against the {@literal indices} API.
 		 *
 		 * @param consumer never {@literal null}.
 		 * @return a {@link Mono} signalling successful operation completion or an {@link Mono#error(Throwable) error} if
 		 *         eg. the index already exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html"> Indices
 		 *      Create API on elastic.co</a>
-		 * @deprecated since 4.2
 		 */
-		@Deprecated
-		default Mono<Boolean> createIndex(
-				Consumer<org.elasticsearch.action.admin.indices.create.CreateIndexRequest> consumer) {
+		default Mono<Boolean> createIndex(Consumer<CreateIndexRequest> consumer) {

-			org.elasticsearch.action.admin.indices.create.CreateIndexRequest request = new org.elasticsearch.action.admin.indices.create.CreateIndexRequest();
+			CreateIndexRequest request = new CreateIndexRequest();
 			consumer.accept(request);
 			return createIndex(request);
 		}

-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.create.CreateIndexRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param createIndexRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling successful operation completion or an {@link Mono#error(Throwable) error} if
-		 *         eg. the index already exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html"> Indices
-		 *      Create API on elastic.co</a>
-		 * @deprecated since 4.2, use {@link #createIndex(CreateIndexRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> createIndex(
-				org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) {
-			return createIndex(HttpHeaders.EMPTY, createIndexRequest);
-		}
-
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.create.CreateIndexRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param createIndexRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling successful operation completion or an {@link Mono#error(Throwable) error} if
-		 *         eg. the index already exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html"> Indices
-		 *      Create API on elastic.co</a>
-		 * @deprecated since 4.2, use {@link #createIndex(HttpHeaders, CreateIndexRequest)}
-		 */
-		@Deprecated
-		Mono<Boolean> createIndex(HttpHeaders headers,
-				org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest);
-
 		/**
 		 * Execute the given {@link CreateIndexRequest} against the {@literal indices} API.
 		 *
@@ -960,7 +806,6 @@ public interface ReactiveElasticsearchClient {
 		 *         eg. the index already exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html"> Indices
 		 *      Create API on elastic.co</a>
-		 * @since 4.2
 		 */
 		default Mono<Boolean> createIndex(CreateIndexRequest createIndexRequest) {
 			return createIndex(HttpHeaders.EMPTY, createIndexRequest);
@@ -975,7 +820,6 @@ public interface ReactiveElasticsearchClient {
 		 *         eg. the index already exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html"> Indices
 		 *      Create API on elastic.co</a>
-		 * @since 4.2
 		 */
 		Mono<Boolean> createIndex(HttpHeaders headers, CreateIndexRequest createIndexRequest);

@@ -1103,8 +947,7 @@ public interface ReactiveElasticsearchClient {
 		Mono<Void> refreshIndex(HttpHeaders headers, RefreshRequest refreshRequest);

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link PutMappingRequest} against the {@literal indices} API.
 		 *
 		 * @param consumer never {@literal null}.
 		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
@@ -1114,14 +957,12 @@ public interface ReactiveElasticsearchClient {
 		 * @deprecated since 4.1, use {@link #putMapping(Consumer)}
 		 */
 		@Deprecated
-		default Mono<Boolean> updateMapping(
-				Consumer<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest> consumer) {
+		default Mono<Boolean> updateMapping(Consumer<PutMappingRequest> consumer) {
 			return putMapping(consumer);
 		}

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link PutMappingRequest} against the {@literal indices} API.
 		 *
 		 * @param putMappingRequest must not be {@literal null}.
 		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
@@ -1131,14 +972,12 @@ public interface ReactiveElasticsearchClient {
 		 * @deprecated since 4.1, use {@link #putMapping(PutMappingRequest)}
 		 */
 		@Deprecated
-		default Mono<Boolean> updateMapping(
-				org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
+		default Mono<Boolean> updateMapping(PutMappingRequest putMappingRequest) {
 			return putMapping(putMappingRequest);
 		}

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link PutMappingRequest} against the {@literal indices} API.
 		 *
 		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
 		 * @param putMappingRequest must not be {@literal null}.
@@ -1149,64 +988,26 @@ public interface ReactiveElasticsearchClient {
 		 * @deprecated since 4.1, use {@link #putMapping(HttpHeaders, PutMappingRequest)}
 		 */
 		@Deprecated
-		default Mono<Boolean> updateMapping(HttpHeaders headers,
-				org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
+		default Mono<Boolean> updateMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
 			return putMapping(headers, putMappingRequest);
 		}

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link PutMappingRequest} against the {@literal indices} API.
 		 *
 		 * @param consumer never {@literal null}.
 		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
 		 *         does not exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
 		 *      Put Mapping API on elastic.co</a>
-		 * @deprecated since 4.2
 		 */
-		@Deprecated
-		default Mono<Boolean> putMapping(
-				Consumer<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest> consumer) {
+		default Mono<Boolean> putMapping(Consumer<PutMappingRequest> consumer) {

-			org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest request = new org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest();
+			PutMappingRequest request = new PutMappingRequest();
 			consumer.accept(request);
 			return putMapping(request);
 		}

-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param putMappingRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
-		 *      Put Mapping API on elastic.co</a>
-		 * @deprecated since 4.2, use {@link #putMapping(PutMappingRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> putMapping(
-				org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
-			return putMapping(HttpHeaders.EMPTY, putMappingRequest);
-		}
-
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param putMappingRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
-		 *      Put Mapping API on elastic.co</a>
-		 * @deprecated since 4.2, use {@link #putMapping(HttpHeaders, PutMappingRequest)}
-		 */
-		@Deprecated
-		Mono<Boolean> putMapping(HttpHeaders headers,
-				org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest);
-
 		/**
 		 * Execute the given {@link PutMappingRequest} against the {@literal indices} API.
 		 *
@@ -1215,7 +1016,6 @@ public interface ReactiveElasticsearchClient {
 		 *         does not exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
 		 *      Put Mapping API on elastic.co</a>
-		 * @since 4.2
 		 */
 		default Mono<Boolean> putMapping(PutMappingRequest putMappingRequest) {
 			return putMapping(HttpHeaders.EMPTY, putMappingRequest);
@@ -1230,7 +1030,6 @@ public interface ReactiveElasticsearchClient {
 		 *         does not exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
 		 *      Put Mapping API on elastic.co</a>
-		 * @since 4.2
 		 */
 		Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest);

@@ -1320,8 +1119,7 @@ public interface ReactiveElasticsearchClient {
 		Mono<GetSettingsResponse> getSettings(HttpHeaders headers, GetSettingsRequest getSettingsRequest);

 		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest} against the
-		 * {@literal indices} API.
+		 * Execute the given {@link GetMappingsRequest} against the {@literal indices} API.
 		 *
 		 * @param consumer never {@literal null}.
 		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
@@ -1329,52 +1127,14 @@ public interface ReactiveElasticsearchClient {
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-mapping.html"> Indices
 		 *      Flush API on elastic.co</a>
 		 * @since 4.1
-		 * @deprecated since 4.2
 		 */
-		@Deprecated
-		default Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(
-				Consumer<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest> consumer) {
+		default Mono<GetMappingsResponse> getMapping(Consumer<GetMappingsRequest> consumer) {

-			org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest request = new org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest();
+			GetMappingsRequest request = new GetMappingsRequest();
 			consumer.accept(request);
 			return getMapping(request);
 		}

-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param getMappingsRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-mapping.html"> Indices
-		 *      Flush API on elastic.co</a>
-		 * @since 4.1
-		 * @deprecated since 4.2, use {@link #getMapping(GetMappingsRequest)}
-		 */
-		@Deprecated
-		default Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(
-				org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
-			return getMapping(HttpHeaders.EMPTY, getMappingsRequest);
-		}
-
-		/**
-		 * Execute the given {@link org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest} against the
-		 * {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getMappingsRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-mapping.html"> Indices
-		 *      Flush API on elastic.co</a>
-		 * @since 4.1
-		 * @deprecated since 4.2, use {@link #getMapping(HttpHeaders, GetMappingsRequest)}
-		 */
-		@Deprecated
-		Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(HttpHeaders headers,
-				org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest);
-
 		/**
 		 * Execute the given {@link GetMappingsRequest} against the {@literal indices} API.
 		 *
@@ -1382,8 +1142,8 @@ public interface ReactiveElasticsearchClient {
 		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
 		 *         does not exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-mapping.html"> Indices
-		 *      Get mapping API on elastic.co</a>
-		 * @since 4.2
+		 *      Flush API on elastic.co</a>
+		 * @since 4.1
 		 */
 		default Mono<GetMappingsResponse> getMapping(GetMappingsRequest getMappingsRequest) {
 			return getMapping(HttpHeaders.EMPTY, getMappingsRequest);
@@ -1397,59 +1157,14 @@ public interface ReactiveElasticsearchClient {
 		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
 		 *         does not exist.
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-mapping.html"> Indices
-		 *      Get mapping API on elastic.co</a>
-		 * @since 4.2
+		 *      Flush API on elastic.co</a>
+		 * @since 4.1
 		 */
 		Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest);

-		/**
-		 * Execute the given {@link GetFieldMappingsRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html">
-		 *      Indices Flush API on elastic.co</a>
-		 * @since 4.2
-		 */
-		default Mono<GetFieldMappingsResponse> getFieldMapping(Consumer<GetFieldMappingsRequest> consumer) {
-
-			GetFieldMappingsRequest request = new GetFieldMappingsRequest();
-			consumer.accept(request);
-			return getFieldMapping(request);
-		}
-
-		/**
-		 * Execute the given {@link GetFieldMappingsRequest} against the {@literal indices} API.
-		 *
-		 * @param getFieldMappingsRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html">
-		 *      Indices Flush API on elastic.co</a>
-		 * @since 4.2
-		 */
-		default Mono<GetFieldMappingsResponse> getFieldMapping(GetFieldMappingsRequest getFieldMappingsRequest) {
-			return getFieldMapping(HttpHeaders.EMPTY, getFieldMappingsRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetFieldMappingsRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getFieldMappingsRequest must not be {@literal null}.
-		 * @return a {@link Mono} signalling operation completion or an {@link Mono#error(Throwable) error} if eg. the index
-		 *         does not exist.
-		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-field-mapping.html">
-		 *      Indices Flush API on elastic.co</a>
-		 * @since 4.2
-		 */
-		Mono<GetFieldMappingsResponse> getFieldMapping(HttpHeaders headers,
-				GetFieldMappingsRequest getFieldMappingsRequest);
-
 		/**
 		 * Execute the given {@link IndicesAliasesRequest} against the {@literal indices} API.
-		 *
+		 * 
 		 * @param consumer never {@literal null}.
 		 * @return a {@link Mono} signalling operation completion.
 		 * @since 4.1
@@ -1462,7 +1177,7 @@ public interface ReactiveElasticsearchClient {

 		/**
 		 * Execute the given {@link IndicesAliasesRequest} against the {@literal indices} API.
-		 *
+		 * 
 		 * @param indicesAliasesRequest must not be {@literal null}
 		 * @return a {@link Mono} signalling operation completion.
 		 * @since 4.1
@@ -1473,7 +1188,7 @@ public interface ReactiveElasticsearchClient {

 		/**
 		 * Execute the given {@link IndicesAliasesRequest} against the {@literal indices} API.
-		 *
+		 * 
 		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
 		 * @param indicesAliasesRequest must not be {@literal null}
 		 * @return a {@link Mono} signalling operation completion.
@@ -1653,80 +1368,5 @@ public interface ReactiveElasticsearchClient {
 		 * @since 4.1
 		 */
 		Mono<Boolean> deleteTemplate(HttpHeaders headers, DeleteIndexTemplateRequest deleteIndexTemplateRequest);
-
-		/**
-		 * Execute the given {@link GetIndexRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return the {@link Mono} emitting the response
-		 * @since 4.2
-		 */
-		default Mono<GetIndexResponse> getIndex(Consumer<GetIndexRequest> consumer) {
-			GetIndexRequest getIndexRequest = new GetIndexRequest();
-			consumer.accept(getIndexRequest);
-			return getIndex(getIndexRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetIndexRequest} against the {@literal indices} API.
-		 *
-		 * @param getIndexRequest must not be {@literal null}
-		 * @return the {@link Mono} emitting the response
-		 * @since 4.2
-		 */
-		default Mono<GetIndexResponse> getIndex(GetIndexRequest getIndexRequest) {
-			return getIndex(HttpHeaders.EMPTY, getIndexRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetIndexRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getIndexRequest must not be {@literal null}
-		 * @return the {@link Mono} emitting the response
-		 * @since 4.2
-		 */
-		Mono<GetIndexResponse> getIndex(HttpHeaders headers, GetIndexRequest getIndexRequest);
-	}
-
-	/**
-	 * Encapsulation of methods for accessing the Cluster API.
-	 *
-	 * @author Peter-Josef Meisch
-	 * @since 4.2
-	 */
-	interface Cluster {
-
-		/**
-		 * Execute the given {{@link ClusterHealthRequest}} against the {@literal cluster} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return Mono emitting the {@link ClusterHealthResponse}.
-		 */
-		default Mono<ClusterHealthResponse> health(Consumer<ClusterHealthRequest> consumer) {
-
-			ClusterHealthRequest clusterHealthRequest = new ClusterHealthRequest();
-			consumer.accept(clusterHealthRequest);
-			return health(clusterHealthRequest);
-		}
-
-		/**
-		 * Execute the given {{@link ClusterHealthRequest}} against the {@literal cluster} API.
-		 *
-		 * @param clusterHealthRequest must not be {@literal null} // * @return Mono emitting the
-		 *          {@link ClusterHealthResponse}.
-		 */
-		default Mono<ClusterHealthResponse> health(ClusterHealthRequest clusterHealthRequest) {
-			return health(HttpHeaders.EMPTY, clusterHealthRequest);
-		}
-
-		/**
-		 * Execute the given {{@link ClusterHealthRequest}} against the {@literal cluster} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param clusterHealthRequest must not be {@literal null} // * @return Mono emitting the
-		 *          {@link ClusterHealthResponse}.
-		 */
-		Mono<ClusterHealthResponse> health(HttpHeaders headers, ClusterHealthRequest clusterHealthRequest);
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -3,12 +3,15 @@ package org.springframework.data.elasticsearch.client.reactive;
 import java.io.IOException;
 import java.util.function.Function;

-import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
+import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
@@ -25,24 +28,15 @@ import org.elasticsearch.action.search.SearchScrollRequest;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.core.CountRequest;
-import org.elasticsearch.client.indices.CreateIndexRequest;
-import org.elasticsearch.client.indices.GetFieldMappingsRequest;
-import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.GetMappingsRequest;
 import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
 import org.elasticsearch.client.indices.PutIndexTemplateRequest;
-import org.elasticsearch.client.indices.PutMappingRequest;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import org.elasticsearch.index.reindex.UpdateByQueryRequest;
-import org.elasticsearch.script.mustache.SearchTemplateRequest;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
 import org.springframework.data.elasticsearch.client.util.RequestConverters;

 /**
 * @author Roman Puchkovskiy
- * @author Farid Faoudi
- * @author George Popides
 * @since 4.0
 */
 public interface RequestCreator {
@@ -51,10 +45,6 @@ public interface RequestCreator {
 		return RequestConverters::search;
 	}

-	default Function<SearchTemplateRequest, Request> searchTemplate() {
-		return RequestConverters::searchTemplate;
-	}
-
 	default Function<SearchScrollRequest, Request> scroll() {
 		return RequestConverters::searchScroll;
 	}
@@ -99,13 +89,6 @@ public interface RequestCreator {
 		return RequestConverters::deleteByQuery;
 	}

-	/**
-	 * @since 4.2
-	 */
-	default Function<UpdateByQueryRequest, Request> updateByQuery() {
-		return RequestConverters::updateByQuery;
-	}
-
 	default Function<BulkRequest, Request> bulk() {

 		return request -> {
@@ -120,18 +103,7 @@ public interface RequestCreator {

 	// --> INDICES

-	/**
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.get.GetIndexRequest, Request> indexExists() {
-		return RequestConverters::indexExists;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetIndexRequest, Request> indexExistsRequest() {
+	default Function<GetIndexRequest, Request> indexExists() {
 		return RequestConverters::indexExists;
 	}

@@ -139,18 +111,7 @@ public interface RequestCreator {
 		return RequestConverters::indexDelete;
 	}

-	/**
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.create.CreateIndexRequest, Request> indexCreate() {
-		return RequestConverters::indexCreate;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<CreateIndexRequest, Request> createIndexRequest() {
+	default Function<CreateIndexRequest, Request> indexCreate() {
 		return RequestConverters::indexCreate;
 	}

@@ -166,18 +127,7 @@ public interface RequestCreator {
 		return RequestConverters::indexRefresh;
 	}

-	/**
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest, Request> putMapping() {
-		return RequestConverters::putMapping;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<PutMappingRequest, Request> putMappingRequest() {
+	default Function<PutMappingRequest, Request> putMapping() {
 		return RequestConverters::putMapping;
 	}

@@ -198,17 +148,8 @@ public interface RequestCreator {

 	/**
 	 * @since 4.1
-	 * @deprecated since 4.2
 	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest, Request> getMapping() {
-		return RequestConverters::getMapping;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetMappingsRequest, Request> getMappingRequest() {
+	default Function<GetMappingsRequest, Request> getMapping() {
 		return RequestConverters::getMapping;
 	}

@@ -253,25 +194,4 @@ public interface RequestCreator {
 	default Function<DeleteIndexTemplateRequest, Request> deleteTemplate() {
 		return RequestConverters::deleteTemplate;
 	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetFieldMappingsRequest, Request> getFieldMapping() {
-		return RequestConverters::getFieldMapping;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetIndexRequest, Request> getIndex() {
-		return RequestConverters::getIndex;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<ClusterHealthRequest, Request> clusterHealth() {
-		return RequestConverters::clusterHealth;
-	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,18 +32,16 @@ import org.springframework.web.reactive.function.client.WebClient;
 *
 * @author Christoph Strobl
 * @author Mark Paluch
- * @author Peter-Josef Meisch
 * @since 3.2
 */
-class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
+class SingleNodeHostProvider implements HostProvider {

 	private final WebClientProvider clientProvider;
 	private final Supplier<HttpHeaders> headersSupplier;
 	private final InetSocketAddress endpoint;
 	private volatile ElasticsearchHost state;

-	SingleNodeHostProvider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
-			InetSocketAddress endpoint) {
+	SingleNodeHostProvider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier, InetSocketAddress endpoint) {

 		this.clientProvider = clientProvider;
 		this.headersSupplier = headersSupplier;
@@ -59,20 +57,23 @@ class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
 	public Mono<ClusterInformation> clusterInfo() {

 		return createWebClient(endpoint) //
-				.head().uri("/") //
+				.head().uri("/")
 				.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
-				.exchangeToMono(it -> {
+				.exchange() //
+				.flatMap(it -> {
 					if (it.statusCode().isError()) {
 						state = ElasticsearchHost.offline(endpoint);
 					} else {
 						state = ElasticsearchHost.online(endpoint);
 					}
-					return Mono.just(state);
+					return it.releaseBody().thenReturn(state);
 				}).onErrorResume(throwable -> {
+
 					state = ElasticsearchHost.offline(endpoint);
 					clientProvider.getErrorListener().accept(throwable);
 					return Mono.just(state);
-				}).map(elasticsearchHost -> new ClusterInformation(Collections.singleton(elasticsearchHost)));
+				}) //
+				.map(it -> new ClusterInformation(Collections.singleton(it)));
 	}

 	/*
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -71,7 +71,6 @@ import org.elasticsearch.client.Requests;
 import org.elasticsearch.client.RethrottleRequest;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.indices.AnalyzeRequest;
-import org.elasticsearch.client.indices.GetFieldMappingsRequest;
 import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
 import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
 import org.elasticsearch.client.indices.PutIndexTemplateRequest;
@@ -98,7 +97,6 @@ import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.index.reindex.ReindexRequest;
 import org.elasticsearch.index.reindex.UpdateByQueryRequest;
 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.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
@@ -107,9 +105,8 @@ import org.springframework.lang.Nullable;

 /**
 * <p>
- * Original implementation source {@link org.elasticsearch.client.RequestConverters},
- * {@link org.elasticsearch.client.IndicesRequestConverters} and
- * {@link org.elasticsearch.client.ClusterRequestConverters} by {@literal Elasticsearch}
+ * Original implementation source {@link org.elasticsearch.client.RequestConverters} and
+ * {@link org.elasticsearch.client.IndicesRequestConverters} by {@literal Elasticsearch}
 * (<a href="https://www.elastic.co">https://www.elastic.co</a>) licensed under the Apache License, Version 2.0.
 * </p>
 * Modified for usage with {@link ReactiveElasticsearchClient}.
@@ -118,7 +115,6 @@ import org.springframework.lang.Nullable;
 *
 * @author Christoph Strobl
 * @author Peter-Josef Meisch
- * @author Farid Faoudi
 * @since 3.2
 */
@SuppressWarnings("JavadocReference")
@@ -413,24 +409,9 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request searchTemplate(SearchTemplateRequest templateRequest) {
-		SearchRequest searchRequest = templateRequest.getRequest();
-
-		String endpoint = new EndpointBuilder().addCommaSeparatedPathParts(templateRequest.getRequest().indices())
-				.addPathPart("_search").addPathPart("template").build();
-
-		Request request = new Request(HttpMethod.GET.name(), endpoint);
-		Params params = new Params(request);
-		addSearchRequestParams(params, searchRequest);
-
-		request.setEntity(createEntity(templateRequest, REQUEST_BODY_CONTENT_TYPE));
-
-		return request;
-	}
-
 	/**
 	 * Creates a count request.
-	 *
+	 * 
 	 * @param countRequest the search defining the data to be counted
 	 * @return Elasticsearch count request
 	 * @since 4.0
@@ -555,32 +536,26 @@ public class RequestConverters {
 	}

 	public static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) {
-		String endpoint = endpoint(updateByQueryRequest.indices(), "_update_by_query");
+		String endpoint = endpoint(updateByQueryRequest.indices(), updateByQueryRequest.getDocTypes(), "_update_by_query");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
-		Params params = new Params(request).withRouting(updateByQueryRequest.getRouting()) //
-				.withPipeline(updateByQueryRequest.getPipeline()) //
-				.withRefresh(updateByQueryRequest.isRefresh()) //
-				.withTimeout(updateByQueryRequest.getTimeout()) //
-				.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards()) //
-				.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond()) //
-				.withIndicesOptions(updateByQueryRequest.indicesOptions()); //
-
+		Params params = new Params(request).withRouting(updateByQueryRequest.getRouting())
+				.withPipeline(updateByQueryRequest.getPipeline()).withRefresh(updateByQueryRequest.isRefresh())
+				.withTimeout(updateByQueryRequest.getTimeout())
+				.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards())
+				.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond())
+				.withIndicesOptions(updateByQueryRequest.indicesOptions());
 		if (!updateByQueryRequest.isAbortOnVersionConflict()) {
 			params.putParam("conflicts", "proceed");
 		}
-
 		if (updateByQueryRequest.getBatchSize() != AbstractBulkByScrollRequest.DEFAULT_SCROLL_SIZE) {
 			params.putParam("scroll_size", Integer.toString(updateByQueryRequest.getBatchSize()));
 		}
-
 		if (updateByQueryRequest.getScrollTime() != AbstractBulkByScrollRequest.DEFAULT_SCROLL_TIMEOUT) {
 			params.putParam("scroll", updateByQueryRequest.getScrollTime());
 		}
-
-		if (updateByQueryRequest.getMaxDocs() > 0) {
-			params.putParam("max_docs", Integer.toString(updateByQueryRequest.getMaxDocs()));
+		if (updateByQueryRequest.getSize() > 0) {
+			params.putParam("size", Integer.toString(updateByQueryRequest.getSize()));
 		}
-
 		request.setEntity(createEntity(updateByQueryRequest, REQUEST_BODY_CONTENT_TYPE));
 		return request;
 	}
@@ -709,22 +684,6 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request getIndex(org.elasticsearch.client.indices.GetIndexRequest getIndexRequest) {
-		String[] indices = getIndexRequest.indices() == null ? Strings.EMPTY_ARRAY : getIndexRequest.indices();
-
-		String endpoint = endpoint(indices);
-		Request request = new Request(HttpMethod.GET.name(), endpoint);
-
-		Params params = new Params(request);
-		params.withIndicesOptions(getIndexRequest.indicesOptions());
-		params.withLocal(getIndexRequest.local());
-		params.withIncludeDefaults(getIndexRequest.includeDefaults());
-		params.withHuman(getIndexRequest.humanReadable());
-		params.withMasterTimeout(getIndexRequest.masterNodeTimeout());
-
-		return request;
-	}
-
 	public static Request indexDelete(DeleteIndexRequest deleteIndexRequest) {
 		String endpoint = RequestConverters.endpoint(deleteIndexRequest.indices());
 		Request request = new Request(HttpMethod.DELETE.name(), endpoint);
@@ -752,22 +711,6 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request indexExists(org.elasticsearch.client.indices.GetIndexRequest getIndexRequest) {
-		// this can be called with no indices as argument by transport client, not via REST though
-		if (getIndexRequest.indices() == null || getIndexRequest.indices().length == 0) {
-			throw new IllegalArgumentException("indices are mandatory");
-		}
-		String endpoint = endpoint(getIndexRequest.indices(), "");
-		Request request = new Request(HttpMethod.HEAD.name(), endpoint);
-
-		Params params = new Params(request);
-		params.withLocal(getIndexRequest.local());
-		params.withHuman(getIndexRequest.humanReadable());
-		params.withIndicesOptions(getIndexRequest.indicesOptions());
-		params.withIncludeDefaults(getIndexRequest.includeDefaults());
-		return request;
-	}
-
 	public static Request indexOpen(OpenIndexRequest openIndexRequest) {
 		String endpoint = RequestConverters.endpoint(openIndexRequest.indices(), "_open");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
@@ -804,19 +747,6 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request indexCreate(org.elasticsearch.client.indices.CreateIndexRequest createIndexRequest) {
-		String endpoint = RequestConverters.endpoint(new String[] { createIndexRequest.index() });
-		Request request = new Request(HttpMethod.PUT.name(), endpoint);
-
-		Params parameters = new Params(request);
-		parameters.withTimeout(createIndexRequest.timeout());
-		parameters.withMasterTimeout(createIndexRequest.masterNodeTimeout());
-		parameters.withWaitForActiveShards(createIndexRequest.waitForActiveShards(), ActiveShardCount.DEFAULT);
-
-		request.setEntity(createEntity(createIndexRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
-		return request;
-	}
-
 	public static Request indexRefresh(RefreshRequest refreshRequest) {

 		String[] indices = refreshRequest.indices() == null ? Strings.EMPTY_ARRAY : refreshRequest.indices();
@@ -829,7 +759,6 @@ public class RequestConverters {
 		return request;
 	}

-	@Deprecated
 	public static Request putMapping(PutMappingRequest putMappingRequest) {
 		// The concreteIndex is an internal concept, not applicable to requests made over the REST API.
 		if (putMappingRequest.getConcreteIndex() != null) {
@@ -847,18 +776,6 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request putMapping(org.elasticsearch.client.indices.PutMappingRequest putMappingRequest) {
-		Request request = new Request(HttpMethod.PUT.name(),
-				RequestConverters.endpoint(putMappingRequest.indices(), "_mapping"));
-
-		new RequestConverters.Params(request) //
-				.withTimeout(putMappingRequest.timeout()) //
-				.withMasterTimeout(putMappingRequest.masterNodeTimeout()) //
-				.withIncludeTypeName(false);
-		request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
-		return request;
-	}
-
 	public static Request flushIndex(FlushRequest flushRequest) {
 		String[] indices = flushRequest.indices() == null ? Strings.EMPTY_ARRAY : flushRequest.indices();
 		Request request = new Request(HttpMethod.POST.name(), RequestConverters.endpoint(indices, "_flush"));
@@ -884,19 +801,6 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request getMapping(org.elasticsearch.client.indices.GetMappingsRequest getMappingsRequest) {
-		String[] indices = getMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY : getMappingsRequest.indices();
-
-		Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_mapping"));
-
-		RequestConverters.Params parameters = new RequestConverters.Params(request);
-		parameters.withMasterTimeout(getMappingsRequest.masterNodeTimeout());
-		parameters.withIndicesOptions(getMappingsRequest.indicesOptions());
-		parameters.withLocal(getMappingsRequest.local());
-		parameters.withIncludeTypeName(false);
-		return request;
-	}
-
 	public static Request getSettings(GetSettingsRequest getSettingsRequest) {
 		String[] indices = getSettingsRequest.indices() == null ? Strings.EMPTY_ARRAY : getSettingsRequest.indices();
 		String[] names = getSettingsRequest.names() == null ? Strings.EMPTY_ARRAY : getSettingsRequest.names();
@@ -987,43 +891,6 @@ public class RequestConverters {
 		return request;
 	}

-	public static Request getFieldMapping(GetFieldMappingsRequest getFieldMappingsRequest) {
-		String[] indices = getFieldMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY
-				: getFieldMappingsRequest.indices();
-		String[] fields = getFieldMappingsRequest.fields() == null ? Strings.EMPTY_ARRAY : getFieldMappingsRequest.fields();
-
-		final String endpoint = new EndpointBuilder().addCommaSeparatedPathParts(indices).addPathPartAsIs("_mapping")
-				.addPathPartAsIs("field").addCommaSeparatedPathParts(fields).build();
-
-		Request request = new Request(HttpMethod.GET.name(), endpoint);
-
-		RequestConverters.Params parameters = new Params(request);
-		parameters.withIndicesOptions(getFieldMappingsRequest.indicesOptions());
-		parameters.withIncludeDefaults(getFieldMappingsRequest.includeDefaults());
-		parameters.withIncludeTypeName(false);
-		return request;
-	}
-
-	public static Request clusterHealth(ClusterHealthRequest healthRequest) {
-		String[] indices = healthRequest.indices() == null ? Strings.EMPTY_ARRAY : healthRequest.indices();
-		String endpoint = new EndpointBuilder().addPathPartAsIs(new String[] { "_cluster/health" })
-				.addCommaSeparatedPathParts(indices).build();
-
-		Request request = new Request("GET", endpoint);
-
-		RequestConverters.Params parameters = new Params(request);
-		parameters.withWaitForStatus(healthRequest.waitForStatus());
-		parameters.withWaitForNoRelocatingShards(healthRequest.waitForNoRelocatingShards());
-		parameters.withWaitForNoInitializingShards(healthRequest.waitForNoInitializingShards());
-		parameters.withWaitForActiveShards(healthRequest.waitForActiveShards(), ActiveShardCount.NONE);
-		parameters.withWaitForNodes(healthRequest.waitForNodes());
-		parameters.withWaitForEvents(healthRequest.waitForEvents());
-		parameters.withTimeout(healthRequest.timeout());
-		parameters.withMasterTimeout(healthRequest.masterNodeTimeout());
-		parameters.withLocal(healthRequest.local()).withLevel(healthRequest.level());
-		return request;
-	}
-
 	static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType) {

 		try {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -37,18 +37,19 @@ public abstract class AbstractElasticsearchConfiguration extends ElasticsearchCo
 	@Bean
 	public abstract RestHighLevelClient elasticsearchClient();

-	/**
-	 * Creates {@link ElasticsearchOperations}.
-	 *
-	 * @return never {@literal null}.
-	 */
+    /**
+     * Creates {@link ElasticsearchOperations}. <br/>
+     * NOTE: in version 4.1.2 the second parameter was added, previously this implementation called
+     * {@link #elasticsearchClient()} directly. This is not possible anymore, as the base configuration classes don not
+     * use proxied bean methods anymore.
+     *
+     * @param elasticsearchConverter the {@link ElasticsearchConverter} to use*
+     * @param elasticsearchClient the {@link RestHighLevelClient} to use
+     * @return never {@literal null}.
+     */
 	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
 	public ElasticsearchOperations elasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
 			RestHighLevelClient elasticsearchClient) {
-
-		ElasticsearchRestTemplate template = new ElasticsearchRestTemplate(elasticsearchClient, elasticsearchConverter);
-		template.setRefreshPolicy(refreshPolicy());
-
-		return template;
+		return new ElasticsearchRestTemplate(elasticsearchClient, elasticsearchConverter);
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author 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,11 +16,11 @@
 package org.springframework.data.elasticsearch.config;

 import org.elasticsearch.action.support.IndicesOptions;
+import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
-import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.lang.Nullable;

@@ -58,13 +58,13 @@ public abstract class AbstractReactiveElasticsearchConfiguration extends Elastic
 	}

 	/**
-	 * Set up the write {@link RefreshPolicy}. Default is set to null to use the cluster defaults..
+	 * Set up the write {@link RefreshPolicy}. Default is set to {@link RefreshPolicy#IMMEDIATE}.
 	 *
 	 * @return {@literal null} to use the server defaults.
 	 */
 	@Nullable
 	protected RefreshPolicy refreshPolicy() {
-		return null;
+		return RefreshPolicy.IMMEDIATE;
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author 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,14 +28,10 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
-import org.springframework.data.mapping.model.FieldNamingStrategy;
-import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

@@ -48,8 +44,8 @@ import org.springframework.util.StringUtils;
 public class ElasticsearchConfigurationSupport {

 	@Bean
-	public ElasticsearchConverter elasticsearchEntityMapper(SimpleElasticsearchMappingContext elasticsearchMappingContext,
-			ElasticsearchCustomConversions elasticsearchCustomConversions) {
+	public ElasticsearchConverter elasticsearchEntityMapper(
+			SimpleElasticsearchMappingContext elasticsearchMappingContext, ElasticsearchCustomConversions elasticsearchCustomConversions) {

 		MappingElasticsearchConverter elasticsearchConverter = new MappingElasticsearchConverter(
 				elasticsearchMappingContext);
@@ -65,13 +61,11 @@ public class ElasticsearchConfigurationSupport {
 	 * @return never {@literal null}.
 	 */
 	@Bean
-	public SimpleElasticsearchMappingContext elasticsearchMappingContext(
-			ElasticsearchCustomConversions elasticsearchCustomConversions) {
+	public SimpleElasticsearchMappingContext elasticsearchMappingContext(ElasticsearchCustomConversions elasticsearchCustomConversions) {

 		SimpleElasticsearchMappingContext mappingContext = new SimpleElasticsearchMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(elasticsearchCustomConversions.getSimpleTypeHolder());
-		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());

 		return mappingContext;
 	}
@@ -120,7 +114,8 @@ public class ElasticsearchConfigurationSupport {
 	}

 	/**
-	 * Scans the given base package for entities, i.e. Elasticsearch specific types annotated with {@link Document}.
+	 * Scans the given base package for entities, i.e. Elasticsearch specific types annotated with {@link Document} and
+	 * {@link Persistent}.
 	 *
 	 * @param basePackage must not be {@literal null}.
 	 * @return never {@literal null}.
@@ -136,6 +131,7 @@ public class ElasticsearchConfigurationSupport {
 		ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
 				false);
 		componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
+		componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));

 		for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {

@@ -151,24 +147,4 @@ public class ElasticsearchConfigurationSupport {

 		return initialEntitySet;
 	}
-
-	/**
-	 * Set up the write {@link RefreshPolicy}. Default is set to null to use the cluster defaults..
-	 *
-	 * @return {@literal null} to use the server defaults.
-	 */
-	@Nullable
-	protected RefreshPolicy refreshPolicy() {
-		return null;
-	}
-
-	/**
-	 * Configures a {@link FieldNamingStrategy} on the {@link SimpleElasticsearchMappingContext} instance created.
-	 *
-	 * @return the {@link FieldNamingStrategy} to use
-	 * @since 4.2
-	 */
-	protected FieldNamingStrategy fieldNamingStrategy() {
-		return PropertyNameFieldNamingStrategy.INSTANCE;
-	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,24 +25,24 @@ import java.util.Set;
 import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.annotations.Setting;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.index.AliasData;
 import org.springframework.data.elasticsearch.core.index.MappingBuilder;
-import org.springframework.data.elasticsearch.core.index.Settings;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.AliasQuery;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;

 /**
 * Base implementation of {@link IndexOperations} common to Transport and Rest based Implementations of IndexOperations.
- *
+ * 
 * @author Peter-Josef Meisch
 * @author Sascha Woo
 * @since 4.0
@@ -89,45 +89,40 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	@Override
 	public boolean create() {

-		Settings settings = boundClass != null ? createSettings(boundClass) : new Settings();
-		return doCreate(getIndexCoordinates(), settings, null);
+		Document settings = null;
+
+		if (boundClass != null) {
+			settings = createSettings(boundClass);
+		}
+
+		return doCreate(getIndexCoordinates(), settings);
 	}

 	@Override
-	public Settings createSettings(Class<?> clazz) {
+	public Document createSettings(Class<?> clazz) {

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

-		ElasticsearchPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(clazz);
-		String settingPath = persistentEntity.settingPath();
-		return hasText(settingPath) //
-				? Settings.parse(ResourceUtil.readFileFromClasspath(settingPath)) //
-				: persistentEntity.getDefaultSettings();
+		Document settings = null;
+
+		if (clazz.isAnnotationPresent(Setting.class)) {
+			String settingPath = clazz.getAnnotation(Setting.class).settingPath();
+			settings = loadSettings(settingPath);
+		}
+
+		if (settings == null) {
+			settings = getRequiredPersistentEntity(clazz).getDefaultSettings();
+		}
+
+		return settings;
 	}

 	@Override
-	public boolean createWithMapping() {
-		return doCreate(getIndexCoordinates(), createSettings(), createMapping());
+	public boolean create(Document settings) {
+		return doCreate(getIndexCoordinates(), settings);
 	}

-	@Override
-	public boolean create(Map<String, Object> settings) {
-
-		Assert.notNull(settings, "settings must not be null");
-
-		return doCreate(getIndexCoordinates(), settings, null);
-	}
-
-	@Override
-	public boolean create(Map<String, Object> settings, Document mapping) {
-
-		Assert.notNull(settings, "settings must not be null");
-		Assert.notNull(mapping, "mapping must not be null");
-
-		return doCreate(getIndexCoordinates(), settings, mapping);
-	}
-
-	protected abstract boolean doCreate(IndexCoordinates index, Map<String, Object> settings, @Nullable Document mapping);
+	protected abstract boolean doCreate(IndexCoordinates index, @Nullable Document settings);

 	@Override
 	public boolean delete() {
@@ -158,16 +153,16 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	abstract protected Map<String, Object> doGetMapping(IndexCoordinates index);

 	@Override
-	public Settings getSettings() {
+	public Map<String, Object> getSettings() {
 		return getSettings(false);
 	}

 	@Override
-	public Settings getSettings(boolean includeDefaults) {
+	public Map<String, Object> getSettings(boolean includeDefaults) {
 		return doGetSettings(getIndexCoordinates(), includeDefaults);
 	}

-	protected abstract Settings doGetSettings(IndexCoordinates index, boolean includeDefaults);
+	protected abstract Map<String, Object> doGetSettings(IndexCoordinates index, boolean includeDefaults);

 	@Override
 	public void refresh() {
@@ -177,12 +172,10 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	protected abstract void doRefresh(IndexCoordinates indexCoordinates);

 	@Override
-	@Deprecated
 	public boolean addAlias(AliasQuery query) {
 		return doAddAlias(query, getIndexCoordinates());
 	}

-	@Deprecated
 	protected abstract boolean doAddAlias(AliasQuery query, IndexCoordinates index);

 	@Override
@@ -193,12 +186,10 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	protected abstract List<AliasMetadata> doQueryForAlias(IndexCoordinates index);

 	@Override
-	@Deprecated
 	public boolean removeAlias(AliasQuery query) {
 		return doRemoveAlias(query, getIndexCoordinates());
 	}

-	@Deprecated
 	protected abstract boolean doRemoveAlias(AliasQuery query, IndexCoordinates index);

 	@Override
@@ -233,14 +224,13 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	protected Document buildMapping(Class<?> clazz) {

 		// load mapping specified in Mapping annotation if present
-		Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
-		if (mappingAnnotation != null) {
-			String mappingPath = mappingAnnotation.mappingPath();
+		if (clazz.isAnnotationPresent(Mapping.class)) {
+			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();

-			if (hasText(mappingPath)) {
+			if (!StringUtils.isEmpty(mappingPath)) {
 				String mappings = ResourceUtil.readFileFromClasspath(mappingPath);

-				if (hasText(mappings)) {
+				if (!StringUtils.isEmpty(mappings)) {
 					return Document.parse(mappings);
 				}
 			} else {
@@ -258,7 +248,7 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	}

 	@Override
-	public Settings createSettings() {
+	public Document createSettings() {
 		return createSettings(checkForBoundClass());
 	}

@@ -277,5 +267,19 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	public IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
 		return getRequiredPersistentEntity(clazz).getIndexCoordinates();
 	}
+
+	@Nullable
+	private Document loadSettings(String settingPath) {
+		if (hasText(settingPath)) {
+			String settingsFile = ResourceUtil.readFileFromClasspath(settingPath);
+
+			if (hasText(settingsFile)) {
+				return Document.parse(settingsFile);
+			}
+		} else {
+			LOGGER.info("settingPath in @Setting has to be defined. Using default instead.");
+		}
+		return null;
+	}
 	// endregion
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,8 +31,6 @@ 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.action.support.WriteRequest;
-import org.elasticsearch.action.support.WriteRequestBuilder;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
 import org.elasticsearch.search.suggest.SuggestBuilder;
@@ -53,7 +51,7 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
+import org.springframework.data.elasticsearch.core.query.GetQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
@@ -61,12 +59,10 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
-import org.springframework.data.elasticsearch.core.routing.DefaultRoutingResolver;
-import org.springframework.data.elasticsearch.core.routing.RoutingResolver;
 import org.springframework.data.elasticsearch.support.VersionInfo;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.callback.EntityCallbacks;
-import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.util.CloseableIterator;
 import org.springframework.data.util.Streamable;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
@@ -86,8 +82,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	@Nullable protected RequestFactory requestFactory;
 	@Nullable private EntityOperations entityOperations;
 	@Nullable private EntityCallbacks entityCallbacks;
-	@Nullable private RefreshPolicy refreshPolicy;
-	@Nullable protected RoutingResolver routingResolver;

 	// region Initialization
 	protected void initialize(ElasticsearchConverter elasticsearchConverter) {
@@ -95,33 +89,12 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null.");

 		this.elasticsearchConverter = elasticsearchConverter;
-		MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext = this.elasticsearchConverter
-				.getMappingContext();
-		this.entityOperations = new EntityOperations(mappingContext);
-		this.routingResolver = new DefaultRoutingResolver((SimpleElasticsearchMappingContext) mappingContext);
-
+		this.entityOperations = new EntityOperations(this.elasticsearchConverter.getMappingContext());
 		requestFactory = new RequestFactory(elasticsearchConverter);
+
 		VersionInfo.logVersions(getClusterVersion());
 	}

-	/**
-	 * @return copy of this instance.
-	 */
-	private AbstractElasticsearchTemplate copy() {
-
-		AbstractElasticsearchTemplate copy = doCopy();
-
-		if (entityCallbacks != null) {
-			copy.setEntityCallbacks(entityCallbacks);
-		}
-
-		copy.setRoutingResolver(routingResolver);
-
-		return copy;
-	}
-
-	protected abstract AbstractElasticsearchTemplate doCopy();
-
 	protected ElasticsearchConverter createElasticsearchConverter() {
 		MappingElasticsearchConverter mappingElasticsearchConverter = new MappingElasticsearchConverter(
 				new SimpleElasticsearchMappingContext());
@@ -157,15 +130,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper

 		this.entityCallbacks = entityCallbacks;
 	}
-
-	public void setRefreshPolicy(@Nullable RefreshPolicy refreshPolicy) {
-		this.refreshPolicy = refreshPolicy;
-	}
-
-	@Nullable
-	public RefreshPolicy getRefreshPolicy() {
-		return refreshPolicy;
-	}
 	// endregion

 	// region DocumentOperations
@@ -250,10 +214,22 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	}

 	@Override
-	public <T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz) {
+	@Nullable
+	public <T> T get(GetQuery query, Class<T> clazz, IndexCoordinates index) {
+		return get(query.getId(), clazz, index);
+	}
+
+	@Override
+	public <T> List<T> multiGet(Query query, Class<T> clazz) {
 		return multiGet(query, clazz, getIndexCoordinatesFor(clazz));
 	}

+	@Override
+	@Nullable
+	public <T> T queryForObject(GetQuery query, Class<T> clazz) {
+		return get(query.getId(), clazz, getIndexCoordinatesFor(clazz));
+	}
+
 	@Override
 	public boolean exists(String id, Class<?> clazz) {
 		return exists(id, getIndexCoordinatesFor(clazz));
@@ -276,8 +252,8 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	}

 	@Override
-	public ByQueryResponse delete(Query query, Class<?> clazz) {
-		return delete(query, clazz, getIndexCoordinatesFor(clazz));
+	public void delete(Query query, Class<?> clazz) {
+		delete(query, clazz, getIndexCoordinatesFor(clazz));
 	}

 	@Override
@@ -290,19 +266,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		return this.delete(getEntityId(entity), index);
 	}

-	@Override
-	public String delete(String id, IndexCoordinates index) {
-		return doDelete(id, routingResolver.getRouting(), index);
-	}
-
-	@Override
-	@Deprecated
-	final public String delete(String id, @Nullable String routing, IndexCoordinates index) {
-		return doDelete(id, routing, index);
-	}
-
-	protected abstract String doDelete(String id, @Nullable String routing, IndexCoordinates index);
-
 	@Override
 	public List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, Class<?> clazz) {
 		return bulkIndex(queries, getIndexCoordinatesFor(clazz));
@@ -345,41 +308,6 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper

 	public abstract List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
 			IndexCoordinates index);
-
-	/**
-	 * 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 request must not be {@literal null}.
-	 * @param <R>
-	 * @return the processed {@link WriteRequest}.
-	 */
-	protected <R extends WriteRequest<R>> R prepareWriteRequest(R request) {
-
-		if (refreshPolicy == null) {
-			return request;
-		}
-
-		return request.setRefreshPolicy(RequestFactory.toElasticsearchRefreshPolicy(refreshPolicy));
-	}
-
-	/**
-	 * 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
@@ -388,6 +316,11 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		return count(query, clazz, getIndexCoordinatesFor(clazz));
 	}

+	@Override
+	public <T> CloseableIterator<T> stream(Query query, Class<T> clazz, IndexCoordinates index) {
+		return (CloseableIterator<T>) SearchHitSupport.unwrapSearchHits(searchForStream(query, clazz, index));
+	}
+
 	@Override
 	public <T> SearchHitsIterator<T> searchForStream(Query query, Class<T> clazz) {
 		return searchForStream(query, clazz, getIndexCoordinatesFor(clazz));
@@ -612,30 +545,25 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	}

 	protected void updateIndexedObject(Object entity, IndexedObjectInformation indexedObjectInformation) {
+		ElasticsearchPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(entity.getClass());
+		PersistentPropertyAccessor<Object> propertyAccessor = persistentEntity.getPropertyAccessor(entity);
+		ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();

-		ElasticsearchPersistentEntity<?> persistentEntity = elasticsearchConverter.getMappingContext()
-				.getPersistentEntity(entity.getClass());
+		// Only deal with text because ES generated Ids are strings!
+		if (idProperty != null && idProperty.getType().isAssignableFrom(String.class)) {
+			propertyAccessor.setProperty(idProperty, indexedObjectInformation.getId());
+		}

-		if (persistentEntity != null) {
-			PersistentPropertyAccessor<Object> propertyAccessor = persistentEntity.getPropertyAccessor(entity);
-			ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();
+		if (indexedObjectInformation.getSeqNo() != null && indexedObjectInformation.getPrimaryTerm() != null
+				&& persistentEntity.hasSeqNoPrimaryTermProperty()) {
+			ElasticsearchPersistentProperty seqNoPrimaryTermProperty = persistentEntity.getSeqNoPrimaryTermProperty();
+			propertyAccessor.setProperty(seqNoPrimaryTermProperty,
+					new SeqNoPrimaryTerm(indexedObjectInformation.getSeqNo(), indexedObjectInformation.getPrimaryTerm()));
+		}

-			// Only deal with text because ES generated Ids are strings!
-			if (idProperty != null && idProperty.getType().isAssignableFrom(String.class)) {
-				propertyAccessor.setProperty(idProperty, indexedObjectInformation.getId());
-			}
-
-			if (indexedObjectInformation.getSeqNo() != null && indexedObjectInformation.getPrimaryTerm() != null
-					&& persistentEntity.hasSeqNoPrimaryTermProperty()) {
-				ElasticsearchPersistentProperty seqNoPrimaryTermProperty = persistentEntity.getSeqNoPrimaryTermProperty();
-				propertyAccessor.setProperty(seqNoPrimaryTermProperty,
-						new SeqNoPrimaryTerm(indexedObjectInformation.getSeqNo(), indexedObjectInformation.getPrimaryTerm()));
-			}
-
-			if (indexedObjectInformation.getVersion() != null && persistentEntity.hasVersionProperty()) {
-				ElasticsearchPersistentProperty versionProperty = persistentEntity.getVersionProperty();
-				propertyAccessor.setProperty(versionProperty, indexedObjectInformation.getVersion());
-			}
+		if (indexedObjectInformation.getVersion() != null && persistentEntity.hasVersionProperty()) {
+			ElasticsearchPersistentProperty versionProperty = persistentEntity.getVersionProperty();
+			propertyAccessor.setProperty(versionProperty, indexedObjectInformation.getVersion());
 		}
 	}

@@ -646,8 +574,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	@Nullable
 	private String getEntityId(Object entity) {

-		Object id = entityOperations.forEntity(entity, elasticsearchConverter.getConversionService(), routingResolver)
-				.getId();
+		Object id = entityOperations.forEntity(entity, elasticsearchConverter.getConversionService()).getId();

 		if (id != null) {
 			return stringIdRepresentation(id);
@@ -658,15 +585,13 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper

 	@Nullable
 	public String getEntityRouting(Object entity) {
-		return entityOperations.forEntity(entity, elasticsearchConverter.getConversionService(), routingResolver)
-				.getRouting();
+		return entityOperations.forEntity(entity, elasticsearchConverter.getConversionService()).getRouting();
 	}

 	@Nullable
 	private Long getEntityVersion(Object entity) {

-		Number version = entityOperations.forEntity(entity, elasticsearchConverter.getConversionService(), routingResolver)
-				.getVersion();
+		Number version = entityOperations.forEntity(entity, elasticsearchConverter.getConversionService()).getVersion();

 		if (version != null && Long.class.isAssignableFrom(version.getClass())) {
 			return ((Long) version);
@@ -679,12 +604,11 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 	private SeqNoPrimaryTerm getEntitySeqNoPrimaryTerm(Object entity) {

 		EntityOperations.AdaptibleEntity<Object> adaptibleEntity = entityOperations.forEntity(entity,
-				elasticsearchConverter.getConversionService(), routingResolver);
+				elasticsearchConverter.getConversionService());
 		return adaptibleEntity.hasSeqNoPrimaryTerm() ? adaptibleEntity.getSeqNoPrimaryTerm() : null;
 	}

 	private <T> IndexQuery getIndexQuery(T entity) {
-
 		String id = getEntityId(entity);

 		if (id != null) {
@@ -694,9 +618,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		IndexQueryBuilder builder = new IndexQueryBuilder() //
 				.withId(id) //
 				.withObject(entity);
-
 		SeqNoPrimaryTerm seqNoPrimaryTerm = getEntitySeqNoPrimaryTerm(entity);
-
 		if (seqNoPrimaryTerm != null) {
 			builder.withSeqNoPrimaryTerm(seqNoPrimaryTerm);
 		} else {
@@ -705,11 +627,9 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		}

 		String routing = getEntityRouting(entity);
-
 		if (routing != null) {
 			builder.withRouting(routing);
 		}
-
 		return builder.build();
 	}

@@ -896,24 +816,4 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		}
 	}
 	// endregion
-
-	// region routing
-	private void setRoutingResolver(RoutingResolver routingResolver) {
-
-		Assert.notNull(routingResolver, "routingResolver must not be null");
-
-		this.routingResolver = routingResolver;
-	}
-
-	@Override
-	public ElasticsearchOperations withRouting(RoutingResolver routingResolver) {
-
-		Assert.notNull(routingResolver, "routingResolver must not be null");
-
-		AbstractElasticsearchTemplate copy = copy();
-		copy.setRoutingResolver(routingResolver);
-		return copy;
-	}
-
-	// endregion
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author 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,14 +18,12 @@ package org.springframework.data.elasticsearch.core;
 import static org.elasticsearch.index.query.Operator.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
-import static org.springframework.util.StringUtils.*;

 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

 import org.apache.lucene.queryparser.flexible.standard.QueryParserUtil;
-import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -138,7 +136,7 @@ class CriteriaQueryProcessor {
 			return null;

 		String fieldName = field.getName();
-		Assert.notNull(fieldName, "Unknown field " + fieldName);
+		Assert.notNull(fieldName, "Unknown field");

 		Iterator<Criteria.CriteriaEntry> it = criteria.getQueryCriteriaEntries().iterator();
 		QueryBuilder query;
@@ -154,11 +152,6 @@ class CriteriaQueryProcessor {
 		}

 		addBoost(query, criteria.getBoost());
-
-		if (hasText(field.getPath())) {
-			query = nestedQuery(field.getPath(), query, ScoreMode.Avg);
-		}
-
 		return query;
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import org.elasticsearch.client.GetAliasesResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.GetIndexRequest;
-import org.elasticsearch.client.indices.GetIndexResponse;
 import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
 import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
 import org.elasticsearch.client.indices.GetMappingsRequest;
@@ -50,7 +49,6 @@ import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.Settings;
 import org.springframework.data.elasticsearch.core.index.TemplateData;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.AliasQuery;
@@ -59,10 +57,9 @@ import org.springframework.util.Assert;

 /**
 * {@link IndexOperations} implementation using the RestClient.
- *
+ * 
 * @author Peter-Josef Meisch
 * @author Sascha Woo
- * @author George Popides
 * @since 4.0
 */
 class DefaultIndexOperations extends AbstractDefaultIndexOperations implements IndexOperations {
@@ -82,8 +79,8 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 	}

 	@Override
-	protected boolean doCreate(IndexCoordinates index, Map<String, Object> settings, @Nullable Document mapping) {
-		CreateIndexRequest request = requestFactory.createIndexRequest(index, settings, mapping);
+	protected boolean doCreate(IndexCoordinates index, @Nullable Document settings) {
+		CreateIndexRequest request = requestFactory.createIndexRequest(index, settings);
 		return restTemplate.execute(client -> client.indices().create(request, RequestOptions.DEFAULT).isAcknowledged());
 	}

@@ -142,7 +139,6 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 	}

 	@Override
-	@Deprecated
 	protected boolean doAddAlias(AliasQuery query, IndexCoordinates index) {

 		IndicesAliasesRequest request = requestFactory.indicesAddAliasesRequest(query, index);
@@ -151,7 +147,6 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 	}

 	@Override
-	@Deprecated
 	protected boolean doRemoveAlias(AliasQuery query, IndexCoordinates index) {

 		Assert.notNull(index, "No index defined for Alias");
@@ -180,8 +175,8 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I

 		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(aliasNames, indexNames);

-		return restTemplate.execute(client -> ResponseConverter
-				.aliasDatas(client.indices().getAlias(getAliasesRequest, RequestOptions.DEFAULT).getAliases()));
+		return restTemplate.execute(client -> requestFactory
+				.convertAliasesResponse(client.indices().getAlias(getAliasesRequest, RequestOptions.DEFAULT).getAliases()));
 	}

 	@Override
@@ -193,7 +188,7 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 	}

 	@Override
-	protected Settings doGetSettings(IndexCoordinates index, boolean includeDefaults) {
+	protected Map<String, Object> doGetSettings(IndexCoordinates index, boolean includeDefaults) {

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

@@ -201,7 +196,7 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 		GetSettingsResponse response = restTemplate.execute(client -> client.indices() //
 				.getSettings(getSettingsRequest, RequestOptions.DEFAULT));

-		return ResponseConverter.fromSettingsResponse(response, getSettingsRequest.indices()[0]);
+		return requestFactory.fromSettingsResponse(response, getSettingsRequest.indices()[0]);
 	}

 	@Override
@@ -236,7 +231,7 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 		GetIndexTemplatesRequest getIndexTemplatesRequest = requestFactory.getIndexTemplatesRequest(getTemplateRequest);
 		GetIndexTemplatesResponse getIndexTemplatesResponse = restTemplate
 				.execute(client -> client.indices().getIndexTemplate(getIndexTemplatesRequest, RequestOptions.DEFAULT));
-		return ResponseConverter.getTemplateData(getIndexTemplatesResponse, getTemplateRequest.getTemplateName());
+		return requestFactory.getTemplateData(getIndexTemplatesResponse, getTemplateRequest.getTemplateName());
 	}

 	@Override
@@ -261,16 +256,5 @@ class DefaultIndexOperations extends AbstractDefaultIndexOperations implements I
 				client -> client.indices().deleteTemplate(deleteIndexTemplateRequest, RequestOptions.DEFAULT).isAcknowledged());
 	}

-	@Override
-	public List<IndexInformation> getInformation(IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		GetIndexRequest request = requestFactory.getIndexRequest(index);
-		return restTemplate.execute(client -> {
-			GetIndexResponse getIndexResponse = client.indices().get(request, RequestOptions.DEFAULT);
-			return ResponseConverter.getIndexInformations(getIndexResponse);
-		});
-	}
 	// endregion
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020 the original author 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,7 +18,6 @@ package org.springframework.data.elasticsearch.core;
 import static org.elasticsearch.client.Requests.*;
 import static org.springframework.util.StringUtils.*;

-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

 import java.util.Map;
@@ -26,22 +25,22 @@ import java.util.Set;

 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
 import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.client.GetAliasesResponse;
-import org.elasticsearch.client.indices.CreateIndexRequest;
-import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.GetMappingsRequest;
 import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
 import org.elasticsearch.client.indices.PutIndexTemplateRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
 import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.annotations.Setting;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.index.AliasActions;
@@ -51,7 +50,6 @@ import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.MappingBuilder;
 import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.Settings;
 import org.springframework.data.elasticsearch.core.index.TemplateData;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
@@ -60,7 +58,6 @@ import org.springframework.util.Assert;

 /**
 * @author Peter-Josef Meisch
- * @author George Popides
 * @since 4.1
 */
 class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
@@ -101,43 +98,23 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	@Override
 	public Mono<Boolean> create() {

-		IndexCoordinates index = getIndexCoordinates();
+		String indexName = getIndexCoordinates().getIndexName();

 		if (boundClass != null) {
-			return createSettings(boundClass).flatMap(settings -> doCreate(index, settings, null));
+			return createSettings(boundClass).flatMap(settings -> doCreate(indexName, settings));
 		} else {
-			return doCreate(index, new Settings(), null);
+			return doCreate(indexName, null);
 		}
 	}

 	@Override
-	public Mono<Boolean> createWithMapping() {
-		return createSettings() //
-				.flatMap(settings -> //
-				createMapping().flatMap(mapping -> //
-				doCreate(getIndexCoordinates(), settings, mapping))); //
+	public Mono<Boolean> create(Document settings) {
+		return doCreate(getIndexCoordinates().getIndexName(), settings);
 	}

-	@Override
-	public Mono<Boolean> create(Map<String, Object> settings) {
+	private Mono<Boolean> doCreate(String indexName, @Nullable Document settings) {

-		Assert.notNull(settings, "settings must not be null");
-
-		return doCreate(getIndexCoordinates(), settings, null);
-	}
-
-	@Override
-	public Mono<Boolean> create(Map<String, Object> settings, Document mapping) {
-
-		Assert.notNull(settings, "settings must not be null");
-		Assert.notNull(mapping, "mapping must not be null");
-
-		return doCreate(getIndexCoordinates(), settings, mapping);
-	}
-
-	private Mono<Boolean> doCreate(IndexCoordinates index, Map<String, Object> settings, @Nullable Document mapping) {
-
-		CreateIndexRequest request = requestFactory.createIndexRequest(index, settings, mapping);
+		CreateIndexRequest request = requestFactory.createIndexRequestReactive(indexName, settings);
 		return Mono.from(operations.executeWithIndicesClient(client -> client.createIndex(request)));
 	}

@@ -160,7 +137,7 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	@Override
 	public Mono<Boolean> exists() {

-		GetIndexRequest request = requestFactory.getIndexRequest(getIndexCoordinates());
+		GetIndexRequest request = requestFactory.getIndexRequestReactive(getIndexCoordinates().getIndexName());
 		return Mono.from(operations.executeWithIndicesClient(client -> client.existsIndex(request)));
 	}

@@ -180,10 +157,9 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	@Override
 	public Mono<Document> createMapping(Class<?> clazz) {

-		Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
-
-		if (mappingAnnotation != null) {
-			return loadDocument(mappingAnnotation.mappingPath(), "@Mapping");
+		if (clazz.isAnnotationPresent(Mapping.class)) {
+			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
+			return loadDocument(mappingPath, "@Mapping");
 		}

 		String mapping = new MappingBuilder(converter).buildPropertyMapping(clazz);
@@ -192,7 +168,7 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {

 	@Override
 	public Mono<Boolean> putMapping(Mono<Document> mapping) {
-		return mapping.map(document -> requestFactory.putMappingRequest(getIndexCoordinates(), document)) //
+		return mapping.map(document -> requestFactory.putMappingRequestReactive(getIndexCoordinates(), document)) //
 				.flatMap(request -> Mono.from(operations.executeWithIndicesClient(client -> client.putMapping(request))));
 	}

@@ -200,13 +176,13 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	public Mono<Document> getMapping() {

 		IndexCoordinates indexCoordinates = getIndexCoordinates();
-		GetMappingsRequest request = requestFactory.getMappingsRequest(indexCoordinates);
+		GetMappingsRequest request = requestFactory.getMappingRequestReactive(indexCoordinates);

 		return Mono.from(operations.executeWithIndicesClient(client -> client.getMapping(request)))
 				.flatMap(getMappingsResponse -> {
-					Map<String, Object> source = getMappingsResponse.mappings().get(indexCoordinates.getIndexName())
-							.getSourceAsMap();
-					Document document = Document.from(source);
+					Document document = Document.create();
+					document.put("properties",
+							getMappingsResponse.mappings().get(indexCoordinates.getIndexName()).get("properties").getSourceAsMap());
 					return Mono.just(document);
 				});
 	}
@@ -215,31 +191,30 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	// region settings

 	@Override
-	public Mono<Settings> createSettings() {
+	public Mono<Document> createSettings() {
 		return createSettings(checkForBoundClass());
 	}

 	@Override
-	public Mono<Settings> createSettings(Class<?> clazz) {
+	public Mono<Document> createSettings(Class<?> clazz) {

-		Assert.notNull(clazz, "clazz must not be null");
+		if (clazz.isAnnotationPresent(Setting.class)) {
+			String settingPath = clazz.getAnnotation(Setting.class).settingPath();

-		ElasticsearchPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(clazz);
-		String settingPath = persistentEntity.settingPath();
-		return hasText(settingPath) //
-				? loadDocument(settingPath, "@Setting") //
-						.map(Settings::new) //
-				: Mono.just(persistentEntity.getDefaultSettings());
+			return loadDocument(settingPath, "@Setting");
+		}
+
+		return Mono.just(getRequiredPersistentEntity(clazz).getDefaultSettings());
 	}

 	@Override
-	public Mono<Settings> getSettings(boolean includeDefaults) {
+	public Mono<Document> getSettings(boolean includeDefaults) {

 		String indexName = getIndexCoordinates().getIndexName();
 		GetSettingsRequest request = requestFactory.getSettingsRequest(indexName, includeDefaults);

 		return Mono.from(operations.executeWithIndicesClient(client -> client.getSettings(request)))
-				.map(getSettingsResponse -> ResponseConverter.fromSettingsResponse(getSettingsResponse, indexName));
+				.map(getSettingsResponse -> requestFactory.fromSettingsResponse(getSettingsResponse, indexName));
 	}

 	// endregion
@@ -266,7 +241,7 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {

 		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(aliasNames, indexNames);
 		return Mono.from(operations.executeWithIndicesClient(client -> client.getAliases(getAliasesRequest)))
-				.map(GetAliasesResponse::getAliases).map(ResponseConverter::aliasDatas);
+				.map(GetAliasesResponse::getAliases).map(requestFactory::convertAliasesResponse);
 	}
 	// endregion

@@ -289,8 +264,7 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 		return Mono.from(operations.executeWithIndicesClient(client -> client.getTemplate(getIndexTemplatesRequest)))
 				.flatMap(response -> {
 					if (response != null) {
-						TemplateData templateData = ResponseConverter.getTemplateData(response,
-								getTemplateRequest.getTemplateName());
+						TemplateData templateData = requestFactory.getTemplateData(response, getTemplateRequest.getTemplateName());
 						if (templateData != null) {
 							return Mono.just(templateData);
 						}
@@ -327,18 +301,6 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 		return (boundClass != null) ? getIndexCoordinatesFor(boundClass) : boundIndex;
 	}

-	@Override
-	public Flux<IndexInformation> getInformation(IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		org.elasticsearch.client.indices.GetIndexRequest getIndexRequest = requestFactory.getIndexRequest(index);
-		return Mono
-				.from(operations.executeWithIndicesClient(
-						client -> client.getIndex(getIndexRequest).map(ResponseConverter::getIndexInformations)))
-				.flatMapMany(Flux::fromIterable);
-	}
-
 	private IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
 		return operations.getElasticsearchConverter().getMappingContext().getRequiredPersistentEntity(clazz)
 				.getIndexCoordinates();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author 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,6 @@ import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
-import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
-import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
@@ -46,6 +44,7 @@ import org.elasticsearch.cluster.metadata.IndexTemplateMetadata;
 import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.common.settings.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
@@ -56,7 +55,6 @@ import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
 import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.Settings;
 import org.springframework.data.elasticsearch.core.index.TemplateData;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.AliasQuery;
@@ -68,7 +66,6 @@ import org.springframework.util.Assert;
 *
 * @author Peter-Josef Meisch
 * @author Sascha Woo
- * @author George Popides
 * @since 4.0
 */
 class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations implements IndexOperations {
@@ -90,9 +87,9 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 	}

 	@Override
-	protected boolean doCreate(IndexCoordinates index, Map<String, Object> settings, @Nullable Document mapping) {
+	protected boolean doCreate(IndexCoordinates index, @Nullable Document settings) {
 		CreateIndexRequestBuilder createIndexRequestBuilder = requestFactory.createIndexRequestBuilder(client, index,
-				settings, mapping);
+				settings);
 		return createIndexRequestBuilder.execute().actionGet().isAcknowledged();
 	}

@@ -153,7 +150,6 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 	}

 	@Override
-	@Deprecated
 	protected boolean doRemoveAlias(AliasQuery query, IndexCoordinates index) {

 		Assert.notNull(index, "No index defined for Alias");
@@ -181,7 +177,7 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp

 		Map<String, Set<AliasMetadata>> aliasesResponse = new LinkedHashMap<>();
 		aliases.keysIt().forEachRemaining(index -> aliasesResponse.put(index, new HashSet<>(aliases.get(index))));
-		return ResponseConverter.aliasDatas(aliasesResponse);
+		return requestFactory.convertAliasesResponse(aliasesResponse);
 	}

 	@Override
@@ -193,7 +189,7 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 	}

 	@Override
-	protected Settings doGetSettings(IndexCoordinates index, boolean includeDefaults) {
+	protected Map<String, Object> doGetSettings(IndexCoordinates index, boolean includeDefaults) {

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

@@ -203,7 +199,7 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 				.getSettings(getSettingsRequest) //
 				.actionGet();

-		return ResponseConverter.fromSettingsResponse(response, index.getIndexName());
+		return requestFactory.fromSettingsResponse(response, index.getIndexName());
 	}

 	@Override
@@ -238,8 +234,8 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp

 			if (indexTemplateMetadata.getName().equals(getTemplateRequest.getTemplateName())) {

-				Settings settings = new Settings();
-				org.elasticsearch.common.settings.Settings templateSettings = indexTemplateMetadata.settings();
+				Document settings = Document.create();
+				Settings templateSettings = indexTemplateMetadata.settings();
 				templateSettings.keySet().forEach(key -> settings.put(key, templateSettings.get(key)));

 				Map<String, AliasData> aliases = new LinkedHashMap<>();
@@ -247,7 +243,7 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 				Iterator<String> keysItAliases = aliasesResponse.keysIt();
 				while (keysItAliases.hasNext()) {
 					String key = keysItAliases.next();
-					aliases.put(key, ResponseConverter.toAliasData(aliasesResponse.get(key)));
+					aliases.put(key, requestFactory.convertAliasMetadata(aliasesResponse.get(key)));
 				}

 				Map<String, String> mappingsDoc = new LinkedHashMap<>();
@@ -300,15 +296,4 @@ class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations imp
 				deleteTemplateRequest);
 		return client.admin().indices().deleteTemplate(deleteIndexTemplateRequest).actionGet().isAcknowledged();
 	}
-
-	@Override
-	public List<IndexInformation> getInformation(IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		GetIndexRequest getIndexRequest = new GetIndexRequest();
-		getIndexRequest.indices(index.getIndexNames());
-		GetIndexResponse getIndexResponse = client.admin().indices().getIndex(getIndexRequest).actionGet();
-		return ResponseConverter.getIndexInformations(getIndexResponse);
-	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ import java.util.List;

 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.DeleteQuery;
+import org.springframework.data.elasticsearch.core.query.GetQuery;
 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.core.routing.RoutingResolver;
 import org.springframework.lang.Nullable;

 /**
@@ -32,7 +32,6 @@ import org.springframework.lang.Nullable;
 * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs.html">Elasticsearch Document APIs</a>.
 *
 * @author Peter-Josef Meisch
- * @author Farid Faoudi
 * @since 4.0
 */
 public interface DocumentOperations {
@@ -120,10 +119,10 @@ public interface DocumentOperations {
 	 *
 	 * @param query the query defining the ids of the objects to get
 	 * @param clazz the type of the object to be returned
-	 * @return list of {@link MultiGetItem}s
+	 * @return list of objects, contains null values for ids that are not found
 	 * @since 4.1
 	 */
-	<T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz);
+	<T> List<T> multiGet(Query query, Class<T> clazz);

 	/**
 	 * Execute a multiGet against elasticsearch for the given ids.
@@ -131,9 +130,9 @@ public interface DocumentOperations {
 	 * @param query the query defining the ids of the objects to get
 	 * @param clazz the type of the object to be returned
 	 * @param index the index(es) from which the objects are read.
-	 * @return list of {@link MultiGetItem}s
+	 * @return list of objects, contains null values for ids that are not found
 	 */
-	<T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz, IndexCoordinates index);
+	<T> List<T> multiGet(Query query, Class<T> clazz, IndexCoordinates index);

 	/**
 	 * Check if an entity with given {@literal id} exists.
@@ -206,7 +205,7 @@ public interface DocumentOperations {

 	/**
 	 * Bulk update all objects. Will do update.
-	 *
+	 * 
 	 * @param clazz the entity class
 	 * @param queries the queries to execute in bulk
 	 * @since 4.1
@@ -228,7 +227,9 @@ public interface DocumentOperations {
 	 * @param index the index from which to delete
 	 * @return documentId of the document deleted
 	 */
-	String delete(String id, IndexCoordinates index);
+	default String delete(String id, IndexCoordinates index) {
+		return delete(id, null, index);
+	}

 	/**
 	 * Delete the one object with provided id.
@@ -238,10 +239,7 @@ public interface DocumentOperations {
 	 * @param index the index from which to delete
 	 * @return documentId of the document deleted
 	 * @since 4.1
-	 * @deprecated since 4.2, use {@link ElasticsearchOperations#withRouting(RoutingResolver)} and
-	 *             {@link #delete(String, IndexCoordinates)}
 	 */
-	@Deprecated
 	String delete(String id, @Nullable String routing, IndexCoordinates index);

 	/**
@@ -276,21 +274,19 @@ public interface DocumentOperations {
 	 * @param query query defining the objects
 	 * @param clazz The entity class, must be annotated with
 	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
-	 * @return response with detailed information
 	 * @since 4.1
 	 */
-	ByQueryResponse delete(Query query, Class<?> clazz);
+	void delete(Query query, Class<?> clazz);

 	/**
 	 * Delete all records matching the query.
-	 * 
+	 *
 	 * @param query query defining the objects
 	 * @param clazz The entity class, must be annotated with
 	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
 	 * @param index the index from which to delete
-	 * @return response with detailed information
 	 */
-	ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index);
+	void delete(Query query, Class<?> clazz, IndexCoordinates index);

 	/**
 	 * Partial update of the document.
@@ -301,13 +297,40 @@ public interface DocumentOperations {
 	 */
 	UpdateResponse update(UpdateQuery updateQuery, IndexCoordinates index);

+	// region deprecated
 	/**
-	 * Update document(s) by query
+	 * Delete all records matching the query.
 	 *
-	 * @param updateQuery query defining the update, must not be {@literal null}
-	 * @param index the index where to update the records , must not be {@literal null}
-	 * @return the update response
-	 * @since 4.2
+	 * @param query query defining the objects
+	 * @param index the index where to delete the records
+	 * @deprecated since 4.0, use {@link #delete(Query, Class, IndexCoordinates)}
 	 */
-	ByQueryResponse updateByQuery(UpdateQuery updateQuery, IndexCoordinates index);
+	@Deprecated
+	void delete(DeleteQuery query, IndexCoordinates index);
+
+	/**
+	 * Retrieves an object from an index.
+	 *
+	 * @param query the query defining the id of the object to get
+	 * @param clazz the type of the object to be returned
+	 * @param index the index from which the object is read.
+	 * @return the found object
+	 * @deprecated since 4.0, use {@link #get(String, Class, IndexCoordinates)}
+	 */
+	@Deprecated
+	@Nullable
+	<T> T get(GetQuery query, Class<T> clazz, IndexCoordinates index);
+
+	/**
+	 * Retrieves an object from an index.
+	 *
+	 * @param query the query defining the id of the object to get
+	 * @param clazz the type of the object to be returned
+	 * @return the found object
+	 * @deprecated since 4.0, use {@link #get(String, Class, IndexCoordinates)}
+	 */
+	@Deprecated
+	@Nullable
+	<T> T queryForObject(GetQuery query, Class<T> clazz);
+	// endregion
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,12 +15,15 @@
 */
 package org.springframework.data.elasticsearch.core;

+import java.util.List;
+import java.util.Map;
 import java.util.Objects;

-import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
+import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.routing.RoutingResolver;
+import org.springframework.data.elasticsearch.core.query.AliasQuery;
 import org.springframework.lang.Nullable;

 /**
@@ -40,34 +43,25 @@ public interface ElasticsearchOperations extends DocumentOperations, SearchOpera

 	/**
 	 * get an {@link IndexOperations} that is bound to the given class
-	 *
+	 * 
 	 * @return IndexOperations
 	 */
 	IndexOperations indexOps(Class<?> clazz);

 	/**
 	 * get an {@link IndexOperations} that is bound to the given index
-	 *
+	 * 
 	 * @return IndexOperations
 	 */
 	IndexOperations indexOps(IndexCoordinates index);

-	/**
-	 * return a {@link ClusterOperations} instance that uses the same client communication setup as this
-	 * ElasticsearchOperations instance.
-	 *
-	 * @return ClusterOperations implementation
-	 * @since 4.2
-	 */
-	ClusterOperations cluster();
-
 	ElasticsearchConverter getElasticsearchConverter();

 	IndexCoordinates getIndexCoordinatesFor(Class<?> clazz);

 	/**
 	 * gets the routing for an entity which might be defined by a join-type relation
-	 *
+	 * 
 	 * @param entity the entity
 	 * @return the routing, may be null if not set.
 	 * @since 4.1
@@ -75,10 +69,344 @@ public interface ElasticsearchOperations extends DocumentOperations, SearchOpera
 	@Nullable
 	String getEntityRouting(Object entity);

+	// region IndexOperations
+	/**
+	 * Create an index for given indexName .
+	 *
+	 * @param indexName the name of the index
+	 * @return {@literal true} if the index was created
+	 * @deprecated since 4.0, use {@link IndexOperations#create()}
+	 */
+	@Deprecated
+	default boolean createIndex(String indexName) {
+		return indexOps(IndexCoordinates.of(indexName)).create();
+	}
+
+	/**
+	 * Create an index for given indexName and Settings.
+	 *
+	 * @param indexName the name of the index
+	 * @param settings the index settings
+	 * @return {@literal true} if the index was created
+	 * @deprecated since 4.0, use {@link IndexOperations#create(Document)}
+	 */
+	@Deprecated
+	default boolean createIndex(String indexName, Object settings) {
+		return indexOps(IndexCoordinates.of(indexName)).create(getDocument(settings));
+	}
+
+	/**
+	 * Create an index for a class if it does not already exist.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @return {@literal true} if the index was created
+	 * @deprecated since 4.0, use {@link IndexOperations#create()}
+	 */
+	@Deprecated
+	default boolean createIndex(Class<?> clazz) {
+		return indexOps(clazz).create();
+	}
+
+	/**
+	 * Create an index for given class and Settings.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @param settings the index settings
+	 * @return {@literal true} if the index was created
+	 * @deprecated since 4.0, use {@link IndexOperations#create(Document)}
+	 */
+	@Deprecated
+	default boolean createIndex(Class<?> clazz, Object settings) {
+		return indexOps(clazz).create(getDocument(settings));
+	}
+
+	/**
+	 * Deletes an index for given entity.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @return {@literal true} if the index was deleted
+	 * @deprecated since 4.0, use {@link IndexOperations#delete()}
+	 */
+	@Deprecated
+	default boolean deleteIndex(Class<?> clazz) {
+		return indexOps(clazz).delete();
+	}
+
+	/**
+	 * Deletes an index.
+	 *
+	 * @param indexName the name of the index to delete
+	 * @return {@literal true} if the index was deleted
+	 * @deprecated since 4.0, use {@link IndexOperations#delete()}
+	 */
+	@Deprecated
+	default boolean deleteIndex(String indexName) {
+		return indexOps(IndexCoordinates.of(indexName)).delete();
+	}
+
+	/**
+	 * Deletes an index for an IndexCoordinate
+	 *
+	 * @param index the index to delete
+	 * @return {@literal true} if the index was deleted
+	 * @deprecated since 4.0 use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#delete()}
+	 */
+	@Deprecated
+	default boolean deleteIndex(IndexCoordinates index) {
+		return indexOps(index).delete();
+	}
+
+	/**
+	 * check if index exists.
+	 *
+	 * @param indexName the name of the index
+	 * @return {@literal true} if the index exists
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#exists()}
+	 */
+	@Deprecated
+	default boolean indexExists(String indexName) {
+		return indexOps(IndexCoordinates.of(indexName)).exists();
+	}
+
+	/**
+	 * check if index is exists.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @return {@literal true} if the index exists
+	 * @deprecated since 4.0, use {@link #indexOps(Class)} and {@link IndexOperations#exists()}
+	 */
+	@Deprecated
+	default boolean indexExists(Class<?> clazz) {
+		return indexOps(clazz).exists();
+	}
+
+	/**
+	 * Create mapping for a class and store it to the index.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @return {@literal true} if the mapping could be stored
+	 * @deprecated since 4.0, use {@link #indexOps(Class)}, {@link IndexOperations#createMapping(Class)} and
+	 *             {@link IndexOperations#putMapping(Document)}
+	 */
+	@Deprecated
+	default boolean putMapping(Class<?> clazz) {
+		IndexOperations indexOps = indexOps(clazz);
+		return indexOps.putMapping(clazz);
+	}
+
+	/**
+	 * Create mapping for the given class and put the mapping to the given index.
+	 *
+	 * @param index the index to store the mapping to
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @return {@literal true} if the mapping could be stored
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)}, {@link IndexOperations#createMapping(Class)} and
+	 *             {@link IndexOperations#putMapping(Document)}
+	 */
+	@Deprecated
+	default boolean putMapping(IndexCoordinates index, Class<?> clazz) {
+		IndexOperations indexOps = indexOps(index);
+		return indexOps.putMapping(clazz);
+	}
+
+	/**
+	 * Stores a mapping to an index.
+	 *
+	 * @param index the index to store the mapping to
+	 * @param mappings can be a JSON String or a {@link Map}
+	 * @return {@literal true} if the mapping could be stored
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#putMapping(Document)}
+	 */
+	@Deprecated
+	default boolean putMapping(IndexCoordinates index, Object mappings) {
+		return indexOps(index).putMapping(getDocument(mappings));
+	}
+
+	/**
+	 * Create mapping for a class Stores a mapping to an index.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @param mappings can be a JSON String or a {@link Map}
+	 * @return {@literal true} if the mapping could be stored
+	 * @deprecated since 4.0, use {@link #indexOps(Class)} and {@link IndexOperations#putMapping(Document)}
+	 */
+	@Deprecated
+	default boolean putMapping(Class<?> clazz, Object mappings) {
+		return indexOps(clazz).putMapping(getDocument(mappings));
+	}
+
+	/**
+	 * Get mapping for an index defined by a class.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}.
+	 * @return the mapping
+	 * @deprecated since 4.0, use {@link #indexOps(Class)} and {@link IndexOperations#getMapping()}
+	 */
+	@Deprecated
+	default Map<String, Object> getMapping(Class<?> clazz) {
+		return indexOps(clazz).getMapping();
+	}
+
+	/**
+	 * Get mapping for a given index.
+	 *
+	 * @param index the index to read the mapping from
+	 * @return the mapping
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#getMapping()}
+	 */
+	@Deprecated
+	default Map<String, Object> getMapping(IndexCoordinates index) {
+		return indexOps(index).getMapping();
+	}
+
+	/**
+	 * Add an alias.
+	 *
+	 * @param query query defining the alias
+	 * @param index the index for which to add an alias
+	 * @return true if the alias was created
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#addAlias(AliasQuery)}
+	 */
+	@Deprecated
+	default boolean addAlias(AliasQuery query, IndexCoordinates index) {
+		return indexOps(index).addAlias(query);
+	}
+
+	/**
+	 * Remove an alias.
+	 *
+	 * @param query query defining the alias
+	 * @param index the index for which to remove an alias
+	 * @return true if the alias was removed
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} {@link IndexOperations#removeAlias(AliasQuery)}
+	 */
+	@Deprecated
+	default boolean removeAlias(AliasQuery query, IndexCoordinates index) {
+		return indexOps(index).removeAlias(query);
+	}
+
+	/**
+	 * Get the alias informations for a specified index.
+	 *
+	 * @param indexName the name of the index
+	 * @return alias information
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#queryForAlias()}
+	 */
+	@Deprecated
+	default List<AliasMetadata> queryForAlias(String indexName) {
+		return indexOps(IndexCoordinates.of(indexName)).queryForAlias();
+	}
+
+	/**
+	 * Get settings for a given indexName.
+	 *
+	 * @param indexName the name of the index
+	 * @return the settings
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#getSettings()} )}
+	 */
+	@Deprecated
+	default Map<String, Object> getSetting(String indexName) {
+		return indexOps(IndexCoordinates.of(indexName)).getSettings();
+	}
+
+	/**
+	 * Get settings for a given class.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @return the settings
+	 * @deprecated since 4.0, use {@link #indexOps(Class)} and {@link IndexOperations#getSettings()}
+	 */
+	@Deprecated
+	default Map<String, Object> getSetting(Class<?> clazz) {
+		return indexOps(clazz).getSettings();
+	}
+
+	/**
+	 * Get settings for a given indexName.
+	 *
+	 * @param indexName the name of the index
+	 * @param includeDefaults whether or not to include all the default settings
+	 * @deprecated since 4.0 use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#getSettings(boolean)} ()}
+	 * @return the settings
+	 */
+	@Deprecated
+	default Map<String, Object> getSettings(String indexName, boolean includeDefaults) {
+		return indexOps(IndexCoordinates.of(indexName)).getSettings(includeDefaults);
+	}
+
+	/**
+	 * Get settings for a given class.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @param includeDefaults whether or not to include all the default settings
+	 * @return the settings
+	 * @deprecated since 4.0 use {@link #indexOps(Class)} and {@link IndexOperations#getSettings(boolean)} ()}
+	 */
+	default Map<String, Object> getSettings(Class<?> clazz, boolean includeDefaults) {
+		return indexOps(clazz).getSettings(includeDefaults);
+	}
+
+	/**
+	 * Refresh the index(es).
+	 *
+	 * @param index the index to refresh
+	 * @deprecated since 4.0, use {@link #indexOps(IndexCoordinates)} and {@link IndexOperations#refresh()} instead}
+	 */
+	@Deprecated
+	default void refresh(IndexCoordinates index) {
+		indexOps(index).refresh();
+	}
+
+	/**
+	 * Refresh the index.
+	 *
+	 * @param clazz The entity class, must be annotated with
+	 *          {@link org.springframework.data.elasticsearch.annotations.Document}
+	 * @deprecated since 4.0, use {@link #indexOps(Class)} and {@link IndexOperations#refresh()} instead}
+	 */
+	@Deprecated
+	default void refresh(Class<?> clazz) {
+		indexOps(clazz).refresh();
+	}
+
+	/**
+	 * converts an object to a Document
+	 *
+	 * @param object
+	 * @return
+	 * @deprecated since 4.0, helper method for deprecated functions
+	 */
+	@Deprecated
+	@Nullable
+	default Document getDocument(Object object) {
+		Document document = null;
+
+		try {
+			if (object instanceof String) {
+				document = Document.parse((String) object);
+			} else if (object instanceof Map) {
+				document = Document.from((Map<String, Object>) object);
+			}
+		} catch (Exception e) {
+			throw new IllegalArgumentException("object cannot be converted to Document", e);
+		}
+		return document;
+	} // endregion
+
 	// region helper
 	/**
 	 * gets the String representation for an id.
-	 *
+	 * 
 	 * @param id
 	 * @return
 	 * @since 4.0
@@ -88,16 +416,4 @@ public interface ElasticsearchOperations extends DocumentOperations, SearchOpera
 		return Objects.toString(id, null);
 	}
 	// endregion
-
-	// region routing
-	/**
-	 * Returns a copy of this instance with the same configuration, but that uses a different {@link RoutingResolver} to
-	 * obtain routing information.
-	 *
-	 * @param routingResolver the {@link RoutingResolver} value, must not be {@literal null}.
-	 * @return DocumentOperations instance
-	 * @since 4.2
-	 */
-	ElasticsearchOperations withRouting(RoutingResolver routingResolver);
-	// endregion
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -37,20 +37,17 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.unit.TimeValue;
-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.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.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
@@ -90,14 +87,13 @@ import org.springframework.util.Assert;
 * @author Mathias Teier
 * @author Gyula Attila Csorogi
 * @author Massimiliano Poggi
- * @author Farid Faoudi
 */
 public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {

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

 	private final RestHighLevelClient client;
-	private final ElasticsearchExceptionTranslator exceptionTranslator = new ElasticsearchExceptionTranslator();
+	private final ElasticsearchExceptionTranslator exceptionTranslator;

 	// region Initialization
 	public ElasticsearchRestTemplate(RestHighLevelClient client) {
@@ -105,6 +101,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(client, "Client must not be null!");

 		this.client = client;
+		this.exceptionTranslator = new ElasticsearchExceptionTranslator();

 		initialize(createElasticsearchConverter());
 	}
@@ -114,15 +111,11 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(client, "Client must not be null!");

 		this.client = client;
+		this.exceptionTranslator = new ElasticsearchExceptionTranslator();

 		initialize(elasticsearchConverter);
 	}

-	@Override
-	protected AbstractElasticsearchTemplate doCopy() {
-		return new ElasticsearchRestTemplate(client, elasticsearchConverter);
-	}
-
 	// endregion

 	// region IndexOperations
@@ -143,19 +136,13 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 	}
 	// endregion

-	// region ClusterOperations
-	@Override
-	public ClusterOperations cluster() {
-		return ClusterOperations.forTemplate(this);
-	}
-	// endregion
-
 	// region DocumentOperations
 	public String doIndex(IndexQuery query, IndexCoordinates index) {

-		IndexRequest request = prepareWriteRequest(requestFactory.indexRequest(query, index));
+		IndexRequest request = requestFactory.indexRequest(query, index);
 		IndexResponse indexResponse = execute(client -> client.index(request, RequestOptions.DEFAULT));

+		// We should call this because we are not going through a mapper.
 		Object queryObject = query.getObject();
 		if (queryObject != null) {
 			updateIndexedObject(queryObject, IndexedObjectInformation.of(indexResponse.getId(), indexResponse.getSeqNo(),
@@ -168,7 +155,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 	@Override
 	@Nullable
 	public <T> T get(String id, Class<T> clazz, IndexCoordinates index) {
-		GetRequest request = requestFactory.getRequest(id, routingResolver.getRouting(), index);
+		GetRequest request = requestFactory.getRequest(id, index);
 		GetResponse response = execute(client -> client.get(request, RequestOptions.DEFAULT));

 		DocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
@@ -176,24 +163,21 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 	}

 	@Override
-	public <T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {
+	public <T> List<T> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {

 		Assert.notNull(index, "index must not be null");
-		Assert.notEmpty(query.getIds(), "No Id defined for Query");
+		Assert.notEmpty(query.getIds(), "No Id define for Query");

 		MultiGetRequest request = requestFactory.multiGetRequest(query, clazz, index);
 		MultiGetResponse result = execute(client -> client.mget(request, RequestOptions.DEFAULT));

 		DocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
-		return DocumentAdapters.from(result).stream() //
-				.map(multiGetItem -> MultiGetItem.of( //
-						multiGetItem.isFailed() ? null : callback.doWith(multiGetItem.getItem()), multiGetItem.getFailure())) //
-				.collect(Collectors.toList());
+		return DocumentAdapters.from(result).stream().map(callback::doWith).collect(Collectors.toList());
 	}

 	@Override
 	protected boolean doExists(String id, IndexCoordinates index) {
-		GetRequest request = requestFactory.getRequest(id, routingResolver.getRouting(), index);
+		GetRequest request = requestFactory.getRequest(id, index);
 		request.fetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE);
 		return execute(client -> client.get(request, RequestOptions.DEFAULT).isExists());
 	}
@@ -208,63 +192,39 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 	}

 	@Override
-	protected String doDelete(String id, @Nullable String routing, IndexCoordinates index) {
+	public String delete(String id, @Nullable String routing, IndexCoordinates index) {

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

-		DeleteRequest request = prepareWriteRequest(
-				requestFactory.deleteRequest(elasticsearchConverter.convertId(id), routing, index));
+		DeleteRequest request = requestFactory.deleteRequest(elasticsearchConverter.convertId(id), routing, index);
 		return execute(client -> client.delete(request, RequestOptions.DEFAULT).getId());
 	}

 	@Override
-	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
+	public void delete(Query query, Class<?> clazz, IndexCoordinates index) {
 		DeleteByQueryRequest deleteByQueryRequest = requestFactory.deleteByQueryRequest(query, clazz, index);
-		return ByQueryResponse.of(execute(client -> client.deleteByQuery(deleteByQueryRequest, RequestOptions.DEFAULT)));
+		execute(client -> client.deleteByQuery(deleteByQueryRequest, RequestOptions.DEFAULT));
+	}
+
+	@Override
+	@Deprecated
+	public void delete(DeleteQuery deleteQuery, IndexCoordinates index) {
+		DeleteByQueryRequest deleteByQueryRequest = requestFactory.deleteByQueryRequest(deleteQuery, index);
+		execute(client -> client.deleteByQuery(deleteByQueryRequest, RequestOptions.DEFAULT));
 	}

 	@Override
 	public UpdateResponse update(UpdateQuery query, IndexCoordinates index) {
 		UpdateRequest request = requestFactory.updateRequest(query, index);
-
-		if (query.getRefreshPolicy() == null && getRefreshPolicy() != null) {
-			request.setRefreshPolicy(RequestFactory.toElasticsearchRefreshPolicy(getRefreshPolicy()));
-		}
-
-		if (query.getRouting() == null && routingResolver.getRouting() != null) {
-			request.routing(routingResolver.getRouting());
-		}
-
 		UpdateResponse.Result result = UpdateResponse.Result
 				.valueOf(execute(client -> client.update(request, RequestOptions.DEFAULT)).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 UpdateByQueryRequest updateByQueryRequest = requestFactory.updateByQueryRequest(query, index);
-
-		if (query.getRefreshPolicy() == null && getRefreshPolicy() != null) {
-			updateByQueryRequest.setRefresh(getRefreshPolicy() == RefreshPolicy.IMMEDIATE);
-		}
-
-		if (query.getRouting() == null && routingResolver.getRouting() != null) {
-			updateByQueryRequest.setRouting(routingResolver.getRouting());
-		}
-
-		final BulkByScrollResponse bulkByScrollResponse = execute(
-				client -> client.updateByQuery(updateByQueryRequest, RequestOptions.DEFAULT));
-		return ByQueryResponse.of(bulkByScrollResponse);
-	}
-
 	public List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
 			IndexCoordinates index) {
-		BulkRequest bulkRequest = prepareWriteRequest(requestFactory.bulkRequest(queries, bulkOptions, index));
+		BulkRequest bulkRequest = requestFactory.bulkRequest(queries, bulkOptions, index);
 		List<IndexedObjectInformation> indexedObjectInformationList = checkForBulkOperationFailure(
 				execute(client -> client.bulk(bulkRequest, RequestOptions.DEFAULT)));
 		updateIndexedObjectsWithQueries(queries, indexedObjectInformationList);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -36,18 +36,16 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.unit.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.Document;
 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.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
@@ -83,7 +81,6 @@ import org.springframework.util.Assert;
 * @author Farid Azaza
 * @author Gyula Attila Csorogi
 * @author Roman Puchkovskiy
- * @author Farid Faoudi
 * @deprecated as of 4.0
 */
@Deprecated
@@ -115,14 +112,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		this.client = client;
 		initialize(elasticsearchConverter);
 	}
-
-	@Override
-	protected AbstractElasticsearchTemplate doCopy() {
-		ElasticsearchTemplate elasticsearchTemplate = new ElasticsearchTemplate(client, elasticsearchConverter);
-		elasticsearchTemplate.setSearchTimeout(searchTimeout);
-		return elasticsearchTemplate;
-	}
-
 	// endregion

 	// region IndexOperations
@@ -143,13 +132,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	}
 	// endregion

-	// region ClusterOperations
-	@Override
-	public ClusterOperations cluster() {
-		return ClusterOperations.forTemplate(this);
-	}
-	// endregion
-
 	// region getter/setter
 	@Nullable
 	public String getSearchTimeout() {
@@ -165,7 +147,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	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 {
@@ -175,6 +156,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		}
 		String documentId = response.getId();

+		// We should call this because we are not going through a mapper.
 		Object queryObject = query.getObject();
 		if (queryObject != null) {
 			updateIndexedObject(queryObject, IndexedObjectInformation.of(documentId, response.getSeqNo(),
@@ -187,9 +169,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	@Override
 	@Nullable
 	public <T> T get(String id, Class<T> clazz, IndexCoordinates index) {
-
-		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, id, routingResolver.getRouting(),
-				index);
+		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, id, index);
 		GetResponse response = getRequestBuilder.execute().actionGet();

 		DocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
@@ -197,7 +177,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	}

 	@Override
-	public <T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {
+	public <T> List<T> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {

 		Assert.notNull(index, "index must not be null");
 		Assert.notEmpty(query.getIds(), "No Ids defined for Query");
@@ -205,18 +185,13 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		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());
+		List<Document> documents = DocumentAdapters.from(builder.execute().actionGet());
+		return documents.stream().map(callback::doWith).collect(Collectors.toList());
 	}

 	@Override
 	protected boolean doExists(String id, IndexCoordinates index) {
-
-		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, id, routingResolver.getRouting(),
-				index);
+		GetRequestBuilder getRequestBuilder = requestFactory.getRequestBuilder(client, id, index);
 		getRequestBuilder.setFetchSource(false);
 		return getRequestBuilder.execute().actionGet().isExists();
 	}
@@ -231,19 +206,25 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	}

 	@Override
-	protected String doDelete(String id, @Nullable String routing, IndexCoordinates index) {
+	public String delete(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));
+		DeleteRequestBuilder deleteRequestBuilder = requestFactory.deleteRequestBuilder(client,
+				elasticsearchConverter.convertId(id), routing, index);
 		return deleteRequestBuilder.execute().actionGet().getId();
 	}

 	@Override
-	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
-		return ByQueryResponse.of(requestFactory.deleteByQueryRequestBuilder(client, query, clazz, index).get());
+	@Deprecated
+	public void delete(DeleteQuery deleteQuery, IndexCoordinates index) {
+		requestFactory.deleteByQueryRequestBuilder(client, deleteQuery, index).get();
+	}
+
+	@Override
+	public void delete(Query query, Class<?> clazz, IndexCoordinates index) {
+		requestFactory.deleteByQueryRequestBuilder(client, query, clazz, index).get();
 	}

 	@Override
@@ -253,47 +234,17 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {

 	@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 ByQueryResponse.of(bulkByScrollResponse);
-	}
-
 	public List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
 			IndexCoordinates index) {
-		BulkRequestBuilder bulkRequestBuilder = requestFactory.bulkRequestBuilder(client, queries, bulkOptions, index);
-		bulkRequestBuilder = prepareWriteRequestBuilder(bulkRequestBuilder);
+		BulkRequestBuilder bulkRequest = requestFactory.bulkRequestBuilder(client, queries, bulkOptions, index);
 		final List<IndexedObjectInformation> indexedObjectInformations = checkForBulkOperationFailure(
-				bulkRequestBuilder.execute().actionGet());
+				bulkRequest.execute().actionGet());
 		updateIndexedObjectsWithQueries(queries, indexedObjectInformations);
 		return indexedObjectInformations;
 	}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christoph Strobl	bf32581105	Release version 4.1.3 (2020.0.3). See #1572	2021-01-13 14:18:34 +01:00
Christoph Strobl	7f89d79b12	Prepare 4.1.3 (2020.0.3). See #1572	2021-01-13 14:17:43 +01:00
Christoph Strobl	955eb77add	Updated changelog. See #1572	2021-01-13 14:17:43 +01:00
Peter-Josef Meisch	0086d35e54	#1634 - Update Testcontainers dependency. Original Pull Request: #1635 Closes #1634 (cherry picked from commit `6913d8045b`)	2021-01-07 22:13:38 +01:00
Greg L. Turnquist	53f0e79990	DATAES-996 - Use Docker hub credentials for all CI jobs.	2020-12-17 08:41:33 -06:00
Mark Paluch	3da9eaadc5	DATAES-973 - After release cleanups.	2020-12-09 16:46:55 +01:00
Mark Paluch	310f6f0f22	DATAES-973 - Prepare next development iteration.	2020-12-09 16:46:49 +01:00
Mark Paluch	262af9f0e8	DATAES-973 - Release version 4.1.2 (2020.0.2).	2020-12-09 16:01:27 +01:00
Mark Paluch	bc74126d7e	DATAES-973 - Prepare 4.1.2 (2020.0.2).	2020-12-09 16:00:56 +01:00
Mark Paluch	308de7f8db	DATAES-973 - Updated changelog.	2020-12-09 16:00:51 +01:00
Mark Paluch	ae5f72fb62	DATAES-966 - Updated changelog.	2020-12-09 15:33:31 +01:00
Mark Paluch	170facc3f3	DATAES-964 - Updated changelog.	2020-12-09 12:42:33 +01:00
Mark Paluch	0aaffebf16	DATAES-963 - Updated changelog.	2020-12-09 09:59:18 +01:00
Peter-Josef Meisch	d1da6ac4ed	DATAES-543 - Adjust configuration support classes so they do not require proxying. Original PR: #557 (cherry picked from commit `54727229e1`)	2020-12-08 20:36:11 +01:00
Peter-Josef Meisch	133bc315ed	DATAES-990 - Index creation fails with Authentication object cannot be null on startup. Only do a SpEL resolution if there is a SpEL expressin in the index name; resolve ExpressionDependencies. Original PR: #565 (cherry picked from commit `6edb8353b5`)	2020-12-05 12:22:31 +01:00
Peter-Josef Meisch	9f243fd2c9	DATAES-991 - Wrong value for TermVector(with_positions_offets_payloads). Original PR: #564 (cherry picked from commit `6a6ead5e1e`)	2020-12-04 08:41:46 +01:00
Peter-Josef Meisch	de57159c7f	DATAES-987 - IndexOperations getMapping fail when using index alias. Original PR: #560 (cherry picked from commit `7912ae9779`)	2020-11-26 07:22:41 +01:00
Peter-Josef Meisch	74ed69877d	DATAES-978 - Accept DateFormat.none for a date property to enable custom Converters. Original pR: #556 (cherry picked from commit `04ceed2905`)	2020-11-19 23:14:22 +01:00
Peter-Josef Meisch	7314bfc21d	DATAES-972 - BeforeConvertCallback should be called before index query is built. Originap PR: #555 (cherry picked from commit `98043348f7`)	2020-11-16 13:44:37 +01:00
Peter-Josef Meisch	5909c19ead	DATAES-977 - Fix versions in reference documentation for 4.1.	2020-11-12 19:13:57 +01:00
Mark Paluch	9df27ef289	DATAES-965 - After release cleanups.	2020-11-11 12:14:54 +01:00
Mark Paluch	28d92359b2	DATAES-965 - Prepare next development iteration.	2020-11-11 12:14:51 +01:00
Mark Paluch	d8b0d526b4	DATAES-965 - Release version 4.1.1 (2020.0.1).	2020-11-11 11:59:00 +01:00
Mark Paluch	dc832e75a6	DATAES-965 - Prepare 4.1.1 (2020.0.1).	2020-11-11 11:58:36 +01:00
Mark Paluch	866cd96477	DATAES-965 - Updated changelog.	2020-11-11 11:58:33 +01:00
Peter-Josef Meisch	162c57df31	DATAES-969 - Use ResultProcessor in ElasticsearchPartQuery to build PartTree. Original PR: #546 (cherry picked from commit `d036693f05`)	2020-11-07 18:28:59 +01:00
Mark Paluch	3600452796	DATAES-968 - Enable Maven caching for Jenkins jobs.	2020-10-30 08:36:23 +01:00
Mark Paluch	4b1c4c8000	DATAES-950 - Enable maintenance branch build.	2020-10-29 09:53:38 +01:00
Mark Paluch	70d556e526	DATAES-950 - After release cleanups.	2020-10-28 16:10:55 +01:00
Mark Paluch	214d91f3c1	DATAES-950 - Prepare next development iteration.	2020-10-28 16:10:52 +01:00