Support collection parameters in @Query methods.

Original Pull Request #1856
Closes #1858

(cherry picked from commit 6f84a1c589)
(cherry picked from commit 254948d1c9)
(cherry picked from commit 979c164135)
(cherry picked from commit d6cfc20a69)

CI.adoc

@@ -1,8 +1,8 @@
 = Continuous Integration
 
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmaster&subject=2020.0.0%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F4.0.x&subject=Neumann%20(4.0.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F3.2.x&subject=Moore%20(3.2.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmaster&subject=Moore%20(master)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F3.1.x&subject=Lovelace%20(3.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F2.1.x&subject=Ingalls%20(2.1.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
 
 == Running CI tasks locally
 
@@ -30,7 +30,7 @@ Since the container is binding to your source, you can make edits from your IDE
 
 If you need to package things up, do this:
 
-1. `docker run -it -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash`
+1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash`
 +
 This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`.
 +

CODE_OF_CONDUCT.adoc

@@ -0,0 +1,27 @@
+= Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at spring-code-of-conduct@pivotal.io.
+All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
+Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].

CONTRIBUTING.adoc

@@ -1,7 +1,3 @@
 = Spring Data contribution guidelines
 
 You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here].
-
-== Running the test locally
-
-In order to run the tests locally with `./mvnw test` you need to have docker running because Spring Data Elasticsearch uses https://www.testcontainers.org/[Testcontainers] to start a local running Elasticsearch instance.

Jenkinsfile

@@ -3,7 +3,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/2.4.x", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.2.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -12,70 +12,36 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (jdk8)") {
+		stage("Test") {
 			when {
 				anyOf {
-					branch '4.1.x'
-					not { triggeredBy 'UpstreamCause' }
-				}
-			}
-			agent {
-				docker {
-					image 'adoptopenjdk/openjdk8:latest'
-					label 'data'
-					args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
-				}
-			}
-			options { timeout(time: 30, unit: 'MINUTES') }
-			steps {
-			    sh 'mkdir -p /tmp/jenkins-home'
-            	sh 'chown -R 1001:1001 .'
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
-			}
-		}
-
-		stage("Test other configurations") {
-			when {
-				allOf {
-					branch '4.1.x'
+					branch '3.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			parallel {
-				stage("test: baseline (jdk11)") {
+				stage("test: baseline") {
 					agent {
 						docker {
-							image 'adoptopenjdk/openjdk11:latest'
+							image 'adoptopenjdk/openjdk8:latest'
 							label 'data'
 							args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
 						}
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
-					steps {
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
+					environment {
+						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 					}
-				}
-
-				stage("test: baseline (jdk15)") {
-					agent {
-						docker {
-							image 'adoptopenjdk/openjdk15:latest'
-							label 'data'
-        					args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
-						}
-					}
-					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pjava11 clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch'
 					}
 				}
 			}
 		}
-
 		stage('Release to artifactory') {
 			when {
 				anyOf {
-					branch '4.1.x'
+					branch '3.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -93,7 +59,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -105,7 +71,7 @@ pipeline {
 		}
 		stage('Publish documentation') {
 			when {
-				branch '4.1.x'
+				branch '3.2.x'
 			}
 			agent {
 				docker {
@@ -121,7 +87,7 @@ pipeline {
 			}
 
 			steps {
-				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +

LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.

README.adoc

@@ -11,15 +11,15 @@ This project is lead and maintained by the community.
 == Features
 
 * Spring configuration support using Java based `@Configuration` classes or an XML namespace for a ES clients instances.
-* `ElasticsearchRestTemplate` helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
+* `ElasticsearchTemplate` helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
 * Feature Rich Object Mapping integrated with Spring’s Conversion Service
-* Annotation based mapping metadata
-* Automatic implementation of `Repository` interfaces including support for custom search methods.
+* Annotation based mapping metadata but extensible to support other metadata formats
+* Automatic implementation of `Repository` interfaces including support for custom finder methods.
 * CDI support for repositories
 
 == Code of Conduct
 
-This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the link:CODE_OF_CONDUCT.adoc[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 == Getting Started
 
@@ -53,56 +53,51 @@ public class MyService {
     repository.save(person);
 
     List<Person> lastNameResults = repository.findByLastname("Gierke");
-    List<Person> firstNameResults = repository.findByFirstnameLike("Oli");
+    List<Person> firstNameResults = repository.findByFirstnameLike("Oli*");
  }
 }
 ----
 
-=== Using Transport Client
+Using Node Client
 
-NOTE: Usage of the TransportClient is deprecated as of version 4.0, use RestClient instead.
-
-
-[source,java]
+[source,xml]
 ----
-@Configuration
-public class TransportClientConfig extends ElasticsearchConfigurationSupport {
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	@Bean
-	public Client elasticsearchClient() throws UnknownHostException {
-		Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();
-		TransportClient client = new PreBuiltTransportClient(settings);
-		client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
-		return client;
-	}
+    <elasticsearch:node-client id="client" local="true"/>
 
-	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-	public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-		return new ElasticsearchTemplate(elasticsearchClient());
-	}
-}
+    <bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+</beans>
 ----
 
-=== Using the RestClient
+Using Transport Client
 
-Provide a configuration like this:
-
-[source,java]
+[source,xml]
 ----
-@Configuration
-public class RestClientConfig extends AbstractElasticsearchConfiguration {
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    @Override
-    @Bean
-    public RestHighLevelClient elasticsearchClient() {
+    <elasticsearch:repositories base-package="com.xyz.acme"/>
 
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-            .connectedTo("localhost:9200")
-            .build();
+    <elasticsearch:transport-client id="client" cluster-nodes="ip:9300,ip:9300" cluster-name="elasticsearch" />
 
-        return RestClients.create(clientConfiguration).rest();
-    }
-}
+    <bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
+        <constructor-arg name="client" ref="client"/>
+    </bean>
+
+</beans>
 ----
 
 === Maven configuration
@@ -123,7 +118,7 @@ Add the Maven dependency:
 // Always change both files!
 **Compatibility Matrix**
 
-The compatibility between Spring Data Elasticsearch, Elasticsearch client drivers and Spring Boot versions can be found in the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#preface.versions[reference documentation].
+The compatibility between Spring Data Elasticsearch, Elasticsearch client drivers and Spring Boot versions can be found in the https://docs.spring.io/spring-data/elasticsearch/docs/3.2.0.RC3/reference/html/#preface.versions[reference documentation].
 
 To use the Release candidate versions of the upcoming major version, use our Maven milestone repository and declare the appropriate dependency version:
 
@@ -195,11 +190,7 @@ You also need JDK 1.8.
 
 If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.5.0 or above].
 
-_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 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.
-
+_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 your first non-trivial change._
 
 === Building reference documentation
 

pom.xml

@@ -3,14 +3,14 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.1.2</version>
+    <groupId>org.springframework.data</groupId>
+    <artifactId>spring-data-elasticsearch</artifactId>
+    <version>3.2.14.BUILD-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.4.2</version>
+		<version>2.2.14.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -19,11 +19,10 @@
 
 	<properties>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>7.9.3</elasticsearch>
-		<log4j>2.13.3</log4j>
-		<netty>4.1.52.Final</netty>
-		<springdata.commons>2.4.2</springdata.commons>
-		<testcontainers>1.14.3</testcontainers>
+		<elasticsearch>6.8.14</elasticsearch>
+		<log4j>2.9.1</log4j>
+		<springdata.commons>2.2.14.BUILD-SNAPSHOT</springdata.commons>
+		<netty>4.1.39.Final</netty>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>
 
@@ -75,6 +74,7 @@
 	</issueManagement>
 
 	<dependencyManagement>
+
 		<dependencies>
 			<dependency>
 				<groupId>io.netty</groupId>
@@ -121,7 +121,7 @@
 
 		<dependency>
 			<groupId>io.projectreactor.netty</groupId>
-			<artifactId>reactor-netty-http</artifactId>
+			<artifactId>reactor-netty</artifactId>
 			<optional>true</optional>
 		</dependency>
 
@@ -144,7 +144,6 @@
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>${jodatime}</version>
-			<optional>true</optional>
 		</dependency>
 
 		<!-- Elasticsearch -->
@@ -152,6 +151,12 @@
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>transport</artifactId>
 			<version>${elasticsearch}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -219,13 +224,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-to-slf4j</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
@@ -253,7 +251,7 @@
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock-jre8</artifactId>
-			<version>2.26.3</version>
+			<version>2.25.1</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- these exclusions are needed because of Elasticsearch JarHell-->
@@ -283,40 +281,9 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-junit-jupiter</artifactId>
-			<version>${mockito}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>elasticsearch</artifactId>
-			<version>${testcontainers}</version>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/versions.properties</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>false</filtering>
-				<excludes>
-					<exclude>**/versions.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
-
 		<plugins>
 			<!--
 			please do not remove this configuration for surefire - we need that to avoid issue with jar hell
@@ -335,30 +302,6 @@
 						<es.set.netty.runtime.available.processors>false</es.set.netty.runtime.available.processors>
 					</systemPropertyVariables>
 				</configuration>
-				<executions>
-					<!-- the default-test execution runs only the unit tests -->
-					<execution>
-						<id>default-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<excludedGroups>integration-test</excludedGroups>
-						</configuration>
-					</execution>
-					<!-- execution to run the integration tests -->
-					<execution>
-						<id>integration-test</id>
-						<phase>integration-test</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-						</configuration>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -405,8 +348,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
+			<id>spring-libs-snapshot</id>
+			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 

settings.xml

@@ -0,0 +1,29 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+	<servers>
+		<server>
+			<id>spring-plugins-release</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-snapshot</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-milestone</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-release</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+	</servers>
+
+</settings>

src/main/asciidoc/index.adoc

@@ -5,14 +5,13 @@ 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-2020 The original author(s).
+(C) 2013-2019 The original author(s).
 
 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 
 toc::[]
 
 include::preface.adoc[]
-
 :leveloffset: +1
 include::{spring-data-commons-docs}/repositories.adoc[]
 :leveloffset: -1
@@ -24,15 +23,7 @@ include::{spring-data-commons-docs}/repositories.adoc[]
 include::reference/elasticsearch-clients.adoc[]
 include::reference/elasticsearch-object-mapping.adoc[]
 include::reference/elasticsearch-operations.adoc[]
-
 include::reference/elasticsearch-repositories.adoc[]
-
-include::{spring-data-commons-docs}/auditing.adoc[]
-include::reference/elasticsearch-auditing.adoc[]
-
-include::{spring-data-commons-docs}/entity-callbacks.adoc[]
-include::reference/elasticsearch-entity-callbacks.adoc[leveloffset=+1]
-
 include::reference/elasticsearch-misc.adoc[]
 :leveloffset: -1
 
@@ -44,5 +35,4 @@ include::{spring-data-commons-docs}/repository-namespace-reference.adoc[]
 include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[]
 include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[]
 include::{spring-data-commons-docs}/repository-query-return-types-reference.adoc[]
-include::reference/migration-guides.adoc[]
 :leveloffset: -1

src/main/asciidoc/preface.adoc

@@ -1,10 +1,9 @@
 [[preface]]
 = Preface
 
-The Spring Data Elasticsearch project applies core Spring concepts to the development of solutions using the Elasticsearch Search Engine.
-It provides:
+The Spring Data Elasticsearch project applies core Spring concepts to the development of solutions using the Elasticsearch Search Engine. It provides:
 
-* _Templates_ as a high-level abstraction for storing, searching, sorting documents and building aggregations.
+* _Templates_ as a high-level abstraction for storing, querying, sorting and faceting documents.
 * _Repositories_ which for example enable the user to express queries by defining interfaces having customized method names (for basic information about repositories see <<repositories>>).
 
 You will notice similarities to the Spring data solr and mongodb support in the Spring Framework.
@@ -28,18 +27,18 @@ Requires an installation of https://www.elastic.co/products/elasticsearch[Elasti
 
 [[preface.versions]]
 === Versions
+// NOTE: since Github does not support include directives, the content of
+// this file is duplicated in the toplevel README
+// Always change both files!
 
-The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring Data release train:
-
+The 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 refering to that particular Spring Data release train:
 [cols="^,^,^,^",options="header"]
 |===
-| 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[]
+|Spring Data Release Train |Spring Data Elasticsearch |Elasticsearch | Spring Boot
+|Moore |3.2.x |6.8.14 |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>>.

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

@@ -1,79 +0,0 @@
-[[elasticsearch.auditing]]
-== Elasticsearch Auditing
-
-=== Preparing entities
-
-In order for the auditing code to be able to decide whether an entity instance is new, the entity must implement the `Persistable<ID>` interface which is defined as follows:
-
-[source,java]
-----
-package org.springframework.data.domain;
-
-import org.springframework.lang.Nullable;
-
-public interface Persistable<ID> {
-    @Nullable
-    ID getId();
-
-    boolean isNew();
-}
-----
-
-As the existence of an Id is not a sufficient criterion to determine if an enitity is new in Elasticsearch, additional information is necessary. One way is to use the creation-relevant auditing fields for this decision:
-
-A `Person` entity might look as follows - omitting getter and setter methods for brevity:
-
-[source,java]
-----
-@Document(indexName = "person")
-public class Person implements Persistable<Long> {
-    @Id private Long id;
-    private String lastName;
-    private String firstName;
-    @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
-    private Instant createdDate;
-    private String createdBy
-    @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
-    private Instant lastModifiedDate;
-    private String lastModifiedBy;
-
-    public Long getId() {                                                 // <.>
-        return id;
-    }
-
-    @Override
-    public boolean isNew() {
-        return id == null || (createdDate == null && createdBy == null);  // <.>
-    }
-}
-----
-<.> the getter is the required implementation from the interface
-<.> an object is new if it either has no `id` or none of fields containing creation attributes are set.
-
-=== Activating auditing
-
-After the entities have been set up and providing the `AuditorAware` - or `ReactiveAuditorAware` - the Auditing must be activated by setting the `@EnableElasticsearchAuditing` on a configuration class:
-
-[source,java]
-----
-@Configuration
-@EnableElasticsearchRepositories
-@EnableElasticsearchAuditing
-class MyConfiguration {
-   // configuration code
-}
-----
-
-When using the reactive stack this must be:
-[source,java]
-----
-@Configuration
-@EnableReactiveElasticsearchRepositories
-@EnableReactiveElasticsearchAuditing
-class MyConfiguration {
-   // configuration code
-}
-----
-
-If your code contains more than one `AuditorAware` bean for different types, you must provide the name of the bean to use as an argument to the `auditorAwareRef` parameter of the 
- `@EnableElasticsearchAuditing` annotation. 

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

@@ -3,13 +3,13 @@
 
 This chapter illustrates configuration and usage of supported Elasticsearch client implementations.
 
-Spring Data Elasticsearch operates upon an Elasticsearch client that is connected to a single Elasticsearch node or a cluster. Although the Elasticsearch Client can be used to work with the cluster, applications using Spring Data Elasticsearch normally use the higher level abstractions of <<elasticsearch.operations>> and <<elasticsearch.repositories>>.
+Spring data Elasticsearch operates upon an Elasticsearch client that is connected to a single Elasticsearch node or a cluster. Although the Elasticsearch Client can be used to work with the cluster,  applications using Spring Data Elasticsearch normally use the higher level abstractions of <<elasticsearch.operations>> and <<elasticsearch.repositories>>.
 
 [[elasticsearch.clients.transport]]
 == Transport Client
 
 WARNING: The 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.
+Elasticsearch <<elasticsearch.versions,version>>.
 
 We strongly recommend to use the <<elasticsearch.clients.rest>> instead of the `TransportClient`.
 
@@ -17,21 +17,18 @@ We strongly recommend to use the <<elasticsearch.clients.rest>> instead of the `
 ====
 [source,java]
 ----
-@Configuration
-public class TransportClientConfig extends ElasticsearchConfigurationSupport {
+static class Config {
 
-    @Bean
-    public Client elasticsearchClient() throws UnknownHostException {
-        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)); <2>
-        return client;
-    }
-
-    @Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-    public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-        return new ElasticsearchTemplate(elasticsearchClient());
-    }
+  @Bean
+  Client client() {
+  	Settings settings = Settings.builder()
+  	  .put("cluster.name", "elasticsearch")   <1>
+      .build();
+  	TransportClient client = new PreBuiltTransportClient(settings);
+    client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1")
+      , 9300));                               <2>
+    return client;
+  }
 }
 
 // ...
@@ -49,7 +46,7 @@ IndexResponse response = client.index(request);
 [[elasticsearch.clients.rest]]
 == High Level REST Client
 
-The Java High Level REST Client is the default client of Elasticsearch, it provides a straight forward replacement for the `TransportClient` as it accepts and returns
+The Java High Level REST Client now is the default client of Elasticsearch, it provides a straight forward replacement for the `TransportClient` as it accepts and returns
 the very same request/response objects and therefore depends on the Elasticsearch core project.
 Asynchronous calls are operated upon a client managed thread pool and require a callback to be notified when the request is done.
 
@@ -57,19 +54,18 @@ Asynchronous calls are operated upon a client managed thread pool and require a
 ====
 [source,java]
 ----
-@Configuration
-public class RestClientConfig extends AbstractElasticsearchConfiguration {
+import org.springframework.beans.factory.annotation.Autowired;@Configuration
+static class Config {
 
-    @Override
-    @Bean
-    public RestHighLevelClient elasticsearchClient() {
+  @Bean
+  RestHighLevelClient client() {
 
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder()  <1>
-            .connectedTo("localhost:9200")
-            .build();
+    ClientConfiguration clientConfiguration = ClientConfiguration.builder() <1>
+      .connectedTo("localhost:9200", "localhost:9201")
+      .build();
 
-        return RestClients.create(clientConfiguration).rest();                         <2>
-    }
+    return RestClients.create(clientConfiguration).rest();                  <2>
+  }
 }
 
 // ...
@@ -77,7 +73,7 @@ public class RestClientConfig extends AbstractElasticsearchConfiguration {
   @Autowired
   RestHighLevelClient highLevelClient;
 
-  RestClient lowLevelClient = highLevelClient.lowLevelClient();                        <3>
+  RestClient lowLevelClient = highLevelClient.lowLevelClient();             <3>
 
 // ...
 
@@ -143,47 +139,36 @@ NOTE: The ReactiveClient response, especially for search operations, is bound to
 [[elasticsearch.clients.configuration]]
 == Client Configuration
 
-Client behaviour can be changed via the `ClientConfiguration` that allows to set options for SSL, connect and socket timeouts, headers and other parameters.
+Client behaviour can be changed via the `ClientConfiguration` that allows to set options for SSL, connect and socket timeouts.
 
 .Client Configuration
 ====
 [source,java]
 ----
-HttpHeaders httpHeaders = new HttpHeaders();
-httpHeaders.add("some-header", "on every request")                      <1>
+// optional if Basic Auhtentication is needed
+HttpHeaders defaultHeaders = new HttpHeaders();
+defaultHeaders.setBasicAuth(USER_NAME, USER_PASS);                      <1>
 
 ClientConfiguration clientConfiguration = ClientConfiguration.builder()
   .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;
-  })
+  .withConnectTimeout(Duration.ofSeconds(5))                            <3>
+  .withSocketTimeout(Duration.ofSeconds(3))                             <4>
+  .usingSsl()                                                           <5>
+  .withDefaultHeaders(defaultHeaders)                                   <6>
+  .withBasicAuth(username, password)                                    <7>
   . // ... other options
   .build();
 
 ----
 <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.
+<3> Set the connection timeout. Default is 10 sec.
+<4> Set the socket timeout. Default is 5 sec.
+<5> Optionally enable SSL.
+<6> Optionally set headers.
+<7> Add basic authentication.
 ====
 
-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!
-
 [[elasticsearch.clients.logging]]
 == Client Logging
 

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

@@ -1,35 +0,0 @@
-[[elasticsearch.entity-callbacks]]
-= Elasticsearch EntityCallbacks
-
-Spring Data Elasticsearch uses the `EntityCallback` API internally for its auditing support and reacts on the following callbacks:
-
-.Supported Entity Callbacks
-[%header,cols="4"]
-|===
-| Callback
-| Method
-| Description
-| Order
-
-| Reactive/BeforeConvertCallback
-| `onBeforeConvert(T entity, IndexCoordinates index)`
-| Invoked before a domain object is converted to `org.springframework.data.elasticsearch.core.document.Document`. Can return the `entity` or a modified entity which then will be converted.
-| `Ordered.LOWEST_PRECEDENCE`
-
-| Reactive/AfterConvertCallback
-| `onAfterConvert(T entity, Document document, IndexCoordinates indexCoordinates)`
-| Invoked after a domain object is converted from `org.springframework.data.elasticsearch.core.document.Document` on reading result data from Elasticsearch.
-| `Ordered.LOWEST_PRECEDENCE`
-
-| Reactive/AuditingEntityCallback
-| `onBeforeConvert(Object entity, IndexCoordinates index)`
-| Marks an auditable entity _created_ or _modified_
-| 100
-
-| Reactive/AfterSaveCallback
-| `T onAfterSave(T entity, IndexCoordinates index)`
-| Invoked after a domain object is saved.
-| `Ordered.LOWEST_PRECEDENCE`
-
-|===
-

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

@@ -1,133 +0,0 @@
-[[elasticsearch-migration-guide-3.2-4.0]]
-= Upgrading from 3.2.x to 4.0.x
-
-This section describes breaking changes from version 3.2.x to 4.0.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-3.2-4.0.jackson-removal]]
-== Removal of the used Jackson Mapper
-
-One of the changes in version 4.0.x is that Spring Data Elasticsearch does not use the Jackson Mapper anymore to map an entity to the JSON representation needed for Elasticsearch (see <<elasticsearch.mapping>>). In version 3.2.x the Jackson Mapper was the default that was used. It was possible to switch to the meta-model based converter (named `ElasticsearchEntityMapper`) by explicitly configuring it (<<elasticsearch.mapping.meta-model>>).
-
-In version 4.0.x the meta-model based converter is the only one that is available and does not need to be configured explicitly. If you had a custom configuration to enable the meta-model converter by providing a bean like this:
-
-[source,java]
-----
-@Bean
-@Override
-public EntityMapper entityMapper() {
-
-  ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(
-    elasticsearchMappingContext(), new DefaultConversionService()
-  );
-  entityMapper.setConversions(elasticsearchCustomConversions());
-
-  return entityMapper;
-}
-----
-
-You now have to remove this bean, the `ElasticsearchEntityMapper` interface has been removed.
-
-.Entity configuration
-Some users had custom Jackson annotations on the entity class, for example in order to define a custom name for the mapped document in Elasticsearch or to configure date conversions. These are not taken into account anymore. The needed functionality is now provided with Spring Data Elasticsearch's `@Field` annotation. Please see <<elasticsearch.mapping.meta-model.annotations>> for detailed information.
-
-[[elasticsearch-migration-guide-3.2-4.0.implicit-index-name]]
-== Removal of implicit index name from query objects
-
-In 3.2.x the different query classes like `IndexQuery` or `SearchQuery` had properties that were taking the index name or index names that they were operating upon. If these were not set, the passed in entity was inspected to retrieve the index name that was set in the `@Document` annotation. +
-In 4.0.x the index name(s) must now be provided in an additional parameter of type `IndexCoordinates`. By separating this, it now is possible to use one query object against different indices.
-
-So for example the following code:
-
-[source,java]
-----
-IndexQuery indexQuery = new IndexQueryBuilder()
-  .withId(person.getId().toString())
-  .withObject(person)
-  .build();
-
-String documentId = elasticsearchOperations.index(indexQuery);
-----
-
-must be changed to:
-
-[source,java]
-----
-IndexCoordinates indexCoordinates = elasticsearchOperations.getIndexCoordinatesFor(person.getClass());
-
-IndexQuery indexQuery = new IndexQueryBuilder()
-  .withId(person.getId().toString())
-  .withObject(person)
-  .build();
-
-String documentId = elasticsearchOperations.index(indexQuery, indexCoordinates);
-----
-
-To make it easier to work with entities and use the index name that is contained in the entitie's `@Document` annotation, new methods have been added like `DocumentOperations.save(T entity)`;
-
-[[elasticsearch-migration-guide-3.2-4.0.new-operations]]
-== The new Operations interfaces
-
-In version 3.2 there was the `ElasticsearchOperations` interface that defined all the methods for the `ElasticsearchTemplate` class. In version 4 the functions have been split into different interfaces, aligning these interfaces with the Elasticsearch API:
-
-* `DocumentOperations` are the functions related documents like saving, or deleting
-* `SearchOperations` contains the functions to search in Elasticsearch
-* `IndexOperations` define the functions to operate on indexes, like index creation or mappings creation.
-
-`ElasticsearchOperations` now extends `DocumentOperations` and `SearchOperations` and has methods get access to an `IndexOperations` instance.
-
-NOTE: All the functions from the `ElasticsearchOperations` interface in version 3.2 that are now moved to the `IndexOperations` interface are still available, they are marked as deprecated and have default implementations that delegate to the new implementation:
-
-[source,java]
-----
-/**
- * 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();
-}
-----
-
-[[elasticsearch-migration-guide-3.2-4.0.deprecations]]
-== Deprecations
-
-=== Methods and classes
-
-Many functions and classes have been deprecated. These functions still work, but the Javadocs show with what they should be replaced.
-
-.Example from ElasticsearchOperations
-[source,java]
-----
-/*
- * 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);
-----
-
-=== Elasticsearch deprecations
-
-Since version 7 the Elasticsearch `TransportClient` is deprecated, it will be removed with Elasticsearch version 8. Spring Data Elasticsearch deprecates the `ElasticsearchTemplate` class which uses the `TransportClient` in version 4.0.
-
-Mapping types were removed from Elasticsearch 7, they still exist as deprecated values in the Spring Data `@Document` annotation and the `IndexCoordinates` class but they are not used anymore internally.
-
-[[elasticsearch-migration-guide-3.2-4.0.removal]]
-== Removals
-
-* As already described, the `ElasticsearchEntityMapper` interface has been removed.
-
-* The `SearchQuery` interface has been merged into it's base interface `Query`, so it's occurrences can just be replaced with `Query`.
-
-* The method `org.springframework.data.elasticsearch.core.ElasticsearchOperations.query(SearchQuery query, ResultsExtractor<T> resultsExtractor);` and the `org.springframework.data.elasticsearch.core.ResultsExtractor` interface have been removed. These could be used to parse the result from Elasticsearch for cases in which the response mapping done with the Jackson based mapper was not enough. Since version 4.0, there are the new <<elasticsearch.operations.searchresulttypes>>  to return the information from an Elasticsearch response, so there is no need to expose this low level functionality.
-
-* The low level methods `startScroll`, `continueScroll` and `clearScroll` have been removed from the `ElasticsearchOperations` interface. For low level scroll API access, there now are `searchScrollStart`, `searchScrollContinue` and `searchScrollClear` methods on the `ElasticsearchRestTemplate` class.

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

@@ -1,46 +0,0 @@
-[[elasticsearch-migration-guide-4.0-4.1]]
-= Upgrading from 4.0.x to 4.1.x
-
-This section describes breaking changes from version 4.0.x to 4.1.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-4.0-4.1.deprecations]]
-== Deprecations
-
-.Definition of the id property
-It is possible to define a property of en entity as the id property by naming it either `id` or  `document`.
-This behaviour is now deprecated and will produce a warning.
-PLease us the `@Id` annotation to mark a property as being the id property.
-
-.Index mappings
-In the `ReactiveElasticsearchClient.Indices` interface the `updateMapping` methods are deprecated in favour of the `putMapping` methods.
-They do the same, but `putMapping` is consistent with the naming in the Elasticsearch API:
-
-.Alias handling
-In the `IndexOperations` interface the methods `addAlias(AliasQuery)`, `removeAlias(AliasQuery)` and `queryForAlias()` have been deprecated.
-The new methods `alias(AliasAction)`, `getAliases(String...)` and `getAliasesForIndex(String...)` offer more functionality and a cleaner API.
-
-.Parent-ID
-Usage of a parent-id has been removed from Elasticsearch since version 6. We now deprecate the corresponding fields and methods.
-
-[[elasticsearch-migration-guide-4.0-4.1.removal]]
-== Removals
-
-.Type mappings
-The _type mappings_ parameters of the `@Document` annotation and the `IndexCoordinates` object were removed.
-They had been deprecated in Spring Data Elasticsearch 4.0 and their values weren't used anymore.
-
-[[elasticsearch-migration-guide-4.0-4.1.breaking-changes]]
-== Breaking Changes
-
-=== Return types of ReactiveElasticsearchClient.Indices methods
-
-The methods in the `ReactiveElasticsearchClient.Indices` were not used up to now.
-With the introduction of the `ReactiveIndexOperations` it became necessary to change some of the return types:
-
-* the `createIndex`  variants now return a `Mono<Boolean>` instead of a `Mono<Void>` to signal successful index creation.
-* the `updateMapping`  variants now return a `Mono<Boolean>` instead of a `Mono<Void>` to signal successful mappings storage.
-
-=== Return types of DocumentOperartions.bulkIndex methods
-
-These methods were returing a `List<String>` containing the ids of the new indexed records.
-Now they return a `List<IndexedObjectInformation>`; these objects contain the id and information about optimistic locking (seq_no and primary_term)

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

@@ -11,296 +11,67 @@ Filter Builder improves query speed.
 ====
 [source,java]
 ----
-private ElasticsearchOperations operations;
-
-IndexCoordinates index = IndexCoordinates.of("sample-index");
+private ElasticsearchTemplate elasticsearchTemplate;
 
 SearchQuery searchQuery = new NativeSearchQueryBuilder()
   .withQuery(matchAllQuery())
   .withFilter(boolFilter().must(termFilter("id", documentId)))
   .build();
   
-Page<SampleEntity> sampleEntities = operations.searchForPage(searchQuery, SampleEntity.class, index);
+Page<SampleEntity> sampleEntities =
+  elasticsearchTemplate.queryForPage(searchQuery,SampleEntity.class);
 ----
 ====
 
 [[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. `ElasticsearchTemplate` has startScroll and continueScroll methods that can be used as below.
 
+.Using startScroll and continueScroll
+====
 [source,java]
 ----
-IndexCoordinates index = IndexCoordinates.of("sample-index");
-
 SearchQuery searchQuery = new NativeSearchQueryBuilder()
   .withQuery(matchAllQuery())
+  .withIndices(INDEX_NAME)
+  .withTypes(TYPE_NAME)
   .withFields("message")
   .withPageable(PageRequest.of(0, 10))
   .build();
 
-SearchHitsIterator<SampleEntity> stream = elasticsearchTemplate.searchForStream(searchQuery, SampleEntity.class, index);
+ScrolledPage<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class);
+
+String scrollId = scroll.getScrollId();
+List<SampleEntity> sampleEntities = new ArrayList<>();
+while (scroll.hasContent()) {
+  sampleEntities.addAll(scroll.getContent());
+  scrollId = scroll.getScrollId();
+  scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class);
+}
+elasticsearchTemplate.clearScroll(scrollId);
+----
+====
+
+`ElasticsearchTemplate` additionally has the stream method which wraps the scan and scroll operations into a CloseableIterator.
+
+.Using stream
+====
+[source,java]
+----
+SearchQuery searchQuery = new NativeSearchQueryBuilder()
+  .withQuery(matchAllQuery())
+  .withIndices(INDEX_NAME)
+  .withTypes(TYPE_NAME)
+  .withFields("message")
+  .withPageable(PageRequest.of(0, 10))
+  .build();
+
+CloseableIterator<SampleEntity> stream = elasticsearchTemplate.stream(searchQuery, SampleEntity.class);
 
 List<SampleEntity> sampleEntities = new ArrayList<>();
 while (stream.hasNext()) {
   sampleEntities.add(stream.next());
 }
-
-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]
-----
-
-@Autowired ElasticsearchRestTemplate template;
-
-IndexCoordinates index = IndexCoordinates.of("sample-index");
-
-SearchQuery searchQuery = new NativeSearchQueryBuilder()
-  .withQuery(matchAllQuery())
-  .withFields("message")
-  .withPageable(PageRequest.of(0, 10))
-  .build();
-
-SearchScrollHits<SampleEntity> scroll = template.searchScrollStart(1000, searchQuery, SampleEntity.class, index);
-
-String scrollId = scroll.getScrollId();
-List<SampleEntity> sampleEntities = new ArrayList<>();
-while (scroll.hasSearchHits()) {
-  sampleEntities.addAll(scroll.getSearchHits());
-  scrollId = scroll.getScrollId();
-  scroll = template.searchScrollContinue(scrollId, 1000, SampleEntity.class);
-}
-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.
-
-[source,java]
-----
-interface SampleEntityRepository extends Repository<SampleEntity, String> {
-
-    Stream<SampleEntity> findBy();
-
-}
-----
-
-[[elasticsearch.misc.sorts]]
-== Sort options
-
-In addition to the default sort options described <<repositories.paging-and-sorting>> Spring Data Elasticsearch has a `GeoDistanceOrder` class which can be used to have the result of a search operation ordered by geographical distance.
-
-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);
-}
-----
-====
-

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

@@ -1,32 +1,6 @@
 [[new-features]]
 = What's new
 
-[[new-features.4-1-0]]
-== New in Spring Data Elasticsearch 4.1
-
-* Uses Spring 5.3.
-* Upgrade to Elasticsearch 7.9.3.
-* Improved API for alias management.
-* Introduction of `ReactiveIndexOperations` for index management.
-* Index templates support.
-* Support for Geo-shape data with GeoJson.
-
-[[new-features.4-0-0]]
-== New in Spring Data Elasticsearch 4.0
-
-* Uses Spring 5.2.
-* Upgrade to Elasticsearch 7.6.2.
-* Deprecation of `TransportClient` usage.
-* Implements most of the mapping-types available for the index mappings.
-* Removal of the Jackson `ObjectMapper`, now using the <<elasticsearch.mapping.meta-model,MappingElasticsearchConverter>>
-* Cleanup of the API in the `*Operations` interfaces, grouping and renaming methods so that they match the Elasticsearch API, deprecating the old methods, aligning with other Spring Data modules.
-* Introduction of `SearchHit<T>` class to represent a found document together with the relevant result metadata for this document (i.e. _sortValues_).
-* Introduction of the `SearchHits<T>` class to represent a whole search result together with the metadata for the complete search result (i.e. _max_score_).
-* Introduction of `SearchPage<T>` class to represent a paged result containing a `SearchHits<T>` instance.
-* Introduction of the `GeoDistanceOrder` class to be able to create sorting by geographical distance
-* Implementation of Auditing Support
-* Implementation of lifecycle entity callbacks
-
 [[new-features.3-2-0]]
 == New in Spring Data Elasticsearch 3.2
 

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

@@ -1,20 +1,36 @@
 [[elasticsearch.mapping]]
 = Elasticsearch Object Mapping
 
-Spring Data Elasticsearch Object Mapping is the process that maps a Java object - the domain entity - into the JSON representation that is stored in Elasticsearch and back.
+Spring Data Elasticsearch allows to choose between two mapping implementations abstracted via the `EntityMapper` interface:
 
-Earlier versions of Spring Data Elasticsearch used a Jackson based conversion, Spring Data Elasticsearch 3.2.x introduced the <<elasticsearch.mapping.meta-model>>.
-As of version 4.0 only the Meta Object Mapping is used, the Jackson based mapper is not available anymore and the `MappingElasticsearchConverter` is used.
+* <<elasticsearch.mapping.jackson2>>
+* <<elasticsearch.mapping.meta-model>>
 
-The main reasons for the removal of the Jackson based mapper are:
+[[elasticsearch.mapping.jackson2]]
+== Jackson Object Mapping
 
-* Custom mappings of fields needed to be done with annotations like `@JsonFormat` or `@JsonInclude`.
-This often caused problems when the same object was used in different JSON based datastores or sent over a JSON based API.
-* Custom field types and formats also need to be stored into the Elasticsearch index mappings.
-The Jackson based annotations did not fully provide all the information that is necessary to represent the types of Elasticsearch.
-* Fields must be mapped not only when converting from and to entities, but also in query argument, returned data and on other places.
+The Jackson2 based approach (used by default) utilizes a customized `ObjectMapper` instance with spring data specific modules.
+Extensions to the actual mapping need to be customized via Jackson annotations like `@JsonInclude`.
 
-Using the `MappingElasticsearchConverter` now covers all these cases.
+.Jackson2 Object Mapping Configuration
+====
+[source,java]
+----
+@Configuration
+public class Config extends AbstractElasticsearchConfiguration { <1>
+
+  @Override
+  public RestHighLevelClient elasticsearchClient() {
+    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest();
+  }
+}
+----
+<1> `AbstractElasticsearchConfiguration` already defines a Jackson2 based `entityMapper` via `ElasticsearchConfigurationSupport`.
+====
+
+[WARNING]
+`CustomConversions`, `@ReadingConverter` & `@WritingConverter` cannot be applied when using the Jackson based `EntityMapper`.  +
+Setting the name of a mapped field with `@Field(name="custom-name")` also cannot be used with this Mapper.
 
 [[elasticsearch.mapping.meta-model]]
 == Meta Model Object Mapping
@@ -22,52 +38,63 @@ Using the `MappingElasticsearchConverter` now covers all these cases.
 The Metamodel based approach uses domain type information for reading/writing from/to Elasticsearch.
 This allows to register `Converter` instances for specific domain type mapping.
 
+.Meta Model Object Mapping Configuration
+====
+[source,java]
+----
+@Configuration
+public class Config extends AbstractElasticsearchConfiguration {
+
+  @Override
+  public RestHighLevelClient elasticsearchClient() {
+    return RestClients.create(ClientConfiguration.create("localhost:9200")).rest()
+  }
+
+  @Bean
+  @Override
+  public EntityMapper entityMapper() {                                 <1>
+
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(
+      elasticsearchMappingContext(), new DefaultConversionService()    <2>
+    );
+    entityMapper.setConversions(elasticsearchCustomConversions());     <3>
+
+  	return entityMapper;
+  }
+}
+----
+<1> Overwrite the default `EntityMapper` from `ElasticsearchConfigurationSupport` and expose it as bean.
+<2> Use the provided `SimpleElasticsearchMappingContext` to avoid inconsistencies and provide a `GenericConversionService`
+for `Converter` registration.
+<3> Optionally set `CustomConversions` if applicable.
+====
+
 [[elasticsearch.mapping.meta-model.annotations]]
 === Mapping Annotation Overview
 
-The `MappingElasticsearchConverter` uses metadata to drive the mapping of objects to documents.
-The metadata is taken from the entity's properties which can be annotated.
-
-The following annotations are available:
-
-* `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database.
-The most important attributes are:
-** `indexName`: the name of the index to store this entity in.
-This can contain a SpEL template expression like `"log-#{T(java.time.LocalDate).now().toString()}"`
-** `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>>
-** `versionType`: Configuration of version management.
-Default value is _EXTERNAL_.
+The `ElasticsearchEntityMapper` can use metadata to drive the mapping of objects to documents. The following annotations are available:
 
 * `@Id`: Applied at the field level to mark the field used for identity purpose.
-* `@Transient`: By default all fields are mapped to the document when it is stored or retrieved, this annotation excludes the field.
-* `@PersistenceConstructor`: Marks a given constructor - even a package protected one - to use when instantiating the object from the database.
-Constructor arguments are mapped by name to the key values in the retrieved Document.
-* `@Field`: Applied at the field level and defines properties of the field, most of the attributes map to the respective https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html[Elasticsearch Mapping] definitions (the following list is not complete, check the annotation Javadoc for a complete reference):
+* `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database. The most important attributes are:
+** `indexName`: the name of the index to store this entity in
+** `type`: the mapping type. If not set, the lowercased simple name of the class is used.
+** `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`: Configuration whether to create an index on repository bootstrapping. Default value is _true_.
+** `versionType`: Configuration of version management. Default value is _EXTERNAL_.
+* `@Transient`: By default all private fields are mapped to the document, this annotation excludes the field where it is applied from being stored in the database
+* `@PersistenceConstructor`: Marks a given constructor - even a package protected one - to use when instantiating the object from the database. Constructor arguments are mapped by name to the key values in the retrieved Document.
+* `@Field`: Applied at the field level and defines properties of the field, most of the attributes map to the respective https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html[Elasticsearch Mapping] definitions:
 ** `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_.
-See https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html[Elasticsearch Mapping Types]
-** `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.
-Can be omitted if the field is an instance of the `GeoPoint` class.
+** `type`: the field type, can be one of _Text, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment, Keyword_.
+** `format` and `pattern` custom definitions for the _Date_ type.
+** `store`: Flag wether the original field value should be store in Elasticsearch, default value is _false_.
+** `analyzer`, `searchAnalyzer`, `normalizer` for specifying custom custom analyzers and normalizer.
+** `copy_to`: the target field to copy multiple document fields to.
+* `@GeoPoint`: marks a field as _geo_point_ datatype. Can be omitted if the field is an instance of the `GeoPoint` class.
 
-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].
 
 The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.
 
@@ -90,7 +117,6 @@ public class Person {              <1>
   String lastname;
 }
 ----
-
 [source,json]
 ----
 {
@@ -103,10 +129,10 @@ public class Person {              <1>
 <1> By default the domain types class name is used for the type hint.
 ====
 
-Type hints can be configured to hold custom information.
-Use the `@TypeAlias` annotation to do so.
+Type hints can be configured to hold custom information. Use the `@TypeAlias` annotation to do so.
 
-NOTE: Make sure to add types with `@TypeAlias` to the initial entity set (`AbstractElasticsearchConfiguration#getInitialEntitySet`) to already have entity information available when first reading data from the store.
+NOTE: Make sure to add types with `@TypeAlias` to the initial entity set (`AbstractElasticsearchConfiguration#getInitialEntitySet`)
+to already have entity information available when first reading data from the store.
 
 .Type Hints with Alias
 ====
@@ -119,7 +145,6 @@ public class Person {
   // ...
 }
 ----
-
 [source,json]
 ----
 {
@@ -146,7 +171,6 @@ public class Address {
   Point location;
 }
 ----
-
 [source,json]
 ----
 {
@@ -157,46 +181,6 @@ public class Address {
 ----
 ====
 
-==== GeoJson Types
-
-Spring Data Elasticsearch supports the GeoJson types by providing an interface `GeoJson` and implementations for the different geometries.
-They are mapped to Elasticsearch documents according to the GeoJson specification.
-The corresponding properties of the entity are specified in the index mappings as `geo_shape` when the index mappings is written. (check the https://www.elastic.co/guide/en/elasticsearch/reference/current/geo-shape.html[Elasticsearch documentation] as well)
-
-.GeoJson types
-====
-[source,java]
-----
-public class Address {
-
-  String city, street;
-  GeoJsonPoint location;
-}
-----
-
-[source,json]
-----
-{
-  "city": "Los Angeles",
-  "street": "2800 East Observatory Road",
-  "location": {
-    "type": "Point",
-    "coordinates": [-118.3026284, 34.118347]
-  }
-}
-----
-====
-
-The following GeoJson types are implemented:
-
-* `GeoJsonPoint`
-* `GeoJsonMultiPoint`
-* `GeoJsonLineString`
-* `GeoJsonMultiLineString`
-* `GeoJsonPolygon`
-* `GeoJsonMultiPolygon`
-* `GeoJsonGeometryCollection`
-
 ==== Collections
 
 For values inside Collections apply the same mapping rules as for aggregate roots when it comes to _type hints_ and <<elasticsearch.mapping.meta-model.conversions>>.
@@ -213,7 +197,6 @@ public class Person {
 
 }
 ----
-
 [source,json]
 ----
 {
@@ -241,7 +224,6 @@ public class Person {
 
 }
 ----
-
 [source,json]
 ----
 {
@@ -277,12 +259,23 @@ public class Config extends AbstractElasticsearchConfiguration {
 
   @Bean
   @Override
-  public ElasticsearchCustomConversions elasticsearchCustomConversions() {
-    return new ElasticsearchCustomConversions(
-      Arrays.asList(new AddressToMap(), new MapToAddress()));       <1>
+  public EntityMapper entityMapper() {
+
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(
+      elasticsearchMappingContext(), new DefaultConversionService());
+    entityMapper.setConversions(elasticsearchCustomConversions());  <1>
+
+  	return entityMapper;
   }
 
-  @WritingConverter                                                 <2>
+  @Bean
+  @Override
+  public ElasticsearchCustomConversions elasticsearchCustomConversions() {
+    return new ElasticsearchCustomConversions(
+      Arrays.asList(new AddressToMap(), new MapToAddress()));       <2>
+  }
+
+  @WritingConverter                                                 <3>
   static class AddressToMap implements Converter<Address, Map<String, Object>> {
 
     @Override
@@ -296,7 +289,7 @@ public class Config extends AbstractElasticsearchConfiguration {
     }
   }
 
-  @ReadingConverter                                                 <3>
+  @ReadingConverter                                                 <4>
   static class MapToAddress implements Converter<Map<String, Object>, Address> {
 
     @Override
@@ -308,7 +301,6 @@ public class Config extends AbstractElasticsearchConfiguration {
   }
 }
 ----
-
 [source,json]
 ----
 {
@@ -317,7 +309,8 @@ public class Config extends AbstractElasticsearchConfiguration {
   "localidad" : { "lat" : 34.118347, "lon" : -118.3026284 }
 }
 ----
-<1> Add `Converter` implementations.
-<2> Set up the `Converter` used for writing `DomainType` to Elasticsearch.
-<3> Set up the `Converter` used for reading `DomainType` from search result.
+<1> Register `ElasticsearchCustomConversions` with the `EntityMapper`.
+<2> Add `Converter` implementations.
+<3> Set up the `Converter` used for writing `DomainType` to Elasticsearch.
+<4> Set up the `Converter` used for reading `DomainType` from search result.
 ====

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

@@ -1,39 +1,17 @@
 [[elasticsearch.operations]]
 = Elasticsearch Operations
 
-Spring Data Elasticsearch uses several interfaces to define the operations that can be called against an Elasticsearch index (for a description of the reactive interfaces see <<elasticsearch.reactive.operations>>).
-
-* `IndexOperations` defines actions on index level like creating or deleting an index.
-* `DocumentOperations` defines actions to store, update and retrieve entities based on their id.
-* `SearchOperations` define the actions to search for multiple entities using queries
-* `ElasticsearchOperations` combines the `DocumentOperations` and `SearchOperations` interfaces.
-
-These interfaces correspond to the structuring of the https://www.elastic.co/guide/en/elasticsearch/reference/current/rest-apis.html[Elasticsearch API].
+Spring Data Elasticsearch uses two interfaces to define the operations that can be called against an Elasticsearch index. These are `ElasticsearchOperations` and `ReactiveElasticsearchOperations`. Whereas the first is used with the classic synchronous implementations, the second one uses reactive infrastructure.
 
 The default implementations of the interfaces offer:
 
-* index management functionality.
 * Read/Write mapping support for domain types.
 * A rich query and criteria api.
 * Resource management and Exception translation.
 
-[NOTE]
-====
-.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.
-
-**None of these operations are done automatically** by the implementations of `IndexOperations` or `ElasticsearchOperations`. It is the user's responsibility to call the methods.
-
-There is support for automatic creation of indices and writing the mappings when using Spring Data Elasticsearch repositories, see <<elasticsearch.repositories.autocreation>>
-
-====
-
 [[elasticsearch.operations.template]]
 == ElasticsearchTemplate
 
-NOTE: Usage of the ElasticsearchTemplate is deprecated as of version 4.0, use ElasticsearchRestTemplate instead.
-
 The `ElasticsearchTemplate` is an implementation of the `ElasticsearchOperations` interface using the <<elasticsearch.clients.transport>>.
 
 .ElasticsearchTemplate configuration
@@ -53,13 +31,23 @@ public class TransportClientConfig extends ElasticsearchConfigurationSupport {
 
   @Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
   public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException { <2>
-  	return new ElasticsearchTemplate(elasticsearchClient());
+  	return new ElasticsearchTemplate(elasticsearchClient(), entityMapper());
+  }
+
+  // use the ElasticsearchEntityMapper
+  @Bean
+  @Override
+  public EntityMapper entityMapper() {                                               <3>
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
+  	  new DefaultConversionService());
+    entityMapper.setConversions(elasticsearchCustomConversions());
+    return entityMapper;
   }
 }
 ----
 <1> Setting up the <<elasticsearch.clients.transport>>.
-Deprecated as of version 4.0.
 <2> Creating the `ElasticsearchTemplate` bean, offering both names, _elasticsearchOperations_ and _elasticsearchTemplate_.
+<3> Using the <<elasticsearch.mapping.meta-model>> ElasticsearchMapper.
 ====
 
 [[elasticsearch.operations.resttemplate]]
@@ -79,18 +67,29 @@ public class RestClientConfig extends AbstractElasticsearchConfiguration {
   }
 
   // no special bean creation needed                       <2>
+
+  // use the ElasticsearchEntityMapper
+  @Bean
+  @Override
+  public EntityMapper entityMapper() {                     <3>
+    ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
+        new DefaultConversionService());
+    entityMapper.setConversions(elasticsearchCustomConversions());
+
+    return entityMapper;
+  }
 }
 ----
 <1> Setting up the <<elasticsearch.clients.rest>>.
 <2> The base class `AbstractElasticsearchConfiguration` already provides the `elasticsearchTemplate` bean.
+<3> Using the <<elasticsearch.mapping.meta-model>> ElasticsearchMapper.
 ====
 
 [[elasticsearch.operations.usage]]
 == Usage examples
 
-As both `ElasticsearchTemplate` and `ElasticsearchRestTemplate` implement the `ElasticsearchOperations` interface, the code to use them is not different.
-The example shows how to use an injected `ElasticsearchOperations` instance in a Spring REST controller.
-The decision, if this is using the `TransportClient` or the `RestClient` is made by providing the corresponding Bean with one of the configurations shown above.
+As both `ElasticsearchTemplate` and `ElasticsearchRestTemplate` implement the `ElasticsearchOperations` interface, the code to use them is not different. The example shows how to use an injected `ElasticsearchOperations` instance in a Spring REST controller. The decision, if this is using the `TransportClient` or the `RestClient` is made by providing the
+ corresponding Bean with one of the configurations shown above.
 
 .ElasticsearchOperations usage
 ====
@@ -134,147 +133,3 @@ public class TestController {
 To see the full possibilities of `ElasticsearchOperations` please refer to the API documentation.
 
 include::reactive-elasticsearch-operations.adoc[leveloffset=+1]
-
-[[elasticsearch.operations.searchresulttypes]]
-== Search Result Types
-
-When a document is retrieved with the methods of the  `DocumentOperations` interface, just the found entity will be returned.
-When searching with the methods of the `SearchOperations` interface, additional information is available for each entity, for example the _score_ or the _sortValues_ of the found entity.
-
-In order to return this information, each entity is wrapped in a `SearchHit` object that contains this entity-specific additional information.
-These `SearchHit` objects themselves are returned within a `SearchHits` object which additionally contains informations about the whole search like the _maxScore_ or requested aggregations.
-The following classes and interfaces are now available:
-
-.SearchHit<T>
-Contains the following information:
-
-* Id
-* Score
-* Sort Values
-* Highlight fields
-* Inner hits (this is an embedded `SearchHits` object containing eventually returned inner hits)
-* The retrieved entity of type <T>
-
-.SearchHits<T>
-Contains the following information:
-
-* Number of total hits
-* Total hits relation
-* Maximum score
-* A list of `SearchHit<T>` objects
-* Returned aggregations
-
-.SearchPage<T>
-Defines a Spring Data `Page` that contains a `SearchHits<T>` element and can be used for paging access using repository methods.
-
-.SearchScrollHits<T>
-Returned by the low level scroll API functions in `ElasticsearchRestTemplate`, it enriches a `SearchHits<T>` with the Elasticsearch scroll id.
-
-.SearchHitsIterator<T>
-An Iterator returned by the streaming functions of the `SearchOperations` interface.
-
-== 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`.
-
-=== 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.
-
-NOTE: when talking about AND or OR when combining criteria keep in mind, that in Elasticsearch AND are converted to a **must** condition and OR to a **should**
-
-`Criteria` and their usage are best explained by example
-(let's assume we have a `Book` entity with a `price` property):
-
-.Get books with a given price
-====
-[source,java]
-----
-Criteria criteria = new Criteria("price").is(42.0);
-Query query = new CriteriaQuery(criteria);
-----
-====
-
-Conditions for the same field can be chained, they will be combined with a logical AND:
-
-.Get books with a given price
-====
-[source,java]
-----
-Criteria criteria = new Criteria("price").greaterThan(42.0).lessThan(34.0L);
-Query query = new CriteriaQuery(criteria);
-----
-====
-
-When chaining `Criteria`, by default a AND logic is used:
-
-.Get all persons with first name _James_  and last name _Miller_:
-====
-[source,java]
-----
-Criteria criteria = new Criteria("lastname").is("Miller") <1>
-  .and("firstname").is("James")                           <2>
-Query query = new CriteriaQuery(criteria);
-----
-<1> the first `Criteria`
-<2> the and() creates a new `Criteria` and chaines it to the first one.
-====
-
-If you want to create nested queries, you need to use subqueries for this. Let's assume we want to find all persons with a last name of _Miller_ and a first name of either _Jack_ or _John_:
-
-.Nested subqueries
-====
-[source,java]
-----
-Criteria miller = new Criteria("lastName").is("Miller")  <.>
-  .subCriteria(                                          <.>
-    new Criteria().or("firstName").is("John")            <.>
-      .or("firstName").is("Jack")                        <.>
-  );
-Query query = new CriteriaQuery(criteria);
-----
-<.> create a first `Criteria` for the last name
-<.> this is combined with AND to a subCriteria
-<.> This sub Criteria is an OR combination for the first name _John_
-<.> and the first name Jack
-====
-
-Please refer to the API documentation of the `Criteria` class for a complete overview of the different available operations.
-
-=== StringQuery
-
-This class takes an Elasticsearch query as JSON String.
-The following code shows a query that searches for persons having the first name "Jack":
-
-====
-[source,java]
-----
-
-Query query = new SearchQuery("{ \"match\": { \"firstname\": { \"query\": \"Jack\" } } } ");
-SearchHits<Person> searchHits = operations.search(query, Person.class);
-
-----
-====
-
-Using `StringQuery` may be appropriate if you already have an Elasticsearch query to use.
-
-=== 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.
-It allows to use all the different `QueryBuilder` implementations from the Elasticsearch library therefore named "native".
-
-The following code shows how to search for persons with a given firstname and for the found documents have a terms aggregation that counts the number of occurences of the lastnames for these persons:
-
-====
-[source,java]
-----
-Query query = new NativeSearchQueryBuilder()
-    .addAggregation(terms("lastnames").field("lastname").size(10)) //
-    .withQuery(QueryBuilders.matchQuery("firstname", firstName))
-    .build();
-
-SearchHits<Person> searchHits = operations.search(query, Person.class);
-----
-====
-
-

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

@@ -3,65 +3,8 @@
 
 This chapter includes details of the Elasticsearch repository implementation.
 
-.The sample `Book` entity
-====
-[source,java]
-----
-@Document(indexName="books")
-class Book {
-    @Id
-    private String id;
-
-    @Field(type = FieldType.text)
-    private String name;
-
-    @Field(type = FieldType.text)
-    private String summary;
-
-    @Field(type = FieldType.Integer)
-    private Integer price;
-
-	// getter/setter ...
-}
-----
-====
-
-[[elasticsearch.repositories.autocreation]]
-== Automatic creation of indices with the corresponding mapping
-
-The `@Document` annotation has an argument `createIndex`. If this argument is set to true - which is the default value  - Spring Data Elasticsearch will during bootstrapping the repository support on application startup check if the index defined by the `@Document` annotation exists.
-
-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]
 
-include::reactive-elasticsearch-repositories.adoc[leveloffset=+1]
-
-[[elasticsearch.repositories.annotations]]
-== Annotations for repository methods
-
-=== @Highlight
-
-The `@Highlight` annotation on a repository method defines for which fields of the returned entity highlighting should be included. To search for some text in a `Book` 's name or summary and have the found data highlighted, the following repository method can be used:
-
-====
-[source,java]
-----
-interface BookRepository extends Repository<Book, String> {
-
-    @Highlight(fields = {
-        @HighlightField(name = "name"),
-        @HighlightField(name = "summary")
-    })
-    List<SearchHit<Book>> findByNameOrSummary(String text, String summary);
-}
-----
-====
-
-It is possible to define multiple fields to be highlighted like above, and both the `@Highlight` and the `@HighlightField` annotation can further be customized with a `@HighlightParameters` annotation. Check the Javadocs for the possible configuration options.
-
-In the search results the highlight data can be retrieved from the `SearchHit` class.
-
 [[elasticsearch.annotation]]
 == Annotation based configuration
 
@@ -97,8 +40,7 @@ class ProductService {
 }
 ----
 
-<1> The `EnableElasticsearchRepositories` annotation activates the Repository support.
-If no base package is configured, it will use the one of the configuration class it is put on.
+<1> The `EnableElasticsearchRepositories` annotation activates the Repository support. If no base package is configured, it will use the one of the configuration class it is put on.
 <2> Provide a Bean named `elasticsearchTemplate` of type `ElasticsearchOperations` by using one of the configurations shown in the <<elasticsearch.operations>> chapter.
 <3> Let Spring inject the Repository bean into your class.
 ====
@@ -203,3 +145,5 @@ Using the `Transport Client` or `Rest Client` element registers an instance of `
 </beans>
 ----
 ====
+
+include::reactive-elasticsearch-repositories.adoc[leveloffset=+1]

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

@@ -8,14 +8,12 @@ The Elasticsearch module supports all basic query building feature as string que
 
 === Declared queries
 
-Deriving the query from the method name is not always sufficient and/or may result in unreadable method names.
-In this case one might make use of the `@Query` annotation (see <<elasticsearch.query-methods.at-query>> ).
+Deriving the query from the method name is not always sufficient and/or may result in unreadable method names. In this case one might make use of the `@Query` annotation (see <<elasticsearch.query-methods.at-query>> ).
 
 [[elasticsearch.query-methods.criterions]]
 == Query creation
 
-Generally the query creation mechanism for Elasticsearch works as described in <<repositories.query-methods>>.
-Here's a short example of what a Elasticsearch query method translates into:
+Generally the query creation mechanism for Elasticsearch works as described in <<repositories.query-methods>>. Here's a short example of what a Elasticsearch query method translates into:
 
 .Query creation from method names
 ====
@@ -45,22 +43,20 @@ The method name above will be translated into the following Elasticsearch json q
 
 A list of supported keywords for Elasticsearch is shown below.
 
-[cols="1,2,3",options="header"]
+[cols="1,2,3", options="header"]
 .Supported keywords inside method names
 |===
 | Keyword
 | Sample
-| Elasticsearch Query String
-
-| `And`
+| Elasticsearch Query String| `And`
 | `findByNameAndPrice`
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "?", "fields" : [ "name" ] } },
-{ "query_string" : { "query" : "?", "fields" : [ "price" ] } }
-]
-}
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } },
+      { "query_string" : { "query" : "?", "fields" : [ "price" ] } }
+    ]
+  }
 }}`
 
 | `Or`
@@ -68,10 +64,10 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "should" : [
-{ "query_string" : { "query" : "?", "fields" : [ "name" ] } },
-{ "query_string" : { "query" : "?", "fields" : [ "price" ] } }
-]
-}
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } },
+      { "query_string" : { "query" : "?", "fields" : [ "price" ] } }
+    ]
+  }
 }}`
 
 | `Is`
@@ -79,9 +75,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "?", "fields" : [ "name" ] } }
-]
-}
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } }
+    ]
+  }
 }}`
 
 | `Not`
@@ -89,9 +85,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must_not" : [
-{ "query_string" : { "query" : "?", "fields" : [ "name" ] } }
-]
-}
+      { "query_string" : { "query" : "?", "fields" : [ "name" ] } }
+    ]
+  }
 }}`
 
 | `Between`
@@ -99,9 +95,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : ?, "to" : ?, "include_lower" : true, "include_upper" : true } } }
-]
-}
+    {"range" : {"price" : {"from" : ?, "to" : ?, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
 }}`
 
 | `LessThan`
@@ -109,9 +105,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : false } } }
-]
-}
+    {"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : false } } }
+    ]
+  }
 }}`
 
 | `LessThanEqual`
@@ -119,9 +115,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : true } } }
-]
-}
+    {"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
 }}`
 
 | `GreaterThan`
@@ -129,9 +125,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : false, "include_upper" : true } } }
-]
-}
+    {"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : false, "include_upper" : true } } }
+    ]
+  }
 }}`
 
 
@@ -140,9 +136,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : true, "include_upper" : true } } }
-]
-}
+    {"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
 }}`
 
 | `Before`
@@ -150,9 +146,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : true } } }
-]
-}
+    {"range" : {"price" : {"from" : null, "to" : ?, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
 }}`
 
 | `After`
@@ -160,9 +156,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : true, "include_upper" : true } } }
-]
-}
+    {"range" : {"price" : {"from" : ?, "to" : null, "include_lower" : true, "include_upper" : true } } }
+    ]
+  }
 }}`
 
 | `Like`
@@ -170,9 +166,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
-]
-}
+      { "query_string" : { "query" : "?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
 }}`
 
 | `StartingWith`
@@ -180,9 +176,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
-]
-}
+      { "query_string" : { "query" : "?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
 }}`
 
 | `EndingWith`
@@ -190,9 +186,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "*?", "fields" : [ "name" ] }, "analyze_wildcard": true }
-]
-}
+      { "query_string" : { "query" : "*?", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
 }}`
 
 | `Contains/Containing`
@@ -200,47 +196,38 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "\*?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
-]
-}
+      { "query_string" : { "query" : "\*?*", "fields" : [ "name" ] }, "analyze_wildcard": true }
+    ]
+  }
 }}`
 
-| `In` (when annotated as FieldType.Keyword)
-| `findByNameIn(Collection<String>names)`
-| `{ "query" : {
-"bool" : {
-"must" : [
-{"bool" : {"must" : [
-{"terms" : {"name" : ["?","?"]}}
-]
-}
-}
-]
-}
-}}`
-
-
 | `In`
 | `findByNameIn(Collection<String>names)`
-| `{ "query": {"bool": {"must": [{"query_string":{"query": "\"?\" \"?\"", "fields": ["name"]}}]}}}`
-
-| `NotIn`  (when annotated as FieldType.Keyword)
-| `findByNameNotIn(Collection<String>names)`
 | `{ "query" : {
 "bool" : {
 "must" : [
-{"bool" : {"must_not" : [
-{"terms" : {"name" : ["?","?"]}}
-]
-}
-}
-]
-}
+      {"bool" : {"must" : [
+            {"terms" : {"name" : ["?","?"]}}
+          ]
+        }
+      }
+    ]
+  }
 }}`
 
 | `NotIn`
 | `findByNameNotIn(Collection<String>names)`
-| `{"query": {"bool": {"must": [{"query_string": {"query": "NOT(\"?\" \"?\")", "fields": ["name"]}}]}}}`
+| `{ "query" : {
+"bool" : {
+"must" : [
+      {"bool" : {"must_not" : [
+            {"terms" : {"name" : ["?","?"]}}
+          ]
+        }
+      }
+    ]
+  }
+}}`
 
 | `Near`
 | `findByStoreNear`
@@ -251,9 +238,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "true", "fields" : [ "available" ] } }
-]
-}
+      { "query_string" : { "query" : "true", "fields" : [ "available" ] } }
+    ]
+  }
 }}`
 
 | `False`
@@ -261,9 +248,9 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "false", "fields" : [ "available" ] } }
-]
-}
+      { "query_string" : { "query" : "false", "fields" : [ "available" ] } }
+    ]
+  }
 }}`
 
 | `OrderBy`
@@ -271,27 +258,21 @@ A list of supported keywords for Elasticsearch is shown below.
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "true", "fields" : [ "available" ] } }
-]
-}
+      { "query_string" : { "query" : "true", "fields" : [ "available" ] } }
+    ]
+  }
 }, "sort":[{"name":{"order":"desc"}}]
 }`
 
 |===
 
-NOTE: Methods names to build Geo-shape queries taking `GeoJson` parameters are not supported.
-Use `ElasticsearchOperations` with `CriteriaQuery` in a custom repository implementation if you need to have such a function in a repository.
-
 == Method return types
 
 Repository methods can be defined to have the following return types for returning multiple Elements:
 
 * `List<T>`
 * `Stream<T>`
-* `SearchHits<T>`
-* `List<SearchHit<T>>`
-* `Stream<SearchHit<T>>`
-* `SearchPage<T>`
+* `AggregatedPage<T>`
 
 [[elasticsearch.query-methods.at-query]]
 == Using @Query Annotation
@@ -305,10 +286,7 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
     Page<Book> findByName(String name,Pageable pageable);
 }
 ----
-
-The String that is set as the annotation argument must be a valid Elasticsearch JSON query.
-It will be sent to Easticsearch as value of the query element; if for example the function is called with the parameter _John_, it would produce the following query body:
-
+The String that is set as the annotation argument must be a valid Elasticsearch JSON query. It will be sent to Easticsearch as value of the query element; if for example the function is called with the parameter _John_, it would produce the following query body:
 [source,json]
 ----
 {

src/main/asciidoc/reference/migration-guides.adoc

@@ -1,9 +0,0 @@
-[[elasticsearch.migration]]
-= Appendix E: Migration Guides
-
-// line breaks required otherwise the TOC breaks due to joining of first/last lines.
-:leveloffset: +1
-include::elasticsearch-migration-guide-3.2-4.0.adoc[]
-
-include::elasticsearch-migration-guide-4.0-4.1.adoc[]
-:leveloffset: -1

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

@@ -82,7 +82,7 @@ Consider the following:
 ====
 [source,java]
 ----
-@Document(indexName = "marvel")
+@Document(indexName = "marvel", type = "characters")
 public class Person {
 
   private @Id String id;

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

@@ -1,37 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch;
-
-import org.springframework.dao.DataRetrievalFailureException;
-
-import java.util.Map;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.1
- */
-public class BulkFailureException extends DataRetrievalFailureException {
-	private final Map<String, String> failedDocuments;
-
-	public BulkFailureException(String msg, Map<String, String> failedDocuments) {
-		super(msg);
-		this.failedDocuments = failedDocuments;
-	}
-
-	public Map<String, String> getFailedDocuments() {
-		return failedDocuments;
-	}
-}

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

@@ -17,20 +17,15 @@ 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;
+	private Map<String, String> failedDocuments;
 
 	public ElasticsearchException(String message) {
 		super(message);
@@ -50,7 +45,6 @@ public class ElasticsearchException extends RuntimeException {
 		this.failedDocuments = failedDocuments;
 	}
 
-	@Nullable
 	public Map<String, String> getFailedDocuments() {
 		return failedDocuments;
 	}

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

@@ -1,33 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch;
-
-import org.springframework.dao.UncategorizedDataAccessException;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-public class UncategorizedElasticsearchException extends UncategorizedDataAccessException {
-
-	public UncategorizedElasticsearchException(String msg) {
-		super(msg, null);
-	}
-
-	public UncategorizedElasticsearchException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-}

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

@@ -1,5 +1,7 @@
 package org.springframework.data.elasticsearch.annotations;
 
+import org.elasticsearch.search.suggest.completion.context.ContextMapping;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -7,8 +9,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.elasticsearch.search.suggest.completion.context.ContextMapping;
-
 /**
  * Based on reference doc - https://www.elastic.co/guide/en/elasticsearch/reference/current/suggester-context.html
  *
@@ -26,5 +26,4 @@ public @interface CompletionContext {
 
 	String precision() default "";
 
-	String path() default "";
 }

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

@@ -16,58 +16,16 @@
 package org.springframework.data.elasticsearch.annotations;
 
 /**
- * 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
+ *         Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
  */
 public enum DateFormat {
-	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 //
+	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, 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, weekDateTimeNoMillis, week_year, weekyearWeek,
+	weekyearWeekDay, year, year_month, year_month_day
 }

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

@@ -22,6 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.elasticsearch.index.VersionType;
+
 import org.springframework.data.annotation.Persistent;
 
 /**
@@ -32,7 +33,6 @@ import org.springframework.data.annotation.Persistent;
  * @author Mason Chan
  * @author Ivan Greene
  * @author Mark Paluch
- * @author Peter-Josef Meisch
  */
 @Persistent
 @Inherited
@@ -53,17 +53,20 @@ public @interface Document {
 	 */
 	String indexName();
 
+	/**
+	 * Mapping type name.
+	 */
+	String type() default "";
+
 	/**
 	 * Use server-side settings when creating the index.
 	 */
 	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.
+	 * Number of shards for the index {@link #indexName()}. Used for index creation.
 	 */
-	short shards() default 1;
+	short shards() default 5;
 
 	/**
 	 * Number of replicas for the index {@link #indexName()}. Used for index creation.

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

@@ -1,37 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to set the dynamic mapping mode
- * {@see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic.html">elasticsearch doc</a>}
- * 
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.FIELD })
-@Documented
-public @interface DynamicMapping {
-
-	DynamicMappingValue value() default DynamicMappingValue.True;
-}

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

@@ -12,7 +12,7 @@ import org.springframework.data.annotation.Persistent;
  * Elasticsearch dynamic templates mapping.
  * This annotation is handy if you prefer apply dynamic templates on fields with annotation e.g. {@link Field}
  * with type = FieldType.Object etc. instead of static mapping on Document via {@link Mapping} annotation.
- * DynamicTemplates annotation is omitted if {@link Mapping} annotation is used.
+ * DynamicTemplates annotation is ommited if {@link Mapping} annotation is used.
  *
  * @author Petr Kukral
  */

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

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
+import org.springframework.core.annotation.AliasFor;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -22,8 +24,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.core.annotation.AliasFor;
-
 /**
  * @author Rizwan Idrees
  * @author Mohsin Husen
@@ -32,8 +32,6 @@ import org.springframework.core.annotation.AliasFor;
  * @author Jakub Vavrik
  * @author Kevin Leturc
  * @author Peter-Josef Meisch
- * @author Xiao Yu
- * @author Aleksei Arsenev
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
@@ -43,7 +41,6 @@ public @interface Field {
 
 	/**
 	 * Alias for {@link #name}.
-	 *
 	 * @since 3.2
 	 */
 	@AliasFor("name")
@@ -51,9 +48,7 @@ public @interface Field {
 
 	/**
 	 * The <em>name</em> to be used to store the field inside the document.
-	 * <p>
-	 * √5 If not set, the name of the annotated property is used.
-	 *
+	 * <p>If not set, the name of the annotated property is used.
 	 * @since 3.2
 	 */
 	@AliasFor("value")
@@ -82,107 +77,4 @@ public @interface Field {
 	boolean includeInParent() default false;
 
 	String[] copyTo() default {};
-
-	/**
-	 * @since 4.0
-	 */
-	int ignoreAbove() default -1;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean coerce() default true;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean docValues() default true;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean ignoreMalformed() default false;
-
-	/**
-	 * @since 4.0
-	 */
-	IndexOptions indexOptions() default IndexOptions.none;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean indexPhrases() default false;
-
-	/**
-	 * implemented as array to enable the empty default value
-	 *
-	 * @since 4.0
-	 */
-	IndexPrefixes[] indexPrefixes() default {};
-
-	/**
-	 * @since 4.0
-	 */
-	boolean norms() default true;
-
-	/**
-	 * @since 4.0
-	 */
-	String nullValue() default "";
-
-	/**
-	 * @since 4.0
-	 */
-	int positionIncrementGap() default -1;
-
-	/**
-	 * @since 4.0
-	 */
-	Similarity similarity() default Similarity.Default;
-
-	/**
-	 * @since 4.0
-	 */
-	TermVector termVector() default TermVector.none;
-
-	/**
-	 * @since 4.0
-	 */
-	double scalingFactor() default 1;
-
-	/**
-	 * @since 4.0
-	 */
-	int maxShingleSize() default -1;
-
-	/**
-	 * 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;
-
-	/**
-	 * to be used in combination with {@link FieldType#Object}
-	 *
-	 * @since 4.1
-	 */
-	boolean enabled() default true;
-
-	/**
-	 * @since 4.1
-	 */
-	boolean eagerGlobalOrdinals() default false;
-
-	/**
-	 * @since 4.1
-	 */
-	NullValueType nullValueType() default NullValueType.String;
 }

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

@@ -20,40 +20,22 @@ package org.springframework.data.elasticsearch.annotations;
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Zeng Zetang
- * @author Peter-Josef Meisch
- * @author Aleksei Arsenev
  */
 public enum FieldType {
-	Auto, //
-	Text, //
-	Keyword, //
-	Long, //
-	Integer, //
-	Short, //
-	Byte, //
-	Double, //
-	Float, //
-	Half_Float, //
-	Scaled_Float, //
-	Date, //
-	Date_Nanos, //
-	Boolean, //
-	Binary, //
-	Integer_Range, //
-	Float_Range, //
-	Long_Range, //
-	Double_Range, //
-	Date_Range, //
-	Ip_Range, //
-	Object, //
-	Nested, //
-	Ip, //
-	TokenCount, //
-	Percolator, //
-	Flattened, //
-	Search_As_You_Type, //
-	/** @since 4.1 */
-	Rank_Feature, //
-	/** @since 4.1 */
-	Rank_Features //
+	Text,
+	Byte,
+	Short,
+	Integer,
+	Long,
+	Date,
+	Half_Float,
+	Float,
+	Double,
+	Boolean,
+	Object,
+	Auto,
+	Nested,
+	Ip,
+	Attachment,
+	Keyword
 }

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

@@ -1,44 +0,0 @@
-/*
- * 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.
- * 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;
-
-/**
- * @author Lukas Vorisek
- * @author Peter-Josef Meisch
- * @since 4.1
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-public @interface GeoShapeField {
-	Orientation orientation() default Orientation.ccw;
-
-	boolean ignoreMalformed() default false;
-
-	boolean ignoreZValue() default true;
-
-	boolean coerce() default false;
-
-	enum Orientation {
-		right, ccw, counterclockwise, left, cw, clockwise
-	}
-}

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

@@ -1,37 +0,0 @@
-/*
- * 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.
- * 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.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HighlightField {
-
-	/**
-	 * The name of the field to apply highlighting to. This must be the field name of the entity's property, not the name
-	 * of the field in the index mappings.
-	 */
-	String name() default "";
-
-	HighlightParameters parameters() default @HighlightParameters;
-}

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

@@ -1,78 +0,0 @@
-/*
- * 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.
- * 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.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HighlightParameters {
-	String boundaryChars() default "";
-
-	int boundaryMaxScan() default -1;
-
-	String boundaryScanner() default "";
-
-	String boundaryScannerLocale() default "";
-
-	/**
-	 * only used for {@link Highlight}s.
-	 */
-	String encoder() default "";
-
-	boolean forceSource() default false;
-
-	String fragmenter() default "";
-
-	/**
-	 * only used for {@link HighlightField}s.
-	 */
-	int fragmentOffset() default -1;
-
-	int fragmentSize() default -1;
-
-	/**
-	 * only used for {@link HighlightField}s.
-	 */
-	String[] matchedFields() default {};
-
-	int noMatchSize() default -1;
-
-	int numberOfFragments() default -1;
-
-	String order() default "";
-
-	int phraseLimit() default -1;
-
-	String[] preTags() default {};
-
-	String[] postTags() default {};
-
-	boolean requireFieldMatch() default true;
-
-	/**
-	 * only used for {@link Highlight}s.
-	 */
-	String tagsSchema() default "";
-
-	String type() default "";
-}

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

@@ -24,12 +24,9 @@ import java.lang.annotation.Target;
  * @author Artur Konczak
  * @author Mohsin Husen
  * @author Sascha Woo
- * @author Xiao Yu
- * @author Peter-Josef Meisch
- * @author Aleksei Arsenev
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
+@Target(ElementType.FIELD)
 public @interface InnerField {
 
 	String suffix();
@@ -51,93 +48,4 @@ public @interface InnerField {
 	String analyzer() default "";
 
 	String normalizer() default "";
-
-	/**
-	 * @since 4.0
-	 */
-	int ignoreAbove() default -1;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean coerce() default true;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean docValues() default true;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean ignoreMalformed() default false;
-
-	/**
-	 * @since 4.0
-	 */
-	IndexOptions indexOptions() default IndexOptions.none;
-
-	/**
-	 * @since 4.0
-	 */
-	boolean indexPhrases() default false;
-
-	/**
-	 * implemented as array to enable the empty default value
-	 *
-	 * @since 4.0
-	 */
-	IndexPrefixes[] indexPrefixes() default {};
-
-	/**
-	 * @since 4.0
-	 */
-	boolean norms() default true;
-
-	/**
-	 * @since 4.0
-	 */
-	String nullValue() default "";
-
-	/**
-	 * @since 4.0
-	 */
-	int positionIncrementGap() default -1;
-
-	/**
-	 * @since 4.0
-	 */
-	Similarity similarity() default Similarity.Default;
-
-	/**
-	 * @since 4.0
-	 */
-	TermVector termVector() default TermVector.none;
-
-	/**
-	 * @since 4.0
-	 */
-	double scalingFactor() default 1;
-
-	/**
-	 * @since 4.0
-	 */
-	int maxShingleSize() default -1;
-
-	/**
-	 * to be used in combination with {@link FieldType#Rank_Feature}
-	 * 
-	 * @since 4.1
-	 */
-	boolean positiveScoreImpact() default true;
-
-	/**
-	 * @since 4.1
-	 */
-	boolean eagerGlobalOrdinals() default false;
-
-	/**
-	 * @since 4.1
-	 */
-	NullValueType nullValueType() default NullValueType.String;
 }

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

@@ -1,36 +0,0 @@
-/*
- * 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.
- * 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;
-
-/**
- * @author Subhobrata Dey
- * @since 4.1
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface JoinTypeRelation {
-
-	String parent();
-
-	String[] children();
-}

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

@@ -1,36 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Subhobrata Dey
- * @since 4.1
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Inherited
-public @interface JoinTypeRelations {
-
-	JoinTypeRelation[] relations();
-}

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

@@ -15,25 +15,20 @@
  */
 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 java.lang.annotation.*;
 
 /**
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Jonathan Yan
- * @author Xiao Yu
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
 public @interface MultiField {
 
-	Field mainField();
+	public Field mainField();
 
-	InnerField[] otherFields() default {};
+	public InnerField[] otherFields() default {};
 }

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

@@ -23,9 +23,8 @@ import org.springframework.data.annotation.Persistent;
  * Parent
  *
  * @author Philipp Jardas
- * @deprecated since 4.1, not supported anymore by Elasticsearch
  */
-@Deprecated
+
 @Persistent
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)

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

@@ -8,21 +8,16 @@ 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 {
-}
+public @interface Score {}

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

@@ -1,24 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-public enum TermVector {
-	none, no, yes, with_positions, with_offsets, with_positions_offsets, with_positions_payloads, with_positions_offsets_payloads
-}

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

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

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

@@ -21,13 +21,11 @@ import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
@@ -151,18 +149,17 @@ public interface ClientConfiguration {
 
 	/**
 	 * Returns the path prefix that should be prepended to HTTP(s) requests for Elasticsearch behind a proxy.
-	 * 
+	 *
 	 * @return the path prefix.
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
-	@Nullable
 	String getPathPrefix();
 
 	/**
 	 * returns an optionally set proxy in the form host:port
-	 * 
+	 *
 	 * @return the optional proxy
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
 	Optional<String> getProxy();
 
@@ -171,11 +168,6 @@ public interface ClientConfiguration {
 	 */
 	Function<WebClient, WebClient> getWebClientConfigurer();
 
-	/**
-	 * @return the supplier for custom headers.
-	 */
-	Supplier<HttpHeaders> getHeadersSupplier();
-
 	/**
 	 * @author Christoph Strobl
 	 */
@@ -320,10 +312,10 @@ public interface ClientConfiguration {
 
 		/**
 		 * Configure the path prefix that will be prepended to any HTTP(s) requests
-		 * 
+		 *
 		 * @param pathPrefix the pathPrefix.
 		 * @return the {@link TerminalClientConfigurationBuilder}
-		 * @since 4.0
+		 * @since 3.2.4
 		 */
 		TerminalClientConfigurationBuilder withPathPrefix(String pathPrefix);
 
@@ -341,19 +333,6 @@ public interface ClientConfiguration {
 		 */
 		TerminalClientConfigurationBuilder withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);
 
-		/**
-		 * 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
-		 */
-		TerminalClientConfigurationBuilder withHeaders(Supplier<HttpHeaders> headers);
-
 		/**
 		 * Build the {@link ClientConfiguration} object.
 		 *

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

@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javax.net.ssl.HostnameVerifier;
@@ -55,12 +54,11 @@ class ClientConfigurationBuilder
 	private @Nullable HostnameVerifier hostnameVerifier;
 	private Duration connectTimeout = Duration.ofSeconds(10);
 	private Duration soTimeout = Duration.ofSeconds(5);
-	private @Nullable String username;
-	private @Nullable String password;
-	private @Nullable String pathPrefix;
-	private @Nullable String proxy;
-	private Function<WebClient, WebClient> webClientConfigurer = Function.identity();
-	private Supplier<HttpHeaders> headersSupplier = () -> HttpHeaders.EMPTY;
+	private String username;
+	private String password;
+	private String pathPrefix;
+	private String proxy;
+	private Function<WebClient, WebClient> webClientConfigurer;
 
 	/*
 	 * (non-Javadoc)
@@ -198,8 +196,7 @@ class ClientConfigurationBuilder
 	}
 
 	@Override
-	public TerminalClientConfigurationBuilder withWebClientConfigurer(
-			Function<WebClient, WebClient> webClientConfigurer) {
+	public TerminalClientConfigurationBuilder withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer) {
 
 		Assert.notNull(webClientConfigurer, "webClientConfigurer must not be null");
 
@@ -207,15 +204,6 @@ class ClientConfigurationBuilder
 		return this;
 	}
 
-	@Override
-	public TerminalClientConfigurationBuilder withHeaders(Supplier<HttpHeaders> headers) {
-
-		Assert.notNull(headers, "headersSupplier must not be null");
-
-		this.headersSupplier = headers;
-		return this;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithOptionalDefaultHeaders#build()
@@ -231,7 +219,7 @@ class ClientConfigurationBuilder
 		}
 
 		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix,
-				hostnameVerifier, proxy, webClientConfigurer, headersSupplier);
+				hostnameVerifier, proxy, webClientConfigurer);
 	}
 
 	private static InetSocketAddress parse(String hostAndPort) {

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

@@ -20,7 +20,6 @@ import java.util.function.Supplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -91,7 +90,7 @@ public abstract class ClientLogger {
 	 * @param logId the correlation Id, see {@link #newLogId()}.
 	 * @param statusCode the HTTP status code.
 	 */
-	public static void logRawResponse(String logId, @Nullable HttpStatus statusCode) {
+	public static void logRawResponse(String logId, HttpStatus statusCode) {
 
 		if (isEnabled()) {
 			WIRE_LOGGER.trace("[{}] Received raw response: {}", logId, statusCode);

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

@@ -66,7 +66,7 @@ class ClusterNodes implements Streamable<TransportAddress> {
 			Assert.hasText(host, () -> String.format("No host name given cluster node %s!", node));
 			Assert.hasText(port, () -> String.format("No port given in cluster node %s!", node));
 
-			return new TransportAddress(toInetAddress(host), Integer.parseInt(port));
+			return new TransportAddress(toInetAddress(host), Integer.valueOf(port));
 
 		}).collect(Collectors.toList());
 	}

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

@@ -22,7 +22,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -48,16 +47,14 @@ class DefaultClientConfiguration implements ClientConfiguration {
 	private final @Nullable SSLContext sslContext;
 	private final Duration soTimeout;
 	private final Duration connectTimeout;
-	private final @Nullable String pathPrefix;
+	private final String pathPrefix;
 	private final @Nullable HostnameVerifier hostnameVerifier;
-	private final @Nullable String proxy;
+	private final String proxy;
 	private final Function<WebClient, WebClient> webClientConfigurer;
-	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, Supplier<HttpHeaders> headersSupplier) {
+			@Nullable HostnameVerifier hostnameVerifier, String proxy, Function<WebClient, WebClient> webClientConfigurer) {
 
 		this.hosts = Collections.unmodifiableList(new ArrayList<>(hosts));
 		this.headers = new HttpHeaders(headers);
@@ -69,7 +66,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		this.hostnameVerifier = hostnameVerifier;
 		this.proxy = proxy;
 		this.webClientConfigurer = webClientConfigurer;
-		this.headersSupplier = headersSupplier;
 	}
 
 	@Override
@@ -107,7 +103,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return this.soTimeout;
 	}
 
-	@Nullable
 	@Override
 	public String getPathPrefix() {
 		return this.pathPrefix;
@@ -120,11 +115,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 
 	@Override
 	public Function<WebClient, WebClient> getWebClientConfigurer() {
-		return webClientConfigurer;
-	}
-
-	@Override
-	public Supplier<HttpHeaders> getHeadersSupplier() {
-		return headersSupplier;
+		return webClientConfigurer != null ? webClientConfigurer : Function.identity();
 	}
 }

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

@@ -104,7 +104,7 @@ public class ElasticsearchHost {
 
 	@Override
 	public String toString() {
-		return "ElasticsearchHost(" + endpoint + ", " + state.name() + ')';
+		return "ElasticsearchHost(" + endpoint + ", " + state.name() + ")";
 	}
 
 	public enum State {

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

@@ -15,10 +15,11 @@
  */
 package org.springframework.data.elasticsearch.client;
 
+import static java.util.Arrays.*;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.node.NodeClient;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.FactoryBeanNotInitializedException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
 /**
@@ -43,35 +42,28 @@ import org.springframework.util.StringUtils;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Ilkang Na
- * @author Peter-Josef Meisch
- * @deprecated since 4.1, we're not supporting embedded Node clients anymore, use the REST client
  */
-@Deprecated
 public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingBean, DisposableBean {
 
 	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
 	private boolean local;
 	private boolean enableHttp;
-	private @Nullable String clusterName;
-	private @Nullable Node node;
-	private @Nullable NodeClient nodeClient;
-	private @Nullable String pathData;
-	private @Nullable String pathHome;
-	private @Nullable String pathConfiguration;
+	private String clusterName;
+	private NodeClient nodeClient;
+	private String pathData;
+	private String pathHome;
+	private String pathConfiguration;
 
 	public static class TestNode extends Node {
 
-		private static final String DEFAULT_NODE_NAME = "spring-data-elasticsearch-nodeclientfactorybean-test";
-
 		public TestNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
 
-			super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, Collections.emptyMap(), null,
-					() -> DEFAULT_NODE_NAME), classpathPlugins, false);
+			super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins, false);
 		}
 
 		protected void registerDerivedNodeNameWithLogger(String nodeName) {
 			try {
-				LogConfigurator.setNodeName(nodeName);
+				 LogConfigurator.setNodeName(nodeName);
 			} catch (Exception e) {
 				// nagh - just forget about it
 			}
@@ -85,12 +77,7 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 	}
 
 	@Override
-	public NodeClient getObject() {
-
-		if (nodeClient == null) {
-			throw new FactoryBeanNotInitializedException();
-		}
-
+	public NodeClient getObject() throws Exception {
 		return nodeClient;
 	}
 
@@ -107,17 +94,10 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 	@Override
 	public void afterPropertiesSet() throws Exception {
 
-		Settings settings = Settings.builder() //
-				.put(loadConfig()) //
-				.put("transport.type", "netty4") //
-				.put("http.type", "netty4") //
-				.put("path.home", this.pathHome) //
-				.put("path.data", this.pathData) //
-				.put("cluster.name", this.clusterName) //
-				.put("node.max_local_storage_nodes", 100) //
-				.build();
-		node = new TestNode(settings, Collections.singletonList(Netty4Plugin.class));
-		nodeClient = (NodeClient) node.start().client();
+		nodeClient = (NodeClient) new TestNode(Settings.builder().put(loadConfig()).put("transport.type", "netty4")
+				.put("http.type", "netty4").put("path.home", this.pathHome).put("path.data", this.pathData)
+				.put("cluster.name", this.clusterName).put("node.max_local_storage_nodes", 100).build(),
+				asList(Netty4Plugin.class)).start().client();
 	}
 
 	private Settings loadConfig() throws IOException {
@@ -157,14 +137,11 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 	}
 
 	@Override
-	public void destroy() {
+	public void destroy() throws Exception {
 		try {
-			// NodeClient.close() is a noop, no need to call it here
-			nodeClient = null;
-			logger.info("Closing elasticSearch node");
-			if (node != null) {
-				node.close();
-				node = null;
+			logger.info("Closing elasticSearch  client");
+			if (nodeClient != null) {
+				nodeClient.close();
 			}
 		} catch (final Exception e) {
 			logger.error("Error closing ElasticSearch client: ", e);

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

@@ -15,44 +15,40 @@
  */
 package org.springframework.data.elasticsearch.client;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.net.URL;
 import java.util.ArrayList;
 
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.FactoryBeanNotInitializedException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * RestClientFactoryBean
- *
+ * 
  * @author Don Wellington
- * @author Peter-Josef Meisch
  */
+@Slf4j
 public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RestClientFactoryBean.class);
-
-	private @Nullable RestHighLevelClient client;
+	private RestHighLevelClient client;
 	private String hosts = "http://localhost:9200";
 	static final String COMMA = ",";
 
 	@Override
-	public void destroy() {
+	public void destroy() throws Exception {
 		try {
-			LOGGER.info("Closing elasticSearch  client");
+			log.info("Closing elasticSearch  client");
 			if (client != null) {
 				client.close();
 			}
 		} catch (final Exception e) {
-			LOGGER.error("Error closing ElasticSearch client: ", e);
+			log.error("Error closing ElasticSearch client: ", e);
 		}
 	}
 
@@ -62,12 +58,7 @@ public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>,
 	}
 
 	@Override
-	public RestHighLevelClient getObject() {
-
-		if (client == null) {
-			throw new FactoryBeanNotInitializedException();
-		}
-
+	public RestHighLevelClient getObject() throws Exception {
 		return client;
 	}
 
@@ -84,8 +75,7 @@ public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>,
 	protected void buildClient() throws Exception {
 
 		Assert.hasText(hosts, "[Assertion Failed] At least one host must be set.");
-
-		ArrayList<HttpHost> httpHosts = new ArrayList<>();
+		ArrayList<HttpHost> httpHosts = new ArrayList<HttpHost>();
 		for (String host : hosts.split(COMMA)) {
 			URL hostUrl = new URL(host);
 			httpHosts.add(new HttpHost(hostUrl.getHost(), hostUrl.getPort(), hostUrl.getProtocol()));

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

@@ -20,11 +20,13 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.List;
-import java.util.function.Supplier;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
@@ -85,23 +87,31 @@ public final class RestClients {
 		HttpHeaders headers = clientConfiguration.getDefaultHeaders();
 
 		if (!headers.isEmpty()) {
-			builder.setDefaultHeaders(toHeaderArray(headers));
+
+			Header[] httpHeaders = headers.toSingleValueMap().entrySet().stream()
+					.map(it -> new BasicHeader(it.getKey(), it.getValue())).toArray(Header[]::new);
+			builder.setDefaultHeaders(httpHeaders);
 		}
 
 		builder.setHttpClientConfigCallback(clientBuilder -> {
-			clientConfiguration.getSslContext().ifPresent(clientBuilder::setSSLContext);
-			clientConfiguration.getHostNameVerifier().ifPresent(clientBuilder::setSSLHostnameVerifier);
-			clientBuilder.addInterceptorLast(new CustomHeaderInjector(clientConfiguration.getHeadersSupplier()));
+
+			Optional<SSLContext> sslContext = clientConfiguration.getSslContext();
+			Optional<HostnameVerifier> hostNameVerifier = clientConfiguration.getHostNameVerifier();
+			sslContext.ifPresent(clientBuilder::setSSLContext);
+			hostNameVerifier.ifPresent(clientBuilder::setSSLHostnameVerifier);
 
 			if (ClientLogger.isEnabled()) {
+
 				HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
 
 				clientBuilder.addInterceptorLast((HttpRequestInterceptor) interceptor);
 				clientBuilder.addInterceptorLast((HttpResponseInterceptor) interceptor);
 			}
 
-			Builder requestConfigBuilder = RequestConfig.custom();
 			Duration connectTimeout = clientConfiguration.getConnectTimeout();
+			Duration timeout = clientConfiguration.getSocketTimeout();
+
+			Builder requestConfigBuilder = RequestConfig.custom();
 
 			if (!connectTimeout.isNegative()) {
 
@@ -109,8 +119,6 @@ public final class RestClients {
 				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
 			}
 
-			Duration timeout = clientConfiguration.getSocketTimeout();
-
 			if (!timeout.isNegative()) {
 				requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis()));
 			}
@@ -126,16 +134,9 @@ public final class RestClients {
 		return () -> client;
 	}
 
-	private static Header[] toHeaderArray(HttpHeaders headers) {
-		return headers.entrySet().stream() //
-				.flatMap(entry -> entry.getValue().stream() //
-						.map(value -> new BasicHeader(entry.getKey(), value))) //
-				.toArray(Header[]::new);
-	}
-
 	private static List<String> formattedHosts(List<InetSocketAddress> hosts, boolean useSsl) {
-		return hosts.stream().map(it -> (useSsl ? "https" : "http") + "://" + it.getHostString() + ":" + it.getPort())
-				.collect(Collectors.toList());
+		return hosts.stream().map(it -> (useSsl ? "https" : "http") + "://" + it.getHostString() + ':' + it.getPort())
+			.collect(Collectors.toList());
 	}
 
 	/**
@@ -180,6 +181,7 @@ public final class RestClients {
 			String logId = (String) context.getAttribute(RestClients.LOG_ID_ATTRIBUTE);
 
 			if (logId == null) {
+
 				logId = ClientLogger.newLogId();
 				context.setAttribute(RestClients.LOG_ID_ATTRIBUTE, logId);
 			}
@@ -204,31 +206,10 @@ public final class RestClients {
 
 		@Override
 		public void process(HttpResponse response, HttpContext context) {
+
 			String logId = (String) context.getAttribute(RestClients.LOG_ID_ATTRIBUTE);
+
 			ClientLogger.logRawResponse(logId, HttpStatus.resolve(response.getStatusLine().getStatusCode()));
 		}
 	}
-
-	/**
-	 * Interceptor to inject custom supplied headers.
-	 * 
-	 * @since 4.0
-	 */
-	private static class CustomHeaderInjector implements HttpRequestInterceptor {
-
-		public CustomHeaderInjector(Supplier<HttpHeaders> headersSupplier) {
-			this.headersSupplier = headersSupplier;
-		}
-
-		private final Supplier<HttpHeaders> headersSupplier;
-
-		@Override
-		public void process(HttpRequest request, HttpContext context) {
-			HttpHeaders httpHeaders = headersSupplier.get();
-
-			if (httpHeaders != null && httpHeaders != HttpHeaders.EMPTY) {
-				Arrays.stream(toHeaderArray(httpHeaders)).forEach(request::addHeader);
-			}
-		}
-	}
 }

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

@@ -24,9 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.FactoryBeanNotInitializedException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
 
 /**
  * TransportClientFactoryBean
@@ -37,10 +35,7 @@ import org.springframework.lang.Nullable;
  * @author Piotr Betkier
  * @author Ilkang Na
  * @author Oliver Gierke
- * @author Peter-Josef Meisch
- * @deprecated as of 4.0
  */
-@Deprecated
 public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
 
 	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
@@ -50,11 +45,11 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	private Boolean clientIgnoreClusterName = Boolean.FALSE;
 	private String clientPingTimeout = "5s";
 	private String clientNodesSamplerInterval = "5s";
-	private @Nullable TransportClient client;
-	private @Nullable Properties properties;
+	private TransportClient client;
+	private Properties properties;
 
 	@Override
-	public void destroy() {
+	public void destroy() throws Exception {
 		try {
 			logger.info("Closing elasticSearch  client");
 			if (client != null) {
@@ -66,11 +61,7 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}
 
 	@Override
-	public TransportClient getObject() {
-
-		if (clientTransportSniff == null) {
-			throw new FactoryBeanNotInitializedException();
-		}
+	public TransportClient getObject() throws Exception {
 		return client;
 	}
 
@@ -89,14 +80,14 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 		buildClient();
 	}
 
-	protected void buildClient() {
+	protected void buildClient() throws Exception {
 
 		client = new PreBuiltTransportClient(settings());
-
+		
 		clusterNodes.stream() //
 				.peek(it -> logger.info("Adding transport node : " + it.toString())) //
 				.forEach(client::addTransportAddress);
-
+		
 		client.connectedNodes();
 	}
 
@@ -110,10 +101,13 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 
 			return builder.build();
 		}
-		return Settings.builder().put("cluster.name", clusterName).put("client.transport.sniff", clientTransportSniff)
+		return Settings.builder()
+				.put("cluster.name", clusterName)
+				.put("client.transport.sniff", clientTransportSniff)
 				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)
 				.put("client.transport.ping_timeout", clientPingTimeout)
-				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval).build();
+				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval)
+				.build();
 	}
 
 	public void setClusterNodes(String clusterNodes) {

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

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

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

@@ -1,7 +0,0 @@
-package org.springframework.data.elasticsearch.client.reactive;
-
-/**
- * @author Roman Puchkovskiy
- * @since 4.0
- */
-class DefaultRequestCreator implements RequestCreator {}

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

@@ -61,12 +61,12 @@ 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 webClientConfigurer 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,
 			Consumer<Throwable> errorListener, HttpHeaders headers, @Nullable String pathPrefix,

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

@@ -20,11 +20,9 @@ import reactor.core.publisher.Mono;
 import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.Set;
-import java.util.function.Supplier;
 
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
-import org.springframework.http.HttpHeaders;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.function.client.WebClient;
 
@@ -42,20 +40,18 @@ 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 endpoints must not be {@literal null} nor empty.
 	 * @return new instance of {@link HostProvider}.
 	 */
-	static HostProvider provider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
-			InetSocketAddress... endpoints) {
+	static HostProvider provider(WebClientProvider clientProvider, InetSocketAddress... endpoints) {
 
 		Assert.notNull(clientProvider, "WebClientProvider must not be null");
 		Assert.notEmpty(endpoints, "Please provide at least one endpoint to connect to.");
 
 		if (endpoints.length == 1) {
-			return new SingleNodeHostProvider(clientProvider, headersSupplier, endpoints[0]);
+			return new SingleNodeHostProvider(clientProvider, endpoints[0]);
 		} else {
-			return new MultiNodeHostProvider(clientProvider,headersSupplier, endpoints);
+			return new MultiNodeHostProvider(clientProvider, endpoints);
 		}
 	}
 

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

@@ -27,12 +27,10 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
-import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -47,13 +45,11 @@ import org.springframework.web.reactive.function.client.WebClient;
 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, InetSocketAddress... endpoints) {
 
 		this.clientProvider = clientProvider;
-		this.headersSupplier = headersSupplier;
 		this.hosts = new ConcurrentHashMap<>();
 		for (InetSocketAddress endpoint : endpoints) {
 			this.hosts.put(endpoint, new ElasticsearchHost(endpoint, State.UNKNOWN));
@@ -64,7 +60,6 @@ class MultiNodeHostProvider implements HostProvider {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.reactive.HostProvider#clusterInfo()
 	 */
-	@Override
 	public Mono<ClusterInformation> clusterInfo() {
 		return nodes(null).map(this::updateNodeState).buffer(hosts.size())
 				.then(Mono.just(new ClusterInformation(new LinkedHashSet<>(this.hosts.values()))));
@@ -121,15 +116,15 @@ class MultiNodeHostProvider implements HostProvider {
 				.map(ElasticsearchHost::getEndpoint).next();
 	}
 
-	private ElasticsearchHost updateNodeState(Tuple2<InetSocketAddress, State> tuple2) {
+	private ElasticsearchHost updateNodeState(Tuple2<InetSocketAddress, ClientResponse> tuple2) {
 
-		State state = tuple2.getT2();
+		State state = tuple2.getT2().statusCode().isError() ? State.OFFLINE : State.ONLINE;
 		ElasticsearchHost elasticsearchHost = new ElasticsearchHost(tuple2.getT1(), state);
 		hosts.put(tuple2.getT1(), elasticsearchHost);
 		return elasticsearchHost;
 	}
 
-	private Flux<Tuple2<InetSocketAddress, State>> nodes(@Nullable State state) {
+	private Flux<Tuple2<InetSocketAddress, ClientResponse>> nodes(@Nullable State state) {
 
 		return Flux.fromIterable(hosts()) //
 				.filter(entry -> state == null || entry.getState().equals(state)) //
@@ -137,15 +132,13 @@ class MultiNodeHostProvider implements HostProvider {
 				.flatMap(host -> {
 
 					Mono<ClientResponse> exchange = createWebClient(host) //
-							.head().uri("/") //
-							.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
-							.exchange().doOnError(throwable -> {
+							.head().uri("/").exchange().doOnError(throwable -> {
+
 								hosts.put(host, new ElasticsearchHost(host, State.OFFLINE));
 								clientProvider.getErrorListener().accept(throwable);
 							});
 
-					return Mono.just(host).zipWith(exchange
-							.flatMap(it -> it.releaseBody().thenReturn(it.statusCode().isError() ? State.OFFLINE : State.ONLINE)));
+					return Mono.just(host).zipWith(exchange);
 				}) //
 				.onErrorContinue((throwable, o) -> clientProvider.getErrorListener().accept(throwable));
 	}

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

@@ -15,12 +15,7 @@
  */
 package org.springframework.data.elasticsearch.client.reactive;
 
-import reactor.core.publisher.Mono;
-
-import java.io.IOException;
-
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.common.io.stream.StreamOutput;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.reactive.ClientHttpResponse;
@@ -66,21 +61,4 @@ class RawActionResponse extends ActionResponse {
 	public <T> T body(BodyExtractor<T, ? super ClientHttpResponse> extractor) {
 		return delegate.body(extractor);
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * until Elasticsearch 7.4 this empty implementation was available in the abstract base class
-	 */
-	@Override
-	public void writeTo(StreamOutput out) throws IOException {
-	}
-
-	/**
-	 * Ensure the response body is released to properly release the underlying connection.
-	 *
-	 * @return
-	 */
-	public Mono<Void> releaseBody() {
-		return delegate.releaseBody();
-	}
 }

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

@@ -22,21 +22,14 @@ import java.net.ConnectException;
 import java.util.Collection;
 import java.util.function.Consumer;
 
-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;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
-import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -50,21 +43,14 @@ import org.elasticsearch.action.search.SearchRequest;
 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.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
-import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
-import org.elasticsearch.client.indices.PutIndexTemplateRequest;
+import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 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.http.HttpHeaders;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -76,7 +62,6 @@ import org.springframework.web.reactive.function.client.WebClient;
  * @author Mark Paluch
  * @author Peter-Josef Meisch
  * @author Henrique Amaral
- * @author Thomas Geese
  * @since 3.2
  * @see ClientConfiguration
  * @see ReactiveRestClients
@@ -355,39 +340,39 @@ public interface ReactiveElasticsearchClient {
 	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html">Count API on
 	 *      elastic.co</a>
 	 * @return the {@link Mono} emitting the count result.
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
-	default Mono<Long> count(Consumer<SearchRequest> consumer) {
+	default Mono<Long> count(Consumer<CountRequest> consumer) {
 
-		SearchRequest searchRequest = new SearchRequest();
-		consumer.accept(searchRequest);
-		return count(searchRequest);
+		CountRequest countRequest = new CountRequest();
+		consumer.accept(countRequest);
+		return count(countRequest);
 	}
 
 	/**
-	 * Execute a {@link SearchRequest} against the {@literal search} API.
+	 * Execute a {@link SearchRequest} against the {@literal count} API.
 	 *
-	 * @param searchRequest must not be {@literal null}.
+	 * @param countRequest must not be {@literal null}.
 	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html">Count API on
 	 *      elastic.co</a>
 	 * @return the {@link Mono} emitting the count result.
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
-	default Mono<Long> count(SearchRequest searchRequest) {
-		return count(HttpHeaders.EMPTY, searchRequest);
+	default Mono<Long> count(CountRequest countRequest) {
+		return count(HttpHeaders.EMPTY, countRequest);
 	}
 
 	/**
-	 * Execute a {@link SearchRequest} against the {@literal search} API.
+	 * Execute a {@link SearchRequest} against the {@literal count} API.
 	 *
 	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-	 * @param searchRequest must not be {@literal null}.
+	 * @param countRequest must not be {@literal null}.
 	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html">Count API on
 	 *      elastic.co</a>
 	 * @return the {@link Mono} emitting the count result.
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
-	Mono<Long> count(HttpHeaders headers, SearchRequest searchRequest);
+	Mono<Long> count(HttpHeaders headers, CountRequest countRequest);
 
 	/**
 	 * Execute a {@link SearchRequest} against the {@literal search} API.
@@ -427,109 +412,6 @@ public interface ReactiveElasticsearchClient {
 	 */
 	Flux<SearchHit> search(HttpHeaders headers, SearchRequest searchRequest);
 
-	/**
-	 * Execute the given {@link SearchRequest} against the {@literal search} API returning the whole response in one Mono.
-	 *
-	 * @param searchRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html">Search API on
-	 *      elastic.co</a>
-	 * @return the {@link Mono} emitting the whole {@link SearchResponse}.
-	 * @since 4.1
-	 */
-	default Mono<SearchResponse> searchForResponse(SearchRequest searchRequest) {
-		return searchForResponse(HttpHeaders.EMPTY, searchRequest);
-	}
-
-	/**
-	 * Execute the given {@link SearchRequest} against the {@literal search} API returning the whole response in one Mono.
-	 *
-	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-	 * @param searchRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html">Search API on
-	 *      elastic.co</a>
-	 * @return the {@link Mono} emitting the whole {@link SearchResponse}.
-	 * @since 4.1
-	 */
-	Mono<SearchResponse> searchForResponse(HttpHeaders headers, SearchRequest searchRequest);
-
-	/**
-	 * Execute the given {@link SearchRequest} against the {@literal search} API.
-	 *
-	 * @param consumer never {@literal null}.
-	 * @return the {@link Flux} emitting {@link Suggest suggestions} one by one.
-	 * @since 4.1
-	 */
-	default Flux<Suggest> suggest(Consumer<SearchRequest> consumer) {
-
-		SearchRequest request = new SearchRequest();
-		consumer.accept(request);
-		return suggest(request);
-	}
-
-	/**
-	 * Execute the given {@link SearchRequest} against the {@literal search} API.
-	 *
-	 * @param searchRequest must not be {@literal null}.
-	 * @return the {@link Flux} emitting {@link Suggest suggestions} one by one.
-	 * @since 4.1
-	 */
-	default Flux<Suggest> suggest(SearchRequest searchRequest) {
-		return suggest(HttpHeaders.EMPTY, searchRequest);
-	}
-
-	/**
-	 * Execute the given {@link SearchRequest} against the {@literal search} API.
-	 *
-	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-	 * @param searchRequest must not be {@literal null}.
-	 * @return the {@link Flux} emitting {@link Suggest suggestions} one by one.
-	 * @since 4.1
-	 */
-	Flux<Suggest> suggest(HttpHeaders headers, SearchRequest searchRequest);
-
-	/**
-	 * Execute the given {@link SearchRequest} with aggregations against the {@literal search} API.
-	 *
-	 * @param consumer never {@literal null}.
-	 * @return the {@link Flux} emitting {@link Aggregation} one by one.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html">Search API on
-	 *      elastic.co</a>
-	 * @since 4.0
-	 */
-	default Flux<Aggregation> aggregate(Consumer<SearchRequest> consumer) {
-
-		Assert.notNull(consumer, "consumer must not be null");
-
-		SearchRequest request = new SearchRequest();
-		consumer.accept(request);
-		return aggregate(request);
-	}
-
-	/**
-	 * Execute the given {@link SearchRequest} with aggregations against the {@literal search} API.
-	 *
-	 * @param searchRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html">Search API on
-	 *      elastic.co</a>
-	 * @return the {@link Flux} emitting {@link Aggregation} one by one.
-	 * @since 4.0
-	 */
-	default Flux<Aggregation> aggregate(SearchRequest searchRequest) {
-		return aggregate(HttpHeaders.EMPTY, searchRequest);
-	}
-
-	/**
-	 * Execute the given {@link SearchRequest} with aggregations against the {@literal search} API.
-	 *
-	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-	 * @param searchRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html">Search API on
-	 *      elastic.co</a>
-	 * @return the {@link Flux} emitting {@link Aggregation} one by one.
-	 * @since 4.0
-	 */
-	Flux<Aggregation> aggregate(HttpHeaders headers, SearchRequest searchRequest);
-
 	/**
 	 * Execute the given {@link SearchRequest} against the {@literal search scroll} API.
 	 *
@@ -638,11 +520,9 @@ public interface ReactiveElasticsearchClient {
 	 * unavailable.
 	 *
 	 * @param callback the {@link ReactiveElasticsearchClientCallback callback} wielding the actual command to run.
-	 * @param <T> the type emitted by the returned Mono.
 	 * @return the {@link Mono} emitting the {@link ClientResponse} once subscribed.
 	 */
-	@SuppressWarnings("JavaDoc")
-	<T> Mono<T> execute(ReactiveElasticsearchClientCallback<T> callback);
+	Mono<ClientResponse> execute(ReactiveElasticsearchClientCallback callback);
 
 	/**
 	 * Get the current client {@link Status}. <br />
@@ -656,12 +536,11 @@ public interface ReactiveElasticsearchClient {
 	/**
 	 * Low level callback interface operating upon {@link WebClient} to send commands towards elasticsearch.
 	 *
-	 * @param <T> the type emitted by the returned Mono.
 	 * @author Christoph Strobl
 	 * @since 3.2
 	 */
-	interface ReactiveElasticsearchClientCallback<T> {
-		Mono<T> doWithClient(WebClient client);
+	interface ReactiveElasticsearchClientCallback {
+		Mono<ClientResponse> doWithClient(WebClient client);
 	}
 
 	/**
@@ -750,7 +629,7 @@ public interface ReactiveElasticsearchClient {
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-delete-index.html"> Indices
 		 *      Delete API on elastic.co</a>
 		 */
-		default Mono<Boolean> deleteIndex(Consumer<DeleteIndexRequest> consumer) {
+		default Mono<Void> deleteIndex(Consumer<DeleteIndexRequest> consumer) {
 
 			DeleteIndexRequest request = new DeleteIndexRequest();
 			consumer.accept(request);
@@ -766,7 +645,7 @@ public interface ReactiveElasticsearchClient {
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-delete-index.html"> Indices
 		 *      Delete API on elastic.co</a>
 		 */
-		default Mono<Boolean> deleteIndex(DeleteIndexRequest deleteIndexRequest) {
+		default Mono<Void> deleteIndex(DeleteIndexRequest deleteIndexRequest) {
 			return deleteIndex(HttpHeaders.EMPTY, deleteIndexRequest);
 		}
 
@@ -780,18 +659,18 @@ public interface ReactiveElasticsearchClient {
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-delete-index.html"> Indices
 		 *      Delete API on elastic.co</a>
 		 */
-		Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest deleteIndexRequest);
+		Mono<Void> deleteIndex(HttpHeaders headers, DeleteIndexRequest deleteIndexRequest);
 
 		/**
 		 * 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.
+		 * @return a {@link Mono} signalling 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>
 		 */
-		default Mono<Boolean> createIndex(Consumer<CreateIndexRequest> consumer) {
+		default Mono<Void> createIndex(Consumer<CreateIndexRequest> consumer) {
 
 			CreateIndexRequest request = new CreateIndexRequest();
 			consumer.accept(request);
@@ -802,12 +681,12 @@ public interface ReactiveElasticsearchClient {
 		 * Execute the given {@link 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.
+		 * @return a {@link Mono} signalling 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>
 		 */
-		default Mono<Boolean> createIndex(CreateIndexRequest createIndexRequest) {
+		default Mono<Void> createIndex(CreateIndexRequest createIndexRequest) {
 			return createIndex(HttpHeaders.EMPTY, createIndexRequest);
 		}
 
@@ -816,12 +695,12 @@ public interface ReactiveElasticsearchClient {
 		 *
 		 * @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.
+		 * @return a {@link Mono} signalling 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>
 		 */
-		Mono<Boolean> createIndex(HttpHeaders headers, CreateIndexRequest createIndexRequest);
+		Mono<Void> createIndex(HttpHeaders headers, CreateIndexRequest createIndexRequest);
 
 		/**
 		 * Execute the given {@link OpenIndexRequest} against the {@literal indices} API.
@@ -954,58 +833,12 @@ 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>
-		 * @deprecated since 4.1, use {@link #putMapping(Consumer)}
 		 */
-		@Deprecated
-		default Mono<Boolean> updateMapping(Consumer<PutMappingRequest> consumer) {
-			return putMapping(consumer);
-		}
-
-		/**
-		 * 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
-		 *         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.1, use {@link #putMapping(PutMappingRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> updateMapping(PutMappingRequest putMappingRequest) {
-			return putMapping(putMappingRequest);
-		}
-
-		/**
-		 * 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}.
-		 * @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.1, use {@link #putMapping(HttpHeaders, PutMappingRequest)}
-		 */
-		@Deprecated
-		default Mono<Boolean> updateMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
-			return putMapping(headers, putMappingRequest);
-		}
-
-		/**
-		 * 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>
-		 */
-		default Mono<Boolean> putMapping(Consumer<PutMappingRequest> consumer) {
+		default Mono<Void> updateMapping(Consumer<PutMappingRequest> consumer) {
 
 			PutMappingRequest request = new PutMappingRequest();
 			consumer.accept(request);
-			return putMapping(request);
+			return updateMapping(request);
 		}
 
 		/**
@@ -1017,8 +850,8 @@ public interface ReactiveElasticsearchClient {
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
 		 *      Put Mapping API on elastic.co</a>
 		 */
-		default Mono<Boolean> putMapping(PutMappingRequest putMappingRequest) {
-			return putMapping(HttpHeaders.EMPTY, putMappingRequest);
+		default Mono<Void> updateMapping(PutMappingRequest putMappingRequest) {
+			return updateMapping(HttpHeaders.EMPTY, putMappingRequest);
 		}
 
 		/**
@@ -1031,7 +864,7 @@ public interface ReactiveElasticsearchClient {
 		 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-put-mapping.html"> Indices
 		 *      Put Mapping API on elastic.co</a>
 		 */
-		Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest);
+		Mono<Void> updateMapping(HttpHeaders headers, PutMappingRequest putMappingRequest);
 
 		/**
 		 * Execute the given {@link FlushRequest} against the {@literal indices} API.
@@ -1073,300 +906,5 @@ public interface ReactiveElasticsearchClient {
 		 *      API on elastic.co</a>
 		 */
 		Mono<Void> flushIndex(HttpHeaders headers, FlushRequest flushRequest);
-
-		/**
-		 * Execute the given {@link GetSettingsRequest} 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-settings.html"> Indices
-		 *      Flush API on elastic.co</a>
-		 * @since 4.1
-		 */
-		default Mono<GetSettingsResponse> getSettings(Consumer<GetSettingsRequest> consumer) {
-
-			GetSettingsRequest request = new GetSettingsRequest();
-			consumer.accept(request);
-			return getSettings(request);
-		}
-
-		/**
-		 * Execute the given {@link GetSettingsRequest} against the {@literal indices} API.
-		 *
-		 * @param getSettingsRequest 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-settings.html"> Indices
-		 *      Flush API on elastic.co</a>
-		 * @since 4.1
-		 */
-		default Mono<GetSettingsResponse> getSettings(GetSettingsRequest getSettingsRequest) {
-			return getSettings(HttpHeaders.EMPTY, getSettingsRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetSettingsRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getSettingsRequest 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-settings.html"> Indices
-		 *      Flush API on elastic.co</a>
-		 * @since 4.1
-		 */
-		Mono<GetSettingsResponse> getSettings(HttpHeaders headers, GetSettingsRequest getSettingsRequest);
-
-		/**
-		 * 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
-		 *         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
-		 */
-		default Mono<GetMappingsResponse> getMapping(Consumer<GetMappingsRequest> consumer) {
-
-			GetMappingsRequest request = new GetMappingsRequest();
-			consumer.accept(request);
-			return getMapping(request);
-		}
-
-		/**
-		 * Execute the given {@link 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
-		 */
-		default Mono<GetMappingsResponse> getMapping(GetMappingsRequest getMappingsRequest) {
-			return getMapping(HttpHeaders.EMPTY, getMappingsRequest);
-		}
-
-		/**
-		 * Execute the given {@link 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
-		 */
-		Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest);
-
-		/**
-		 * 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
-		 */
-		default Mono<Boolean> updateAliases(Consumer<IndicesAliasesRequest> consumer) {
-			IndicesAliasesRequest indicesAliasesRequest = new IndicesAliasesRequest();
-			consumer.accept(indicesAliasesRequest);
-			return updateAliases(indicesAliasesRequest);
-		}
-
-		/**
-		 * 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
-		 */
-		default Mono<Boolean> updateAliases(IndicesAliasesRequest indicesAliasesRequest) {
-			return updateAliases(HttpHeaders.EMPTY, indicesAliasesRequest);
-		}
-
-		/**
-		 * 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.
-		 * @since 4.1
-		 */
-		Mono<Boolean> updateAliases(HttpHeaders headers, IndicesAliasesRequest indicesAliasesRequest);
-
-		/**
-		 * Execute the given {@link GetAliasesRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return a {@link Mono} signalling operation completion.
-		 * @since 4.1
-		 */
-		default Mono<GetAliasesResponse> getAliases(Consumer<GetAliasesRequest> consumer) {
-			GetAliasesRequest getAliasesRequest = new GetAliasesRequest();
-			consumer.accept(getAliasesRequest);
-			return getAliases(getAliasesRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetAliasesRequest} against the {@literal indices} API.
-		 *
-		 * @param getAliasesRequest must not be {@literal null}
-		 * @return a {@link Mono} signalling operation completion.
-		 * @since 4.1
-		 */
-		default Mono<GetAliasesResponse> getAliases(GetAliasesRequest getAliasesRequest) {
-			return getAliases(HttpHeaders.EMPTY, getAliasesRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetAliasesRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getAliasesRequest must not be {@literal null}
-		 * @return a {@link Mono} signalling operation completion.
-		 * @since 4.1
-		 */
-		Mono<GetAliasesResponse> getAliases(HttpHeaders headers, GetAliasesRequest getAliasesRequest);
-
-		/**
-		 * Execute the given {@link PutIndexTemplateRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return a {@link Mono} signalling operation completion.
-		 * @since 4.1
-		 */
-		default Mono<Boolean> putTemplate(Consumer<PutIndexTemplateRequest> consumer, String templateName) {
-			PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest(templateName);
-			consumer.accept(putIndexTemplateRequest);
-			return putTemplate(putIndexTemplateRequest);
-		}
-
-		/**
-		 * Execute the given {@link PutIndexTemplateRequest} against the {@literal indices} API.
-		 *
-		 * @param putIndexTemplateRequest must not be {@literal null}
-		 * @return a {@link Mono} signalling operation completion.
-		 * @since 4.1
-		 */
-		default Mono<Boolean> putTemplate(PutIndexTemplateRequest putIndexTemplateRequest) {
-			return putTemplate(HttpHeaders.EMPTY, putIndexTemplateRequest);
-		}
-
-		/**
-		 * Execute the given {@link PutIndexTemplateRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param putIndexTemplateRequest must not be {@literal null}
-		 * @return a {@link Mono} signalling operation completion.
-		 * @since 4.1
-		 */
-		Mono<Boolean> putTemplate(HttpHeaders headers, PutIndexTemplateRequest putIndexTemplateRequest);
-
-		/**
-		 * Execute the given {@link GetIndexTemplatesRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return a {@link Mono} with the GetIndexTemplatesResponse.
-		 * @since 4.1
-		 */
-		default Mono<GetIndexTemplatesResponse> getTemplate(Consumer<GetIndexTemplatesRequest> consumer) {
-
-			GetIndexTemplatesRequest getIndexTemplatesRequest = new GetIndexTemplatesRequest();
-			consumer.accept(getIndexTemplatesRequest);
-			return getTemplate(getIndexTemplatesRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetIndexTemplatesRequest} against the {@literal indices} API.
-		 *
-		 * @param getIndexTemplatesRequest must not be {@literal null}
-		 * @return a {@link Mono} with the GetIndexTemplatesResponse.
-		 * @since 4.1
-		 */
-		default Mono<GetIndexTemplatesResponse> getTemplate(GetIndexTemplatesRequest getIndexTemplatesRequest) {
-			return getTemplate(HttpHeaders.EMPTY, getIndexTemplatesRequest);
-		}
-
-		/**
-		 * Execute the given {@link GetIndexTemplatesRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param getIndexTemplatesRequest must not be {@literal null}
-		 * @return a {@link Mono} with the GetIndexTemplatesResponse.
-		 * @since 4.1
-		 */
-		Mono<GetIndexTemplatesResponse> getTemplate(HttpHeaders headers, GetIndexTemplatesRequest getIndexTemplatesRequest);
-
-		/**
-		 * Execute the given {@link IndexTemplatesExistRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return the {@link Mono} emitting {@literal true} if the template exists, {@literal false} otherwise.
-		 * @since 4.1
-		 */
-		default Mono<Boolean> existsTemplate(Consumer<IndexTemplatesExistRequest> consumer) {
-
-			IndexTemplatesExistRequest indexTemplatesExistRequest = new IndexTemplatesExistRequest();
-			consumer.accept(indexTemplatesExistRequest);
-			return existsTemplate(indexTemplatesExistRequest);
-		}
-
-		/**
-		 * Execute the given {@link IndexTemplatesExistRequest} against the {@literal indices} API.
-		 *
-		 * @param indexTemplatesExistRequest must not be {@literal null}
-		 * @return the {@link Mono} emitting {@literal true} if the template exists, {@literal false} otherwise.
-		 * @since 4.1
-		 */
-		default Mono<Boolean> existsTemplate(IndexTemplatesExistRequest indexTemplatesExistRequest) {
-			return existsTemplate(HttpHeaders.EMPTY, indexTemplatesExistRequest);
-		}
-
-		/**
-		 * Execute the given {@link IndexTemplatesExistRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param indexTemplatesExistRequest must not be {@literal null}
-		 * @return the {@link Mono} emitting {@literal true} if the template exists, {@literal false} otherwise.
-		 * @since 4.1
-		 */
-		Mono<Boolean> existsTemplate(HttpHeaders headers, IndexTemplatesExistRequest indexTemplatesExistRequest);
-
-		/**
-		 * Execute the given {@link DeleteIndexTemplateRequest} against the {@literal indices} API.
-		 *
-		 * @param consumer never {@literal null}.
-		 * @return the {@link Mono} emitting {@literal true} if the template exists, {@literal false} otherwise.
-		 * @since 4.1
-		 */
-		default Mono<Boolean> deleteTemplate(Consumer<DeleteIndexTemplateRequest> consumer) {
-
-			DeleteIndexTemplateRequest deleteIndexTemplateRequest = new DeleteIndexTemplateRequest();
-			consumer.accept(deleteIndexTemplateRequest);
-			return deleteTemplate(deleteIndexTemplateRequest);
-		}
-
-		/**
-		 * Execute the given {@link DeleteIndexTemplateRequest} against the {@literal indices} API.
-		 *
-		 * @param deleteIndexTemplateRequest must not be {@literal null}
-		 * @return the {@link Mono} emitting {@literal true} if the template exists, {@literal false} otherwise.
-		 * @since 4.1
-		 */
-		default Mono<Boolean> deleteTemplate(DeleteIndexTemplateRequest deleteIndexTemplateRequest) {
-			return deleteTemplate(HttpHeaders.EMPTY, deleteIndexTemplateRequest);
-		}
-
-		/**
-		 * Execute the given {@link DeleteIndexTemplateRequest} against the {@literal indices} API.
-		 *
-		 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
-		 * @param deleteIndexTemplateRequest must not be {@literal null}
-		 * @return the {@link Mono} emitting {@literal true} if the template exists, {@literal false} otherwise.
-		 * @since 4.1
-		 */
-		Mono<Boolean> deleteTemplate(HttpHeaders headers, DeleteIndexTemplateRequest deleteIndexTemplateRequest);
 	}
 }

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

@@ -24,7 +24,6 @@ import org.springframework.util.Assert;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Roman Puchkovskiy
  * @since 3.2
  */
 public final class ReactiveRestClients {
@@ -34,8 +33,6 @@ public final class ReactiveRestClients {
 	/**
 	 * Start here to create a new client tailored to your needs.
 	 *
-	 * @param clientConfiguration client configuration to use for building {@link ReactiveElasticsearchClient}; must not
-	 *          be {@literal null}.
 	 * @return new instance of {@link ReactiveElasticsearchClient}.
 	 */
 	public static ReactiveElasticsearchClient create(ClientConfiguration clientConfiguration) {
@@ -44,21 +41,4 @@ public final class ReactiveRestClients {
 
 		return DefaultReactiveElasticsearchClient.create(clientConfiguration);
 	}
-
-	/**
-	 * Start here to create a new client tailored to your needs.
-	 *
-	 * @param clientConfiguration client configuration to use for building {@link ReactiveElasticsearchClient}; must not
-	 *          be {@literal null}.
-	 * @param requestCreator request creator to use in the client; must not be {@literal null}.
-	 * @return new instance of {@link ReactiveElasticsearchClient}.
-	 */
-	public static ReactiveElasticsearchClient create(ClientConfiguration clientConfiguration,
-			RequestCreator requestCreator) {
-
-		Assert.notNull(clientConfiguration, "ClientConfiguration must not be null!");
-		Assert.notNull(requestCreator, "RequestCreator must not be null!");
-
-		return DefaultReactiveElasticsearchClient.create(clientConfiguration, requestCreator);
-	}
 }

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

@@ -1,197 +0,0 @@
-package org.springframework.data.elasticsearch.client.reactive;
-
-import java.io.IOException;
-import java.util.function.Function;
-
-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;
-import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
-import org.elasticsearch.action.bulk.BulkRequest;
-import org.elasticsearch.action.delete.DeleteRequest;
-import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.MultiGetRequest;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.main.MainRequest;
-import org.elasticsearch.action.search.ClearScrollRequest;
-import org.elasticsearch.action.search.SearchRequest;
-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.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
-import org.elasticsearch.client.indices.PutIndexTemplateRequest;
-import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
-import org.springframework.data.elasticsearch.client.util.RequestConverters;
-
-/**
- * @author Roman Puchkovskiy
- * @since 4.0
- */
-public interface RequestCreator {
-
-	default Function<SearchRequest, Request> search() {
-		return RequestConverters::search;
-	}
-
-	default Function<SearchScrollRequest, Request> scroll() {
-		return RequestConverters::searchScroll;
-	}
-
-	default Function<ClearScrollRequest, Request> clearScroll() {
-		return RequestConverters::clearScroll;
-	}
-
-	default Function<IndexRequest, Request> index() {
-		return RequestConverters::index;
-	}
-
-	default Function<GetRequest, Request> get() {
-		return RequestConverters::get;
-	}
-
-	default Function<MainRequest, Request> ping() {
-		return (request) -> RequestConverters.ping();
-	}
-
-	default Function<MainRequest, Request> info() {
-		return (request) -> RequestConverters.info();
-	}
-
-	default Function<MultiGetRequest, Request> multiGet() {
-		return RequestConverters::multiGet;
-	}
-
-	default Function<GetRequest, Request> exists() {
-		return RequestConverters::exists;
-	}
-
-	default Function<UpdateRequest, Request> update() {
-		return RequestConverters::update;
-	}
-
-	default Function<DeleteRequest, Request> delete() {
-		return RequestConverters::delete;
-	}
-
-	default Function<DeleteByQueryRequest, Request> deleteByQuery() {
-		return RequestConverters::deleteByQuery;
-	}
-
-	default Function<BulkRequest, Request> bulk() {
-
-		return request -> {
-
-			try {
-				return RequestConverters.bulk(request);
-			} catch (IOException e) {
-				throw new UncategorizedElasticsearchException("Could not parse request", e);
-			}
-		};
-	}
-
-	// --> INDICES
-
-	default Function<GetIndexRequest, Request> indexExists() {
-		return RequestConverters::indexExists;
-	}
-
-	default Function<DeleteIndexRequest, Request> indexDelete() {
-		return RequestConverters::indexDelete;
-	}
-
-	default Function<CreateIndexRequest, Request> indexCreate() {
-		return RequestConverters::indexCreate;
-	}
-
-	default Function<OpenIndexRequest, Request> indexOpen() {
-		return RequestConverters::indexOpen;
-	}
-
-	default Function<CloseIndexRequest, Request> indexClose() {
-		return RequestConverters::indexClose;
-	}
-
-	default Function<RefreshRequest, Request> indexRefresh() {
-		return RequestConverters::indexRefresh;
-	}
-
-	default Function<PutMappingRequest, Request> putMapping() {
-		return RequestConverters::putMapping;
-	}
-
-	default Function<FlushRequest, Request> flushIndex() {
-		return RequestConverters::flushIndex;
-	}
-
-	default Function<CountRequest, Request> count() {
-		return RequestConverters::count;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<GetSettingsRequest, Request> getSettings() {
-		return RequestConverters::getSettings;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<GetMappingsRequest, Request> getMapping() {
-		return RequestConverters::getMapping;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<IndicesAliasesRequest, Request> updateAlias() {
-		return RequestConverters::updateAliases;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<GetAliasesRequest, Request> getAlias() {
-		return RequestConverters::getAlias;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<PutIndexTemplateRequest, Request> putTemplate() {
-		return RequestConverters::putTemplate;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<GetIndexTemplatesRequest, Request> getTemplates() {
-		return RequestConverters::getTemplates;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<IndexTemplatesExistRequest, Request> templatesExist() {
-		return RequestConverters::templatesExist;
-	}
-
-	/**
-	 * @since 4.1
-	 */
-	default Function<DeleteIndexTemplateRequest, Request> deleteTemplate() {
-		return RequestConverters::deleteTemplate;
-	}
-}

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

@@ -19,12 +19,10 @@ import reactor.core.publisher.Mono;
 
 import java.net.InetSocketAddress;
 import java.util.Collections;
-import java.util.function.Supplier;
 
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
-import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
@@ -37,14 +35,12 @@ import org.springframework.web.reactive.function.client.WebClient;
 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, InetSocketAddress endpoint) {
 
 		this.clientProvider = clientProvider;
-		this.headersSupplier = headersSupplier;
 		this.endpoint = endpoint;
 		this.state = new ElasticsearchHost(this.endpoint, State.UNKNOWN);
 	}
@@ -57,23 +53,22 @@ class SingleNodeHostProvider implements HostProvider {
 	public Mono<ClusterInformation> clusterInfo() {
 
 		return createWebClient(endpoint) //
-				.head().uri("/")
-				.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
-				.exchange() //
+				.head().uri("/").exchange() //
 				.flatMap(it -> {
+
 					if (it.statusCode().isError()) {
 						state = ElasticsearchHost.offline(endpoint);
 					} else {
 						state = ElasticsearchHost.online(endpoint);
 					}
-					return it.releaseBody().thenReturn(state);
+					return Mono.just(state);
 				}).onErrorResume(throwable -> {
 
 					state = ElasticsearchHost.offline(endpoint);
 					clientProvider.getErrorListener().accept(throwable);
 					return Mono.just(state);
 				}) //
-				.map(it -> new ClusterInformation(Collections.singleton(it)));
+				.flatMap(it -> Mono.just(new ClusterInformation(Collections.singleton(it))));
 	}
 
 	/*
@@ -96,16 +91,14 @@ class SingleNodeHostProvider implements HostProvider {
 			return Mono.just(endpoint);
 		}
 
-		return clusterInfo().handle((information, sink) -> {
+		return clusterInfo().flatMap(it -> {
 
-			ElasticsearchHost host = information.getNodes().iterator().next();
+			ElasticsearchHost host = it.getNodes().iterator().next();
 			if (host.isOnline()) {
-
-				sink.next(host.getEndpoint());
-				return;
+				return Mono.just(host.getEndpoint());
 			}
 
-			sink.error(new NoReachableHostException(Collections.singleton(host)));
+			return Mono.error(() -> new NoReachableHostException(Collections.singleton(host)));
 		});
 	}
 

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

@@ -101,11 +101,10 @@ public interface WebClientProvider {
 
 	/**
 	 * Obtain the {@link String pathPrefix} to be used.
-	 * 
+	 *
 	 * @return the pathPrefix if set.
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
-	@Nullable
 	String getPathPrefix();
 
 	/**
@@ -126,20 +125,18 @@ public interface WebClientProvider {
 
 	/**
 	 * Create a new instance of {@link WebClientProvider} where HTTP requests are called with the given path prefix.
-	 * 
+	 *
 	 * @param pathPrefix Path prefix to add to requests
 	 * @return new instance of {@link WebClientProvider}
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
 	WebClientProvider withPathPrefix(String pathPrefix);
 
 	/**
-	 * Create a new instance of {@link WebClientProvider} calling the given {@link Function} to configure the
-	 * {@link WebClient}.
-	 * 
+	 * Create a new instance of {@link WebClientProvider} calling the given {@link Function} to configure the {@link WebClient}.
 	 * @param webClientConfigurer configuration function
 	 * @return new instance of {@link WebClientProvider}
-	 * @since 4.0
+	 * @since 3.2.4
 	 */
 	WebClientProvider withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);
 }

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

@@ -1,3 +1,6 @@
+/**
+ * Everything required for a Reactive Elasticsearch client.
+ */
 @org.springframework.lang.NonNullApi
 @org.springframework.lang.NonNullFields
 package org.springframework.data.elasticsearch.client.reactive;

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

@@ -1,163 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client.util;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.xcontent.ContextParser;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.adjacency.ParsedAdjacencyMatrix;
-import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.composite.ParsedComposite;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
-import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilters;
-import org.elasticsearch.search.aggregations.bucket.geogrid.GeoHashGridAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileGridAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.geogrid.ParsedGeoHashGrid;
-import org.elasticsearch.search.aggregations.bucket.geogrid.ParsedGeoTileGrid;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.ParsedGlobal;
-import org.elasticsearch.search.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.ParsedAutoDateHistogram;
-import org.elasticsearch.search.aggregations.bucket.histogram.ParsedDateHistogram;
-import org.elasticsearch.search.aggregations.bucket.histogram.ParsedHistogram;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.ParsedMissing;
-import org.elasticsearch.search.aggregations.bucket.nested.NestedAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.nested.ParsedNested;
-import org.elasticsearch.search.aggregations.bucket.nested.ParsedReverseNested;
-import org.elasticsearch.search.aggregations.bucket.nested.ReverseNestedAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.GeoDistanceAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ParsedBinaryRange;
-import org.elasticsearch.search.aggregations.bucket.range.ParsedDateRange;
-import org.elasticsearch.search.aggregations.bucket.range.ParsedGeoDistance;
-import org.elasticsearch.search.aggregations.bucket.range.ParsedRange;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.InternalSampler;
-import org.elasticsearch.search.aggregations.bucket.sampler.ParsedSampler;
-import org.elasticsearch.search.aggregations.bucket.terms.DoubleTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.LongTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedDoubleTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedLongTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
-import org.elasticsearch.search.aggregations.metrics.*;
-import org.elasticsearch.search.aggregations.pipeline.*;
-import org.elasticsearch.search.suggest.Suggest;
-import org.elasticsearch.search.suggest.completion.CompletionSuggestion;
-import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder;
-import org.elasticsearch.search.suggest.phrase.PhraseSuggestion;
-import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder;
-import org.elasticsearch.search.suggest.term.TermSuggestion;
-import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
-import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
-
-/**
- * <p>
- * Original implementation source {@link org.elasticsearch.client.RestHighLevelClient#getDefaultNamedXContents()} 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}.
- * <p>
- * Only intended for internal use.
- *
- * @author Russell Parry
- * @since 4.0
- */
-public class NamedXContents {
-
-	private NamedXContents() {
-		// contains only utility methods
-	}
-
-	public static List<NamedXContentRegistry.Entry> getDefaultNamedXContents() {
-		Map<String, ContextParser<Object, ? extends Aggregation>> map = new HashMap<>();
-		map.put(CardinalityAggregationBuilder.NAME, (p, c) -> ParsedCardinality.fromXContent(p, (String) c));
-		map.put(InternalHDRPercentiles.NAME, (p, c) -> ParsedHDRPercentiles.fromXContent(p, (String) c));
-		map.put(InternalHDRPercentileRanks.NAME, (p, c) -> ParsedHDRPercentileRanks.fromXContent(p, (String) c));
-		map.put(InternalTDigestPercentiles.NAME, (p, c) -> ParsedTDigestPercentiles.fromXContent(p, (String) c));
-		map.put(InternalTDigestPercentileRanks.NAME, (p, c) -> ParsedTDigestPercentileRanks.fromXContent(p, (String) c));
-		map.put(PercentilesBucketPipelineAggregationBuilder.NAME,
-				(p, c) -> ParsedPercentilesBucket.fromXContent(p, (String) c));
-		map.put(MedianAbsoluteDeviationAggregationBuilder.NAME,
-				(p, c) -> ParsedMedianAbsoluteDeviation.fromXContent(p, (String) c));
-		map.put(MinAggregationBuilder.NAME, (p, c) -> ParsedMin.fromXContent(p, (String) c));
-		map.put(MaxAggregationBuilder.NAME, (p, c) -> ParsedMax.fromXContent(p, (String) c));
-		map.put(SumAggregationBuilder.NAME, (p, c) -> ParsedSum.fromXContent(p, (String) c));
-		map.put(AvgAggregationBuilder.NAME, (p, c) -> ParsedAvg.fromXContent(p, (String) c));
-		map.put(WeightedAvgAggregationBuilder.NAME, (p, c) -> ParsedWeightedAvg.fromXContent(p, (String) c));
-		map.put(ValueCountAggregationBuilder.NAME, (p, c) -> ParsedValueCount.fromXContent(p, (String) c));
-		map.put(InternalSimpleValue.NAME, (p, c) -> ParsedSimpleValue.fromXContent(p, (String) c));
-		map.put(DerivativePipelineAggregationBuilder.NAME, (p, c) -> ParsedDerivative.fromXContent(p, (String) c));
-		map.put(InternalBucketMetricValue.NAME, (p, c) -> ParsedBucketMetricValue.fromXContent(p, (String) c));
-		map.put(StatsAggregationBuilder.NAME, (p, c) -> ParsedStats.fromXContent(p, (String) c));
-		map.put(StatsBucketPipelineAggregationBuilder.NAME, (p, c) -> ParsedStatsBucket.fromXContent(p, (String) c));
-		map.put(ExtendedStatsAggregationBuilder.NAME, (p, c) -> ParsedExtendedStats.fromXContent(p, (String) c));
-		map.put(ExtendedStatsBucketPipelineAggregationBuilder.NAME,
-				(p, c) -> ParsedExtendedStatsBucket.fromXContent(p, (String) c));
-		map.put(GeoBoundsAggregationBuilder.NAME, (p, c) -> ParsedGeoBounds.fromXContent(p, (String) c));
-		map.put(GeoCentroidAggregationBuilder.NAME, (p, c) -> ParsedGeoCentroid.fromXContent(p, (String) c));
-		map.put(HistogramAggregationBuilder.NAME, (p, c) -> ParsedHistogram.fromXContent(p, (String) c));
-		map.put(DateHistogramAggregationBuilder.NAME, (p, c) -> ParsedDateHistogram.fromXContent(p, (String) c));
-		map.put(AutoDateHistogramAggregationBuilder.NAME, (p, c) -> ParsedAutoDateHistogram.fromXContent(p, (String) c));
-		map.put(StringTerms.NAME, (p, c) -> ParsedStringTerms.fromXContent(p, (String) c));
-		map.put(LongTerms.NAME, (p, c) -> ParsedLongTerms.fromXContent(p, (String) c));
-		map.put(DoubleTerms.NAME, (p, c) -> ParsedDoubleTerms.fromXContent(p, (String) c));
-		map.put(MissingAggregationBuilder.NAME, (p, c) -> ParsedMissing.fromXContent(p, (String) c));
-		map.put(NestedAggregationBuilder.NAME, (p, c) -> ParsedNested.fromXContent(p, (String) c));
-		map.put(ReverseNestedAggregationBuilder.NAME, (p, c) -> ParsedReverseNested.fromXContent(p, (String) c));
-		map.put(GlobalAggregationBuilder.NAME, (p, c) -> ParsedGlobal.fromXContent(p, (String) c));
-		map.put(FilterAggregationBuilder.NAME, (p, c) -> ParsedFilter.fromXContent(p, (String) c));
-		map.put(InternalSampler.PARSER_NAME, (p, c) -> ParsedSampler.fromXContent(p, (String) c));
-		map.put(GeoHashGridAggregationBuilder.NAME, (p, c) -> ParsedGeoHashGrid.fromXContent(p, (String) c));
-		map.put(GeoTileGridAggregationBuilder.NAME, (p, c) -> ParsedGeoTileGrid.fromXContent(p, (String) c));
-		map.put(RangeAggregationBuilder.NAME, (p, c) -> ParsedRange.fromXContent(p, (String) c));
-		map.put(DateRangeAggregationBuilder.NAME, (p, c) -> ParsedDateRange.fromXContent(p, (String) c));
-		map.put(GeoDistanceAggregationBuilder.NAME, (p, c) -> ParsedGeoDistance.fromXContent(p, (String) c));
-		map.put(FiltersAggregationBuilder.NAME, (p, c) -> ParsedFilters.fromXContent(p, (String) c));
-		map.put(AdjacencyMatrixAggregationBuilder.NAME, (p, c) -> ParsedAdjacencyMatrix.fromXContent(p, (String) c));
-		map.put(ScriptedMetricAggregationBuilder.NAME, (p, c) -> ParsedScriptedMetric.fromXContent(p, (String) c));
-		map.put(IpRangeAggregationBuilder.NAME, (p, c) -> ParsedBinaryRange.fromXContent(p, (String) c));
-		map.put(TopHitsAggregationBuilder.NAME, (p, c) -> ParsedTopHits.fromXContent(p, (String) c));
-		map.put(CompositeAggregationBuilder.NAME, (p, c) -> ParsedComposite.fromXContent(p, (String) c));
-		List<NamedXContentRegistry.Entry> entries = map.entrySet().stream().map(
-				entry -> new NamedXContentRegistry.Entry(Aggregation.class, new ParseField(entry.getKey()), entry.getValue()))
-				.collect(Collectors.toList());
-		entries.add(
-				new NamedXContentRegistry.Entry(Suggest.Suggestion.class, new ParseField(TermSuggestionBuilder.SUGGESTION_NAME),
-						(parser, context) -> TermSuggestion.fromXContent(parser, (String) context)));
-		entries.add(new NamedXContentRegistry.Entry(Suggest.Suggestion.class,
-				new ParseField(PhraseSuggestionBuilder.SUGGESTION_NAME),
-				(parser, context) -> PhraseSuggestion.fromXContent(parser, (String) context)));
-		entries.add(new NamedXContentRegistry.Entry(Suggest.Suggestion.class,
-				new ParseField(CompletionSuggestionBuilder.SUGGESTION_NAME),
-				(parser, context) -> CompletionSuggestion.fromXContent(parser, (String) context)));
-		return entries;
-	}
-}

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

@@ -25,11 +25,6 @@ import java.util.Locale;
 import java.util.StringJoiner;
 
 import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
 import org.apache.lucene.util.BytesRef;
@@ -38,19 +33,15 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest;
 import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptRequest;
 import org.elasticsearch.action.admin.cluster.storedscripts.PutStoredScriptRequest;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
-import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
+import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest;
 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;
-import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.explain.ExplainRequest;
@@ -70,10 +61,6 @@ import org.elasticsearch.client.Request;
 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.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
-import org.elasticsearch.client.indices.PutIndexTemplateRequest;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
@@ -90,7 +77,6 @@ import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.rankeval.RankEvalRequest;
 import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
@@ -117,7 +103,6 @@ import org.springframework.lang.Nullable;
  * @author Peter-Josef Meisch
  * @since 3.2
  */
-@SuppressWarnings("JavadocReference")
 public class RequestConverters {
 
 	private static final XContentType REQUEST_BODY_CONTENT_TYPE = XContentType.JSON;
@@ -197,9 +182,7 @@ public class RequestConverters {
 						metadata.field("_index", action.index());
 					}
 					if (Strings.hasLength(action.type())) {
-						if (MapperService.SINGLE_MAPPING_NAME.equals(action.type()) == false) {
-							metadata.field("_type", action.type());
-						}
+						metadata.field("_type", action.type());
 					}
 					if (Strings.hasLength(action.id())) {
 						metadata.field("_id", action.id());
@@ -217,14 +200,11 @@ public class RequestConverters {
 							metadata.field("version_type", "external");
 						} else if (versionType == VersionType.EXTERNAL_GTE) {
 							metadata.field("version_type", "external_gte");
+						} else if (versionType == VersionType.FORCE) {
+							metadata.field("version_type", "force");
 						}
 					}
 
-					if (action.ifSeqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO) {
-						metadata.field("if_seq_no", action.ifSeqNo());
-						metadata.field("if_primary_term", action.ifPrimaryTerm());
-					}
-
 					if (opType == DocWriteRequest.OpType.INDEX || opType == DocWriteRequest.OpType.CREATE) {
 						IndexRequest indexRequest = (IndexRequest) action;
 						if (Strings.hasLength(indexRequest.getPipeline())) {
@@ -384,7 +364,7 @@ public class RequestConverters {
 			XContentType upsertContentType = updateRequest.upsertRequest().getContentType();
 			if ((xContentType != null) && (xContentType != upsertContentType)) {
 				throw new IllegalStateException("Update request cannot have different content types for doc [" + xContentType
-						+ ']' + " and upsert [" + upsertContentType + "] documents");
+						+ "]" + " and upsert [" + upsertContentType + "] documents");
 			} else {
 				xContentType = upsertContentType;
 			}
@@ -411,10 +391,10 @@ public class RequestConverters {
 
 	/**
 	 * Creates a count request.
-	 * 
+	 *
 	 * @param countRequest the search defining the data to be counted
 	 * @return Elasticsearch count request
-	 * @since 4.0
+	 * @since 3.2
 	 */
 	public static Request count(CountRequest countRequest) {
 		Request request = new Request(HttpMethod.POST.name(),
@@ -480,7 +460,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request explain(ExplainRequest explainRequest) {
+	public static Request explain(ExplainRequest explainRequest) throws IOException {
 		Request request = new Request(HttpMethod.GET.name(),
 				endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), "_explain"));
 
@@ -502,7 +482,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request rankEval(RankEvalRequest rankEvalRequest) {
+	public static Request rankEval(RankEvalRequest rankEvalRequest) throws IOException {
 		Request request = new Request(HttpMethod.GET.name(),
 				endpoint(rankEvalRequest.indices(), Strings.EMPTY_ARRAY, "_rank_eval"));
 
@@ -521,7 +501,8 @@ public class RequestConverters {
 		return prepareReindexRequest(reindexRequest, false);
 	}
 
-	private static Request prepareReindexRequest(ReindexRequest reindexRequest, boolean waitForCompletion) {
+	private static Request prepareReindexRequest(ReindexRequest reindexRequest, boolean waitForCompletion)
+			throws IOException {
 		String endpoint = new EndpointBuilder().addPathPart("_reindex").build();
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
 		Params params = new Params(request).withWaitForCompletion(waitForCompletion).withRefresh(reindexRequest.isRefresh())
@@ -535,7 +516,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) {
+	public static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws IOException {
 		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())
@@ -560,7 +541,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request deleteByQuery(DeleteByQueryRequest deleteByQueryRequest) {
+	public static Request deleteByQuery(DeleteByQueryRequest deleteByQueryRequest) throws IOException {
 		String endpoint = endpoint(deleteByQueryRequest.indices(), deleteByQueryRequest.getDocTypes(), "_delete_by_query");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
 		Params params = new Params(request).withRouting(deleteByQueryRequest.getRouting())
@@ -606,7 +587,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request putScript(PutStoredScriptRequest putStoredScriptRequest) {
+	public static Request putScript(PutStoredScriptRequest putStoredScriptRequest) throws IOException {
 		String endpoint = new EndpointBuilder().addPathPartAsIs("_scripts").addPathPart(putStoredScriptRequest.id())
 				.build();
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
@@ -620,7 +601,7 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request analyze(AnalyzeRequest request) {
+	public static Request analyze(AnalyzeRequest request) throws IOException {
 		EndpointBuilder builder = new EndpointBuilder();
 		String index = request.index();
 		if (index != null) {
@@ -750,9 +731,7 @@ public class RequestConverters {
 	public static Request indexRefresh(RefreshRequest refreshRequest) {
 
 		String[] indices = refreshRequest.indices() == null ? Strings.EMPTY_ARRAY : refreshRequest.indices();
-		// using a GET here as reactor-netty set the transfer-encoding to chunked on POST requests which blocks on
-		// Elasticsearch when no body is sent.
-		Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_refresh"));
+		Request request = new Request(HttpMethod.POST.name(), RequestConverters.endpoint(indices, "_refresh"));
 
 		Params parameters = new Params(request);
 		parameters.withIndicesOptions(refreshRequest.indicesOptions());
@@ -766,12 +745,12 @@ public class RequestConverters {
 		}
 
 		Request request = new Request(HttpMethod.PUT.name(),
-				RequestConverters.endpoint(putMappingRequest.indices(), "_mapping"));
+				RequestConverters.endpoint(putMappingRequest.indices(), "_mapping", putMappingRequest.type()));
+
+		RequestConverters.Params parameters = new RequestConverters.Params(request);
+		parameters.withTimeout(putMappingRequest.timeout());
+		parameters.withMasterTimeout(putMappingRequest.masterNodeTimeout());
 
-		RequestConverters.Params parameters = new RequestConverters.Params(request) //
-				.withTimeout(putMappingRequest.timeout()) //
-				.withMasterTimeout(putMappingRequest.masterNodeTimeout()) //
-				.withIncludeTypeName(false);
 		request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
 		return request;
 	}
@@ -787,110 +766,6 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request getMapping(GetMappingsRequest getMappingsRequest) {
-		String[] indices = getMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY : getMappingsRequest.indices();
-		String[] types = getMappingsRequest.types() == null ? Strings.EMPTY_ARRAY : getMappingsRequest.types();
-
-		Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_mapping", types));
-
-		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();
-
-		Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_settings", names));
-
-		RequestConverters.Params parameters = new RequestConverters.Params(request);
-		parameters.withIndicesOptions(getSettingsRequest.indicesOptions());
-		parameters.withLocal(getSettingsRequest.local());
-		parameters.withIncludeDefaults(getSettingsRequest.includeDefaults());
-		parameters.withMasterTimeout(getSettingsRequest.masterNodeTimeout());
-		return request;
-	}
-
-	public static Request updateAliases(IndicesAliasesRequest indicesAliasesRequest) {
-		Request request = new Request(HttpPost.METHOD_NAME, "/_aliases");
-
-		RequestConverters.Params parameters = new RequestConverters.Params(request);
-		parameters.withTimeout(indicesAliasesRequest.timeout());
-		parameters.withMasterTimeout(indicesAliasesRequest.masterNodeTimeout());
-		request
-				.setEntity(RequestConverters.createEntity(indicesAliasesRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
-		return request;
-	}
-
-	public static Request getAlias(GetAliasesRequest getAliasesRequest) {
-
-		String[] indices = getAliasesRequest.indices() == null ? Strings.EMPTY_ARRAY : getAliasesRequest.indices();
-		String[] aliases = getAliasesRequest.aliases() == null ? Strings.EMPTY_ARRAY : getAliasesRequest.aliases();
-		String endpoint = RequestConverters.endpoint(indices, "_alias", aliases);
-
-		Request request = new Request(HttpGet.METHOD_NAME, endpoint);
-
-		RequestConverters.Params params = new RequestConverters.Params(request);
-		params.withIndicesOptions(getAliasesRequest.indicesOptions());
-		params.withLocal(getAliasesRequest.local());
-		return request;
-	}
-
-	public static Request putTemplate(PutIndexTemplateRequest putIndexTemplateRequest) {
-		String endpoint = (new RequestConverters.EndpointBuilder()) //
-				.addPathPartAsIs("_template") //
-				.addPathPart(putIndexTemplateRequest.name()) //
-				.build(); //
-
-		Request request = new Request(HttpPut.METHOD_NAME, endpoint);
-		RequestConverters.Params params = new RequestConverters.Params(request);
-		params.withMasterTimeout(putIndexTemplateRequest.masterNodeTimeout());
-		if (putIndexTemplateRequest.create()) {
-			params.putParam("create", Boolean.TRUE.toString());
-		}
-
-		if (Strings.hasText(putIndexTemplateRequest.cause())) {
-			params.putParam("cause", putIndexTemplateRequest.cause());
-		}
-
-		request.setEntity(
-				RequestConverters.createEntity(putIndexTemplateRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
-		return request;
-	}
-
-	public static Request getTemplates(GetIndexTemplatesRequest getIndexTemplatesRequest) {
-		final String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_template")
-				.addCommaSeparatedPathParts(getIndexTemplatesRequest.names()).build();
-		final Request request = new Request(HttpGet.METHOD_NAME, endpoint);
-		RequestConverters.Params params = new RequestConverters.Params(request);
-		params.withLocal(getIndexTemplatesRequest.isLocal());
-		params.withMasterTimeout(getIndexTemplatesRequest.getMasterNodeTimeout());
-		return request;
-	}
-
-	public static Request templatesExist(IndexTemplatesExistRequest indexTemplatesExistRequest) {
-		final String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_template")
-				.addCommaSeparatedPathParts(indexTemplatesExistRequest.names()).build();
-		final Request request = new Request(HttpHead.METHOD_NAME, endpoint);
-		final RequestConverters.Params params = new RequestConverters.Params(request);
-		params.withLocal(indexTemplatesExistRequest.isLocal());
-		params.withMasterTimeout(indexTemplatesExistRequest.getMasterNodeTimeout());
-		return request;
-	}
-
-	public static Request deleteTemplate(DeleteIndexTemplateRequest deleteIndexTemplateRequest) {
-		String name = deleteIndexTemplateRequest.name();
-		String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_template").addPathPart(name).build();
-		Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
-		RequestConverters.Params params = new RequestConverters.Params(request);
-		params.withMasterTimeout(deleteIndexTemplateRequest.masterNodeTimeout());
-		return request;
-	}
-
 	static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType) {
 
 		try {
@@ -1096,10 +971,7 @@ public class RequestConverters {
 
 		Params withWaitForActiveShards(ActiveShardCount activeShardCount, ActiveShardCount defaultActiveShardCount) {
 			if (activeShardCount != null && activeShardCount != defaultActiveShardCount) {
-				// in Elasticsearch 7, "default" cannot be sent anymore, so it needs to be mapped to the default value of 1
-				String value = activeShardCount == ActiveShardCount.DEFAULT ? "1"
-						: activeShardCount.toString().toLowerCase(Locale.ROOT);
-				return putParam("wait_for_active_shards", value);
+				return putParam("wait_for_active_shards", activeShardCount.toString().toLowerCase(Locale.ROOT));
 			}
 			return this;
 		}
@@ -1239,18 +1111,6 @@ public class RequestConverters {
 			}
 			return this;
 		}
-
-		/**
-		 * sets the include_type_name parameter. Needed for Elasticsearch 7 to be used with the mapping types still
-		 * available. Will be removed again when Elasticsearch drops the support for this parameter in Elasticsearch 8.
-		 *
-		 * @deprecated since 4.0
-		 * @since 4.0
-		 */
-		@Deprecated
-		Params withIncludeTypeName(boolean includeTypeName) {
-			return putParam("include_type_name", String.valueOf(includeTypeName));
-		}
 	}
 
 	/**
@@ -1270,7 +1130,7 @@ public class RequestConverters {
 		}
 		if (requestContentType != xContentType) {
 			throw new IllegalArgumentException("Mismatching content-type found for request with content-type ["
-					+ requestContentType + "], previous requests have content-type [" + xContentType + ']');
+					+ requestContentType + "], previous requests have content-type [" + xContentType + "]");
 		}
 		return xContentType;
 	}
@@ -1319,7 +1179,7 @@ public class RequestConverters {
 				// encode each part (e.g. index, type and id) separately before merging them into the path
 				// we prepend "/" to the path part to make this path absolute, otherwise there can be issues with
 				// paths that start with `-` or contain `:`
-				URI uri = new URI(null, null, null, -1, '/' + pathPart, null, null);
+				URI uri = new URI(null, null, null, -1, "/" + pathPart, null, null);
 				// manually encode any slash that each part may contain
 				return uri.getRawPath().substring(1).replaceAll("/", "%2F");
 			} catch (URISyntaxException e) {

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

@@ -1,72 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.elasticsearch.action.search.SearchScrollRequest;
-import org.elasticsearch.search.Scroll;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
-
-/**
- * Mutable state object holding scrollId to be used for {@link SearchScrollRequest#scroll(Scroll)}
- *
- * @author Christoph Strobl
- * @author Peter-Josef Meisch
- * @since 3.2
- */
-public class ScrollState {
-
-	private final Object lock = new Object();
-
-	private final Set<String> pastIds = new LinkedHashSet<>();
-	@Nullable private String scrollId;
-
-	public ScrollState() {}
-
-	public ScrollState(String scrollId) {
-		updateScrollId(scrollId);
-	}
-
-	@Nullable
-	public String getScrollId() {
-		return scrollId;
-	}
-
-	public List<String> getScrollIds() {
-
-		synchronized (lock) {
-			return Collections.unmodifiableList(new ArrayList<>(pastIds));
-		}
-	}
-
-	public void updateScrollId(@Nullable String scrollId) {
-
-		if (StringUtils.hasText(scrollId)) {
-
-			synchronized (lock) {
-
-				this.scrollId = scrollId;
-				pastIds.add(scrollId);
-			}
-		}
-	}
-}

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

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

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

@@ -19,7 +19,6 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 
 /**
  * @author Christoph Strobl
@@ -31,25 +30,20 @@ public abstract class AbstractElasticsearchConfiguration extends ElasticsearchCo
 
 	/**
 	 * Return the {@link RestHighLevelClient} instance used to connect to the cluster. <br />
+	 * Annotate with {@link Bean} in case you want to expose a {@link RestHighLevelClient} instance to the
+	 * {@link org.springframework.context.ApplicationContext}.
 	 *
 	 * @return never {@literal null}.
 	 */
-	@Bean
 	public abstract RestHighLevelClient elasticsearchClient();
 
-    /**
-     * 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) {
-		return new ElasticsearchRestTemplate(elasticsearchClient, elasticsearchConverter);
+	/**
+	 * Creates {@link ElasticsearchOperations}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
+	public ElasticsearchOperations elasticsearchOperations() {
+		return new ElasticsearchRestTemplate(elasticsearchClient(), elasticsearchConverter(), resultsMapper());
 	}
 }

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

@@ -18,26 +18,27 @@ 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.context.annotation.Configuration;
 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.convert.ElasticsearchConverter;
 import org.springframework.lang.Nullable;
 
 /**
  * @author Christoph Strobl
- * @author Peter-Josef Meisch
  * @since 3.2
  * @see ElasticsearchConfigurationSupport
  */
+@Configuration
 public abstract class AbstractReactiveElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
 
 	/**
 	 * Return the {@link ReactiveElasticsearchClient} instance used to connect to the cluster. <br />
+	 * Annotate with {@link Bean} in case you want to expose a {@link ReactiveElasticsearchClient} instance to the
+	 * {@link org.springframework.context.ApplicationContext}.
 	 *
 	 * @return never {@literal null}.
 	 */
-	@Bean
 	public abstract ReactiveElasticsearchClient reactiveElasticsearchClient();
 
 	/**
@@ -46,11 +47,10 @@ public abstract class AbstractReactiveElasticsearchConfiguration extends Elastic
 	 * @return never {@literal null}.
 	 */
 	@Bean
-	public ReactiveElasticsearchOperations reactiveElasticsearchTemplate(ElasticsearchConverter elasticsearchConverter,
-			ReactiveElasticsearchClient reactiveElasticsearchClient) {
+	public ReactiveElasticsearchOperations reactiveElasticsearchTemplate() {
 
-		ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(reactiveElasticsearchClient,
-				elasticsearchConverter);
+		ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(reactiveElasticsearchClient(),
+				elasticsearchConverter(), resultsMapper());
 		template.setIndicesOptions(indicesOptions());
 		template.setRefreshPolicy(refreshPolicy());
 

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

@@ -1,109 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import static org.springframework.data.config.ParsingUtils.*;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.auditing.config.IsNewAwareAuditingHandlerBeanDefinitionParser;
-import org.springframework.data.elasticsearch.core.event.AuditingEntityCallback;
-import org.springframework.data.elasticsearch.core.event.ReactiveAuditingEntityCallback;
-import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * {@link BeanDefinitionParser} to register a {@link AuditingEntityCallback} to transparently set auditing information
- * on an entity.
- *
- * @author Peter-Josef Meisch
- */
-public class ElasticsearchAuditingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-	private static String MAPPING_CONTEXT_BEAN_NAME = "simpleElasticsearchMappingContext";
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element)
-	 */
-	@Override
-	protected Class<?> getBeanClass(Element element) {
-		return AuditingEntityCallback.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateId()
-	 */
-	@Override
-	protected boolean shouldGenerateId() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder)
-	 */
-	@Override
-	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-
-		String mappingContextRef = element.getAttribute("mapping-context-ref");
-
-		if (!StringUtils.hasText(mappingContextRef)) {
-
-			BeanDefinitionRegistry registry = parserContext.getRegistry();
-
-			if (!registry.containsBeanDefinition(MAPPING_CONTEXT_BEAN_NAME)) {
-				registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME,
-						new RootBeanDefinition(SimpleElasticsearchMappingContext.class));
-			}
-
-			mappingContextRef = MAPPING_CONTEXT_BEAN_NAME;
-		}
-
-		IsNewAwareAuditingHandlerBeanDefinitionParser parser = new IsNewAwareAuditingHandlerBeanDefinitionParser(
-				mappingContextRef);
-		parser.parse(element, parserContext);
-
-		AbstractBeanDefinition isNewAwareAuditingHandler = getObjectFactoryBeanDefinition(parser.getResolvedBeanName(),
-				parserContext.extractSource(element));
-		builder.addConstructorArgValue(isNewAwareAuditingHandler);
-
-		if (ReactiveWrappers.isAvailable(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR)) {
-			registerReactiveAuditingEntityCallback(parserContext.getRegistry(), isNewAwareAuditingHandler,
-					parserContext.extractSource(element));
-		}
-	}
-
-	private void registerReactiveAuditingEntityCallback(BeanDefinitionRegistry registry,
-			AbstractBeanDefinition isNewAwareAuditingHandler, @Nullable Object source) {
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
-
-		builder.addConstructorArgValue(isNewAwareAuditingHandler);
-		builder.getRawBeanDefinition().setSource(source);
-
-		registry.registerBeanDefinition(ReactiveAuditingEntityCallback.class.getName(), builder.getBeanDefinition());
-	}
-}

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

@@ -1,76 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import java.lang.annotation.Annotation;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.data.auditing.IsNewAwareAuditingHandler;
-import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
-import org.springframework.data.auditing.config.AuditingConfiguration;
-import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.elasticsearch.core.event.AuditingEntityCallback;
-import org.springframework.util.Assert;
-
-/**
- * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableElasticsearchAuditing} annotation.
- *
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-class ElasticsearchAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
-
-	@Override
-	protected Class<? extends Annotation> getAnnotation() {
-		return EnableElasticsearchAuditing.class;
-	}
-
-	@Override
-	protected String getAuditingHandlerBeanName() {
-		return "elasticsearchAuditingHandler";
-	}
-
-	@Override
-	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
-
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
-
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
-
-		builder.addConstructorArgValue(definition.getBeanDefinition());
-		return configureDefaultAuditHandlerAttributes(configuration, builder);
-	}
-
-	@Override
-	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
-			BeanDefinitionRegistry registry) {
-
-		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(AuditingEntityCallback.class);
-		builder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
-
-		registerInfrastructureBeanWithId(builder.getBeanDefinition(), AuditingEntityCallback.class.getName(), registry);
-	}
-}

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

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.elasticsearch.config;
 
+import lombok.SneakyThrows;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -28,6 +30,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.DefaultEntityMapper;
+import org.springframework.data.elasticsearch.core.DefaultResultMapper;
+import org.springframework.data.elasticsearch.core.EntityMapper;
+import org.springframework.data.elasticsearch.core.ResultsMapper;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
@@ -37,20 +43,14 @@ import org.springframework.util.StringUtils;
 
 /**
  * @author Christoph Strobl
- * @author Peter-Josef Meisch
  * @since 3.2
  */
-@Configuration(proxyBeanMethods = false)
+@Configuration
 public class ElasticsearchConfigurationSupport {
 
 	@Bean
-	public ElasticsearchConverter elasticsearchEntityMapper(
-			SimpleElasticsearchMappingContext elasticsearchMappingContext, ElasticsearchCustomConversions elasticsearchCustomConversions) {
-
-		MappingElasticsearchConverter elasticsearchConverter = new MappingElasticsearchConverter(
-				elasticsearchMappingContext);
-		elasticsearchConverter.setConversions(elasticsearchCustomConversions);
-		return elasticsearchConverter;
+	public ElasticsearchConverter elasticsearchConverter() {
+		return new MappingElasticsearchConverter(elasticsearchMappingContext());
 	}
 
 	/**
@@ -61,15 +61,45 @@ public class ElasticsearchConfigurationSupport {
 	 * @return never {@literal null}.
 	 */
 	@Bean
-	public SimpleElasticsearchMappingContext elasticsearchMappingContext(ElasticsearchCustomConversions elasticsearchCustomConversions) {
+	@SneakyThrows
+	public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
 
 		SimpleElasticsearchMappingContext mappingContext = new SimpleElasticsearchMappingContext();
 		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(elasticsearchCustomConversions.getSimpleTypeHolder());
+		mappingContext.setSimpleTypeHolder(elasticsearchCustomConversions().getSimpleTypeHolder());
 
 		return mappingContext;
 	}
 
+	/**
+	 * Returns the {@link EntityMapper} used for mapping between the source and domain type. <br />
+	 * <strong>Hint</strong>: you can use {@link org.springframework.data.elasticsearch.core.ElasticsearchEntityMapper} as
+	 * an alternative to the {@link DefaultEntityMapper}.
+	 *
+	 * <pre class="code">
+	 * ElasticsearchEntityMapper entityMapper = new ElasticsearchEntityMapper(elasticsearchMappingContext(),
+	 * 		new DefaultConversionService());
+	 * entityMapper.setConversions(elasticsearchCustomConversions());
+	 * </pre>
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Bean
+	public EntityMapper entityMapper() {
+		return new DefaultEntityMapper(elasticsearchMappingContext());
+	}
+
+	/**
+	 * Returns the {@link ResultsMapper} to be used for search responses.
+	 *
+	 * @see #entityMapper()
+	 * @return never {@literal null}.
+	 */
+	@Bean
+	public ResultsMapper resultsMapper() {
+		return new DefaultResultMapper(elasticsearchMappingContext(), entityMapper());
+	}
+
 	/**
 	 * Register custom {@link Converter}s in a {@link ElasticsearchCustomConversions} object if required.
 	 *
@@ -101,8 +131,9 @@ public class ElasticsearchConfigurationSupport {
 	 *
 	 * @see #getMappingBasePackages()
 	 * @return never {@literal null}.
+	 * @throws ClassNotFoundException
 	 */
-	protected Set<Class<?>> getInitialEntitySet() {
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
 
 		Set<Class<?>> initialEntitySet = new HashSet<>();
 
@@ -119,29 +150,27 @@ public class ElasticsearchConfigurationSupport {
 	 *
 	 * @param basePackage must not be {@literal null}.
 	 * @return never {@literal null}.
+	 * @throws ClassNotFoundException
 	 */
-	protected Set<Class<?>> scanForEntities(String basePackage) {
+	protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFoundException {
 
 		if (!StringUtils.hasText(basePackage)) {
 			return Collections.emptySet();
 		}
 
-		Set<Class<?>> initialEntitySet = new HashSet<>();
+		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
 
-		ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
-				false);
-		componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-		componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
+		if (StringUtils.hasText(basePackage)) {
 
-		for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
+			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
+					false);
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
+			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
 
-			String beanClassName = candidate.getBeanClassName();
+			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
 
-			if (beanClassName != null) {
-				try {
-					initialEntitySet.add(
-							ClassUtils.forName(beanClassName, AbstractReactiveElasticsearchConfiguration.class.getClassLoader()));
-				} catch (ClassNotFoundException | LinkageError ignored) {}
+				initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(),
+						AbstractReactiveElasticsearchConfiguration.class.getClassLoader()));
 			}
 		}
 

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

@@ -1,72 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import 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.context.annotation.Import;
-import org.springframework.data.auditing.DateTimeProvider;
-import org.springframework.data.domain.AuditorAware;
-
-/**
- * Annotation to enable auditing in Elasticsearch via annotation configuration.
- *
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-@Inherited
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Import(ElasticsearchAuditingRegistrar.class)
-public @interface EnableElasticsearchAuditing {
-
-	/**
-	 * Configures the {@link AuditorAware} bean to be used to lookup the current principal.
-	 *
-	 * @return
-	 */
-	String auditorAwareRef() default "";
-
-	/**
-	 * Configures whether the creation and modification dates are set. Defaults to {@literal true}.
-	 *
-	 * @return
-	 */
-	boolean setDates() default true;
-
-	/**
-	 * Configures whether the entity shall be marked as modified on creation. Defaults to {@literal true}.
-	 *
-	 * @return
-	 */
-	boolean modifyOnCreate() default true;
-
-	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
-	 * used for setting creation and modification dates.
-	 *
-	 * @return
-	 * @deprecated since 4.1
-	 */
-	@Deprecated
-	String dateTimeProviderRef() default "";
-}

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

@@ -1,72 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import 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.context.annotation.Import;
-import org.springframework.data.auditing.DateTimeProvider;
-import org.springframework.data.domain.AuditorAware;
-
-/**
- * Annotation to enable auditing in Elasticsearch using reactive infrastructure via annotation configuration.
- *
- * @author Peter-Josef Meisch
- * @since 4.1
- */
-@Inherited
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Import(ReactiveElasticsearchAuditingRegistrar.class)
-public @interface EnableReactiveElasticsearchAuditing {
-
-	/**
-	 * Configures the {@link AuditorAware} bean to be used to lookup the current principal.
-	 *
-	 * @return
-	 */
-	String auditorAwareRef() default "";
-
-	/**
-	 * Configures whether the creation and modification dates are set. Defaults to {@literal true}.
-	 *
-	 * @return
-	 */
-	boolean setDates() default true;
-
-	/**
-	 * Configures whether the entity shall be marked as modified on creation. Defaults to {@literal true}.
-	 *
-	 * @return
-	 */
-	boolean modifyOnCreate() default true;
-
-	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
-	 * used for setting creation and modification dates.
-	 *
-	 * @return
-	 * @deprecated since 4.1
-	 */
-	@Deprecated
-	String dateTimeProviderRef() default "";
-}

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

@@ -1,54 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
-import org.springframework.data.mapping.context.PersistentEntities;
-
-/**
- * Simple helper to be able to wire the {@link PersistentEntities} from a {@link MappingElasticsearchConverter} bean
- * available in the application context.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Peter-Josef Meisch
- * @since 4.1
- */
-class PersistentEntitiesFactoryBean implements FactoryBean<PersistentEntities> {
-
-	private final MappingElasticsearchConverter converter;
-
-	/**
-	 * Creates a new {@link PersistentEntitiesFactoryBean} for the given {@link MappingElasticsearchConverter}.
-	 *
-	 * @param converter must not be {@literal null}.
-	 */
-	public PersistentEntitiesFactoryBean(MappingElasticsearchConverter converter) {
-		this.converter = converter;
-	}
-
-	@Override
-	public PersistentEntities getObject() {
-		return PersistentEntities.of(converter.getMappingContext());
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return PersistentEntities.class;
-	}
-}

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

@@ -1,77 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import java.lang.annotation.Annotation;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.data.auditing.ReactiveIsNewAwareAuditingHandler;
-import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
-import org.springframework.data.auditing.config.AuditingConfiguration;
-import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.elasticsearch.core.event.ReactiveAuditingEntityCallback;
-import org.springframework.util.Assert;
-
-/**
- * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableReactiveElasticsearchAuditing} annotation.
- *
- * @author Peter-Josef Meisch
- * @since 4.1
- */
-class ReactiveElasticsearchAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
-
-	@Override
-	protected Class<? extends Annotation> getAnnotation() {
-		return EnableReactiveElasticsearchAuditing.class;
-	}
-
-	@Override
-	protected String getAuditingHandlerBeanName() {
-		return "reactiveElasticsearchAuditingHandler";
-	}
-
-	@Override
-	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
-
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveIsNewAwareAuditingHandler.class);
-
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
-
-		builder.addConstructorArgValue(definition.getBeanDefinition());
-		return configureDefaultAuditHandlerAttributes(configuration, builder);
-	}
-
-	@Override
-	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
-			BeanDefinitionRegistry registry) {
-
-		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
-		builder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
-
-		registerInfrastructureBeanWithId(builder.getBeanDefinition(), ReactiveAuditingEntityCallback.class.getName(),
-				registry);
-	}
-}

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

@@ -27,9 +27,8 @@ import org.w3c.dom.Element;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @deprecated as of 4.0
  */
-@Deprecated
+
 public class TransportClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
 
 	@Override

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

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

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

@@ -1,285 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import static org.springframework.util.StringUtils.*;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import org.elasticsearch.cluster.metadata.AliasMetadata;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.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
- */
-abstract class AbstractDefaultIndexOperations implements IndexOperations {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDefaultIndexOperations.class);
-
-	protected final ElasticsearchConverter elasticsearchConverter;
-	protected final RequestFactory requestFactory;
-
-	@Nullable protected final Class<?> boundClass;
-	@Nullable private final IndexCoordinates boundIndex;
-
-	public AbstractDefaultIndexOperations(ElasticsearchConverter elasticsearchConverter, Class<?> boundClass) {
-
-		Assert.notNull(boundClass, "boundClass may not be null");
-
-		this.elasticsearchConverter = elasticsearchConverter;
-		requestFactory = new RequestFactory(elasticsearchConverter);
-		this.boundClass = boundClass;
-		this.boundIndex = null;
-	}
-
-	public AbstractDefaultIndexOperations(ElasticsearchConverter elasticsearchConverter, IndexCoordinates boundIndex) {
-
-		Assert.notNull(boundIndex, "boundIndex may not be null");
-
-		this.elasticsearchConverter = elasticsearchConverter;
-		requestFactory = new RequestFactory(elasticsearchConverter);
-		this.boundClass = null;
-		this.boundIndex = boundIndex;
-	}
-
-	protected Class<?> checkForBoundClass() {
-		if (boundClass == null) {
-			throw new InvalidDataAccessApiUsageException("IndexOperations are not bound");
-		}
-		return boundClass;
-	}
-
-	// region IndexOperations
-
-	@Override
-	public boolean create() {
-
-		Document settings = null;
-
-		if (boundClass != null) {
-			settings = createSettings(boundClass);
-		}
-
-		return doCreate(getIndexCoordinates(), settings);
-	}
-
-	@Override
-	public Document createSettings(Class<?> clazz) {
-
-		Assert.notNull(clazz, "clazz must not be null");
-
-		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 create(Document settings) {
-		return doCreate(getIndexCoordinates(), settings);
-	}
-
-	protected abstract boolean doCreate(IndexCoordinates index, @Nullable Document settings);
-
-	@Override
-	public boolean delete() {
-		return doDelete(getIndexCoordinates());
-	}
-
-	protected abstract boolean doDelete(IndexCoordinates index);
-
-	@Override
-	public boolean exists() {
-		return doExists(getIndexCoordinates());
-	}
-
-	protected abstract boolean doExists(IndexCoordinates index);
-
-	@Override
-	public boolean putMapping(Document mapping) {
-		return doPutMapping(getIndexCoordinates(), mapping);
-	}
-
-	protected abstract boolean doPutMapping(IndexCoordinates index, Document mapping);
-
-	@Override
-	public Map<String, Object> getMapping() {
-		return doGetMapping(getIndexCoordinates());
-	}
-
-	abstract protected Map<String, Object> doGetMapping(IndexCoordinates index);
-
-	@Override
-	public Map<String, Object> getSettings() {
-		return getSettings(false);
-	}
-
-	@Override
-	public Map<String, Object> getSettings(boolean includeDefaults) {
-		return doGetSettings(getIndexCoordinates(), includeDefaults);
-	}
-
-	protected abstract Map<String, Object> doGetSettings(IndexCoordinates index, boolean includeDefaults);
-
-	@Override
-	public void refresh() {
-		doRefresh(getIndexCoordinates());
-	}
-
-	protected abstract void doRefresh(IndexCoordinates indexCoordinates);
-
-	@Override
-	public boolean addAlias(AliasQuery query) {
-		return doAddAlias(query, getIndexCoordinates());
-	}
-
-	protected abstract boolean doAddAlias(AliasQuery query, IndexCoordinates index);
-
-	@Override
-	public List<AliasMetadata> queryForAlias() {
-		return doQueryForAlias(getIndexCoordinates());
-	}
-
-	protected abstract List<AliasMetadata> doQueryForAlias(IndexCoordinates index);
-
-	@Override
-	public boolean removeAlias(AliasQuery query) {
-		return doRemoveAlias(query, getIndexCoordinates());
-	}
-
-	protected abstract boolean doRemoveAlias(AliasQuery query, IndexCoordinates index);
-
-	@Override
-	public Map<String, Set<AliasData>> getAliases(String... aliasNames) {
-
-		Assert.notEmpty(aliasNames, "aliasNames must not be empty");
-
-		return doGetAliases(aliasNames, null);
-	}
-
-	@Override
-	public Map<String, Set<AliasData>> getAliasesForIndex(String... indexNames) {
-
-		Assert.notEmpty(indexNames, "indexNames must not be empty");
-
-		return doGetAliases(null, indexNames);
-	}
-
-	protected abstract Map<String, Set<AliasData>> doGetAliases(@Nullable String[] aliasNames,
-			@Nullable String[] indexNames);
-
-	@Override
-	public Document createMapping() {
-		return createMapping(checkForBoundClass());
-	}
-
-	@Override
-	public Document createMapping(Class<?> clazz) {
-		return buildMapping(clazz);
-	}
-
-	protected Document buildMapping(Class<?> clazz) {
-
-		// load mapping specified in Mapping annotation if present
-		if (clazz.isAnnotationPresent(Mapping.class)) {
-			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
-
-			if (!StringUtils.isEmpty(mappingPath)) {
-				String mappings = ResourceUtil.readFileFromClasspath(mappingPath);
-
-				if (!StringUtils.isEmpty(mappings)) {
-					return Document.parse(mappings);
-				}
-			} else {
-				LOGGER.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
-			}
-		}
-
-		// build mapping from field annotations
-		try {
-			String mapping = new MappingBuilder(elasticsearchConverter).buildPropertyMapping(clazz);
-			return Document.parse(mapping);
-		} catch (Exception e) {
-			throw new UncategorizedElasticsearchException("Failed to build mapping for " + clazz.getSimpleName(), e);
-		}
-	}
-
-	@Override
-	public Document createSettings() {
-		return createSettings(checkForBoundClass());
-	}
-
-	// endregion
-
-	// region Helper functions
-	ElasticsearchPersistentEntity<?> getRequiredPersistentEntity(Class<?> clazz) {
-		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz);
-	}
-
-	@Override
-	public IndexCoordinates getIndexCoordinates() {
-		return (boundClass != null) ? getIndexCoordinatesFor(boundClass) : Objects.requireNonNull(boundIndex);
-	}
-
-	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
-}

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

@@ -1,819 +1,54 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.data.elasticsearch.core;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.elasticsearch.action.DocWriteResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.search.MultiSearchRequest;
-import org.elasticsearch.action.search.MultiSearchResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.search.suggest.SuggestBuilder;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.data.convert.EntityReader;
-import org.springframework.data.elasticsearch.BulkFailureException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.elasticsearch.ElasticsearchException;
+import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
-import org.springframework.data.elasticsearch.core.event.AfterConvertCallback;
-import org.springframework.data.elasticsearch.core.event.AfterSaveCallback;
-import org.springframework.data.elasticsearch.core.event.BeforeConvertCallback;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-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.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;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-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.support.VersionInfo;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.callback.EntityCallbacks;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.data.util.Streamable;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * AbstractElasticsearchTemplate
- *
+ * 
  * @author Sascha Woo
- * @author Peter-Josef Meisch
- * @author Roman Puchkovskiy
- * @author Subhobrata Dey
  */
-public abstract class AbstractElasticsearchTemplate implements ElasticsearchOperations, ApplicationContextAware {
+public abstract class AbstractElasticsearchTemplate {
 
-	@Nullable protected ElasticsearchConverter elasticsearchConverter;
-	@Nullable protected RequestFactory requestFactory;
-	@Nullable private EntityOperations entityOperations;
-	@Nullable private EntityCallbacks entityCallbacks;
+	static final Integer INDEX_MAX_RESULT_WINDOW = 10_000;
 
-	// region Initialization
-	protected void initialize(ElasticsearchConverter elasticsearchConverter) {
+	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractElasticsearchTemplate.class);
+
+	protected ElasticsearchConverter elasticsearchConverter;
+
+	public AbstractElasticsearchTemplate(ElasticsearchConverter elasticsearchConverter) {
 
 		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null.");
-
 		this.elasticsearchConverter = elasticsearchConverter;
-		this.entityOperations = new EntityOperations(this.elasticsearchConverter.getMappingContext());
-		requestFactory = new RequestFactory(elasticsearchConverter);
-
-		VersionInfo.logVersions(getClusterVersion());
 	}
 
-	protected ElasticsearchConverter createElasticsearchConverter() {
-		MappingElasticsearchConverter mappingElasticsearchConverter = new MappingElasticsearchConverter(
-				new SimpleElasticsearchMappingContext());
-		mappingElasticsearchConverter.afterPropertiesSet();
-		return mappingElasticsearchConverter;
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-
-		if (entityCallbacks == null) {
-			setEntityCallbacks(EntityCallbacks.create(applicationContext));
-		}
-
-		if (elasticsearchConverter instanceof ApplicationContextAware) {
-			((ApplicationContextAware) elasticsearchConverter).setApplicationContext(applicationContext);
-		}
-	}
-
-	/**
-	 * Set the {@link EntityCallbacks} instance to use when invoking {@link EntityCallbacks callbacks} like the
-	 * {@link org.springframework.data.elasticsearch.core.event.BeforeConvertCallback}.
-	 * <p />
-	 * Overrides potentially existing {@link EntityCallbacks}.
-	 *
-	 * @param entityCallbacks must not be {@literal null}.
-	 * @throws IllegalArgumentException if the given instance is {@literal null}.
-	 * @since 4.0
-	 */
-	public void setEntityCallbacks(EntityCallbacks entityCallbacks) {
-
-		Assert.notNull(entityCallbacks, "entityCallbacks must not be null");
-
-		this.entityCallbacks = entityCallbacks;
-	}
-	// endregion
-
-	// region DocumentOperations
-	@Override
-	public <T> T save(T entity) {
-
-		Assert.notNull(entity, "entity must not be null");
-
-		return save(entity, getIndexCoordinatesFor(entity.getClass()));
-	}
-
-	@Override
-	public <T> T save(T entity, IndexCoordinates index) {
-
-		Assert.notNull(entity, "entity must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		T entityAfterBeforeConvert = maybeCallbackBeforeConvert(entity, index);
-
-		IndexQuery query = getIndexQuery(entityAfterBeforeConvert);
-		doIndex(query, index);
-
-		T entityAfterAfterSave = maybeCallbackAfterSave(entityAfterBeforeConvert, index);
-
-		return entityAfterAfterSave;
-	}
-
-	@Override
-	public <T> Iterable<T> save(Iterable<T> entities) {
-
-		Assert.notNull(entities, "entities must not be null");
-
-		Iterator<T> iterator = entities.iterator();
-		if (iterator.hasNext()) {
-			return save(entities, getIndexCoordinatesFor(iterator.next().getClass()));
-		}
-
-		return entities;
-	}
-
-	@Override
-	public <T> Iterable<T> save(Iterable<T> entities, IndexCoordinates index) {
-
-		Assert.notNull(entities, "entities must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		List<IndexQuery> indexQueries = Streamable.of(entities).stream().map(this::getIndexQuery)
-				.collect(Collectors.toList());
-
-		if (!indexQueries.isEmpty()) {
-			List<IndexedObjectInformation> indexedObjectInformations = bulkIndex(indexQueries, index);
-			Iterator<IndexedObjectInformation> iterator = indexedObjectInformations.iterator();
-			entities.forEach(entity -> updateIndexedObject(entity, iterator.next()));
-		}
-
-		return indexQueries.stream().map(IndexQuery::getObject).map(entity -> (T) entity).collect(Collectors.toList());
-	}
-
-	@Override
-	public <T> Iterable<T> save(T... entities) {
-		return save(Arrays.asList(entities));
-	}
-
-	@Override
-	public String index(IndexQuery query, IndexCoordinates index) {
-
-		maybeCallbackBeforeConvertWithQuery(query, index);
-
-		String documentId = doIndex(query, index);
-
-		maybeCallbackAfterSaveWithQuery(query, index);
-
-		return documentId;
-	}
-
-	public abstract String doIndex(IndexQuery query, IndexCoordinates indexCoordinates);
-
-	@Override
-	@Nullable
-	public <T> T get(String id, Class<T> clazz) {
-		return get(id, clazz, getIndexCoordinatesFor(clazz));
-	}
-
-	@Override
-	@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));
-	}
-
-	@Override
-	public boolean exists(String id, IndexCoordinates index) {
-		return doExists(id, index);
-	}
-
-	abstract protected boolean doExists(String id, IndexCoordinates index);
-
-	@Override
-	public String delete(String id, Class<?> entityType) {
-
-		Assert.notNull(id, "id must not be null");
-		Assert.notNull(entityType, "entityType must not be null");
-
-		return this.delete(id, getIndexCoordinatesFor(entityType));
-	}
-
-	@Override
-	public void delete(Query query, Class<?> clazz) {
-		delete(query, clazz, getIndexCoordinatesFor(clazz));
-	}
-
-	@Override
-	public String delete(Object entity) {
-		return delete(entity, getIndexCoordinatesFor(entity.getClass()));
-	}
-
-	@Override
-	public String delete(Object entity, IndexCoordinates index) {
-		return this.delete(getEntityId(entity), index);
-	}
-
-	@Override
-	public List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, Class<?> clazz) {
-		return bulkIndex(queries, getIndexCoordinatesFor(clazz));
-	}
-
-	@Override
-	public List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions, Class<?> clazz) {
-		return bulkIndex(queries, bulkOptions, getIndexCoordinatesFor(clazz));
-	}
-
-	@Override
-	public final List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions,
-			IndexCoordinates index) {
-
-		Assert.notNull(queries, "List of IndexQuery must not be null");
-		Assert.notNull(bulkOptions, "BulkOptions must not be null");
-
-		return bulkOperation(queries, bulkOptions, index);
-	}
-
-	@Override
-	public void bulkUpdate(List<UpdateQuery> queries, Class<?> clazz) {
-		bulkUpdate(queries, getIndexCoordinatesFor(clazz));
-	}
-
-	public List<IndexedObjectInformation> bulkOperation(List<?> queries, BulkOptions bulkOptions,
-			IndexCoordinates index) {
-
-		Assert.notNull(queries, "List of IndexQuery must not be null");
-		Assert.notNull(bulkOptions, "BulkOptions must not be null");
-
-		maybeCallbackBeforeConvertWithQueries(queries, index);
-
-		List<IndexedObjectInformation> indexedObjectInformations = doBulkOperation(queries, bulkOptions, index);
-
-		maybeCallbackAfterSaveWithQueries(queries, index);
-
-		return indexedObjectInformations;
-	}
-
-	public abstract List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
-			IndexCoordinates index);
-	// endregion
-
-	// region SearchOperations
-	@Override
-	public long count(Query query, Class<?> clazz) {
-		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));
-	}
-
-	@Override
-	public <T> SearchHitsIterator<T> searchForStream(Query query, Class<T> clazz, IndexCoordinates index) {
-
-		long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
-
-		// noinspection ConstantConditions
-		int maxCount = query.isLimiting() ? query.getMaxResults() : 0;
-
-		return StreamQueries.streamResults( //
-				maxCount, //
-				searchScrollStart(scrollTimeInMillis, query, clazz, index), //
-				scrollId -> searchScrollContinue(scrollId, scrollTimeInMillis, clazz, index), //
-				this::searchScrollClear);
-	}
-
-	@Override
-	public <T> SearchHits<T> search(MoreLikeThisQuery query, Class<T> clazz) {
-		return search(query, clazz, getIndexCoordinatesFor(clazz));
-	}
-
-	@Override
-	public <T> SearchHits<T> search(MoreLikeThisQuery query, Class<T> clazz, IndexCoordinates index) {
-
-		Assert.notNull(query.getId(), "No document id defined for MoreLikeThisQuery");
-
-		MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = requestFactory.moreLikeThisQueryBuilder(query, index);
-		return search(new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).build(), clazz, index);
-	}
-
-	@Override
-	public <T> List<SearchHits<T>> multiSearch(List<? extends Query> queries, Class<T> clazz) {
-		return multiSearch(queries, clazz, getIndexCoordinatesFor(clazz));
-	}
-
-	@Override
-	public <T> List<SearchHits<T>> multiSearch(List<? extends Query> queries, Class<T> clazz, IndexCoordinates index) {
-		MultiSearchRequest request = new MultiSearchRequest();
-		for (Query query : queries) {
-			request.add(requestFactory.searchRequest(query, clazz, index));
-		}
-
-		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
-
-		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
-		List<SearchHits<T>> res = new ArrayList<>(queries.size());
-		int c = 0;
-		for (Query query : queries) {
-			res.add(callback.doWith(SearchDocumentResponse.from(items[c++].getResponse())));
-		}
-		return res;
-	}
-
-	@Override
-	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes) {
-
-		Assert.notNull(queries, "queries must not be null");
-		Assert.notNull(classes, "classes must not be null");
-		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
-
-		MultiSearchRequest request = new MultiSearchRequest();
-		Iterator<Class<?>> it = classes.iterator();
-		for (Query query : queries) {
-			Class<?> clazz = it.next();
-			request.add(requestFactory.searchRequest(query, clazz, getIndexCoordinatesFor(clazz)));
-		}
-
-		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
-
-		List<SearchHits<?>> res = new ArrayList<>(queries.size());
-		int c = 0;
-		Iterator<Class<?>> it1 = classes.iterator();
-		for (Query query : queries) {
-			Class entityClass = it1.next();
-
-			SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(entityClass,
-					getIndexCoordinatesFor(entityClass));
-
-			SearchResponse response = items[c++].getResponse();
-			res.add(callback.doWith(SearchDocumentResponse.from(response)));
-		}
-		return res;
-	}
-
-	@Override
-	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes,
-			IndexCoordinates index) {
-
-		Assert.notNull(queries, "queries must not be null");
-		Assert.notNull(classes, "classes must not be null");
-		Assert.notNull(index, "index must not be null");
-		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
-
-		MultiSearchRequest request = new MultiSearchRequest();
-		Iterator<Class<?>> it = classes.iterator();
-		for (Query query : queries) {
-			request.add(requestFactory.searchRequest(query, it.next(), index));
-		}
-
-		MultiSearchResponse.Item[] items = getMultiSearchResult(request);
-
-		List<SearchHits<?>> res = new ArrayList<>(queries.size());
-		int c = 0;
-		Iterator<Class<?>> it1 = classes.iterator();
-		for (Query query : queries) {
-			Class entityClass = it1.next();
-
-			SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(entityClass,
-					index);
-
-			SearchResponse response = items[c++].getResponse();
-			res.add(callback.doWith(SearchDocumentResponse.from(response)));
-		}
-		return res;
-	}
-
-	@Override
-	public <T> SearchHits<T> search(Query query, Class<T> clazz) {
-		return search(query, clazz, getIndexCoordinatesFor(clazz));
-	}
-
-	/*
-	 * internal use only, not for public API
-	 */
-	abstract protected <T> SearchScrollHits<T> searchScrollStart(long scrollTimeInMillis, Query query, Class<T> clazz,
-			IndexCoordinates index);
-
-	/*
-	 * internal use only, not for public API
-	 */
-	abstract protected <T> SearchScrollHits<T> searchScrollContinue(@Nullable String scrollId, long scrollTimeInMillis,
-			Class<T> clazz, IndexCoordinates index);
-
-	/*
-	 * internal use only, not for public API
-	 */
-	protected void searchScrollClear(String scrollId) {
-		searchScrollClear(Collections.singletonList(scrollId));
-	}
-
-	/*
-	 * internal use only, not for public API
-	 */
-	abstract protected void searchScrollClear(List<String> scrollIds);
-
-	abstract protected MultiSearchResponse.Item[] getMultiSearchResult(MultiSearchRequest request);
-
-	@Override
-	public SearchResponse suggest(SuggestBuilder suggestion, Class<?> clazz) {
-		return suggest(suggestion, getIndexCoordinatesFor(clazz));
-	}
-
-	// endregion
-
-	// region Helper methods
-	@Override
-	public ElasticsearchConverter getElasticsearchConverter() {
-
-		Assert.notNull(elasticsearchConverter, "elasticsearchConverter is not initialized.");
-
-		return elasticsearchConverter;
-	}
-
-	/**
-	 * @since 4.0
-	 */
-	public RequestFactory getRequestFactory() {
-
-		Assert.notNull(requestFactory, "requestfactory not initialized");
-
-		return requestFactory;
-	}
-
-	protected static String[] toArray(List<String> values) {
-		String[] valuesAsArray = new String[values.size()];
-		return values.toArray(valuesAsArray);
-	}
-
-	/**
-	 * @param clazz the entity class
-	 * @return the IndexCoordinates defined on the entity.
-	 * @since 4.0
-	 */
-	@Override
-	public IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
-		return getRequiredPersistentEntity(clazz).getIndexCoordinates();
-	}
-
-	/**
-	 * @param bulkResponse
-	 * @return the list of the item id's
-	 */
-	protected List<IndexedObjectInformation> checkForBulkOperationFailure(BulkResponse bulkResponse) {
-
-		if (bulkResponse.hasFailures()) {
-			Map<String, String> failedDocuments = new HashMap<>();
-			for (BulkItemResponse item : bulkResponse.getItems()) {
-
-				if (item.isFailed())
-					failedDocuments.put(item.getId(), item.getFailureMessage());
-			}
-			throw new BulkFailureException(
-					"Bulk operation has failures. Use ElasticsearchException.getFailedDocuments() for detailed messages ["
-							+ failedDocuments + ']',
-					failedDocuments);
-		}
-
-		return Stream.of(bulkResponse.getItems()).map(bulkItemResponse -> {
-			DocWriteResponse response = bulkItemResponse.getResponse();
-			if (response != null) {
-				return IndexedObjectInformation.of(response.getId(), response.getSeqNo(), response.getPrimaryTerm(),
-						response.getVersion());
+	protected String buildMapping(Class<?> clazz) {
+
+		// load mapping specified in Mapping annotation if present
+		if (clazz.isAnnotationPresent(Mapping.class)) {
+			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
+			if (!StringUtils.isEmpty(mappingPath)) {
+				String mappings = ResourceUtil.readFileFromClasspath(mappingPath);
+				if (!StringUtils.isEmpty(mappings)) {
+					return mappings;
+				}
 			} else {
-				return IndexedObjectInformation.of(bulkItemResponse.getId(), null, null, null);
-			}
-
-		}).collect(Collectors.toList());
-	}
-
-	protected void updateIndexedObject(Object entity, IndexedObjectInformation indexedObjectInformation) {
-		ElasticsearchPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(entity.getClass());
-		PersistentPropertyAccessor<Object> propertyAccessor = persistentEntity.getPropertyAccessor(entity);
-		ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();
-
-		// 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());
-		}
-	}
-
-	ElasticsearchPersistentEntity<?> getRequiredPersistentEntity(Class<?> clazz) {
-		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz);
-	}
-
-	@Nullable
-	private String getEntityId(Object entity) {
-
-		Object id = entityOperations.forEntity(entity, elasticsearchConverter.getConversionService()).getId();
-
-		if (id != null) {
-			return stringIdRepresentation(id);
-		}
-
-		return null;
-	}
-
-	@Nullable
-	public String getEntityRouting(Object entity) {
-		return entityOperations.forEntity(entity, elasticsearchConverter.getConversionService()).getRouting();
-	}
-
-	@Nullable
-	private Long getEntityVersion(Object entity) {
-
-		Number version = entityOperations.forEntity(entity, elasticsearchConverter.getConversionService()).getVersion();
-
-		if (version != null && Long.class.isAssignableFrom(version.getClass())) {
-			return ((Long) version);
-		}
-
-		return null;
-	}
-
-	@Nullable
-	private SeqNoPrimaryTerm getEntitySeqNoPrimaryTerm(Object entity) {
-
-		EntityOperations.AdaptibleEntity<Object> adaptibleEntity = entityOperations.forEntity(entity,
-				elasticsearchConverter.getConversionService());
-		return adaptibleEntity.hasSeqNoPrimaryTerm() ? adaptibleEntity.getSeqNoPrimaryTerm() : null;
-	}
-
-	private <T> IndexQuery getIndexQuery(T entity) {
-		String id = getEntityId(entity);
-
-		if (id != null) {
-			id = elasticsearchConverter.convertId(id);
-		}
-
-		IndexQueryBuilder builder = new IndexQueryBuilder() //
-				.withId(id) //
-				.withObject(entity);
-		SeqNoPrimaryTerm seqNoPrimaryTerm = getEntitySeqNoPrimaryTerm(entity);
-		if (seqNoPrimaryTerm != null) {
-			builder.withSeqNoPrimaryTerm(seqNoPrimaryTerm);
-		} else {
-			// version cannot be used together with seq_no and primary_term
-			builder.withVersion(getEntityVersion(entity));
-		}
-
-		String routing = getEntityRouting(entity);
-		if (routing != null) {
-			builder.withRouting(routing);
-		}
-		return builder.build();
-	}
-
-	/**
-	 * tries to extract the version of the Elasticsearch cluster
-	 *
-	 * @return the version as string if it can be retrieved
-	 */
-	@Nullable
-	abstract protected String getClusterVersion();
-
-	// endregion
-
-	// region Entity callbacks
-	protected <T> T maybeCallbackBeforeConvert(T entity, IndexCoordinates index) {
-
-		if (entityCallbacks != null) {
-			return entityCallbacks.callback(BeforeConvertCallback.class, entity, index);
-		}
-
-		return entity;
-	}
-
-	protected void maybeCallbackBeforeConvertWithQuery(Object query, IndexCoordinates index) {
-
-		if (query instanceof IndexQuery) {
-			IndexQuery indexQuery = (IndexQuery) query;
-			Object queryObject = indexQuery.getObject();
-
-			if (queryObject != null) {
-				queryObject = maybeCallbackBeforeConvert(queryObject, index);
-				indexQuery.setObject(queryObject);
-				// the callback might have set som values relevant for the IndexQuery
-				IndexQuery newQuery = getIndexQuery(queryObject);
-
-				if (indexQuery.getRouting() == null && newQuery.getRouting() != null) {
-					indexQuery.setRouting(newQuery.getRouting());
-				}
-
-				if (indexQuery.getSeqNo() == null && newQuery.getSeqNo() != null) {
-					indexQuery.setSeqNo(newQuery.getSeqNo());
-				}
-
-				if (indexQuery.getPrimaryTerm() == null && newQuery.getPrimaryTerm() != null) {
-					indexQuery.setPrimaryTerm(newQuery.getPrimaryTerm());
-				}
+				LOGGER.info("mappingPath in @Mapping has to be defined. Building mappings using @Field");
 			}
 		}
-	}
 
-	// this can be called with either a List<IndexQuery> or a List<UpdateQuery>; these query classes
-	// don't have a common base class, therefore the List<?> argument
-	protected void maybeCallbackBeforeConvertWithQueries(List<?> queries, IndexCoordinates index) {
-		queries.forEach(query -> maybeCallbackBeforeConvertWithQuery(query, index));
-	}
-
-	protected <T> T maybeCallbackAfterSave(T entity, IndexCoordinates index) {
-
-		if (entityCallbacks != null) {
-			return entityCallbacks.callback(AfterSaveCallback.class, entity, index);
-		}
-
-		return entity;
-	}
-
-	protected void maybeCallbackAfterSaveWithQuery(Object query, IndexCoordinates index) {
-
-		if (query instanceof IndexQuery) {
-			IndexQuery indexQuery = (IndexQuery) query;
-			Object queryObject = indexQuery.getObject();
-
-			if (queryObject != null) {
-				queryObject = maybeCallbackAfterSave(queryObject, index);
-				indexQuery.setObject(queryObject);
-			}
+		// build mapping from field annotations
+		try {
+			MappingBuilder mappingBuilder = new MappingBuilder(elasticsearchConverter);
+			return mappingBuilder.buildPropertyMapping(clazz);
+		} catch (Exception e) {
+			throw new ElasticsearchException("Failed to build mapping for " + clazz.getSimpleName(), e);
 		}
 	}
 
-	// this can be called with either a List<IndexQuery> or a List<UpdateQuery>; these query classes
-	// don't have a common base class, therefore the List<?> argument
-	protected void maybeCallbackAfterSaveWithQueries(List<?> queries, IndexCoordinates index) {
-		queries.forEach(query -> maybeCallbackAfterSaveWithQuery(query, index));
-	}
-
-	protected <T> T maybeCallbackAfterConvert(T entity, Document document, IndexCoordinates index) {
-
-		if (entityCallbacks != null) {
-			return entityCallbacks.callback(AfterConvertCallback.class, entity, document, index);
-		}
-
-		return entity;
-	}
-
-	// endregion
-
-	protected void updateIndexedObjectsWithQueries(List<?> queries,
-			List<IndexedObjectInformation> indexedObjectInformations) {
-		for (int i = 0; i < queries.size(); i++) {
-			Object query = queries.get(i);
-			if (query instanceof IndexQuery) {
-				IndexQuery indexQuery = (IndexQuery) query;
-				Object queryObject = indexQuery.getObject();
-				if (queryObject != null) {
-					updateIndexedObject(queryObject, indexedObjectInformations.get(i));
-				}
-			}
-		}
-	}
-
-	// region Document callbacks
-	protected interface DocumentCallback<T> {
-		@Nullable
-		T doWith(@Nullable Document document);
-	}
-
-	protected class ReadDocumentCallback<T> implements DocumentCallback<T> {
-		private final EntityReader<? super T, Document> reader;
-		private final Class<T> type;
-		private final IndexCoordinates index;
-
-		public ReadDocumentCallback(EntityReader<? super T, Document> reader, Class<T> type, IndexCoordinates index) {
-
-			Assert.notNull(reader, "reader is null");
-			Assert.notNull(type, "type is null");
-
-			this.reader = reader;
-			this.type = type;
-			this.index = index;
-		}
-
-		@Nullable
-		public T doWith(@Nullable Document document) {
-
-			if (document == null) {
-				return null;
-			}
-
-			T entity = reader.read(type, document);
-			return maybeCallbackAfterConvert(entity, document, index);
-		}
-	}
-
-	protected interface SearchDocumentResponseCallback<T> {
-		@NonNull
-		T doWith(@NonNull SearchDocumentResponse response);
-	}
-
-	protected class ReadSearchDocumentResponseCallback<T> implements SearchDocumentResponseCallback<SearchHits<T>> {
-		private final DocumentCallback<T> delegate;
-		private final Class<T> type;
-
-		public ReadSearchDocumentResponseCallback(Class<T> type, IndexCoordinates index) {
-
-			Assert.notNull(type, "type is null");
-
-			this.delegate = new ReadDocumentCallback<>(elasticsearchConverter, type, index);
-			this.type = type;
-		}
-
-		@Override
-		public SearchHits<T> doWith(SearchDocumentResponse response) {
-			List<T> entities = response.getSearchDocuments().stream().map(delegate::doWith).collect(Collectors.toList());
-			return SearchHitMapping.mappingFor(type, elasticsearchConverter).mapHits(response, entities);
-		}
-	}
-
-	protected class ReadSearchScrollDocumentResponseCallback<T>
-			implements SearchDocumentResponseCallback<SearchScrollHits<T>> {
-		private final DocumentCallback<T> delegate;
-		private final Class<T> type;
-
-		public ReadSearchScrollDocumentResponseCallback(Class<T> type, IndexCoordinates index) {
-
-			Assert.notNull(type, "type is null");
-
-			this.delegate = new ReadDocumentCallback<>(elasticsearchConverter, type, index);
-			this.type = type;
-		}
-
-		@Override
-		public SearchScrollHits<T> doWith(SearchDocumentResponse response) {
-			List<T> entities = response.getSearchDocuments().stream().map(delegate::doWith).collect(Collectors.toList());
-			return SearchHitMapping.mappingFor(type, elasticsearchConverter).mapScrollHits(response, entities);
-		}
-	}
-	// endregion
 }

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

@@ -0,0 +1,73 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.util.Assert;
+
+/**
+ * @author Artur Konczak
+ * @author Christoph Strobl
+ */
+public abstract class AbstractResultMapper implements ResultsMapper {
+
+	private final EntityMapper entityMapper;
+	private final ProjectionFactory projectionFactory;
+
+	/**
+	 * Create a new {@link AbstractResultMapper}.
+	 *
+	 * @param entityMapper must not be {@literal null}.
+	 */
+	public AbstractResultMapper(EntityMapper entityMapper) {
+		this(entityMapper, new SpelAwareProxyProjectionFactory());
+	}
+
+	/**
+	 * Create a new {@link AbstractResultMapper}.
+	 *
+	 * @param entityMapper must not be {@literal null}.
+	 * @param projectionFactory must not be {@literal null}.
+	 * @since 3.2
+	 */
+	public AbstractResultMapper(EntityMapper entityMapper, ProjectionFactory projectionFactory) {
+
+		Assert.notNull(entityMapper, "EntityMapper must not be null!");
+		Assert.notNull(projectionFactory, "ProjectionFactory must not be null!");
+
+		this.entityMapper = entityMapper;
+		this.projectionFactory = projectionFactory;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.core.ResultsMapper#getEntityMapper()
+	 */
+	@Override
+	public EntityMapper getEntityMapper() {
+		return this.entityMapper;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.core.ResultsMapper#getProjectionFactory()
+	 */
+	@Override
+	public ProjectionFactory getProjectionFactory() {
+		return this.projectionFactory;
+	}
+}

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

@@ -17,27 +17,20 @@ package org.springframework.data.elasticsearch.core;
 
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.ListIterator;
 
 import org.elasticsearch.common.geo.GeoDistance;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.GeoBoundingBoxQueryBuilder;
-import org.elasticsearch.index.query.GeoDistanceQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.*;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
-import org.springframework.data.elasticsearch.core.geo.GeoJson;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -46,161 +39,139 @@ import org.springframework.util.Assert;
  * @author Franck Marchand
  * @author Mohsin Husen
  * @author Artur Konczak
- * @author Peter-Josef Meisch
+ *
  */
 class CriteriaFilterProcessor {
 
-	@Nullable
-	QueryBuilder createFilter(Criteria criteria) {
-
-		List<QueryBuilder> filterBuilders = new ArrayList<>();
-
-		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {
-
-			if (chainedCriteria.isOr()) {
-				BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
-				queriesForEntries(chainedCriteria).forEach(boolQuery::should);
-				filterBuilders.add(boolQuery);
-			} else if (chainedCriteria.isNegating()) {
-				List<QueryBuilder> negationFilters = buildNegationFilter(criteria.getField().getName(),
-						criteria.getFilterCriteriaEntries().iterator());
-
-				filterBuilders.addAll(negationFilters);
-			} else {
-				filterBuilders.addAll(queriesForEntries(chainedCriteria));
-			}
-		}
 
+	QueryBuilder createFilterFromCriteria(Criteria criteria) {
+		List<QueryBuilder> fbList = new LinkedList<>();
 		QueryBuilder filter = null;
 
-		if (!filterBuilders.isEmpty()) {
+		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
 
-			if (filterBuilders.size() == 1) {
-				filter = filterBuilders.get(0);
+		while (chainIterator.hasNext()) {
+			QueryBuilder fb = null;
+			Criteria chainedCriteria = chainIterator.next();
+			if (chainedCriteria.isOr()) {
+				fb = QueryBuilders.boolQuery();
+				for(QueryBuilder f: createFilterFragmentForCriteria(chainedCriteria)){
+					((BoolQueryBuilder)fb).should(f);
+				}
+				fbList.add(fb);
+			} else if (chainedCriteria.isNegating()) {
+				List<QueryBuilder> negationFilters = buildNegationFilter(criteria.getField().getName(), criteria.getFilterCriteriaEntries().iterator());
+
+				if (!negationFilters.isEmpty()) {
+					fbList.addAll(negationFilters);
+				}
 			} else {
-				BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
-				filterBuilders.forEach(boolQuery::must);
-				filter = boolQuery;
+				fbList.addAll(createFilterFragmentForCriteria(chainedCriteria));
 			}
 		}
 
+		if (!fbList.isEmpty()) {
+			if (fbList.size() == 1) {
+				filter = fbList.get(0);
+			} else {
+				filter = QueryBuilders.boolQuery();
+				for(QueryBuilder f: fbList) {
+					((BoolQueryBuilder)filter).must(f);
+				}
+			}
+		}
 		return filter;
 	}
 
-	private List<QueryBuilder> queriesForEntries(Criteria criteria) {
 
-		Assert.notNull(criteria.getField(), "criteria must have a field");
-		String fieldName = criteria.getField().getName();
+	private List<QueryBuilder> createFilterFragmentForCriteria(Criteria chainedCriteria) {
+		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getFilterCriteriaEntries().iterator();
+		List<QueryBuilder> filterList = new LinkedList<>();
+
+		String fieldName = chainedCriteria.getField().getName();
 		Assert.notNull(fieldName, "Unknown field");
+		QueryBuilder filter = null;
 
-		return criteria.getFilterCriteriaEntries().stream()
-				.map(entry -> queryFor(entry.getKey(), entry.getValue(), fieldName)).collect(Collectors.toList());
+		while (it.hasNext()) {
+			Criteria.CriteriaEntry entry = it.next();
+			filter = processCriteriaEntry(entry.getKey(), entry.getValue(), fieldName);
+			filterList.add(filter);
+		}
+
+		return filterList;
 	}
 
-	@Nullable
-	private QueryBuilder queryFor(OperationKey key, Object value, String fieldName) {
 
+	private QueryBuilder processCriteriaEntry(OperationKey key, Object value, String fieldName) {
+		if (value == null) {
+			return null;
+		}
 		QueryBuilder filter = null;
 
 		switch (key) {
-			case WITHIN:
+			case WITHIN: {
+				GeoDistanceQueryBuilder geoDistanceQueryBuilder = QueryBuilders.geoDistanceQuery(fieldName);
+
 				Assert.isTrue(value instanceof Object[], "Value of a geo distance filter should be an array of two values.");
-				filter = withinQuery(fieldName, (Object[]) value);
+				Object[] valArray = (Object[]) value;
+				Assert.noNullElements(valArray, "Geo distance filter takes 2 not null elements array as parameter.");
+				Assert.isTrue(valArray.length == 2, "Geo distance filter takes a 2-elements array as parameter.");
+				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point, "First element of a geo distance filter must be a GeoPoint, a Point or a text");
+				Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance, "Second element of a geo distance filter must be a text or a Distance");
+
+				StringBuilder dist = new StringBuilder();
+
+				if (valArray[1] instanceof Distance) {
+					extractDistanceString((Distance) valArray[1], dist);
+				} else {
+					dist.append((String) valArray[1]);
+				}
+
+				if (valArray[0] instanceof GeoPoint) {
+					GeoPoint loc = (GeoPoint) valArray[0];
+					geoDistanceQueryBuilder.point(loc.getLat(),loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+				} else if (valArray[0] instanceof Point) {
+					GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]);
+					geoDistanceQueryBuilder.point(loc.getLat(), loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+				} else {
+					String loc = (String) valArray[0];
+					if (loc.contains(",")) {
+						String c[] = loc.split(",");
+						geoDistanceQueryBuilder.point(Double.parseDouble(c[0]), Double.parseDouble(c[1])).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					} else {
+						geoDistanceQueryBuilder.geohash(loc).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					}
+				}
+				filter = geoDistanceQueryBuilder;
+
 				break;
-			case BBOX:
-				Assert.isTrue(value instanceof Object[],
-						"Value of a boundedBy filter should be an array of one or two values.");
-				filter = boundingBoxQuery(fieldName, (Object[]) value);
+			}
+
+			case BBOX: {
+				filter = QueryBuilders.geoBoundingBoxQuery(fieldName);
+
+				Assert.isTrue(value instanceof Object[], "Value of a boundedBy filter should be an array of one or two values.");
+				Object[] valArray = (Object[]) value;
+				Assert.noNullElements(valArray, "Geo boundedBy filter takes a not null element array as parameter.");
+
+				if (valArray.length == 1) {
+					//GeoEnvelop
+					oneParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray[0]);
+				} else if (valArray.length == 2) {
+					//2x GeoPoint
+					//2x text
+					twoParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray);
+				} else {
+					//error
+					Assert.isTrue(false, "Geo distance filter takes a 1-elements array(GeoBox) or 2-elements array(GeoPoints or Strings(format lat,lon or geohash)).");
+				}
 				break;
-			case GEO_INTERSECTS:
-				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_INTERSECTS filter must be a GeoJson object");
-				filter = geoJsonQuery(fieldName, (GeoJson<?>) value, "intersects");
-				break;
-			case GEO_IS_DISJOINT:
-				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_IS_DISJOINT filter must be a GeoJson object");
-				filter = geoJsonQuery(fieldName, (GeoJson<?>) value, "disjoint");
-				break;
-			case GEO_WITHIN:
-				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_WITHIN filter must be a GeoJson object");
-				filter = geoJsonQuery(fieldName, (GeoJson<?>) value, "within");
-				break;
-			case GEO_CONTAINS:
-				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_CONTAINS filter must be a GeoJson object");
-				filter = geoJsonQuery(fieldName, (GeoJson<?>) value, "contains");
-				break;
-		}
-
-		return filter;
-	}
-
-	private QueryBuilder withinQuery(String fieldName, Object[] valArray) {
-
-		GeoDistanceQueryBuilder filter = QueryBuilders.geoDistanceQuery(fieldName);
-
-		Assert.noNullElements(valArray, "Geo distance filter takes 2 not null elements array as parameter.");
-		Assert.isTrue(valArray.length == 2, "Geo distance filter takes a 2-elements array as parameter.");
-		Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point,
-				"First element of a geo distance filter must be a GeoPoint, a Point or a text");
-		Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance,
-				"Second element of a geo distance filter must be a text or a Distance");
-
-		StringBuilder dist = new StringBuilder();
-
-		if (valArray[1] instanceof Distance) {
-			extractDistanceString((Distance) valArray[1], dist);
-		} else {
-			dist.append((String) valArray[1]);
-		}
-
-		if (valArray[0] instanceof GeoPoint) {
-			GeoPoint loc = (GeoPoint) valArray[0];
-			filter.point(loc.getLat(), loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
-		} else if (valArray[0] instanceof Point) {
-			GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]);
-			filter.point(loc.getLat(), loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
-		} else {
-			String loc = (String) valArray[0];
-			if (loc.contains(",")) {
-				String[] c = loc.split(",");
-				filter.point(Double.parseDouble(c[0]), Double.parseDouble(c[1])).distance(dist.toString())
-						.geoDistance(GeoDistance.PLANE);
-			} else {
-				filter.geohash(loc).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
 			}
 		}
 
 		return filter;
 	}
 
-	private QueryBuilder boundingBoxQuery(String fieldName, Object[] valArray) {
-
-		Assert.noNullElements(valArray, "Geo boundedBy filter takes a not null element array as parameter.");
-
-		GeoBoundingBoxQueryBuilder filter = QueryBuilders.geoBoundingBoxQuery(fieldName);
-
-		if (valArray.length == 1) {
-			// GeoEnvelop
-			oneParameterBBox(filter, valArray[0]);
-		} else if (valArray.length == 2) {
-			// 2x GeoPoint
-			// 2x text
-			twoParameterBBox(filter, valArray);
-		} else {
-			throw new IllegalArgumentException(
-					"Geo distance filter takes a 1-elements array(GeoBox) or 2-elements array(GeoPoints or Strings(format lat,lon or geohash)).");
-		}
-
-		return filter;
-	}
-
-	private QueryBuilder geoJsonQuery(String fieldName, GeoJson<?> geoJson, String relation) {
-		return QueryBuilders.wrapperQuery(buildJsonQuery(fieldName, geoJson, relation));
-	}
-
-	private String buildJsonQuery(String fieldName, GeoJson<?> geoJson, String relation) {
-		return "{\"geo_shape\": {\"" + fieldName + "\": {\"shape\": " + geoJson.toJson() + ", \"relation\": \"" + relation
-				+ "\"}}}";
-	}
 
 	/**
 	 * extract the distance string from a {@link org.springframework.data.geo.Distance} object.
@@ -225,21 +196,20 @@ class CriteriaFilterProcessor {
 	}
 
 	private void oneParameterBBox(GeoBoundingBoxQueryBuilder filter, Object value) {
-		Assert.isTrue(value instanceof GeoBox || value instanceof Box,
-				"single-element of boundedBy filter must be type of GeoBox or Box");
+		Assert.isTrue(value instanceof GeoBox || value instanceof Box, "single-element of boundedBy filter must be type of GeoBox or Box");
 
 		GeoBox geoBBox;
 		if (value instanceof Box) {
-			geoBBox = GeoBox.fromBox((Box) value);
+			Box sdbox = (Box) value;
+			geoBBox = GeoBox.fromBox(sdbox);
 		} else {
 			geoBBox = (GeoBox) value;
 		}
 
-		filter.setCorners(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon(), geoBBox.getBottomRight().getLat(),
-				geoBBox.getBottomRight().getLon());
+		filter.setCorners(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon(), geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
 	}
 
-	private static boolean isType(Object[] array, Class<?> clazz) {
+	private static boolean isType(Object[] array, Class clazz) {
 		for (Object o : array) {
 			if (!clazz.isInstance(o)) {
 				return false;
@@ -249,8 +219,7 @@ class CriteriaFilterProcessor {
 	}
 
 	private void twoParameterBBox(GeoBoundingBoxQueryBuilder filter, Object[] values) {
-		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class),
-				" both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
+		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class), " both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
 		if (values[0] instanceof GeoPoint) {
 			GeoPoint topLeft = (GeoPoint) values[0];
 			GeoPoint bottomRight = (GeoPoint) values[1];
@@ -267,8 +236,7 @@ class CriteriaFilterProcessor {
 
 		while (it.hasNext()) {
 			Criteria.CriteriaEntry criteriaEntry = it.next();
-			QueryBuilder notFilter = QueryBuilders.boolQuery()
-					.mustNot(queryFor(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName));
+			QueryBuilder notFilter = QueryBuilders.boolQuery().mustNot(processCriteriaEntry(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName));
 			notFilterList.add(notFilter);
 		}
 

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

@@ -19,17 +19,16 @@ import static org.elasticsearch.index.query.Operator.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 
-import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
 
+import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
 import org.apache.lucene.queryparser.flexible.standard.QueryParserUtil;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.core.query.Criteria;
-import org.springframework.data.elasticsearch.core.query.Field;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -39,87 +38,66 @@ import org.springframework.util.Assert;
  * @author Mohsin Husen
  * @author Franck Marchand
  * @author Artur Konczak
- * @author Rasmus Faber-Espensen
- * @author James Bodkin
- * @author Peter-Josef Meisch
  */
 class CriteriaQueryProcessor {
 
-	@Nullable
-	QueryBuilder createQuery(Criteria criteria) {
+	QueryBuilder createQueryFromCriteria(Criteria criteria) {
+		if (criteria == null)
+			return null;
 
-		Assert.notNull(criteria, "criteria must not be null");
+		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<>();
+		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<>();
+		List<QueryBuilder> mustQueryBuilderList = new LinkedList<>();
 
-		List<QueryBuilder> shouldQueryBuilders = new ArrayList<>();
-		List<QueryBuilder> mustNotQueryBuilders = new ArrayList<>();
-		List<QueryBuilder> mustQueryBuilders = new ArrayList<>();
+		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
 
 		QueryBuilder firstQuery = null;
 		boolean negateFirstQuery = false;
 
-		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {
-			QueryBuilder queryFragment = queryForEntries(chainedCriteria);
-
-			if (queryFragment != null) {
-
+		while (chainIterator.hasNext()) {
+			Criteria chainedCriteria = chainIterator.next();
+			QueryBuilder queryFragmentForCriteria = createQueryFragmentForCriteria(chainedCriteria);
+			if (queryFragmentForCriteria != null) {
 				if (firstQuery == null) {
-					firstQuery = queryFragment;
+					firstQuery = queryFragmentForCriteria;
 					negateFirstQuery = chainedCriteria.isNegating();
 					continue;
 				}
-
 				if (chainedCriteria.isOr()) {
-					shouldQueryBuilders.add(queryFragment);
+					shouldQueryBuilderList.add(queryFragmentForCriteria);
 				} else if (chainedCriteria.isNegating()) {
-					mustNotQueryBuilders.add(queryFragment);
+					mustNotQueryBuilderList.add(queryFragmentForCriteria);
 				} else {
-					mustQueryBuilders.add(queryFragment);
-				}
-			}
-		}
-
-		for (Criteria subCriteria : criteria.getSubCriteria()) {
-
-			QueryBuilder subQuery = createQuery(subCriteria);
-
-			if (subQuery != null) {
-				if (criteria.isOr()) {
-					shouldQueryBuilders.add(subQuery);
-				} else if (criteria.isNegating()) {
-					mustNotQueryBuilders.add(subQuery);
-				} else {
-					mustQueryBuilders.add(subQuery);
+					mustQueryBuilderList.add(queryFragmentForCriteria);
 				}
 			}
 		}
 
 		if (firstQuery != null) {
-
-			if (!shouldQueryBuilders.isEmpty() && mustNotQueryBuilders.isEmpty() && mustQueryBuilders.isEmpty()) {
-				shouldQueryBuilders.add(0, firstQuery);
+			if (!shouldQueryBuilderList.isEmpty() && mustNotQueryBuilderList.isEmpty() && mustQueryBuilderList.isEmpty()) {
+				shouldQueryBuilderList.add(0, firstQuery);
 			} else {
-
 				if (negateFirstQuery) {
-					mustNotQueryBuilders.add(0, firstQuery);
+					mustNotQueryBuilderList.add(0, firstQuery);
 				} else {
-					mustQueryBuilders.add(0, firstQuery);
+					mustQueryBuilderList.add(0, firstQuery);
 				}
 			}
 		}
 
 		BoolQueryBuilder query = null;
 
-		if (!shouldQueryBuilders.isEmpty() || !mustNotQueryBuilders.isEmpty() || !mustQueryBuilders.isEmpty()) {
+		if (!shouldQueryBuilderList.isEmpty() || !mustNotQueryBuilderList.isEmpty() || !mustQueryBuilderList.isEmpty()) {
 
 			query = boolQuery();
 
-			for (QueryBuilder qb : shouldQueryBuilders) {
+			for (QueryBuilder qb : shouldQueryBuilderList) {
 				query.should(qb);
 			}
-			for (QueryBuilder qb : mustNotQueryBuilders) {
+			for (QueryBuilder qb : mustNotQueryBuilderList) {
 				query.mustNot(qb);
 			}
-			for (QueryBuilder qb : mustQueryBuilders) {
+			for (QueryBuilder qb : mustQueryBuilderList) {
 				query.must(qb);
 			}
 		}
@@ -127,66 +105,60 @@ class CriteriaQueryProcessor {
 		return query;
 	}
 
-	@Nullable
-	private QueryBuilder queryForEntries(Criteria criteria) {
-
-		Field field = criteria.getField();
-
-		if (field == null || criteria.getQueryCriteriaEntries().isEmpty())
+	private QueryBuilder createQueryFragmentForCriteria(Criteria chainedCriteria) {
+		if (chainedCriteria.getQueryCriteriaEntries().isEmpty())
 			return null;
 
-		String fieldName = field.getName();
+		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getQueryCriteriaEntries().iterator();
+		boolean singeEntryCriteria = (chainedCriteria.getQueryCriteriaEntries().size() == 1);
+
+		String fieldName = chainedCriteria.getField().getName();
 		Assert.notNull(fieldName, "Unknown field");
+		QueryBuilder query = null;
 
-		Iterator<Criteria.CriteriaEntry> it = criteria.getQueryCriteriaEntries().iterator();
-		QueryBuilder query;
-
-		if (criteria.getQueryCriteriaEntries().size() == 1) {
-			query = queryFor(it.next(), field);
+		if (singeEntryCriteria) {
+			Criteria.CriteriaEntry entry = it.next();
+			query = processCriteriaEntry(entry, fieldName);
 		} else {
 			query = boolQuery();
 			while (it.hasNext()) {
 				Criteria.CriteriaEntry entry = it.next();
-				((BoolQueryBuilder) query).must(queryFor(entry, field));
+				((BoolQueryBuilder) query).must(processCriteriaEntry(entry, fieldName));
 			}
 		}
 
-		addBoost(query, criteria.getBoost());
+		addBoost(query, chainedCriteria.getBoost());
 		return query;
 	}
 
-	@Nullable
-	private QueryBuilder queryFor(Criteria.CriteriaEntry entry, Field field) {
-
-		String fieldName = field.getName();
-		boolean isKeywordField = FieldType.Keyword == field.getFieldType();
-
-		OperationKey key = entry.getKey();
-
-		if (key == OperationKey.EXISTS) {
-			return existsQuery(fieldName);
-		}
-
+	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,
+			/* OperationKey key, Object value,*/ String fieldName) {
 		Object value = entry.getValue();
-		String searchText = QueryParserUtil.escape(value.toString());
-
+		if (value == null) {
+			return null;
+		}
+		OperationKey key = entry.getKey();
 		QueryBuilder query = null;
 
+		String searchText = StringUtils.toString(value);
+
+		Iterable<Object> collection = null;
+
 		switch (key) {
 			case EQUALS:
 				query = queryStringQuery(searchText).field(fieldName).defaultOperator(AND);
 				break;
 			case CONTAINS:
-				query = queryStringQuery('*' + searchText + '*').field(fieldName).analyzeWildcard(true);
+				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
 				break;
 			case STARTS_WITH:
-				query = queryStringQuery(searchText + '*').field(fieldName).analyzeWildcard(true);
+				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
 				break;
 			case ENDS_WITH:
-				query = queryStringQuery('*' + searchText).field(fieldName).analyzeWildcard(true);
+				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
 				break;
 			case EXPRESSION:
-				query = queryStringQuery(value.toString()).field(fieldName);
+				query = queryStringQuery(searchText).field(fieldName);
 				break;
 			case LESS_EQUAL:
 				query = rangeQuery(fieldName).lte(value);
@@ -207,42 +179,27 @@ class CriteriaQueryProcessor {
 			case FUZZY:
 				query = fuzzyQuery(fieldName, searchText);
 				break;
-			case MATCHES:
-				query = matchQuery(fieldName, value).operator(org.elasticsearch.index.query.Operator.OR);
-				break;
-			case MATCHES_ALL:
-				query = matchQuery(fieldName, value).operator(org.elasticsearch.index.query.Operator.AND);
-				break;
 			case IN:
 				if (value instanceof Iterable) {
 					Iterable<?> iterable = (Iterable<?>) value;
-					if (isKeywordField) {
-						query = boolQuery().must(termsQuery(fieldName, toStringList(iterable)));
-					} else {
-						query = queryStringQuery(orQueryString(iterable)).field(fieldName);
-					}
+					query = queryStringQuery(orQueryString(iterable)).field(fieldName);
 				}
 				break;
 			case NOT_IN:
 				if (value instanceof Iterable) {
 					Iterable<?> iterable = (Iterable<?>) value;
-					if (isKeywordField) {
-						query = boolQuery().mustNot(termsQuery(fieldName, toStringList(iterable)));
-					} else {
-						query = queryStringQuery("NOT(" + orQueryString(iterable) + ')').field(fieldName);
-					}
+					query = queryStringQuery("NOT(" + orQueryString(iterable) + ')').field(fieldName);
 				}
 				break;
 		}
 		return query;
 	}
 
-	private static List<String> toStringList(Iterable<?> iterable) {
-		List<String> list = new ArrayList<>();
-		for (Object item : iterable) {
-			list.add(item != null ? item.toString() : null);
+	private void addBoost(QueryBuilder query, float boost) {
+		if (Float.isNaN(boost)) {
+			return;
 		}
-		return list;
+		query.boost(boost);
 	}
 
 	private static String orQueryString(Iterable<?> iterable) {
@@ -263,13 +220,4 @@ class CriteriaQueryProcessor {
 
 		return sb.toString();
 	}
-
-	private void addBoost(@Nullable QueryBuilder query, float boost) {
-
-		if (query == null || Float.isNaN(boost)) {
-			return;
-		}
-
-		query.boost(boost);
-	}
 }

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

@@ -0,0 +1,189 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.elasticsearch.core.geo.CustomGeoModule;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.util.Assert;
+
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
+
+/**
+ * EntityMapper based on a Jackson {@link ObjectMapper}.
+ *
+ * @author Artur Konczak
+ * @author Petar Tahchiev
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ */
+public class DefaultEntityMapper implements EntityMapper {
+
+	private ObjectMapper objectMapper;
+
+	/**
+	 * Creates a new {@link DefaultEntityMapper} using the given {@link MappingContext}.
+	 * 
+	 * @param context must not be {@literal null}.
+	 */
+	public DefaultEntityMapper(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
+
+		Assert.notNull(context, "MappingContext must not be null!");
+
+		objectMapper = new ObjectMapper();
+
+		objectMapper.registerModule(new SpringDataElasticsearchModule(context));
+		objectMapper.registerModule(new CustomGeoModule());
+
+		objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.core.EntityMapper#mapToString(java.lang.Object)
+	 */
+	@Override
+	public String mapToString(Object object) throws IOException {
+		return objectMapper.writeValueAsString(object);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.core.EntityMapper#mapObject(java.lang.Object)
+	 */
+	@Override
+	public Map<String, Object> mapObject(Object source) {
+
+		try {
+			return objectMapper.readValue(mapToString(source), HashMap.class);
+		} catch (IOException e) {
+			throw new MappingException(e.getMessage(), e);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.core.EntityMapper#mapToObject(java.lang.String, java.lang.Class)
+	 */
+	@Override
+	public <T> T mapToObject(String source, Class<T> clazz) throws IOException {
+		return objectMapper.readValue(source, clazz);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.elasticsearch.core.EntityMapper#readObject(java.util.Map, java.lang.Class)
+	 */
+	@Override
+	public <T> T readObject (Map<String, Object> source, Class<T> targetType) {
+
+		try {
+			return mapToObject(mapToString(source), targetType);
+		} catch (IOException e) {
+			throw new MappingException(e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * A simple Jackson module to register the {@link SpringDataSerializerModifier}.
+	 *
+	 * @author Oliver Gierke
+	 * @since 3.1
+	 */
+	private static class SpringDataElasticsearchModule extends SimpleModule {
+
+		private static final long serialVersionUID = -9168968092458058966L;
+
+		/**
+		 * Creates a new {@link SpringDataElasticsearchModule} using the given {@link MappingContext}.
+		 * 
+		 * @param context must not be {@literal null}.
+		 */
+		public SpringDataElasticsearchModule(
+				MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
+
+			Assert.notNull(context, "MappingContext must not be null!");
+
+			setSerializerModifier(new SpringDataSerializerModifier(context));
+		}
+
+		/**
+		 * A {@link BeanSerializerModifier} that will drop properties annotated with {@link ReadOnlyProperty} for
+		 * serialization.
+		 *
+		 * @author Oliver Gierke
+		 * @since 3.1
+		 */
+		private static class SpringDataSerializerModifier extends BeanSerializerModifier {
+
+			private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context;
+
+			public SpringDataSerializerModifier(
+					MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
+
+				Assert.notNull(context, "MappingContext must not be null!");
+
+				this.context = context;
+			}
+
+			/* 
+			 * (non-Javadoc)
+			 * @see com.fasterxml.jackson.databind.ser.BeanSerializerModifier#changeProperties(com.fasterxml.jackson.databind.SerializationConfig, com.fasterxml.jackson.databind.BeanDescription, java.util.List)
+			 */
+			@Override
+			public List<BeanPropertyWriter> changeProperties(SerializationConfig config, BeanDescription description,
+					List<BeanPropertyWriter> properties) {
+
+				Class<?> type = description.getBeanClass();
+				ElasticsearchPersistentEntity<?> entity = context.getPersistentEntity(type);
+
+				if (entity == null) {
+					return super.changeProperties(config, description, properties);
+				}
+
+				List<BeanPropertyWriter> result = new ArrayList<>(properties.size());
+
+				for (BeanPropertyWriter beanPropertyWriter : properties) {
+
+					ElasticsearchPersistentProperty property = entity.getPersistentProperty(beanPropertyWriter.getName());
+
+					if (property != null && property.isWritable()) {
+						result.add(beanPropertyWriter);
+					}
+				}
+
+				return result;
+			}
+		}
+	}
+}

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

@@ -1,260 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-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.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
-import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
-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.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
-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.cluster.metadata.AliasMetadata;
-import org.elasticsearch.cluster.metadata.MappingMetadata;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.index.AliasActions;
-import org.springframework.data.elasticsearch.core.index.AliasData;
-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.TemplateData;
-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;
-
-/**
- * {@link IndexOperations} implementation using the RestClient.
- * 
- * @author Peter-Josef Meisch
- * @author Sascha Woo
- * @since 4.0
- */
-class DefaultIndexOperations extends AbstractDefaultIndexOperations implements IndexOperations {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultIndexOperations.class);
-
-	private final ElasticsearchRestTemplate restTemplate;
-
-	public DefaultIndexOperations(ElasticsearchRestTemplate restTemplate, Class<?> boundClass) {
-		super(restTemplate.getElasticsearchConverter(), boundClass);
-		this.restTemplate = restTemplate;
-	}
-
-	public DefaultIndexOperations(ElasticsearchRestTemplate restTemplate, IndexCoordinates boundIndex) {
-		super(restTemplate.getElasticsearchConverter(), boundIndex);
-		this.restTemplate = restTemplate;
-	}
-
-	@Override
-	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());
-	}
-
-	@Override
-	protected boolean doDelete(IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		if (doExists(index)) {
-			DeleteIndexRequest deleteIndexRequest = requestFactory.deleteIndexRequest(index);
-			return restTemplate
-					.execute(client -> client.indices().delete(deleteIndexRequest, RequestOptions.DEFAULT).isAcknowledged());
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean doExists(IndexCoordinates index) {
-
-		GetIndexRequest getIndexRequest = requestFactory.getIndexRequest(index);
-		return restTemplate.execute(client -> client.indices().exists(getIndexRequest, RequestOptions.DEFAULT));
-	}
-
-	@Override
-	protected boolean doPutMapping(IndexCoordinates index, Document mapping) {
-
-		Assert.notNull(index, "No index defined for putMapping()");
-
-		PutMappingRequest request = requestFactory.putMappingRequest(index, mapping);
-		return restTemplate
-				.execute(client -> client.indices().putMapping(request, RequestOptions.DEFAULT).isAcknowledged());
-	}
-
-	@Override
-	protected Map<String, Object> doGetMapping(IndexCoordinates index) {
-
-		Assert.notNull(index, "No index defined for getMapping()");
-
-		GetMappingsRequest mappingsRequest = requestFactory.getMappingsRequest(index);
-
-		return restTemplate.execute(client -> {
-			Map<String, MappingMetadata> mappings = client.indices() //
-					.getMapping(mappingsRequest, RequestOptions.DEFAULT) //
-					.mappings(); //
-
-			if (mappings == null || mappings.size() == 0) {
-				return Collections.emptyMap();
-			}
-
-			if (mappings.size() > 1) {
-				LOGGER.warn("more than one mapping returned for " + index.getIndexName());
-			}
-			// we have at least one, take the first from the iterator
-			return mappings.entrySet().iterator().next().getValue().getSourceAsMap();
-		});
-	}
-
-	@Override
-	protected boolean doAddAlias(AliasQuery query, IndexCoordinates index) {
-
-		IndicesAliasesRequest request = requestFactory.indicesAddAliasesRequest(query, index);
-		return restTemplate
-				.execute(client -> client.indices().updateAliases(request, RequestOptions.DEFAULT).isAcknowledged());
-	}
-
-	@Override
-	protected boolean doRemoveAlias(AliasQuery query, IndexCoordinates index) {
-
-		Assert.notNull(index, "No index defined for Alias");
-		Assert.notNull(query.getAliasName(), "No alias defined");
-
-		IndicesAliasesRequest indicesAliasesRequest = requestFactory.indicesRemoveAliasesRequest(query, index);
-		return restTemplate.execute(
-				client -> client.indices().updateAliases(indicesAliasesRequest, RequestOptions.DEFAULT).isAcknowledged());
-	}
-
-	@Override
-	protected List<AliasMetadata> doQueryForAlias(IndexCoordinates index) {
-
-		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(index);
-
-		return restTemplate.execute(client -> {
-			GetAliasesResponse alias = client.indices().getAlias(getAliasesRequest, RequestOptions.DEFAULT);
-			// we only return data for the first index name that was requested (always have done so)
-			String index1 = getAliasesRequest.indices()[0];
-			return new ArrayList<>(alias.getAliases().get(index1));
-		});
-	}
-
-	@Override
-	protected Map<String, Set<AliasData>> doGetAliases(@Nullable String[] aliasNames, @Nullable String[] indexNames) {
-
-		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(aliasNames, indexNames);
-
-		return restTemplate.execute(client -> requestFactory
-				.convertAliasesResponse(client.indices().getAlias(getAliasesRequest, RequestOptions.DEFAULT).getAliases()));
-	}
-
-	@Override
-	public boolean alias(AliasActions aliasActions) {
-
-		IndicesAliasesRequest request = requestFactory.indicesAliasesRequest(aliasActions);
-		return restTemplate
-				.execute(client -> client.indices().updateAliases(request, RequestOptions.DEFAULT).isAcknowledged());
-	}
-
-	@Override
-	protected Map<String, Object> doGetSettings(IndexCoordinates index, boolean includeDefaults) {
-
-		Assert.notNull(index, "index must not be null");
-
-		GetSettingsRequest getSettingsRequest = requestFactory.getSettingsRequest(index, includeDefaults);
-		GetSettingsResponse response = restTemplate.execute(client -> client.indices() //
-				.getSettings(getSettingsRequest, RequestOptions.DEFAULT));
-
-		return requestFactory.fromSettingsResponse(response, getSettingsRequest.indices()[0]);
-	}
-
-	@Override
-	protected void doRefresh(IndexCoordinates index) {
-
-		Assert.notNull(index, "No index defined for refresh()");
-
-		RefreshRequest refreshRequest = requestFactory.refreshRequest(index);
-		restTemplate.execute(client -> client.indices().refresh(refreshRequest, RequestOptions.DEFAULT));
-	}
-
-	@Override
-	public boolean putTemplate(PutTemplateRequest putTemplateRequest) {
-
-		Assert.notNull(putTemplateRequest, "putTemplateRequest must not be null");
-
-		PutIndexTemplateRequest putIndexTemplateRequest = requestFactory.putIndexTemplateRequest(putTemplateRequest);
-		return restTemplate.execute(
-				client -> client.indices().putTemplate(putIndexTemplateRequest, RequestOptions.DEFAULT).isAcknowledged());
-	}
-
-	@Override
-	public TemplateData getTemplate(GetTemplateRequest getTemplateRequest) {
-
-		Assert.notNull(getTemplateRequest, "getTemplateRequest must not be null");
-
-		// getIndexTemplate throws an error on non-existing template names
-		if (!existsTemplate(new ExistsTemplateRequest(getTemplateRequest.getTemplateName()))) {
-			return null;
-		}
-
-		GetIndexTemplatesRequest getIndexTemplatesRequest = requestFactory.getIndexTemplatesRequest(getTemplateRequest);
-		GetIndexTemplatesResponse getIndexTemplatesResponse = restTemplate
-				.execute(client -> client.indices().getIndexTemplate(getIndexTemplatesRequest, RequestOptions.DEFAULT));
-		return requestFactory.getTemplateData(getIndexTemplatesResponse, getTemplateRequest.getTemplateName());
-	}
-
-	@Override
-	public boolean existsTemplate(ExistsTemplateRequest existsTemplateRequest) {
-
-		Assert.notNull(existsTemplateRequest, "existsTemplateRequest must not be null");
-
-		IndexTemplatesExistRequest putIndexTemplateRequest = requestFactory
-				.indexTemplatesExistsRequest(existsTemplateRequest);
-		return restTemplate
-				.execute(client -> client.indices().existsTemplate(putIndexTemplateRequest, RequestOptions.DEFAULT));
-	}
-
-	@Override
-	public boolean deleteTemplate(DeleteTemplateRequest deleteTemplateRequest) {
-
-		Assert.notNull(deleteTemplateRequest, "deleteTemplateRequest must not be null");
-
-		DeleteIndexTemplateRequest deleteIndexTemplateRequest = requestFactory
-				.deleteIndexTemplateRequest(deleteTemplateRequest);
-		return restTemplate.execute(
-				client -> client.indices().deleteTemplate(deleteIndexTemplateRequest, RequestOptions.DEFAULT).isAcknowledged());
-	}
-
-	// endregion
-}

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

@@ -1,339 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import static org.elasticsearch.client.Requests.*;
-import static org.springframework.util.StringUtils.*;
-
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-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.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
-import org.elasticsearch.client.indices.PutIndexTemplateRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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;
-import org.springframework.data.elasticsearch.core.index.AliasData;
-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.MappingBuilder;
-import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
-import org.springframework.data.elasticsearch.core.index.TemplateData;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.1
- */
-class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultReactiveIndexOperations.class);
-
-	@Nullable private final Class<?> boundClass;
-	private final IndexCoordinates boundIndex;
-	private final RequestFactory requestFactory;
-	private final ReactiveElasticsearchOperations operations;
-	private final ElasticsearchConverter converter;
-
-	public DefaultReactiveIndexOperations(ReactiveElasticsearchOperations operations, IndexCoordinates index) {
-
-		Assert.notNull(operations, "operations must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		this.operations = operations;
-		this.converter = operations.getElasticsearchConverter();
-		this.requestFactory = new RequestFactory(operations.getElasticsearchConverter());
-		this.boundClass = null;
-		this.boundIndex = index;
-	}
-
-	public DefaultReactiveIndexOperations(ReactiveElasticsearchOperations operations, Class<?> clazz) {
-
-		Assert.notNull(operations, "operations must not be null");
-		Assert.notNull(clazz, "clazz must not be null");
-
-		this.operations = operations;
-		this.converter = operations.getElasticsearchConverter();
-		this.requestFactory = new RequestFactory(operations.getElasticsearchConverter());
-		this.boundClass = clazz;
-		this.boundIndex = getIndexCoordinatesFor(clazz);
-	}
-
-	// region index management
-	@Override
-	public Mono<Boolean> create() {
-
-		String indexName = getIndexCoordinates().getIndexName();
-
-		if (boundClass != null) {
-			return createSettings(boundClass).flatMap(settings -> doCreate(indexName, settings));
-		} else {
-			return doCreate(indexName, null);
-		}
-	}
-
-	@Override
-	public Mono<Boolean> create(Document settings) {
-		return doCreate(getIndexCoordinates().getIndexName(), settings);
-	}
-
-	private Mono<Boolean> doCreate(String indexName, @Nullable Document settings) {
-
-		CreateIndexRequest request = requestFactory.createIndexRequestReactive(indexName, settings);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.createIndex(request)));
-	}
-
-	@Override
-	public Mono<Boolean> delete() {
-
-		return exists() //
-				.flatMap(exists -> {
-
-					if (exists) {
-						DeleteIndexRequest request = requestFactory.deleteIndexRequest(getIndexCoordinates());
-						return Mono.from(operations.executeWithIndicesClient(client -> client.deleteIndex(request)))
-								.onErrorResume(NoSuchIndexException.class, e -> Mono.just(false));
-					} else {
-						return Mono.just(false);
-					}
-				});
-	}
-
-	@Override
-	public Mono<Boolean> exists() {
-
-		GetIndexRequest request = requestFactory.getIndexRequestReactive(getIndexCoordinates().getIndexName());
-		return Mono.from(operations.executeWithIndicesClient(client -> client.existsIndex(request)));
-	}
-
-	@Override
-	public Mono<Void> refresh() {
-		return Mono.from(operations.executeWithIndicesClient(
-				client -> client.refreshIndex(refreshRequest(getIndexCoordinates().getIndexNames()))));
-	}
-	// endregion
-
-	// region mappings
-	@Override
-	public Mono<Document> createMapping() {
-		return createMapping(checkForBoundClass());
-	}
-
-	@Override
-	public Mono<Document> createMapping(Class<?> clazz) {
-
-		if (clazz.isAnnotationPresent(Mapping.class)) {
-			String mappingPath = clazz.getAnnotation(Mapping.class).mappingPath();
-			return loadDocument(mappingPath, "@Mapping");
-		}
-
-		String mapping = new MappingBuilder(converter).buildPropertyMapping(clazz);
-		return Mono.just(Document.parse(mapping));
-	}
-
-	@Override
-	public Mono<Boolean> putMapping(Mono<Document> mapping) {
-		return mapping.map(document -> requestFactory.putMappingRequestReactive(getIndexCoordinates(), document)) //
-				.flatMap(request -> Mono.from(operations.executeWithIndicesClient(client -> client.putMapping(request))));
-	}
-
-	@Override
-	public Mono<Document> getMapping() {
-
-		IndexCoordinates indexCoordinates = getIndexCoordinates();
-		GetMappingsRequest request = requestFactory.getMappingRequestReactive(indexCoordinates);
-
-		return Mono.from(operations.executeWithIndicesClient(client -> client.getMapping(request)))
-				.flatMap(getMappingsResponse -> {
-					Document document = Document.create();
-					document.put("properties",
-							getMappingsResponse.mappings().get(indexCoordinates.getIndexName()).get("properties").getSourceAsMap());
-					return Mono.just(document);
-				});
-	}
-	// endregion
-
-	// region settings
-
-	@Override
-	public Mono<Document> createSettings() {
-		return createSettings(checkForBoundClass());
-	}
-
-	@Override
-	public Mono<Document> createSettings(Class<?> clazz) {
-
-		if (clazz.isAnnotationPresent(Setting.class)) {
-			String settingPath = clazz.getAnnotation(Setting.class).settingPath();
-
-			return loadDocument(settingPath, "@Setting");
-		}
-
-		return Mono.just(getRequiredPersistentEntity(clazz).getDefaultSettings());
-	}
-
-	@Override
-	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 -> requestFactory.fromSettingsResponse(getSettingsResponse, indexName));
-	}
-
-	// endregion
-
-	// region aliases
-	@Override
-	public Mono<Boolean> alias(AliasActions aliasActions) {
-
-		IndicesAliasesRequest request = requestFactory.indicesAliasesRequest(aliasActions);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.updateAliases(request)));
-	}
-
-	@Override
-	public Mono<Map<String, Set<AliasData>>> getAliases(String... aliasNames) {
-		return getAliases(aliasNames, null);
-	}
-
-	@Override
-	public Mono<Map<String, Set<AliasData>>> getAliasesForIndex(String... indexNames) {
-		return getAliases(null, indexNames);
-	}
-
-	private Mono<Map<String, Set<AliasData>>> getAliases(@Nullable String[] aliasNames, @Nullable String[] indexNames) {
-
-		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(aliasNames, indexNames);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.getAliases(getAliasesRequest)))
-				.map(GetAliasesResponse::getAliases).map(requestFactory::convertAliasesResponse);
-	}
-	// endregion
-
-	// region templates
-	@Override
-	public Mono<Boolean> putTemplate(PutTemplateRequest putTemplateRequest) {
-
-		Assert.notNull(putTemplateRequest, "putTemplateRequest must not be null");
-
-		PutIndexTemplateRequest putIndexTemplateRequest = requestFactory.putIndexTemplateRequest(putTemplateRequest);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.putTemplate(putIndexTemplateRequest)));
-	}
-
-	@Override
-	public Mono<TemplateData> getTemplate(GetTemplateRequest getTemplateRequest) {
-
-		Assert.notNull(getTemplateRequest, "getTemplateRequest must not be null");
-
-		GetIndexTemplatesRequest getIndexTemplatesRequest = requestFactory.getIndexTemplatesRequest(getTemplateRequest);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.getTemplate(getIndexTemplatesRequest)))
-				.flatMap(response -> {
-					if (response != null) {
-						TemplateData templateData = requestFactory.getTemplateData(response, getTemplateRequest.getTemplateName());
-						if (templateData != null) {
-							return Mono.just(templateData);
-						}
-					}
-					return Mono.empty();
-				});
-	}
-
-	@Override
-	public Mono<Boolean> existsTemplate(ExistsTemplateRequest existsTemplateRequest) {
-
-		Assert.notNull(existsTemplateRequest, "existsTemplateRequest must not be null");
-
-		IndexTemplatesExistRequest indexTemplatesExistRequest = requestFactory
-				.indexTemplatesExistsRequest(existsTemplateRequest);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.existsTemplate(indexTemplatesExistRequest)));
-	}
-
-	@Override
-	public Mono<Boolean> deleteTemplate(DeleteTemplateRequest deleteTemplateRequest) {
-
-		Assert.notNull(deleteTemplateRequest, "deleteTemplateRequest must not be null");
-
-		DeleteIndexTemplateRequest deleteIndexTemplateRequest = requestFactory
-				.deleteIndexTemplateRequest(deleteTemplateRequest);
-		return Mono.from(operations.executeWithIndicesClient(client -> client.deleteTemplate(deleteIndexTemplateRequest)));
-	}
-
-	// endregion
-
-	// region helper functions
-	@Override
-	public IndexCoordinates getIndexCoordinates() {
-		return (boundClass != null) ? getIndexCoordinatesFor(boundClass) : boundIndex;
-	}
-
-	private IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
-		return operations.getElasticsearchConverter().getMappingContext().getRequiredPersistentEntity(clazz)
-				.getIndexCoordinates();
-	}
-
-	private ElasticsearchPersistentEntity<?> getRequiredPersistentEntity(Class<?> clazz) {
-		return converter.getMappingContext().getRequiredPersistentEntity(clazz);
-	}
-
-	private Mono<Document> loadDocument(String path, String annotation) {
-
-		if (hasText(path)) {
-			return ReactiveResourceUtil.readFileFromClasspath(path).flatMap(s -> {
-				if (hasText(s)) {
-					return Mono.just(Document.parse(s));
-				} else {
-					return Mono.just(Document.create());
-				}
-			});
-		} else {
-			LOGGER.info("path in {} has to be defined. Using default instead.", annotation);
-		}
-
-		return Mono.just(Document.create());
-	}
-
-	private Class<?> checkForBoundClass() {
-		if (boundClass == null) {
-			throw new InvalidDataAccessApiUsageException("IndexOperations are not bound");
-		}
-		return boundClass;
-	}
-
-	// endregion
-
-}

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

@@ -0,0 +1,253 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.elasticsearch.action.get.GetResponse;
+import org.elasticsearch.action.get.MultiGetItemResponse;
+import org.elasticsearch.action.get.MultiGetResponse;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.document.DocumentField;
+import org.elasticsearch.search.SearchHit;
+
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.ElasticsearchException;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.ScriptedField;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+
+/**
+ * @author Artur Konczak
+ * @author Petar Tahchiev
+ * @author Young Gu
+ * @author Oliver Gierke
+ * @author Chris White
+ * @author Mark Paluch
+ * @author Ilkang Na
+ * @author Sascha Woo
+ * @author Christoph Strobl
+ * @author Dmitriy Yakovlev
+ */
+public class DefaultResultMapper extends AbstractResultMapper {
+
+	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+	private final ConversionService conversionService = new DefaultConversionService();
+
+	public DefaultResultMapper() {
+		this(new SimpleElasticsearchMappingContext());
+	}
+
+	public DefaultResultMapper(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+		this(mappingContext, initEntityMapper(mappingContext));
+	}
+
+	public DefaultResultMapper(EntityMapper entityMapper) {
+		this(new SimpleElasticsearchMappingContext(), entityMapper);
+	}
+
+	public DefaultResultMapper(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
+			@Nullable EntityMapper entityMapper) {
+
+		super(entityMapper != null ? entityMapper : initEntityMapper(mappingContext));
+		this.mappingContext = mappingContext;
+	}
+
+	private static EntityMapper initEntityMapper(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		return new DefaultEntityMapper(mappingContext);
+	}
+
+	@Override
+	public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+
+		long totalHits = response.getHits().getTotalHits();
+		float maxScore = response.getHits().getMaxScore();
+
+		List<T> results = new ArrayList<>();
+		for (SearchHit hit : response.getHits()) {
+			if (hit != null) {
+				T result = null;
+				String hitSourceAsString = hit.getSourceAsString();
+				if (!StringUtils.isEmpty(hitSourceAsString)) {
+					result = mapEntity(hitSourceAsString, clazz);
+				} else {
+					result = mapEntity(hit.getFields().values(), clazz);
+				}
+
+				setPersistentEntityId(result, hit.getId(), clazz);
+				setPersistentEntityVersion(result, hit.getVersion(), clazz);
+				setPersistentEntityScore(result, hit.getScore(), clazz);
+
+				populateScriptFields(result, hit);
+				results.add(result);
+			}
+		}
+
+		return new AggregatedPageImpl<T>(results, pageable, totalHits, response.getAggregations(), response.getScrollId(),
+				maxScore);
+	}
+
+	private <T> void populateScriptFields(T result, SearchHit hit) {
+		if (hit.getFields() != null && !hit.getFields().isEmpty() && result != null) {
+			for (java.lang.reflect.Field field : result.getClass().getDeclaredFields()) {
+				ScriptedField scriptedField = field.getAnnotation(ScriptedField.class);
+				if (scriptedField != null) {
+					String name = scriptedField.name().isEmpty() ? field.getName() : scriptedField.name();
+					DocumentField searchHitField = hit.getFields().get(name);
+					if (searchHitField != null) {
+						field.setAccessible(true);
+						try {
+							field.set(result, searchHitField.getValue());
+						} catch (IllegalArgumentException e) {
+							throw new ElasticsearchException(
+									"failed to set scripted field: " + name + " with value: " + searchHitField.getValue(), e);
+						} catch (IllegalAccessException e) {
+							throw new ElasticsearchException("failed to access scripted field: " + name, e);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private <T> T mapEntity(Collection<DocumentField> values, Class<T> clazz) {
+		return mapEntity(buildJSONFromFields(values), clazz);
+	}
+
+	private String buildJSONFromFields(Collection<DocumentField> values) {
+		JsonFactory nodeFactory = new JsonFactory();
+		try {
+			ByteArrayOutputStream stream = new ByteArrayOutputStream();
+			JsonGenerator generator = nodeFactory.createGenerator(stream, JsonEncoding.UTF8);
+			generator.writeStartObject();
+			for (DocumentField value : values) {
+				if (value.getValues().size() > 1) {
+					generator.writeArrayFieldStart(value.getName());
+					for (Object val : value.getValues()) {
+						generator.writeObject(val);
+					}
+					generator.writeEndArray();
+				} else {
+					generator.writeObjectField(value.getName(), value.getValue());
+				}
+			}
+			generator.writeEndObject();
+			generator.flush();
+			return new String(stream.toByteArray(), Charset.forName("UTF-8"));
+		} catch (IOException e) {
+			return null;
+		}
+	}
+
+	@Override
+	public <T> T mapResult(GetResponse response, Class<T> clazz) {
+		T result = mapEntity(response.getSourceAsString(), clazz);
+		if (result != null) {
+			setPersistentEntityId(result, response.getId(), clazz);
+			setPersistentEntityVersion(result, response.getVersion(), clazz);
+		}
+		return result;
+	}
+
+	@Override
+	public <T> List<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
+		List<T> list = new ArrayList<>();
+		for (MultiGetItemResponse response : responses.getResponses()) {
+			if (!response.isFailed() && response.getResponse().isExists()) {
+				T result = mapEntity(response.getResponse().getSourceAsString(), clazz);
+				setPersistentEntityId(result, response.getResponse().getId(), clazz);
+				setPersistentEntityVersion(result, response.getResponse().getVersion(), clazz);
+				list.add(result);
+			}
+		}
+		return list;
+	}
+
+	private <T> void setPersistentEntityId(T result, String id, Class<T> clazz) {
+
+		if (clazz.isAnnotationPresent(Document.class)) {
+
+			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getRequiredPersistentEntity(clazz);
+			ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();
+
+			PersistentPropertyAccessor<T> accessor = new ConvertingPropertyAccessor<>(
+					persistentEntity.getPropertyAccessor(result), conversionService);
+
+			// Only deal with String because ES generated Ids are strings !
+			if (idProperty != null && idProperty.getType().isAssignableFrom(String.class)) {
+				accessor.setProperty(idProperty, id);
+			}
+		}
+	}
+
+	private <T> void setPersistentEntityVersion(T result, long version, Class<T> clazz) {
+
+		if (clazz.isAnnotationPresent(Document.class)) {
+
+			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(clazz);
+			ElasticsearchPersistentProperty versionProperty = persistentEntity.getVersionProperty();
+
+			// Only deal with Long because ES versions are longs !
+			if (versionProperty != null && versionProperty.getType().isAssignableFrom(Long.class)) {
+				// check that a version was actually returned in the response, -1 would indicate that
+				// a search didn't request the version ids in the response, which would be an issue
+				Assert.isTrue(version != -1, "Version in response is -1");
+				persistentEntity.getPropertyAccessor(result).setProperty(versionProperty, version);
+			}
+		}
+	}
+
+	private <T> void setPersistentEntityScore(T result, float score, Class<T> clazz) {
+
+		if (clazz.isAnnotationPresent(Document.class)) {
+
+			ElasticsearchPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(clazz);
+
+			if (!entity.hasScoreProperty()) {
+				return;
+			}
+
+			entity.getPropertyAccessor(result) //
+					.setProperty(entity.getScoreProperty(), score);
+		}
+	}
+}

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

@@ -1,299 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
-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.mapping.get.GetMappingsRequest;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
-import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
-import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
-import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesRequest;
-import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
-import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.cluster.metadata.AliasMetadata;
-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;
-import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.index.AliasActions;
-import org.springframework.data.elasticsearch.core.index.AliasData;
-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.TemplateData;
-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;
-
-/**
- * {@link IndexOperations} implementation using the TransportClient.
- *
- * @author Peter-Josef Meisch
- * @author Sascha Woo
- * @since 4.0
- */
-class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations implements IndexOperations {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTransportIndexOperations.class);
-
-	private final Client client;
-
-	public DefaultTransportIndexOperations(Client client, ElasticsearchConverter elasticsearchConverter,
-			Class<?> boundClass) {
-		super(elasticsearchConverter, boundClass);
-		this.client = client;
-	}
-
-	public DefaultTransportIndexOperations(Client client, ElasticsearchConverter elasticsearchConverter,
-			IndexCoordinates boundIndex) {
-		super(elasticsearchConverter, boundIndex);
-		this.client = client;
-	}
-
-	@Override
-	protected boolean doCreate(IndexCoordinates index, @Nullable Document settings) {
-		CreateIndexRequestBuilder createIndexRequestBuilder = requestFactory.createIndexRequestBuilder(client, index,
-				settings);
-		return createIndexRequestBuilder.execute().actionGet().isAcknowledged();
-	}
-
-	@Override
-	protected boolean doDelete(IndexCoordinates index) {
-
-		Assert.notNull(index, "No index defined for delete operation");
-
-		if (doExists(index)) {
-			DeleteIndexRequest deleteIndexRequest = requestFactory.deleteIndexRequest(index);
-			return client.admin().indices().delete(deleteIndexRequest).actionGet().isAcknowledged();
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean doExists(IndexCoordinates index) {
-
-		IndicesExistsRequest indicesExistsRequest = requestFactory.indicesExistsRequest(index);
-		return client.admin().indices().exists(indicesExistsRequest).actionGet().isExists();
-	}
-
-	@Override
-	protected boolean doPutMapping(IndexCoordinates index, Document mapping) {
-
-		Assert.notNull(index, "No index defined for putMapping()");
-
-		PutMappingRequestBuilder requestBuilder = requestFactory.putMappingRequestBuilder(client, index, mapping);
-		return requestBuilder.execute().actionGet().isAcknowledged();
-	}
-
-	@Override
-	protected Map<String, Object> doGetMapping(IndexCoordinates index) {
-
-		Assert.notNull(index, "No index defined for getMapping()");
-
-		GetMappingsRequest mappingsRequest = requestFactory.getMappingsRequest(client, index);
-
-		ImmutableOpenMap<String, ImmutableOpenMap<String, MappingMetadata>> mappings = client.admin().indices().getMappings( //
-				mappingsRequest).actionGet() //
-				.getMappings();
-
-		if (mappings == null || mappings.size() == 0) {
-			return Collections.emptyMap();
-		}
-
-		if (mappings.size() > 1) {
-			LOGGER.warn("more than one mapping returned for " + index.getIndexName());
-		}
-		// we have at least one, take the first from the iterator
-		return mappings.iterator().next().value.get(IndexCoordinates.TYPE).getSourceAsMap();
-	}
-
-	@Override
-	protected boolean doAddAlias(AliasQuery query, IndexCoordinates index) {
-		IndicesAliasesRequest.AliasActions aliasAction = requestFactory.aliasAction(query, index);
-		return client.admin().indices().prepareAliases().addAliasAction(aliasAction).execute().actionGet().isAcknowledged();
-	}
-
-	@Override
-	protected boolean doRemoveAlias(AliasQuery query, IndexCoordinates index) {
-
-		Assert.notNull(index, "No index defined for Alias");
-		Assert.notNull(query.getAliasName(), "No alias defined");
-
-		IndicesAliasesRequestBuilder indicesAliasesRequestBuilder = requestFactory
-				.indicesRemoveAliasesRequestBuilder(client, query, index);
-		return indicesAliasesRequestBuilder.execute().actionGet().isAcknowledged();
-	}
-
-	@Override
-	protected List<AliasMetadata> doQueryForAlias(IndexCoordinates index) {
-
-		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(index);
-		return client.admin().indices().getAliases(getAliasesRequest).actionGet().getAliases().get(index.getIndexName());
-	}
-
-	@Override
-	protected Map<String, Set<AliasData>> doGetAliases(@Nullable String[] aliasNames, @Nullable String[] indexNames) {
-
-		GetAliasesRequest getAliasesRequest = requestFactory.getAliasesRequest(aliasNames, indexNames);
-
-		ImmutableOpenMap<String, List<AliasMetadata>> aliases = client.admin().indices().getAliases(getAliasesRequest)
-				.actionGet().getAliases();
-
-		Map<String, Set<AliasMetadata>> aliasesResponse = new LinkedHashMap<>();
-		aliases.keysIt().forEachRemaining(index -> aliasesResponse.put(index, new HashSet<>(aliases.get(index))));
-		return requestFactory.convertAliasesResponse(aliasesResponse);
-	}
-
-	@Override
-	public boolean alias(AliasActions aliasActions) {
-
-		IndicesAliasesRequestBuilder indicesAliasesRequestBuilder = requestFactory.indicesAliasesRequestBuilder(client,
-				aliasActions);
-		return indicesAliasesRequestBuilder.execute().actionGet().isAcknowledged();
-	}
-
-	@Override
-	protected Map<String, Object> doGetSettings(IndexCoordinates index, boolean includeDefaults) {
-
-		Assert.notNull(index, "index must not be null");
-
-		GetSettingsRequest getSettingsRequest = requestFactory.getSettingsRequest(index, includeDefaults);
-		GetSettingsResponse response = client.admin() //
-				.indices() //
-				.getSettings(getSettingsRequest) //
-				.actionGet();
-
-		return requestFactory.fromSettingsResponse(response, index.getIndexName());
-	}
-
-	@Override
-	protected void doRefresh(IndexCoordinates index) {
-
-		Assert.notNull(index, "index must not be null");
-
-		RefreshRequest request = requestFactory.refreshRequest(index);
-		client.admin().indices().refresh(request).actionGet();
-	}
-
-	@Override
-	public boolean putTemplate(PutTemplateRequest putTemplateRequest) {
-
-		Assert.notNull(putTemplateRequest, "putTemplateRequest must not be null");
-
-		PutIndexTemplateRequest putIndexTemplateRequest = requestFactory.putIndexTemplateRequest(client,
-				putTemplateRequest);
-		return client.admin().indices().putTemplate(putIndexTemplateRequest).actionGet().isAcknowledged();
-	}
-
-	@Override
-	public TemplateData getTemplate(GetTemplateRequest getTemplateRequest) {
-
-		Assert.notNull(getTemplateRequest, "getTemplateRequest must not be null");
-
-		GetIndexTemplatesRequest getIndexTemplatesRequest = requestFactory.getIndexTemplatesRequest(client,
-				getTemplateRequest);
-		GetIndexTemplatesResponse getIndexTemplatesResponse = client.admin().indices()
-				.getTemplates(getIndexTemplatesRequest).actionGet();
-		for (IndexTemplateMetadata indexTemplateMetadata : getIndexTemplatesResponse.getIndexTemplates()) {
-
-			if (indexTemplateMetadata.getName().equals(getTemplateRequest.getTemplateName())) {
-
-				Document settings = Document.create();
-				Settings templateSettings = indexTemplateMetadata.settings();
-				templateSettings.keySet().forEach(key -> settings.put(key, templateSettings.get(key)));
-
-				Map<String, AliasData> aliases = new LinkedHashMap<>();
-				ImmutableOpenMap<String, AliasMetadata> aliasesResponse = indexTemplateMetadata.aliases();
-				Iterator<String> keysItAliases = aliasesResponse.keysIt();
-				while (keysItAliases.hasNext()) {
-					String key = keysItAliases.next();
-					aliases.put(key, requestFactory.convertAliasMetadata(aliasesResponse.get(key)));
-				}
-
-				Map<String, String> mappingsDoc = new LinkedHashMap<>();
-				ImmutableOpenMap<String, CompressedXContent> mappingsResponse = indexTemplateMetadata.mappings();
-				Iterator<String> keysItMappings = mappingsResponse.keysIt();
-				while (keysItMappings.hasNext()) {
-					String key = keysItMappings.next();
-					mappingsDoc.put(key, mappingsResponse.get(key).string());
-				}
-				String mappingsJson = mappingsDoc.get("_doc");
-				Document mapping = null;
-				if (mappingsJson != null) {
-					try {
-						mapping = Document.from((Map<String, ? extends Object>) Document.parse(mappingsJson).get("_doc"));
-					} catch (Exception e) {
-						LOGGER.warn("Got invalid mappings JSON: {}", mappingsJson);
-					}
-				}
-
-				TemplateData templateData = TemplateData.builder()
-						.withIndexPatterns(indexTemplateMetadata.patterns().toArray(new String[0])) //
-						.withSettings(settings) //
-						.withMapping(mapping) //
-						.withAliases(aliases) //
-						.withOrder(indexTemplateMetadata.order()) //
-						.withVersion(indexTemplateMetadata.version()).build();
-
-				return templateData;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public boolean existsTemplate(ExistsTemplateRequest existsTemplateRequest) {
-
-		Assert.notNull(existsTemplateRequest, "existsTemplateRequest must not be null");
-
-		// client.admin().indices() has no method for checking the existence
-		return getTemplate(new GetTemplateRequest(existsTemplateRequest.getTemplateName())) != null;
-	}
-
-	@Override
-	public boolean deleteTemplate(DeleteTemplateRequest deleteTemplateRequest) {
-
-		Assert.notNull(deleteTemplateRequest, "deleteTemplateRequest must not be null");
-
-		DeleteIndexTemplateRequest deleteIndexTemplateRequest = requestFactory.deleteIndexTemplateRequest(client,
-				deleteTemplateRequest);
-		return client.admin().indices().deleteTemplate(deleteIndexTemplateRequest).actionGet().isAcknowledged();
-	}
-}

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

@@ -1,336 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import java.util.List;
-
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-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.lang.Nullable;
-
-/**
- * The operations for the
- * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs.html">Elasticsearch Document APIs</a>.
- *
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-public interface DocumentOperations {
-
-	/**
-	 * Saves an entity to the index specified in the entity's Document annotation
-	 *
-	 * @param entity the entity to save, must not be {@literal null}
-	 * @param <T> the entity type
-	 * @return the saved entity
-	 */
-	<T> T save(T entity);
-
-	/**
-	 * Saves an entity to the index specified in the entity's Document annotation
-	 *
-	 * @param entity the entity to save, must not be {@literal null}
-	 * @param index the index to save the entity in, must not be {@literal null}
-	 * @param <T> the entity type
-	 * @return the saved entity
-	 */
-	<T> T save(T entity, IndexCoordinates index);
-
-	/**
-	 * saves the given entities to the index retrieved from the entities' Document annotation
-	 *
-	 * @param entities must not be {@literal null}
-	 * @param <T> the entity type
-	 * @return the saved entites
-	 */
-	<T> Iterable<T> save(Iterable<T> entities);
-
-	/**
-	 * saves the given entities to the given index
-	 *
-	 * @param entities must not be {@literal null}
-	 * @param index the index to save the entities in, must not be {@literal null}
-	 * @param <T> the entity type
-	 * @return the saved entities
-	 */
-	<T> Iterable<T> save(Iterable<T> entities, IndexCoordinates index);
-
-	/**
-	 * saves the given entities to the index retrieved from the entities' Document annotation
-	 *
-	 * @param entities must not be {@literal null}
-	 * @param <T> the entity type
-	 * @return the saved entities as Iterable
-	 */
-	<T> Iterable<T> save(T... entities);
-
-	/**
-	 * Index an object. Will do save or update.
-	 *
-	 * @param query the query defining the object
-	 * @param index the index where the object is stored.
-	 * @return returns the document id
-	 */
-	String index(IndexQuery query, IndexCoordinates index);
-
-	/**
-	 * Retrieves an object from the index specified in the entity's Document annotation.
-	 *
-	 * @param id the id of the object
-	 * @param clazz the entity class,
-	 * @param <T> the entity type
-	 * @return the entity
-	 */
-	@Nullable
-	<T> T get(String id, Class<T> clazz);
-
-	/**
-	 * Retrieves an object from the index specified in the entity's Document annotation.
-	 *
-	 * @param id the id of the object
-	 * @param clazz the entity class,
-	 * @param index the index from which the object is read.
-	 * @return the entity
-	 */
-	@Nullable
-	<T> T get(String id, Class<T> clazz, IndexCoordinates index);
-
-	/**
-	 * Execute a multiGet against elasticsearch for the given ids.
-	 *
-	 * @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 objects, contains null values for ids that are not found
-	 * @since 4.1
-	 */
-	<T> List<T> multiGet(Query query, Class<T> clazz);
-
-	/**
-	 * Execute a multiGet against elasticsearch for the given ids.
-	 *
-	 * @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 objects, contains null values for ids that are not found
-	 */
-	<T> List<T> multiGet(Query query, Class<T> clazz, IndexCoordinates index);
-
-	/**
-	 * Check if an entity with given {@literal id} exists.
-	 *
-	 * @param id the {@literal _id} of the document to look for.
-	 * @param clazz the domain type used.
-	 * @return {@literal true} if a matching document exists, {@literal false} otherwise.
-	 */
-	boolean exists(String id, Class<?> clazz);
-
-	/**
-	 * Check if an entity with given {@literal id} exists.
-	 *
-	 * @param id the {@literal _id} of the document to look for.
-	 * @param index the target index, must not be {@literal null}
-	 * @return {@literal true} if a matching document exists, {@literal false} otherwise.
-	 */
-	boolean exists(String id, IndexCoordinates index);
-
-	/**
-	 * Bulk index all objects. Will do save or update.
-	 *
-	 * @param queries the queries to execute in bulk
-	 * @param clazz the entity class
-	 * @return the information about the indexed objects
-	 * @since 4.1
-	 */
-	default List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, Class<?> clazz) {
-		return bulkIndex(queries, BulkOptions.defaultOptions(), clazz);
-	}
-
-	/**
-	 * Bulk index all objects. Will do save or update.
-	 *
-	 * @param queries the queries to execute in bulk
-	 * @return the information about of the indexed objects
-	 */
-	default List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, IndexCoordinates index) {
-		return bulkIndex(queries, BulkOptions.defaultOptions(), index);
-	}
-
-	/**
-	 * Bulk index all objects. Will do save or update.
-	 *
-	 * @param queries the queries to execute in bulk
-	 * @param bulkOptions options to be added to the bulk request
-	 * @param clazz the entity class
-	 * @return the information about of the indexed objects
-	 * @since 4.1
-	 */
-	List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions, Class<?> clazz);
-
-	/**
-	 * Bulk index all objects. Will do save or update.
-	 *
-	 * @param queries the queries to execute in bulk
-	 * @param bulkOptions options to be added to the bulk request
-	 * @return the information about of the indexed objects
-	 */
-	List<IndexedObjectInformation> bulkIndex(List<IndexQuery> queries, BulkOptions bulkOptions, IndexCoordinates index);
-
-	/**
-	 * Bulk update all objects. Will do update.
-	 *
-	 * @param queries the queries to execute in bulk
-	 */
-	default void bulkUpdate(List<UpdateQuery> queries, IndexCoordinates index) {
-		bulkUpdate(queries, BulkOptions.defaultOptions(), index);
-	}
-
-	/**
-	 * Bulk update all objects. Will do update.
-	 * 
-	 * @param clazz the entity class
-	 * @param queries the queries to execute in bulk
-	 * @since 4.1
-	 */
-	void bulkUpdate(List<UpdateQuery> queries, Class<?> clazz);
-
-	/**
-	 * Bulk update all objects. Will do update.
-	 *
-	 * @param queries the queries to execute in bulk
-	 * @param bulkOptions options to be added to the bulk request
-	 */
-	void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index);
-
-	/**
-	 * Delete the one object with provided id.
-	 *
-	 * @param id the document to delete
-	 * @param index the index from which to delete
-	 * @return documentId of the document deleted
-	 */
-	default String delete(String id, IndexCoordinates index) {
-		return delete(id, null, index);
-	}
-
-	/**
-	 * Delete the one object with provided id.
-	 *
-	 * @param id the document to delete
-	 * @param routing the optional routing for the document to be deleted
-	 * @param index the index from which to delete
-	 * @return documentId of the document deleted
-	 * @since 4.1
-	 */
-	String delete(String id, @Nullable String routing, IndexCoordinates index);
-
-	/**
-	 * Delete the one object with provided id.
-	 *
-	 * @param id the document ot delete
-	 * @param entityType must not be {@literal null}.
-	 * @return documentId of the document deleted
-	 */
-	String delete(String id, Class<?> entityType);
-
-	/**
-	 * Deletes the given entity
-	 *
-	 * @param entity the entity to delete
-	 * @return documentId of the document deleted
-	 */
-	String delete(Object entity);
-
-	/**
-	 * Deletes the given entity
-	 *
-	 * @param entity the entity to delete
-	 * @param index the index from which to delete
-	 * @return documentId of the document deleted
-	 */
-	String delete(Object entity, IndexCoordinates index);
-
-	/**
-	 * 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}
-	 * @since 4.1
-	 */
-	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
-	 */
-	void delete(Query query, Class<?> clazz, IndexCoordinates index);
-
-	/**
-	 * Partial update of the document.
-	 *
-	 * @param updateQuery query defining the update
-	 * @param index the index where to update the records
-	 * @return the update response
-	 */
-	UpdateResponse update(UpdateQuery updateQuery, IndexCoordinates index);
-
-	// region deprecated
-	/**
-	 * Delete all records matching the query.
-	 *
-	 * @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)}
-	 */
-	@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
-}

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

@@ -0,0 +1,721 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import lombok.RequiredArgsConstructor;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.CollectionFactory;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.convert.EntityConverter;
+import org.springframework.data.convert.EntityInstantiator;
+import org.springframework.data.convert.EntityInstantiators;
+import org.springframework.data.convert.EntityReader;
+import org.springframework.data.convert.EntityWriter;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchTypeMapper;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
+import org.springframework.data.mapping.model.PropertyValueProvider;
+import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.Streamable;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.format.datetime.DateFormatterRegistrar;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+/**
+ * Elasticsearch specific {@link EntityReader} & {@link EntityWriter} implementation based on domain type
+ * {@link ElasticsearchPersistentEntity metadata}.
+ *
+ * @author Christoph Strobl
+ * @author Peter-Josef Meisch
+ * @since 3.2
+ */
+public class ElasticsearchEntityMapper implements
+		EntityConverter<ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty, Object, Map<String, Object>>,
+		EntityWriter<Object, Map<String, Object>>, EntityReader<Object, Map<String, Object>>, InitializingBean,
+		EntityMapper {
+
+	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+	private final GenericConversionService conversionService;
+	private final ObjectReader objectReader;
+	private final ObjectWriter objectWriter;
+
+	private CustomConversions conversions = new ElasticsearchCustomConversions(Collections.emptyList());
+	private EntityInstantiators instantiators = new EntityInstantiators();
+
+	private ElasticsearchTypeMapper typeMapper;
+
+	public ElasticsearchEntityMapper(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
+			@Nullable GenericConversionService conversionService) {
+
+		this.mappingContext = mappingContext;
+		this.conversionService = conversionService != null ? conversionService : new DefaultConversionService();
+		this.typeMapper = ElasticsearchTypeMapper.create(mappingContext);
+
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectReader = objectMapper.readerFor(HashMap.class);
+		objectWriter = objectMapper.writer();
+	}
+
+	// --> GETTERS / SETTERS
+
+	@Override
+	public MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext() {
+		return mappingContext;
+	}
+
+	@Override
+	public ConversionService getConversionService() {
+		return conversionService;
+	}
+
+	/**
+	 * Set the {@link CustomConversions} to be applied during the mapping process. <br />
+	 * Conversions are registered after {@link #afterPropertiesSet() bean initialization}.
+	 *
+	 * @param conversions must not be {@literal null}.
+	 */
+	public void setConversions(CustomConversions conversions) {
+		this.conversions = conversions;
+	}
+
+	/**
+	 * Set the {@link ElasticsearchTypeMapper} to use for reading / writing type hints.
+	 *
+	 * @param typeMapper must not be {@literal null}.
+	 */
+	public void setTypeMapper(ElasticsearchTypeMapper typeMapper) {
+		this.typeMapper = typeMapper;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
+	@Override
+	public void afterPropertiesSet() {
+
+		DateFormatterRegistrar.addDateConverters(conversionService);
+		conversions.registerConvertersIn(conversionService);
+	}
+
+	// --> READ
+
+	@Override
+	public <T> T readObject(Map<String, Object> source, Class<T> targetType) {
+		return read(targetType, source);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	@Nullable
+	public <R> R read(Class<R> type, Map<String, Object> source) {
+		return doRead(source, ClassTypeInformation.from((Class<R>) ClassUtils.getUserClass(type)));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Nullable
+	protected <R> R doRead(Map<String, Object> source, TypeInformation<R> typeHint) {
+
+		if (source == null) {
+			return null;
+		}
+
+		typeHint = (TypeInformation<R>) typeMapper.readType(source, typeHint);
+
+		if (conversions.hasCustomReadTarget(Map.class, typeHint.getType())) {
+			return conversionService.convert(source, typeHint.getType());
+		}
+
+		if (typeHint.isMap() || ClassTypeInformation.OBJECT.equals(typeHint)) {
+			return (R) source;
+		}
+
+		ElasticsearchPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(typeHint);
+		return readEntity(entity, source);
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <R> R readEntity(ElasticsearchPersistentEntity<?> entity, Map<String, Object> source) {
+
+		ElasticsearchPersistentEntity<?> targetEntity = computeClosestEntity(entity, source);
+
+		ElasticsearchPropertyValueProvider propertyValueProvider = new ElasticsearchPropertyValueProvider(
+				new MapValueAccessor(source));
+
+		EntityInstantiator instantiator = instantiators.getInstantiatorFor(targetEntity);
+
+		R instance = (R) instantiator.createInstance(targetEntity,
+				new PersistentEntityParameterValueProvider<>(targetEntity, propertyValueProvider, null));
+
+		return targetEntity.requiresPropertyPopulation() ? readProperties(targetEntity, instance, propertyValueProvider)
+				: instance;
+	}
+
+	protected <R> R readProperties(ElasticsearchPersistentEntity<?> entity, R instance,
+			ElasticsearchPropertyValueProvider valueProvider) {
+
+		PersistentPropertyAccessor<R> accessor = new ConvertingPropertyAccessor<>(entity.getPropertyAccessor(instance),
+				conversionService);
+
+		for (ElasticsearchPersistentProperty prop : entity) {
+
+			if (entity.isConstructorArgument(prop) || prop.isScoreProperty()) {
+				continue;
+			}
+
+			Object value = valueProvider.getPropertyValue(prop);
+			if (value != null) {
+				accessor.setProperty(prop, valueProvider.getPropertyValue(prop));
+			}
+		}
+
+		return accessor.getBean();
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <R> R readValue(@Nullable Object source, ElasticsearchPersistentProperty property,
+			TypeInformation<R> targetType) {
+
+		if (source == null) {
+			return null;
+		}
+
+		Class<R> rawType = targetType.getType();
+		if (conversions.hasCustomReadTarget(source.getClass(), rawType)) {
+			return rawType.cast(conversionService.convert(source, rawType));
+		} else if (source instanceof List) {
+			return readCollectionValue((List) source, property, targetType);
+		} else if (source instanceof Map) {
+			return readMapValue((Map<String, Object>) source, property, targetType);
+		}
+
+		return (R) readSimpleValue(source, targetType);
+	}
+
+	@SuppressWarnings("unchecked")
+	private <R> R readMapValue(@Nullable Map<String, Object> source, ElasticsearchPersistentProperty property,
+			TypeInformation<R> targetType) {
+
+		TypeInformation information = typeMapper.readType(source);
+		if (property.isEntity() && !property.isMap() || information != null) {
+
+			ElasticsearchPersistentEntity<?> targetEntity = information != null
+					? mappingContext.getRequiredPersistentEntity(information)
+					: mappingContext.getRequiredPersistentEntity(property);
+			return readEntity(targetEntity, source);
+		}
+
+		Map<String, Object> target = new LinkedHashMap<>();
+		for (Entry<String, Object> entry : source.entrySet()) {
+
+			String entryKey = entry.getKey();
+			Object entryValue = entry.getValue();
+
+			if (entryValue == null) {
+				target.put(entryKey, null);
+			} else if (isSimpleType(entryValue)) {
+				target.put(entryKey,
+						readSimpleValue(entryValue, targetType.isMap() ? targetType.getComponentType() : targetType));
+			} else {
+
+				ElasticsearchPersistentEntity<?> targetEntity = computeGenericValueTypeForRead(property, entryValue);
+
+				if (targetEntity.getTypeInformation().isMap()) {
+
+					Map<String, Object> valueMap = (Map) entryValue;
+					if (typeMapper.containsTypeInformation(valueMap)) {
+						target.put(entryKey, readEntity(targetEntity, (Map) entryValue));
+					} else {
+						target.put(entryKey, readValue(valueMap, property, targetEntity.getTypeInformation()));
+					}
+
+				} else if (targetEntity.getTypeInformation().isCollectionLike()) {
+					target.put(entryKey, readValue(entryValue, property, targetEntity.getTypeInformation().getActualType()));
+				} else {
+					target.put(entryKey, readEntity(targetEntity, (Map) entryValue));
+				}
+			}
+		}
+
+		return (R) target;
+	}
+
+	@SuppressWarnings("unchecked")
+	private <R> R readCollectionValue(@Nullable List<?> source, ElasticsearchPersistentProperty property,
+			TypeInformation<R> targetType) {
+
+		if (source == null) {
+			return null;
+		}
+
+		Collection<Object> target = createCollectionForValue(targetType, source.size());
+
+		for (Object value : source) {
+
+			if (value == null) {
+				target.add(null);
+			} else if (isSimpleType(value)) {
+				target.add(
+						readSimpleValue(value, targetType.getComponentType() != null ? targetType.getComponentType() : targetType));
+			} else {
+
+				if (value instanceof List) {
+					target.add(readValue(value, property, property.getTypeInformation().getActualType()));
+				} else if (value instanceof Map) {
+					target
+							.add(readMapValue((Map<String, Object>) value, property, property.getTypeInformation().getActualType()));
+				} else {
+					target.add(readEntity(computeGenericValueTypeForRead(property, value), (Map) value));
+				}
+			}
+		}
+
+		return (R) target;
+	}
+
+	@SuppressWarnings("unchecked")
+	private Object readSimpleValue(@Nullable Object value, TypeInformation<?> targetType) {
+
+		Class<?> target = targetType.getType();
+
+		if (value == null || target == null || ClassUtils.isAssignableValue(target, value)) {
+			return value;
+		}
+
+		if (conversions.hasCustomReadTarget(value.getClass(), target)) {
+			return conversionService.convert(value, target);
+		}
+
+		if (Enum.class.isAssignableFrom(target)) {
+			return Enum.valueOf((Class<Enum>) target, value.toString());
+		}
+
+		return conversionService.convert(value, target);
+	}
+
+	// --> WRITE
+
+	@Override
+	public Map<String, Object> mapObject(Object source) {
+
+		LinkedHashMap<String, Object> target = new LinkedHashMap<>();
+		write(source, target);
+		return target;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void write(@Nullable Object source, Map<String, Object> sink) {
+
+		if (source == null) {
+			return;
+		}
+
+		if (source instanceof Map) {
+
+			sink.putAll((Map<String, Object>) source);
+			return;
+		}
+
+		Class<?> entityType = ClassUtils.getUserClass(source.getClass());
+		TypeInformation<?> type = ClassTypeInformation.from(entityType);
+
+		if (requiresTypeHint(type, source.getClass(), null)) {
+			typeMapper.writeType(source.getClass(), sink);
+		}
+
+		doWrite(source, sink, type);
+	}
+
+	protected void doWrite(@Nullable Object source, Map<String, Object> sink,
+			@Nullable TypeInformation<? extends Object> typeHint) {
+
+		if (source == null) {
+			return;
+		}
+
+		Class<?> entityType = source.getClass();
+		Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(entityType, Map.class);
+
+		if (customTarget.isPresent()) {
+
+			sink.putAll(conversionService.convert(source, Map.class));
+			return;
+		}
+
+		if (typeHint != null) {
+
+			ElasticsearchPersistentEntity<?> entity = typeHint.getType().equals(entityType)
+					? mappingContext.getRequiredPersistentEntity(typeHint)
+					: mappingContext.getRequiredPersistentEntity(entityType);
+
+			writeEntity(entity, source, sink, null);
+			return;
+		}
+
+		// write Entity
+		ElasticsearchPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(entityType);
+		writeEntity(entity, source, sink, null);
+	}
+
+	protected void writeEntity(ElasticsearchPersistentEntity<?> entity, Object source, Map<String, Object> sink,
+			@Nullable TypeInformation containingStructure) {
+
+		PersistentPropertyAccessor<?> accessor = entity.getPropertyAccessor(source);
+
+		if (requiresTypeHint(entity.getTypeInformation(), source.getClass(), containingStructure)) {
+			typeMapper.writeType(source.getClass(), sink);
+		}
+
+		writeProperties(entity, accessor, sink);
+	}
+
+	protected void writeProperties(ElasticsearchPersistentEntity<?> entity, PersistentPropertyAccessor<?> accessor,
+			Map<String, Object> sink) {
+
+		for (ElasticsearchPersistentProperty property : entity) {
+
+			if (!property.isWritable()) {
+				continue;
+			}
+
+			Object value = accessor.getProperty(property);
+
+			if (value == null) {
+				continue;
+			}
+
+			if (!isSimpleType(value)) {
+				writeProperty(property, value, sink);
+			} else {
+				sink.put(property.getFieldName(), getWriteSimpleValue(value));
+			}
+		}
+	}
+
+	protected void writeProperty(ElasticsearchPersistentProperty property, Object value, Map<String, Object> sink) {
+
+		Optional<Class<?>> customWriteTarget = conversions.getCustomWriteTarget(value.getClass());
+
+		if (customWriteTarget.isPresent()) {
+
+			Class<?> writeTarget = customWriteTarget.get();
+			sink.put(property.getFieldName(), conversionService.convert(value, writeTarget));
+			return;
+		}
+
+		TypeInformation<?> typeHint = property.getTypeInformation();
+		if (typeHint.equals(ClassTypeInformation.OBJECT)) {
+
+			if (value instanceof List) {
+				typeHint = ClassTypeInformation.LIST;
+			} else if (value instanceof Map) {
+				typeHint = ClassTypeInformation.MAP;
+			} else if (value instanceof Set) {
+				typeHint = ClassTypeInformation.SET;
+			} else if (value instanceof Collection) {
+				typeHint = ClassTypeInformation.COLLECTION;
+			}
+		}
+
+		sink.put(property.getFieldName(), getWriteComplexValue(property, typeHint, value));
+	}
+
+	protected Object getWriteSimpleValue(Object value) {
+
+		if (value == null) {
+			return null;
+		}
+
+		Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(value.getClass());
+
+		if (customTarget.isPresent()) {
+			return conversionService.convert(value, customTarget.get());
+		}
+
+		return Enum.class.isAssignableFrom(value.getClass()) ? ((Enum<?>) value).name() : value;
+	}
+
+	@SuppressWarnings("unchecked")
+	protected Object getWriteComplexValue(ElasticsearchPersistentProperty property, TypeInformation<?> typeHint,
+			Object value) {
+
+		if (typeHint.isCollectionLike() || value instanceof Iterable) {
+			return writeCollectionValue(value, property, typeHint);
+		}
+		if (typeHint.isMap()) {
+			return writeMapValue((Map<String, Object>) value, property, typeHint);
+		}
+
+		if (property.isEntity() || !isSimpleType(value)) {
+			return writeEntity(value, property, typeHint);
+		}
+
+		return value;
+	}
+
+	private Object writeEntity(Object value, ElasticsearchPersistentProperty property, TypeInformation<?> typeHint) {
+		Map<String, Object> target = new LinkedHashMap<>();
+		writeEntity(mappingContext.getRequiredPersistentEntity(value.getClass()), value, target,
+				property.getTypeInformation());
+		return target;
+	}
+
+	private Object writeMapValue(Map<String, Object> value, ElasticsearchPersistentProperty property,
+			TypeInformation<?> typeHint) {
+
+		Map<Object, Object> target = new LinkedHashMap<>();
+		Streamable<Entry<String, Object>> mapSource = Streamable.of(value.entrySet());
+
+		if (!typeHint.getActualType().getType().equals(Object.class)
+				&& isSimpleType(typeHint.getMapValueType().getType())) {
+			mapSource.forEach(it -> {
+
+				if (it.getValue() == null) {
+					target.put(it.getKey(), null);
+				} else {
+					target.put(it.getKey(), getWriteSimpleValue(it.getValue()));
+				}
+			});
+		} else {
+
+			mapSource.forEach(it -> {
+
+				Object converted = null;
+				if (it.getValue() != null) {
+
+					if (isSimpleType(it.getValue())) {
+						converted = getWriteSimpleValue(it.getValue());
+					} else {
+						converted = getWriteComplexValue(property, ClassTypeInformation.from(it.getValue().getClass()),
+								it.getValue());
+					}
+				}
+
+				target.put(it.getKey(), converted);
+			});
+		}
+
+		return target;
+	}
+
+	private Object writeCollectionValue(Object value, ElasticsearchPersistentProperty property,
+			TypeInformation<?> typeHint) {
+
+		Streamable<?> collectionSource = value instanceof Iterable ? Streamable.of((Iterable<?>) value)
+				: Streamable.of(ObjectUtils.toObjectArray(value));
+
+		List<Object> target = new ArrayList<>();
+		if (!typeHint.getActualType().getType().equals(Object.class) && isSimpleType(typeHint.getActualType().getType())) {
+			collectionSource.map(this::getWriteSimpleValue).forEach(target::add);
+		} else {
+
+			collectionSource.map(it -> {
+
+				if (it == null) {
+					return null;
+				}
+
+				if (isSimpleType(it)) {
+					return getWriteSimpleValue(it);
+				}
+
+				return getWriteComplexValue(property, ClassTypeInformation.from(it.getClass()), it);
+			}).forEach(target::add);
+
+		}
+		return target;
+	}
+
+	// --> LEGACY
+
+	@Override
+	public String mapToString(Object source) throws IOException {
+
+		Map<String, Object> sink = new LinkedHashMap<>();
+		write(source, sink);
+
+		return objectWriter.writeValueAsString(sink);
+	}
+
+	@Override
+	public <T> T mapToObject(String source, Class<T> clazz) throws IOException {
+		return read(clazz, objectReader.readValue(source));
+	}
+
+	// --> PRIVATE HELPERS
+
+	private boolean requiresTypeHint(TypeInformation<?> type, Class<?> actualType,
+			@Nullable TypeInformation<?> container) {
+
+		if (container != null) {
+
+			if (container.isCollectionLike()) {
+				if (type.equals(container.getActualType()) && type.getType().equals(actualType)) {
+					return false;
+				}
+			}
+
+			if (container.isMap()) {
+				if (type.equals(container.getMapValueType()) && type.getType().equals(actualType)) {
+					return false;
+				}
+			}
+
+			if (container.equals(type) && type.getType().equals(actualType)) {
+				return false;
+			}
+		}
+
+		return !conversions.isSimpleType(type.getType()) && !type.isCollectionLike()
+				&& !conversions.hasCustomWriteTarget(type.getType());
+	}
+
+	/**
+	 * Compute the type to use by checking the given entity against the store type;
+	 *
+	 * @param entity
+	 * @param source
+	 * @return
+	 */
+	private ElasticsearchPersistentEntity<?> computeClosestEntity(ElasticsearchPersistentEntity<?> entity,
+			Map<String, Object> source) {
+
+		TypeInformation<?> typeToUse = typeMapper.readType(source);
+
+		if (typeToUse == null) {
+			return entity;
+		}
+
+		if (!entity.getTypeInformation().getType().isInterface() && !entity.getTypeInformation().isCollectionLike()
+				&& !entity.getTypeInformation().isMap()
+				&& !ClassUtils.isAssignableValue(entity.getType(), typeToUse.getType())) {
+			return entity;
+		}
+
+		return mappingContext.getRequiredPersistentEntity(typeToUse);
+	}
+
+	private ElasticsearchPersistentEntity<?> computeGenericValueTypeForRead(ElasticsearchPersistentProperty property,
+			Object value) {
+
+		return ClassTypeInformation.OBJECT.equals(property.getTypeInformation().getActualType())
+				? mappingContext.getRequiredPersistentEntity(value.getClass())
+				: mappingContext.getRequiredPersistentEntity(property.getTypeInformation().getActualType());
+	}
+
+	private Collection<Object> createCollectionForValue(TypeInformation<?> collectionTypeInformation, int size) {
+
+		Class<?> collectionType = collectionTypeInformation.isSubTypeOf(Collection.class) //
+				? collectionTypeInformation.getType() //
+				: List.class;
+
+		TypeInformation<?> componentType = collectionTypeInformation.getComponentType() != null //
+				? collectionTypeInformation.getComponentType() //
+				: ClassTypeInformation.OBJECT;
+
+		return collectionTypeInformation.getType().isArray() //
+				? new ArrayList<>(size) //
+				: CollectionFactory.createCollection(collectionType, componentType.getType(), size);
+	}
+
+	private boolean isSimpleType(Object value) {
+		return isSimpleType(value.getClass());
+	}
+
+	private boolean isSimpleType(Class<?> type) {
+		return conversions.isSimpleType(type);
+	}
+
+	// --> OHTER STUFF
+
+	@RequiredArgsConstructor
+	class ElasticsearchPropertyValueProvider implements PropertyValueProvider<ElasticsearchPersistentProperty> {
+
+		final MapValueAccessor mapValueAccessor;
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T getPropertyValue(ElasticsearchPersistentProperty property) {
+			return (T) readValue(mapValueAccessor.get(property), property, property.getTypeInformation());
+		}
+
+	}
+
+	static class MapValueAccessor {
+
+		final Map<String, Object> target;
+
+		MapValueAccessor(Map<String, Object> target) {
+			this.target = target;
+		}
+
+		public Object get(ElasticsearchPersistentProperty property) {
+
+			String fieldName = property.getFieldName();
+
+			if (!fieldName.contains(".")) {
+				return target.get(fieldName);
+			}
+
+			Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
+			Map<String, Object> source = target;
+			Object result = null;
+
+			while (source != null && parts.hasNext()) {
+
+				result = source.get(parts.next());
+
+				if (parts.hasNext()) {
+					source = getAsMap(result);
+				}
+			}
+
+			return result;
+		}
+
+		@SuppressWarnings("unchecked")
+		private Map<String, Object> getAsMap(Object result) {
+
+			if (result instanceof Map) {
+				return (Map) result;
+			}
+
+			throw new IllegalArgumentException(String.format("%s is not a Map.", result));
+		}
+	}
+
+}

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

@@ -13,36 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.elasticsearch.core;
 
-import java.io.IOException;
+import java.net.ConnectException;
 import java.util.List;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
-import org.elasticsearch.common.ValidationException;
-import org.elasticsearch.index.engine.VersionConflictEngineException;
-import org.elasticsearch.rest.RestStatus;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
-import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Simple {@link PersistenceExceptionTranslator} for Elasticsearch. Convert the given runtime exception to an
- * appropriate exception from the {@code org.springframework.dao} hierarchy. Return {@literal null} if no translation is
- * appropriate: any other exception may have resulted from user code, and should not be translated.
- * 
  * @author Christoph Strobl
- * @author Peter-Josef Meisch
- * @author Roman Puchkovskiy
- * @author Mark Paluch
  * @since 3.2
  */
 public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {
@@ -50,10 +38,6 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 
-		if (isSeqNoConflict(ex)) {
-			return new OptimisticLockingFailureException("Cannot index a document due to seq_no+primary_term conflict", ex);
-		}
-
 		if (ex instanceof ElasticsearchException) {
 
 			ElasticsearchException elasticsearchException = (ElasticsearchException) ex;
@@ -62,57 +46,22 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 				return new NoSuchIndexException(ObjectUtils.nullSafeToString(elasticsearchException.getMetadata("es.index")),
 						ex);
 			}
-
-			return new UncategorizedElasticsearchException(ex.getMessage(), ex);
 		}
 
-		if (ex instanceof ValidationException) {
-			return new DataIntegrityViolationException(ex.getMessage(), ex);
-		}
-
-		Throwable cause = ex.getCause();
-		if (cause instanceof IOException) {
+		if (ex.getCause() instanceof ConnectException) {
 			return new DataAccessResourceFailureException(ex.getMessage(), ex);
 		}
 
 		return null;
 	}
 
-	private boolean isSeqNoConflict(Exception exception) {
-
-		if (exception instanceof ElasticsearchStatusException) {
-
-			ElasticsearchStatusException statusException = (ElasticsearchStatusException) exception;
-
-			return statusException.status() == RestStatus.CONFLICT && statusException.getMessage() != null
-					&& statusException.getMessage().contains("type=version_conflict_engine_exception")
-					&& statusException.getMessage().contains("version conflict, required seqNo");
-		}
-
-		if (exception instanceof VersionConflictEngineException) {
-
-			VersionConflictEngineException versionConflictEngineException = (VersionConflictEngineException) exception;
-
-			return versionConflictEngineException.getMessage() != null
-					&& versionConflictEngineException.getMessage().contains("version conflict, required seqNo");
-		}
-
-		return false;
-	}
-
 	private boolean indexAvailable(ElasticsearchException ex) {
 
 		List<String> metadata = ex.getMetadata("es.index_uuid");
 		if (metadata == null) {
-
-			if (ex.getCause() instanceof ElasticsearchException) {
-				return indexAvailable((ElasticsearchException) ex.getCause());
-			}
-
 			if (ex instanceof ElasticsearchStatusException) {
-				return StringUtils.hasText(ObjectUtils.nullSafeToString(ex.getIndex()));
+				return StringUtils.hasText(ObjectUtils.nullSafeToString(((ElasticsearchStatusException) ex).getIndex()));
 			}
-			return true;
 		}
 		return !CollectionUtils.contains(metadata.iterator(), "_na_");
 	}

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

@@ -0,0 +1,57 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * DocumentMapper interface, it will allow to customize how we mapping object to json
+ *
+ * @author Artur Konczak
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Christoph Strobl
+ */
+public interface EntityMapper {
+
+	String mapToString(Object object) throws IOException;
+
+	<T> T mapToObject(String source, Class<T> clazz) throws IOException;
+
+	/**
+	 * Map the given {@literal source} to {@link Map}.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @return never {@literal null}
+	 * @since 3.2
+	 */
+	Map<String, Object> mapObject(Object source);
+
+	/**
+	 * Map the given {@link Map} into an instance of the {@literal targetType}.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @param targetType must not be {@literal null}.
+	 * @param <T>
+	 * @return can be {@literal null}.
+	 * @since 3.2
+	 */
+	@Nullable
+	<T> T readObject(Map<String, Object> source, Class<T> targetType);
+}

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

@@ -15,43 +15,37 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
 import java.util.Map;
 
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.elasticsearch.core.join.JoinField;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Common operations performed on an entity in the context of it's mapping metadata.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
- * @author Peter-Josef Meisch
- * @author Roman Puchkovskiy
  * @since 3.2
  */
+@RequiredArgsConstructor
 class EntityOperations {
 
 	private static final String ID_FIELD = "id";
 
-	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context;
-
-	public EntityOperations(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
-
-		Assert.notNull(context, "context must not be null");
-
-		this.context = context;
-	}
+	private final @NonNull MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context;
 
 	/**
 	 * Creates a new {@link Entity} for the given bean.
@@ -100,26 +94,13 @@ class EntityOperations {
 	 * @param index index name override can be {@literal null}.
 	 * @param type index type override can be {@literal null}.
 	 * @return the {@link IndexCoordinates} containing index name and index type.
-	 * @deprecated since 4.1, use {@link EntityOperations#determineIndex(Entity, String)}
+	 * @see ElasticsearchPersistentEntity#getIndexName()
+	 * @see ElasticsearchPersistentEntity#getIndexType()
 	 */
-	@Deprecated
 	IndexCoordinates determineIndex(Entity<?> entity, @Nullable String index, @Nullable String type) {
 		return determineIndex(entity.getPersistentEntity(), index, type);
 	}
 
-	/**
-	 * Determine index name and type name from {@link Entity} with {@code index} and {@code type} overrides. Allows using
-	 * preferred values for index and type if provided, otherwise fall back to index and type defined on entity level.
-	 *
-	 * @param entity the entity to determine the index name. Can be {@literal null} if {@code index} and {@literal type}
-	 *          are provided.
-	 * @param index index name override can be {@literal null}.
-	 * @return the {@link IndexCoordinates} containing index name and index type.
-	 */
-	IndexCoordinates determineIndex(Entity<?> entity, @Nullable String index) {
-		return determineIndex(entity.getPersistentEntity(), index);
-	}
-
 	/**
 	 * Determine index name and type name from {@link ElasticsearchPersistentEntity} with {@code index} and {@code type}
 	 * overrides. Allows using preferred values for index and type if provided, otherwise fall back to index and type
@@ -130,27 +111,32 @@ class EntityOperations {
 	 * @param index index name override can be {@literal null}.
 	 * @param type index type override can be {@literal null}.
 	 * @return the {@link IndexCoordinates} containing index name and index type.
-	 * @deprecated since 4.1, use {@link EntityOperations#determineIndex(ElasticsearchPersistentEntity, String)}
+	 * @see ElasticsearchPersistentEntity#getIndexName()
+	 * @see ElasticsearchPersistentEntity#getIndexType()
 	 */
-	@Deprecated
 	IndexCoordinates determineIndex(ElasticsearchPersistentEntity<?> persistentEntity, @Nullable String index,
 			@Nullable String type) {
-		return determineIndex(persistentEntity, index);
+		return new IndexCoordinates(indexName(persistentEntity, index), typeName(persistentEntity, type));
 	}
 
-	/**
-	 * Determine index name and type name from {@link ElasticsearchPersistentEntity} with {@code index} and {@code type}
-	 * overrides. Allows using preferred values for index and type if provided, otherwise fall back to index and type
-	 * defined on entity level.
-	 *
-	 * @param persistentEntity the entity to determine the index name. Can be {@literal null} if {@code index} and
-	 *          {@literal type} are provided.
-	 * @param index index name override can be {@literal null}.
-	 * @return the {@link IndexCoordinates} containing index name and index type.
-	 * @since 4.1
-	 */
-	IndexCoordinates determineIndex(ElasticsearchPersistentEntity<?> persistentEntity, @Nullable String index) {
-		return index != null ? IndexCoordinates.of(index) : persistentEntity.getIndexCoordinates();
+	private static String indexName(@Nullable ElasticsearchPersistentEntity<?> entity, @Nullable String index) {
+
+		if (StringUtils.isEmpty(index)) {
+			Assert.notNull(entity, "Cannot determine index name");
+			return entity.getIndexName();
+		}
+
+		return index;
+	}
+
+	private static String typeName(@Nullable ElasticsearchPersistentEntity<?> entity, @Nullable String type) {
+
+		if (StringUtils.isEmpty(type)) {
+			Assert.notNull(entity, "Cannot determine index type");
+			return entity.getIndexType();
+		}
+
+		return type;
 	}
 
 	/**
@@ -236,18 +222,14 @@ class EntityOperations {
 		 * Returns whether the entity has a parent.
 		 *
 		 * @return {@literal true} if the entity has a parent that has an {@literal id}.
-		 * @deprecated since 4.1, not supported anymore by Elasticsearch
 		 */
-		@Deprecated
 		boolean hasParent();
 
 		/**
 		 * Returns the parent Id. Can be {@literal null}.
 		 *
 		 * @return can be {@literal null}.
-		 * @deprecated since 4.1, not supported anymore by Elasticsearch
 		 */
-		@Deprecated
 		@Nullable
 		Object getParentId();
 
@@ -281,35 +263,8 @@ class EntityOperations {
 		 * @return the current version or {@literal null} in case it's uninitialized or the entity doesn't expose a version
 		 *         property.
 		 */
-		@Override
 		@Nullable
 		Number getVersion();
-
-		/**
-		 * Returns whether there is a property with type SeqNoPrimaryTerm in this entity.
-		 *
-		 * @return true if there is SeqNoPrimaryTerm property
-		 * @since 4.0
-		 */
-		boolean hasSeqNoPrimaryTerm();
-
-		/**
-		 * Returns SeqNoPropertyTerm for this entity.
-		 *
-		 * @return SeqNoPrimaryTerm, may be {@literal null}
-		 * @since 4.0
-		 */
-		@Nullable
-		SeqNoPrimaryTerm getSeqNoPrimaryTerm();
-
-		/**
-		 * returns the routing for the entity if it is available
-		 * 
-		 * @return routing if available
-		 * @since 4.1
-		 */
-		@Nullable
-		String getRouting();
 	}
 
 	/**
@@ -317,15 +272,9 @@ class EntityOperations {
 	 * @author Christoph Strobl
 	 * @since 3.2
 	 */
+	@RequiredArgsConstructor
 	private static class MapBackedEntity<T extends Map<String, Object>> implements AdaptibleEntity<T> {
 
-		public MapBackedEntity(T map) {
-
-			Assert.notNull(map, "map must not be null");
-
-			this.map = map;
-		}
-
 		private final T map;
 
 		/*
@@ -387,16 +336,6 @@ class EntityOperations {
 			return null;
 		}
 
-		@Override
-		public boolean hasSeqNoPrimaryTerm() {
-			return false;
-		}
-
-		@Override
-		public SeqNoPrimaryTerm getSeqNoPrimaryTerm() {
-			return null;
-		}
-
 		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity#incrementVersion()
@@ -432,11 +371,6 @@ class EntityOperations {
 		public ElasticsearchPersistentEntity<?> getPersistentEntity() {
 			return null;
 		}
-
-		@Override
-		public String getRouting() {
-			return null;
-		}
 	}
 
 	/**
@@ -480,24 +414,13 @@ class EntityOperations {
 	 * @param <T>
 	 * @since 3.2
 	 */
+	@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 	private static class MappedEntity<T> implements Entity<T> {
 
 		private final ElasticsearchPersistentEntity<?> entity;
 		private final IdentifierAccessor idAccessor;
 		private final PersistentPropertyAccessor<T> propertyAccessor;
 
-		private MappedEntity(ElasticsearchPersistentEntity<?> entity, IdentifierAccessor idAccessor,
-				PersistentPropertyAccessor<T> propertyAccessor) {
-
-			Assert.notNull(entity, "entity must not ne null");
-			Assert.notNull(idAccessor, "idAccessor must not ne null");
-			Assert.notNull(propertyAccessor, "propertyAccessor must not ne null");
-
-			this.entity = entity;
-			this.idAccessor = idAccessor;
-			this.propertyAccessor = propertyAccessor;
-		}
-
 		private static <T> MappedEntity<T> of(T bean,
 				MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
 
@@ -508,32 +431,56 @@ class EntityOperations {
 			return new MappedEntity<>(entity, identifierAccessor, propertyAccessor);
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.Entity#getId()
+		 */
 		@Override
 		public Object getId() {
 			return idAccessor.getIdentifier();
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.Entity#isVersionedEntity()
+		 */
 		@Override
 		public boolean isVersionedEntity() {
 			return entity.hasVersionProperty();
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.Entity#getVersion()
+		 */
 		@Override
 		@Nullable
 		public Object getVersion() {
-			return propertyAccessor.getProperty(entity.getVersionProperty());
+			return propertyAccessor.getProperty(entity.getRequiredVersionProperty());
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.Entity#getBean()
+		 */
 		@Override
 		public T getBean() {
 			return propertyAccessor.getBean();
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.Entity#isNew()
+		 */
 		@Override
 		public boolean isNew() {
 			return entity.isNew(propertyAccessor.getBean());
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.Entity#getPersistentEntity()
+		 */
 		@Override
 		public ElasticsearchPersistentEntity<?> getPersistentEntity() {
 			return entity;
@@ -549,17 +496,15 @@ class EntityOperations {
 		private final ElasticsearchPersistentEntity<?> entity;
 		private final ConvertingPropertyAccessor<T> propertyAccessor;
 		private final IdentifierAccessor identifierAccessor;
-		private final ConversionService conversionService;
 
 		private AdaptibleMappedEntity(ElasticsearchPersistentEntity<?> entity, IdentifierAccessor identifierAccessor,
-				ConvertingPropertyAccessor<T> propertyAccessor, ConversionService conversionService) {
+				ConvertingPropertyAccessor<T> propertyAccessor) {
 
 			super(entity, identifierAccessor, propertyAccessor);
 
 			this.entity = entity;
 			this.propertyAccessor = propertyAccessor;
 			this.identifierAccessor = identifierAccessor;
-			this.conversionService = conversionService;
 		}
 
 		static <T> AdaptibleEntity<T> of(T bean,
@@ -571,15 +516,22 @@ class EntityOperations {
 			PersistentPropertyAccessor<T> propertyAccessor = entity.getPropertyAccessor(bean);
 
 			return new AdaptibleMappedEntity<>(entity, identifierAccessor,
-					new ConvertingPropertyAccessor<>(propertyAccessor, conversionService), conversionService);
+					new ConvertingPropertyAccessor<>(propertyAccessor, conversionService));
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity#hasParent()
+		 */
 		@Override
 		public boolean hasParent() {
 			return getRequiredPersistentEntity().getParentIdProperty() != null;
 		}
 
-		@Deprecated
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity#getParentId()
+		 */
 		@Override
 		public Object getParentId() {
 
@@ -587,6 +539,10 @@ class EntityOperations {
 			return propertyAccessor.getProperty(parentProperty);
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity#populateIdIfNecessary(java.lang.Object)
+		 */
 		@Nullable
 		@Override
 		public T populateIdIfNecessary(@Nullable Object id) {
@@ -611,27 +567,23 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.MappedEntity#getVersion()
+		 */
 		@Override
 		@Nullable
 		public Number getVersion() {
 
-			ElasticsearchPersistentProperty versionProperty = entity.getVersionProperty();
-			return versionProperty !=  null ? propertyAccessor.getProperty(versionProperty, Number.class) : null;
-		}
-
-		@Override
-		public boolean hasSeqNoPrimaryTerm() {
-			return entity.hasSeqNoPrimaryTermProperty();
-		}
-
-		@Override
-		public SeqNoPrimaryTerm getSeqNoPrimaryTerm() {
-
-			ElasticsearchPersistentProperty seqNoPrimaryTermProperty = entity.getRequiredSeqNoPrimaryTermProperty();
-
-			return propertyAccessor.getProperty(seqNoPrimaryTermProperty, SeqNoPrimaryTerm.class);
+			ElasticsearchPersistentProperty versionProperty = entity.getRequiredVersionProperty();
+
+			return propertyAccessor.getProperty(versionProperty, Number.class);
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity#initializeVersionProperty()
+		 */
 		@Override
 		public T initializeVersionProperty() {
 
@@ -646,6 +598,10 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
+		/* 
+		 * (non-Javadoc)
+		 * @see org.springframework.data.elasticsearch.core.EntityOperations.AdaptibleEntity#incrementVersion()
+		 */
 		@Override
 		public T incrementVersion() {
 
@@ -657,22 +613,16 @@ class EntityOperations {
 
 			return propertyAccessor.getBean();
 		}
-
-		@Override
-		public String getRouting() {
-
-			ElasticsearchPersistentProperty joinFieldProperty = entity.getJoinFieldProperty();
-
-			if (joinFieldProperty != null) {
-				JoinField<?> joinField = propertyAccessor.getProperty(joinFieldProperty, JoinField.class);
-
-				if (joinField != null && joinField.getParent() != null) {
-					return conversionService.convert(joinField.getParent(), String.class);
-				}
-			}
-
-			return null;
-		}
 	}
 
+	/**
+	 * Value object encapsulating index name and index type.
+	 */
+	@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+	@Getter
+	static class IndexCoordinates {
+
+		private final String indexName;
+		private final String typeName;
+	}
 }