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)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,12 @@
 <!--
 
 Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
-
-When contributing, please make sure an issue exists in issue tracker and comment on this issue with how you want to address it. By this we not only know that someone is working on an issue, we can also align architectural questions and possible solutions before work is invested . We so can prevent that much work is put into Pull Requests that have little or no chances of being merged.
-
 Make sure that:
 
 -->
 
 - [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
-- [ ] **There is a ticket in the bug tracker for the project in our [issue tracker](https://github.
-  com/spring-projects/spring-data-elasticsearch/issues)**. Add the issue number to the _Closes #issue-number_ line below
+- [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/DATAES).
 - [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 - [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).
-
-Closes #issue-number

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author 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.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1 @@
-#Tue Feb 22 13:56:16 CET 2022
-wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

CI.adoc

@@ -1,15 +1,15 @@
 = Continuous Integration
 
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=2020.0.0%20(main)[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
 
 Since this pipeline is purely Docker-based, it's easy to:
 
 * Debug what went wrong on your local machine.
-* Test out a a tweak to your `verify.sh` script before sending it out.
+* Test out a a tweak to your `test.sh` script before sending it out.
 * Experiment against a new image before submitting your pull request.
 
 All of these use cases are great reasons to essentially run what the CI server does on your local machine.
@@ -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/main/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.
+You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here].

Jenkinsfile

@@ -1,15 +1,9 @@
-def p = [:]
-node {
-    checkout scm
-    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
-}
-
 pipeline {
 	agent none
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/2.6.x", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.2.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -18,126 +12,88 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (main)") {
+		stage("Test") {
 			when {
 				anyOf {
-					branch 'main'
-					not { triggeredBy 'UpstreamCause' }
-				}
-			}
-			agent {
-				label 'data'
-			}
-			options { timeout(time: 30, unit: 'MINUTES') }
-
-			environment {
-				DOCKER_HUB = credentials("${p['docker.credentials']}")
-				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-			}
-
-			steps {
-				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-							sh 'PROFILE=none ci/verify.sh'
-							sh "ci/clean.sh"
-						}
-					}
-				}
-			}
-		}
-
-		stage("Test other configurations") {
-			when {
-				allOf {
-					branch 'main'
+					branch '3.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			parallel {
-				stage("test: baseline (next)") {
+				stage("test: baseline") {
 					agent {
-						label 'data'
-					}
-					options { timeout(time: 30, unit: 'MINUTES') }
-
-					environment {
-						DOCKER_HUB = credentials("${p['docker.credentials']}")
-						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-					}
-
-					steps {
-						script {
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh 'PROFILE=none ci/verify.sh'
-									sh "ci/clean.sh"
-								}
-							}
+						docker {
+							image 'adoptopenjdk/openjdk8:latest'
+							label 'data'
+							args '-u root -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home'
 						}
 					}
-				}
-
-				stage("test: baseline (LTS)") {
-					agent {
-						label 'data'
-					}
 					options { timeout(time: 30, unit: 'MINUTES') }
-
 					environment {
-						DOCKER_HUB = credentials("${p['docker.credentials']}")
-						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 					}
-
 					steps {
-						script {
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
-									sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-									sh 'PROFILE=none ci/verify.sh'
-									sh "ci/clean.sh"
-								}
-							}
-						}
+						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 'main'
+					branch '3.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			agent {
-				label 'data'
+				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: 20, unit: 'MINUTES') }
 
 			environment {
-				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 			}
 
 			steps {
-				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.staging-repository=libs-snapshot-local " +
-									"-Dartifactory.build-name=spring-data-elasticsearch " +
-									"-Dartifactory.build-number=${BUILD_NUMBER} " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
-					}
+				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} " +
+						"-Dartifactory.staging-repository=libs-snapshot-local " +
+						"-Dartifactory.build-name=spring-data-elasticsearch " +
+						"-Dartifactory.build-number=${BUILD_NUMBER} " +
+						'-Dmaven.test.skip=true clean deploy -U -B'
+			}
+		}
+		stage('Publish documentation') {
+			when {
+				branch '3.2.x'
+			}
+			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: 20, unit: 'MINUTES') }
+
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
+
+			steps {
+				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} " +
+						"-Dartifactory.distribution-repository=temp-private-local " +
+						'-Dmaven.test.skip=true clean deploy -U -B'
+			}
 		}
 	}
 

README.adoc

@@ -1,6 +1,6 @@
 image:https://spring.io/badges/spring-data-elasticsearch/ga.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start] image:https://spring.io/badges/spring-data-elasticsearch/snapshot.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start]
 
-= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
+= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmaster&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
 
 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
@@ -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
@@ -114,7 +109,7 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-elasticsearch</artifactId>
-  <version>${version}</version>
+  <version>${version}.RELEASE</version>
 </dependency>
 ----
 
@@ -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:
 
@@ -149,7 +144,7 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-elasticsearch</artifactId>
-  <version>${version}-SNAPSHOT</version>
+  <version>${version}.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -170,17 +165,17 @@ If you are just starting out with Spring, try one of the https://spring.io/guide
 * If you are upgrading, check out the https://docs.spring.io/spring-data/elasticsearch/docs/current/changelog.txt[changelog] for "`new and noteworthy`" features.
 * Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data-elasticsearch`].
 You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
-* Report bugs with Spring Data for Elasticsearch at https://github.com/spring-projects/spring-data-elasticsearch/issues[https://github.com/spring-projects/spring-data-elasticsearch/issues].
+* Report bugs with Spring Data for Elasticsearch at https://jira.spring.io/browse/DATAES[jira.spring.io/browse/DATAES].
 
 == Reporting Issues
 
-Spring Data uses GitHub as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below:
+Spring Data uses JIRA as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below:
 
 * Before you log a bug, please search the
-https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] to see if someone has already reported the problem.
-* If the issue doesn’t already exist, https://github.com/spring-projects/spring-data-elasticsearch/issues/new[create a new issue].
-* Please provide as much information as possible with the issue report, we like to know the version of Spring Data Elasticsearch that you are using and JVM version.
-* If you need to paste code, or include a stack trace use Markdown +++```+++ escapes before and after your text.
+https://jira.spring.io/browse/DATAES[issue tracker] to see if someone has already reported the problem.
+* If the issue doesn’t already exist, https://jira.spring.io/browse/DATAES[create a new issue].
+* Please provide as much information as possible with the issue report, we like to know the version of Spring Data that you are using and JVM version.
+* If you need to paste code, or include a stack trace use JIRA `{code}…{code}` escapes before and after your text.
 * If possible try to create a test-case or project that replicates the issue. Attach a link to your code or a compressed file containing your code.
 
 == Building from Source
@@ -195,14 +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 https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] and comment on this issue with how you want to address it. By this we not only know that someone is working on an issue, we can also align architectural questions and possible solutions before work is invested
-. We
-so
-can prevent that much work is put into Pull Requests that have little
-or no chances of being merged.
-
+_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
 
@@ -217,7 +205,7 @@ The generated documentation is available from `target/site/reference/html/index.
 
 == Examples
 
-For examples on using the Spring Data for Elasticsearch, see the https://github.com/spring-projects/spring-data-examples/tree/main/elasticsearch/example[spring-data-examples] project.
+For examples on using the Spring Data for Elasticsearch, see the https://github.com/spring-projects/spring-data-examples/tree/master/elasticsearch/example[spring-data-examples] project.
 
 == License
 

TESTING.adoc

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

ci/clean.sh

@@ -1,6 +0,0 @@
-#!/bin/bash -x
-
-set -euo pipefail
-
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch

ci/pipeline.properties

@@ -1,29 +0,0 @@
-# Java versions
-java.main.tag=8u322-b06-jdk
-java.next.tag=11.0.14.1_1-jdk
-java.lts.tag=17.0.2_8-jdk
-
-# Docker container images - standard
-docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
-docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
-
-# Supported versions of MongoDB
-docker.mongodb.4.0.version=4.0.28
-docker.mongodb.4.4.version=4.4.12
-docker.mongodb.5.0.version=5.0.6
-
-# Supported versions of Redis
-docker.redis.6.version=6.2.6
-
-# Supported versions of Cassandra
-docker.cassandra.3.version=3.11.12
-
-# Docker environment settings
-docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
-docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
-
-# Credentials
-docker.registry=
-docker.credentials=hub.docker.com-springbuildmaster
-artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c

ci/verify.sh

@@ -1,10 +0,0 @@
-#!/bin/bash -x
-
-set -euo pipefail
-
-mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
-chown -R 1001:1001 .
-
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./mvnw -s settings.xml \
-  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch

mvnw

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven Start Up Batch script
+# Maven2 Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -114,6 +114,7 @@ if $mingw ; then
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
 fi
 
 if [ -z "$JAVA_HOME" ]; then
@@ -211,11 +212,7 @@ else
     if [ "$MVNW_VERBOSE" = true ]; then
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    fi
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
       esac
@@ -224,38 +221,22 @@ else
       echo "Downloading from: $jarUrl"
     fi
     wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
 
     if command -v wget > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found wget ... using wget"
         fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-        fi
+        wget "$jarUrl" -O "$wrapperJarPath"
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found curl ... using curl"
         fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
-
+        curl -o "$wrapperJarPath" "$jarUrl"
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"
         fi
         javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
         if [ -e "$javaClass" ]; then
             if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
                 if [ "$MVNW_VERBOSE" = true ]; then
@@ -296,11 +277,6 @@ if $cygwin; then
     MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
 fi
 
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \

mvnw.cmd

@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
@@ -18,7 +18,7 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
+@REM Maven2 Start Up Batch script
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
@@ -26,7 +26,7 @@
 @REM Optional ENV vars
 @REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
 @REM     e.g. to debug Maven itself, use
 @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -37,7 +37,7 @@
 @echo off
 @REM set title of command window
 title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
 @REM set %HOME% to equivalent of $HOME
@@ -120,44 +120,23 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
 )
 
 @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
 @REM This allows using the maven wrapper in projects that prohibit checking in binary data.
 if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
+    echo Found %WRAPPER_JAR%
 ) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+    echo Finished downloading %WRAPPER_JAR%
 )
 @REM End of extension
 
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
 %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end

pom.xml

@@ -3,14 +3,14 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.3.4</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.6.4</version>
+		<version>2.2.14.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,22 +18,12 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<elasticsearch>7.15.2</elasticsearch>
-		<log4j>2.17.0</log4j>
-		<netty>4.1.65.Final</netty>
-		<springdata.commons>2.6.4</springdata.commons>
-		<testcontainers>1.15.3</testcontainers>
-		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
+		<commonslang>2.6</commonslang>
+		<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 defining the maven phase for the tests and integration tests
-			set to "none" to disable the corresponding test execution (-Dmvn.unit-test.goal=none)
-			default execution for unit-test: "test", for the integration tests: "integration-test"
-		-->
-		<mvn.unit-test.goal>test</mvn.unit-test.goal>
-		<mvn.integration-test-elasticsearch.goal>integration-test</mvn.integration-test-elasticsearch.goal>
-		<mvn.integration-test-opensearch.goal>none</mvn.integration-test-opensearch.goal>
 	</properties>
 
 	<developers>
@@ -79,11 +69,12 @@
 	</ciManagement>
 
 	<issueManagement>
-		<system>GitHub</system>
-		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
+		<system>JIRA</system>
+		<url>https://jira.spring.io/browse/DATAES</url>
 	</issueManagement>
 
 	<dependencyManagement>
+
 		<dependencies>
 			<dependency>
 				<groupId>io.netty</groupId>
@@ -130,7 +121,7 @@
 
 		<dependency>
 			<groupId>io.projectreactor.netty</groupId>
-			<artifactId>reactor-netty-http</artifactId>
+			<artifactId>reactor-netty</artifactId>
 			<optional>true</optional>
 		</dependency>
 
@@ -140,6 +131,21 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!-- APACHE -->
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commonslang}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- JODA Time -->
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime}</version>
+		</dependency>
+
 		<!-- Elasticsearch -->
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
@@ -158,12 +164,6 @@
 			<groupId>org.elasticsearch.plugin</groupId>
 			<artifactId>transport-netty4-client</artifactId>
 			<version>${elasticsearch}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -178,7 +178,6 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
@@ -204,21 +203,6 @@
 		</dependency>
 
 		<!-- CDI -->
-		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.0.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
@@ -227,20 +211,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-se</artifactId>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -255,34 +225,20 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-to-slf4j</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.projectreactor.tools</groupId>
-			<artifactId>blockhound-junit-platform</artifactId>
-			<version>${blockhound-junit}</version>
-			<scope>test</scope>
-		</dependency>
-
-
-		<!--
-		  we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
-		  lombok compiler stuff is executed regardless of the fact that we don't need it.
-		  On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
-		  Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
-		  src/test/resources/local-maven-repo/
-		  It was installed with
-		   mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
-		-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>999999</version>
+			<groupId>org.apache.openwebbeans.test</groupId>
+			<artifactId>cditest-owb</artifactId>
+			<version>1.2.8</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-jcdi_1.0_spec</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.geronimo.specs</groupId>
+					<artifactId>geronimo-atinject_1.0_spec</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -295,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-->
@@ -310,13 +266,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>io.specto</groupId>
-			<artifactId>hoverfly-java-junit5</artifactId>
-			<version>0.13.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
 		<dependency>
 			<groupId>org.apache.xbean</groupId>
@@ -332,41 +281,13 @@
 			<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
+			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -381,68 +302,7 @@
 						<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>${mvn.unit-test.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<excludedGroups>integration-test</excludedGroups>
-						</configuration>
-					</execution>
-					<!-- execution to run the integration tests against Elasticsearch -->
-					<execution>
-						<id>integration-test-elasticsearch</id>
-						<phase>${mvn.integration-test-elasticsearch.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-							<systemPropertyVariables>
-								<sde.integration-test.environment>elasticsearch</sde.integration-test.environment>
-							</systemPropertyVariables>
-						</configuration>
-					</execution>
-					<!-- execution to run the integration tests against Opensearch -->
-					<execution>
-						<id>integration-test-opensearch</id>
-						<phase>${mvn.integration-test-opensearch.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-							<systemPropertyVariables>
-								<sde.integration-test.environment>opensearch</sde.integration-test.environment>
-							</systemPropertyVariables>
-						</configuration>
-					</execution>
-				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.pitest</groupId>
-				<artifactId>pitest-maven</artifactId>
-				<version>1.5.2</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.pitest</groupId>
-						<artifactId>pitest-junit5-plugin</artifactId>
-						<version>0.12</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<excludedGroups>integration-test</excludedGroups>
-					<targetClasses>
-						<param>org.springframework.data.elasticsearch.core.geo.*</param>
-					</targetClasses>
-					<excludedMethods>toString</excludedMethods>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -456,7 +316,9 @@
 
 	<profiles>
 		<profile>
+
 			<id>ci</id>
+
 			<build>
 				<plugins>
 					<plugin>
@@ -473,45 +335,21 @@
 								</module>
 							</checkstyleRules>
 							<includes>**/*</includes>
-							<excludes>
-								.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy
-							</excludes>
+							<excludes>.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy</excludes>
 							<sourceDirectories>./</sourceDirectories>
 						</configuration>
 					</plugin>
 				</plugins>
 			</build>
+
 		</profile>
 
-		<profile>
-			<id>jdk13+</id>
-			<!-- on jDK13+, Blockhound needs this JVM flag set -->
-			<activation>
-				<jdk>[13,)</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<argLine>-XX:+AllowRedefinitionToAddDeleteMethods</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
-		</repository>
-
-		<repository>
-			<id>local-maven-repo</id>
-			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
+			<id>spring-libs-snapshot</id>
+			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 

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-2021 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,17 +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-join-types.adoc[]
-include::reference/elasticsearch-routing.adoc[]
 include::reference/elasticsearch-misc.adoc[]
 :leveloffset: -1
 
@@ -46,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.
@@ -16,7 +15,7 @@ include::reference/elasticsearch-new.adoc[leveloffset=+1]
 
 * Version Control - https://github.com/spring-projects/spring-data-elasticsearch
 * API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
-* Bugtracker - https://github.com/spring-projects/spring-data-elasticsearch/issues
+* Bugtracker - https://jira.spring.io/browse/DATAES
 * Release repository - https://repo.spring.io/libs-release
 * Milestone repository - https://repo.spring.io/libs-milestone
 * Snapshot repository - https://repo.spring.io/libs-snapshot
@@ -28,20 +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:
-
-[cols="^,^,^,^,^",options="header"]
+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 Framework | Spring Boot
-| 2021.1 (Q)footnote:cdv[Currently in development] | 4.3.xfootnote:cdv[] | 7.15.2 | 5.3.xfootnote:cdv[] | 2.5 .xfootnote:cdv[]
-| 2021.0 (Pascal) | 4.2.x | 7.12.0 | 5.3.x | 2.5.x
-| 2020.0 (Ockham) | 4.1.x | 7.9.3 | 5.3.2 | 2.4.x
-| Neumann | 4.0.x | 7.6.2 | 5.2.12 |2.3.x
-| Moore | 3.2.x |6.8.12 | 5.2.12| 2.2.x
-| Lovelacefootnote:oom[Out of maintenance] | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
-| Kayfootnote:oom[] | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
-| Ingallsfootnote:oom[] | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
+|Spring Data Release Train |Spring Data Elasticsearch |Elasticsearch | Spring Boot
+|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,83 +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;
-    @CreatedDate
-    @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
-    private Instant createdDate;
-    @CreatedBy
-    private String createdBy
-    @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
-    @LastModifiedDate
-    private Instant lastModifiedDate;
-    @LastModifiedBy
-    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,14 +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 `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.
+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>>.
 
 We strongly recommend to use the <<elasticsearch.clients.rest>> instead of the `TransportClient`.
 
@@ -18,64 +17,55 @@ 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();        <.>
-        TransportClient client = new PreBuiltTransportClient(settings);
-        client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300)); <.>
-        return client;
-    }
-
-    @Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-    public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-
-		ElasticsearchTemplate template = new ElasticsearchTemplate(elasticsearchClient, elasticsearchConverter);
-		template.setRefreshPolicy(refreshPolicy());                                                 <.>
-
-		return template;
-    }
+  @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;
+  }
 }
 
 // ...
 
-IndexRequest request = new IndexRequest("spring-data")
- .id(randomID())
- .source(someObject);
+IndexRequest request = new IndexRequest("spring-data", "elasticsearch", randomID())
+ .source(someObject)
+ .setRefreshPolicy(IMMEDIATE);
 
 IndexResponse response = client.index(request);
 ----
-
-<.> The `TransportClient` must be configured with the cluster name.
-<.> The host and port to connect the client to.
-<.> the RefreshPolicy must be set in the `ElasticsearchTemplate` (override `refreshPolicy()` to not use the default)
+<1> The `TransportClient` must be configured with the cluster name.
+<2> The host and port to connect the client to.
 ====
 
 [[elasticsearch.clients.rest]]
 == High Level REST Client
 
-The Java High Level REST Client is the default client of Elasticsearch, it provides a straight forward replacement for the `TransportClient` as it accepts and returns the very same request/response objects and therefore depends on the Elasticsearch core project.
+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.
 
 .High Level REST Client
 ====
 [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>
+  }
 }
 
 // ...
@@ -83,18 +73,16 @@ public class RestClientConfig extends AbstractElasticsearchConfiguration {
   @Autowired
   RestHighLevelClient highLevelClient;
 
-  RestClient lowLevelClient = highLevelClient.lowLevelClient();                        <3>
+  RestClient lowLevelClient = highLevelClient.lowLevelClient();             <3>
 
 // ...
 
-IndexRequest request = new IndexRequest("spring-data")
-  .id(randomID())
+IndexRequest request = new IndexRequest("spring-data", "elasticsearch", randomID())
   .source(singletonMap("feature", "high-level-rest-client"))
   .setRefreshPolicy(IMMEDIATE);
 
-IndexResponse response = highLevelClient.index(request,RequestOptions.DEFAULT);
+IndexResponse response = highLevelClient.index(request);
 ----
-
 <1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
 <2> Create the RestHighLevelClient.
 <3> It is also possible to obtain the `lowLevelRest()` client.
@@ -111,30 +99,39 @@ Calls are directly operated on the reactive stack, **not** wrapping async (threa
 ====
 [source,java]
 ----
-@Configuration
-public class ReactiveRestClientConfig extends AbstractReactiveElasticsearchConfiguration {
+static class Config {
 
-    @Override
-    @Bean
-    public ReactiveElasticsearchClient reactiveElasticsearchClient() {
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder() <.>
-            .connectedTo("localhost:9200") //
+  @Bean
+  ReactiveElasticsearchClient client() {
+
+    ClientConfiguration clientConfiguration = ClientConfiguration.builder()   <1>
+      .connectedTo("localhost:9200", "localhost:9291")
+      .withWebClientConfigurer(webClient -> {                                 <2>
+        ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder()
+            .codecs(configurer -> configurer.defaultCodecs()
+                .maxInMemorySize(-1))
             .build();
-        return ReactiveRestClients.create(clientConfiguration);
+        return webClient.mutate().exchangeStrategies(exchangeStrategies).build();
+       })
+      .build();
 
-    }
+    return ReactiveRestClients.create(clientConfiguration);
+  }
 }
+
 // ...
 
 Mono<IndexResponse> response = client.index(request ->
 
   request.index("spring-data")
+    .type("elasticsearch")
     .id(randomID())
-    .source(singletonMap("feature", "reactive-client"));
+    .source(singletonMap("feature", "reactive-client"))
+    .setRefreshPolicy(IMMEDIATE);
 );
 ----
-
-<.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<1> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
+<2> when configuring a reactive client, the `withWebClientConfigurer` hook can be used to customize the WebClient.
 ====
 
 NOTE: The ReactiveClient response, especially for search operations, is bound to the `from` (offset) & `size` (limit) options of the request.
@@ -142,90 +139,41 @@ 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")                      <.>
+// 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")                      <.>
-  .usingSsl()                                                           <.>
-  .withProxy("localhost:8888")                                          <.>
-  .withPathPrefix("ela")                                                <.>
-  .withConnectTimeout(Duration.ofSeconds(5))                            <.>
-  .withSocketTimeout(Duration.ofSeconds(3))                             <.>
-  .withDefaultHeaders(defaultHeaders)                                   <.>
-  .withBasicAuth(username, password)                                    <.>
-  .withHeaders(() -> {                                                  <.>
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("currentTime", LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
-    return headers;
-  })
-  .withClientConfigurer(                                                <.>
-    ReactiveRestClients.WebClientConfigurationCallback.from(webClient -> {
-  	  // ...
-      return webClient;
-  	}))
-  .withClientConfigurer(                                                <.>
-    RestClients.RestClientConfigurationCallback.from(clientBuilder -> {
-  	  // ...
-      return clientBuilder;
-  	}))
+  .connectedTo("localhost:9200", "localhost:9291")                      <2>
+  .withConnectTimeout(Duration.ofSeconds(5))                            <3>
+  .withSocketTimeout(Duration.ofSeconds(3))                             <4>
+  .usingSsl()                                                           <5>
+  .withDefaultHeaders(defaultHeaders)                                   <6>
+  .withBasicAuth(username, password)                                    <7>
   . // ... other options
   .build();
 
 ----
-
-<.> Define default headers, if they need to be customized
-<.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-<.> Optionally enable SSL.
-<.> Optionally set a proxy.
-<.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
-<.> Set the connection timeout.
-Default is 10 sec.
-<.> Set the socket timeout.
-Default is 5 sec.
-<.> Optionally set headers.
-<.> Add basic authentication.
-<.> A `Supplier<Header>` function can be specified which is called every time before a request is sent to Elasticsearch - here, as an example, the current time is written in a header.
-<.> for reactive setup a function configuring the `WebClient`
-<.> for non-reactive setup a function configuring the REST client
-====
-
-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 7 compatibility headers
-
-When using Spring Data Elasticsearch 4 - which uses the Elasticsearch 7 client libraries - and accessing an Elasticsearch cluster that is running on version 8, it is necessary to set the compatibility headers
-https://www.elastic.co/guide/en/elasticsearch/reference/8.0/rest-api-compatibility.html[see Elasticserach documentation].
-This should be done using a header supplier like shown above:
-
-====
-[source,java]
-----
-ClientConfigurationBuilder configurationBuilder = new ClientConfigurationBuilder();
-    configurationBuilder //
-		// ...
-		.withHeaders(() -> {
-			HttpHeaders defaultCompatibilityHeaders = new HttpHeaders();
-			defaultCompatibilityHeaders.add("Accept",
-                          "application/vnd.elasticsearch+json;compatible-with=7");
-			defaultCompatibilityHeaders.add("Content-Type",
-                          "application/vnd.elasticsearch+json;compatible-with=7");
-			return defaultCompatibilityHeaders;
-		});
-----
+<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> 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.
 ====
 
 [[elasticsearch.clients.logging]]
 == Client Logging
 
-To see what is actually sent to and received from the server `Request` / `Response` logging on the transport level needs to be turned on as outlined in the snippet below.
+To see what is actually sent to and received from the server `Request` / `Response` logging on the transport level needs
+to be turned on as outlined in the snippet below.
 
 .Enable transport layer logging
 [source,xml]

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-join-types.adoc

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

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-migration-guide-4.1-4.2.adoc

@@ -1,66 +0,0 @@
-[[elasticsearch-migration-guide-4.1-4.2]]
-= Upgrading from 4.1.x to 4.2.x
-
-This section describes breaking changes from version 4.1.x to 4.2.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-4.1-4.2.deprecations]]
-== Deprecations
-
-=== @Document parameters
-
-The parameters of the `@Document` annotation that are relevant for  the index settings (`useServerConfiguration`, `shards`. `replicas`, `refreshIntervall` and `indexStoretype`) have been moved to the `@Setting` annotation. Use in `@Document` is still possible but deprecated.
-
-[[elasticsearch-migration-guide-4.1-4.2.removal]]
-== Removals
-
-The `@Score` annotation that was used to set the score return value in an entity was deprecated in version 4.0 and has been removed.
-Scroe values are returned in the `SearchHit` instances that encapsulate the returned entities.
-
-The `org.springframework.data.elasticsearch.ElasticsearchException` class has been removed.
-The remaining usages have been replaced with `org.springframework.data.mapping.MappingException` and `org.springframework.dao.InvalidDataAccessApiUsageException`.
-
-The deprecated `ScoredPage`, `ScrolledPage` `@AggregatedPage` and implementations has been removed.
-
-The deprecated `GetQuery` and `DeleteQuery` have been removed.
-
-The deprecated `find` methods from `ReactiveSearchOperations` and `ReactiveDocumentOperations` have been removed.
-
-[[elasticsearch-migration-guide-4.1-4.2.breaking-changes]]
-== Breaking Changes
-
-=== RefreshPolicy
-
-==== Enum package changed
-
-It was possible in 4.1 to configure the refresh policy for the `ReactiveElasticsearchTemplate` by overriding the method `AbstractReactiveElasticsearchConfiguration.refreshPolicy()` in a custom configuration class.
-The return value of this method was an instance of the class `org.elasticsearch.action.support.WriteRequest.RefreshPolicy`.
-
-Now the configuration must return `org.springframework.data.elasticsearch.core.RefreshPolicy`.
-This enum has the same values and triggers the same behaviour as before, so only the `import` statement has to be adjusted.
-
-==== Refresh behaviour
-
-`ElasticsearchOperations` and `ReactiveElasticsearchOperations` now explicitly use the `RefreshPolicy` set on the template for write requests if not null.
-If the refresh policy is null, then nothing special is done, so the cluster defaults are used. `ElasticsearchOperations` was always using the cluster default before this version.
-
-The provided implementations for `ElasticsearchRepository` and `ReactiveElasticsearchRepository` will do an explicit refresh when the refresh policy is null.
-This is the same behaviour as in previous versions.
-If a refresh policy is set, then it will be used by the repositories as well.
-
-==== Refresh configuration
-
-When configuring Spring Data Elasticsearch like described in <<elasticsearch.clients>> by using `ElasticsearchConfigurationSupport`, `AbstractElasticsearchConfiguration` or `AbstractReactiveElasticsearchConfiguration` the refresh policy will be initialized to `null`.
-Previously the reactive code initialized this to `IMMEDIATE`, now reactive and non-reactive code show the same behaviour.
-
-=== Method return types
-
-==== delete methods that take a Query
-
-The reactive methods previously returned a `Mono<Long>` with the number of deleted documents, the non reactive versions were void. They now return a `Mono<ByQueryResponse>` which contains much more detailed information about the deleted documents and errors that might have occurred.
-
-==== multiget methods
-
-The implementations of _multiget_ previousl only returned the found entities in a `List<T>` for non-reactive implementations and in a `Flux<T>` for reactive implementations. If the request contained ids that were not found, the information that these are missing was not available. The user needed to compare the returned ids to the requested ones to find
-which ones were missing.
-
-Now the `multiget` methods return a `MultiGetItem` for every requested id. This contains information about failures (like non existing indices) and the information if the item existed (then it is contained in the `MultiGetItem) or not.

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

@@ -1,79 +0,0 @@
-[[elasticsearch-migration-guide-4.2-4.3]]
-= Upgrading from 4.2.x to 4.3.x
-
-This section describes breaking changes from version 4.2.x to 4.3.x and how removed features can be replaced by new introduced features.
-
-[NOTE]
-====
-Elasticsearch is working on a new Client that will replace the `RestHighLevelClient` because the `RestHighLevelClient` uses code from Elasticsearch core libraries which are not Apache 2 licensed anymore.
-Spring Data Elasticsearch is preparing for this change as well.
-This means that internally the implementations for the `*Operations` interfaces need to change - which should be no problem if users program against the interfaces like `ElasticsearchOperations` or `ReactiveElasticsearchOperations`.
-If you are using the implementation classes like `ElasticsearchRestTemplate` directly, you will need to adapt to these changes.
-
-Spring Data Elasticsearch also removes or replaces the use of classes from the `org.elasticsearch` packages in it's API classes and methods, only using them in the implementation where the access to Elasticsearch is implemented.
-For the user that means, that some enum classes that were used are replaced by enums that live in `org.springframework.data.elasticsearch` with the same values, these are internally mapped onto the Elasticsearch ones.
-
-Places where classes are used that cannot easily be replaced, this usage is marked as deprecated, we are working on replacements.
-
-Check the sections on <<elasticsearch-migration-guide-4.2-4.3.deprecations>> and <<elasticsearch-migration-guide-4.2-4.3.breaking-changes>> for further details.
-====
-
-[[elasticsearch-migration-guide-4.2-4.3.deprecations]]
-== Deprecations
-
-=== suggest methods
-
-In `SearchOperations`, and so in `ElasticsearchOperations` as well, the `suggest` methods taking a `org.elasticsearch.search.suggest.SuggestBuilder` as argument and returning a `org.elasticsearch.action.search.SearchResponse` have been deprecated.
-Use `SearchHits<T> search(Query query, Class<T> clazz)` instead, passing in a `NativeSearchQuery` which can contain a `SuggestBuilder` and read the suggest results from the returned `SearchHit<T>`.
-
-In `ReactiveSearchOperations` the new `suggest` methods return a `Mono<org.springframework.data.elasticsearch.core.suggest.response.Suggest>` now.
-Here as well the old methods are deprecated.
-
-[[elasticsearch-migration-guide-4.2-4.3.breaking-changes]]
-== Breaking Changes
-
-=== Removal of `org.elasticsearch` classes from the API.
-
-* In the `org.springframework.data.elasticsearch.annotations.CompletionContext` annotation the property `type()` has changed from `org.elasticsearch.search.suggest.completion.context.ContextMapping.Type` to `org.springframework.data.elasticsearch.annotations.CompletionContext.ContextMappingType`, the available enum values are the same.
-* In the `org.springframework.data.elasticsearch.annotations.Document` annotation the `versionType()` property has changed to `org.springframework.data.elasticsearch.annotations.Document.VersionType`, the available enum values are the same.
-* In the `org.springframework.data.elasticsearch.core.query.Query` interface the `searchType()` property has changed to `org.springframework.data.elasticsearch.core.query.Query.SearchType`, the available enum values are the same.
-* In the `org.springframework.data.elasticsearch.core.query.Query` interface the return value of  `timeout()` was changed to `java.time.Duration`.
-* The `SearchHits<T>`class does not contain the `org.elasticsearch.search.aggregations.Aggregations` anymore.
-Instead it now contains an instance of the `org.springframework.data.elasticsearch.core.AggregationsContainer<T>` class where `T` is the concrete aggregations type from the underlying client that is used.
-Currently this will be a `org
-.springframework.data.elasticsearch.core.clients.elasticsearch7.ElasticsearchAggregations` object; later different implementations will be available.
-The same change has been done to the `ReactiveSearchOperations.aggregate()` functions, the now return a `Flux<AggregationContainer<?>>`.
-Programs using the aggregations need to be changed to cast the returned value to the appropriate class to further proces it.
-* methods that might have thrown a `org.elasticsearch.ElasticsearchStatusException` now will throw `org.springframework.data.elasticsearch.RestStatusException` instead.
-
-=== Handling of field and sourceFilter properties of Query
-
-Up to version 4.2 the `fields` property of a `Query` was interpreted and added to the include list of the `sourceFilter`.
-This was not correct, as these are different things for Elasticsearch.
-This has been corrected.
-As a consequence code might not work anymore that relies on using `fields` to specify which fields should be returned from the document's `_source' and should be changed to use the `sourceFilter`.
-
-=== search_type default value
-
-The default value for the `search_type` in Elasticsearch is `query_then_fetch`.
-This now is also set as default value in the `Query` implementations, it was previously set to `dfs_query_then_fetch`.
-
-=== BulkOptions changes
-
-Some properties of the `org.springframework.data.elasticsearch.core.query.BulkOptions` class have changed their type:
-
-* the type of the `timeout` property has been changed to `java.time.Duration`.
-* the type of the`refreshPolicy` property has been changed to `org.springframework.data.elasticsearch.core.RefreshPolicy`.
-
-=== IndicesOptions change
-
-Spring Data Elasticsearch now uses `org.springframework.data.elasticsearch.core.query.IndicesOptions` instead of `org.elasticsearch.action.support.IndicesOptions`.
-
-=== Completion classes
-
-The classes from the package `org.springframework.data.elasticsearch.core.completion` have been moved to `org.springframework.data.elasticsearch.core.suggest`.
-
-=== Other renamings
-
-The `org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentPropertyConverter` interface has been renamed to `org.springframework.data.elasticsearch.core.mapping.PropertyValueConverter`.
-Likewise the implementations classes named _XXPersistentPropertyConverter_ have been renamed to _XXPropertyValueConverter_.

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

@@ -1,79 +1,7 @@
 [[elasticsearch.misc]]
 = Miscellaneous Elasticsearch Operation Support
 
-This chapter covers additional support for Elasticsearch operations that cannot be directly accessed via the repository interface.
-It is recommended to add those operations as custom implementation as described in <<repositories.custom-implementations>> .
-
-[[elasticsearc.misc.index.settings]]
-== Index settings
-
-When creating Elasticsearch indices with Spring Data Elasticsearch different index settings can be defined by using the `@Setting` annotation.
-The following arguments are available:
-
-* `useServerConfiguration` does not send any settings parameters, so the Elasticsearch server configuration determines them.
-* `settingPath` refers to a JSON file defining the settings that must be resolvable in the classpath
-* `shards` the number of shards to use, defaults to _1_
-* `replicas` the number of replicas, defaults to _1_
-* `refreshIntervall`, defaults to _"1s"_
-* `indexStoreType`, defaults to _"fs"_
-
-
-It is as well possible to define https://www.elastic.co/guide/en/elasticsearch/reference/7.11/index-modules-index-sorting.html[index sorting] (check the linked Elasticsearch documentation for the possible field types and values):
-
-====
-[source,java]
-----
-@Document(indexName = "entities")
-@Setting(
-  sortFields = { "secondField", "firstField" },                                  <.>
-  sortModes = { Setting.SortMode.max, Setting.SortMode.min },                    <.>
-  sortOrders = { Setting.SortOrder.desc, Setting.SortOrder.asc },
-  sortMissingValues = { Setting.SortMissing._last, Setting.SortMissing._first })
-class Entity {
-    @Nullable
-    @Id private String id;
-
-    @Nullable
-    @Field(name = "first_field", type = FieldType.Keyword)
-    private String firstField;
-
-    @Nullable @Field(name = "second_field", type = FieldType.Keyword)
-    private String secondField;
-
-    // getter and setter...
-}
-----
-
-<.> when defining sort fields, use the name of the Java property (_firstField_), not the name that might be defined for Elasticsearch (_first_field_)
-<.> `sortModes`, `sortOrders` and `sortMissingValues` are optional, but if they are set, the number of entries must match the number of `sortFields` elements
-====
-
-[[elasticsearch.misc.mappings]]
-== Index Mapping
-
-When Spring Data Elasticsearch creates the index mapping with the `IndexOperations.createMapping()` methods, it uses the annotations described in <<elasticsearch.mapping.meta-model.annotations>>, especially the `@Field` annotation.
-In addition to that it is possible to add the `@Mapping` annotation to a class.
-This annotation has the following properties:
-
-* `mappingPath` a classpath resource in JSON format; if this is not empty it is used as the mapping, no other mapping processing is done.
-* `enabled`  when set to false, this flag is written to the mapping and no further processing is done.
-* `dateDetection` and `numericDetection` set the corresponding properties in the mapping when not set to `DEFAULT`.
-* `dynamicDateFormats` when this String array is not empty, it defines the date formats used for automatic date detection.
-* `runtimeFieldsPath` a classpath resource in JSON format containing the definition of runtime fields which is written to the index mappings, for example:
-
-====
-[source,json]
-----
-{
-  "day_of_week": {
-    "type": "keyword",
-    "script": {
-      "source": "emit(doc['@timestamp'].value.dayOfWeekEnum.getDisplayName(TextStyle.FULL, Locale.ROOT))"
-    }
-  }
-}
-----
-====
+This chapter covers additional support for Elasticsearch operations that cannot be directly accessed via the repository interface. It is recommended to add those operations as custom implementation as described in <<repositories.custom-implementations>> .
 
 [[elasticsearch.misc.filter]]
 == Filter Builder
@@ -83,181 +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 in <<repositories.paging-and-sorting>>, Spring Data Elasticsearch provides the class `org.springframework.data.elasticsearch.core.query.Order` which derives from `org.springframework.data.domain.Sort.Order`.
-It offers additional parameters that can be sent to Elasticsearch when specifying the sorting of the result (see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/sort-search-results.html).
-
-There also is the  `org.springframework.data.elasticsearch.core.query.GeoDistanceOrder` class which can be used to have the result of a search operation ordered by geographical distance.
-
-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.runtime-fields]]
-== Runtime Fields
-
-From version 7.12 on Elasticsearch has added the feature of runtime fields (https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime.html).
-Spring Data Elasticsearch supports this in two ways:
-
-=== Runtime field definitions in the index mappings
-
-The first way to define runtime fields is by adding the definitions to the index mappings (see https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-mapping-fields.html).
-To use this approach in Spring Data Elasticsearch the user must provide a JSON file that contains the corresponding definition, for example:
-
-.runtime-fields.json
-====
-[source,json]
-----
-{
-  "day_of_week": {
-    "type": "keyword",
-    "script": {
-      "source": "emit(doc['@timestamp'].value.dayOfWeekEnum.getDisplayName(TextStyle.FULL, Locale.ROOT))"
-    }
-  }
-}
-----
-====
-
-The path to this JSON file, which must be present on the classpath, must then be set in the `@Mapping` annotation of the entity:
-
-====
-[source,java]
-----
-@Document(indexName = "runtime-fields")
-@Mapping(runtimeFieldsPath = "/runtime-fields.json")
-public class RuntimeFieldEntity {
-	// properties, getter, setter,...
-}
-
-----
-====
-
-=== Runtime fields definitions set on a Query
-
-The second way to define runtime fields is by adding the definitions to a search query (see https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-search-request.html).
-The following code example shows how to do this with Spring Data Elasticsearch :
-
-The entity used is a simple object that has a `price` property:
-
-====
-[source,java]
-----
-@Document(indexName = "some_index_name")
-public class SomethingToBuy {
-
-	private @Id @Nullable String id;
-	@Nullable @Field(type = FieldType.Text) private String description;
-	@Nullable @Field(type = FieldType.Double) private Double price;
-
-	// getter and setter
-}
-
-----
-====
-
-The following query uses a runtime field that calculates a `priceWithTax` value by adding 19% to the price and uses this value in the search query to find all entities where `priceWithTax` is higher or equal than a given value:
-
-====
-[source,java]
-----
-RuntimeField runtimeField = new RuntimeField("priceWithTax", "double", "emit(doc['price'].value * 1.19)");
-Query query = new CriteriaQuery(new Criteria("priceWithTax").greaterThanEqual(16.5));
-query.addRuntimeField(runtimeField);
-
-SearchHits<SomethingToBuy> searchHits = operations.search(query, SomethingToBuy.class);
-----
-====
-
-This works with every implementation of the `Query` interface.

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

@@ -1,48 +1,6 @@
 [[new-features]]
 = What's new
 
-[[new-features.4-3-0]]
-== New in Spring Data Elasticsearch 4.3
-
-* Upgrade to Elasticsearch 7.15.2.
-* Allow runtime_fields to be defined in the index mapping.
-* Add native support for range field types by using a range object.
-* Add repository search for nullable or empty properties.
-* Enable custom converters for single fields.
-* Supply a custom `Sort.Order` providing Elasticsearch specific parameters.
-
-[[new-features.4-2-0]]
-== New in Spring Data Elasticsearch 4.2
-
-* Upgrade to Elasticsearch 7.10.0.
-* Support for custom routing values
-
-[[new-features.4-1-0]]
-== New in Spring Data Elasticsearch 4.1
-
-* 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,141 +38,66 @@ 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()}"`
-** `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].
-If the field type is not specified, it defaults to `FieldType.Auto`.
-This means, that no mapping entry is written for the property and that Elasticsearch will add a mapping entry dynamically when the first data for this property is stored (check the Elasticsearch documentation for dynamic mapping rules).
-** `format`: One or more built-in date formats, see the next section <<elasticsearch.mapping.meta-model.date-formats>>.
-** `pattern`: One or more custom date formats, see the next section <<elasticsearch.mapping.meta-model.date-formats>>.
-** `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.
-* `@ValueConverter` defines a class to be used to convert the given property.
-In difference to a registered Spring `Converter` this only converts the annotated property and not every property of the given type.
+** `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.
+
 
 The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.
 
-[[elasticsearch.mapping.meta-model.date-formats]]
-==== Date format mapping
-
-Properties that derive from `TemporalAccessor` or are of type `java.util.Date` must either have a `@Field` annotation of type `FieldType.Date` or a custom converter must be registered for this type.
-This paragraph describes the use of
-`FieldType.Date`.
-
-There are two attributes of the `@Field` annotation that define which date format information is written to the mapping (also see https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#built-in-date-formats[Elasticsearch Built In Formats] and https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#custom-date-formats[Elasticsearch Custom Date Formats])
-
-The `format` attributes is used to define at least one of the predefined formats.
-If it is not defined, then a default value of __date_optional_time_ and _epoch_millis_ is used.
-
-The `pattern` attribute can be used to add additional custom format strings.
-If you want to use only custom date formats, you must set the `format` property to empty `{}`.
-
-The following table shows the different attributes and the mapping created from their values:
-
-[cols=2*,options=header]
-|===
-| annotation
-| format string in Elasticsearch mapping
-
-| @Field(type=FieldType.Date)
-| "date_optional_time\|\|epoch_millis",
-
-| @Field(type=FieldType.Date, format=DateFormat.basic_date)
-| "basic_date"
-
-| @Field(type=FieldType.Date, format={DateFormat.basic_date, DateFormat.basic_time})
-| "basic_date\|\|basic_time"
-
-| @Field(type=FieldType.Date, pattern="dd.MM.uuuu")
-| "date_optional_time\|\|epoch_millis\|\|dd.MM.uuuu",
-
-| @Field(type=FieldType.Date, format={}, pattern="dd.MM.uuuu")
-| "dd.MM.uuuu"
-
-|===
-
-NOTE: If you are using a custom date format, you need to use _uuuu_ for the year instead of _yyyy_.
-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].
-
-==== Range types
-
-When a field is annotated with a type of one of _Integer_Range, Float_Range, Long_Range, Double_Range, Date_Range,_ or _Ip_Range_ the field must be an instance of a class that will be mapped to an Elasticsearch range, for example:
-
-====
-[source,java]
-----
-class SomePersonData {
-
-    @Field(type = FieldType.Integer_Range)
-    private ValidAge validAge;
-
-    // getter and setter
-}
-
-class ValidAge {
-    @Field(name="gte")
-    private Integer from;
-
-    @Field(name="lte")
-    private Integer to;
-
-    // getter and setter
-}
-----
-====
-
-As an alternative Spring Data Elasticsearch provides a `Range<T>` class so that the previous example can be written as:
-
-====
-[source,java]
-----
-class SomePersonData {
-
-    @Field(type = FieldType.Integer_Range)
-    private Range<Integer> validAge;
-
-    // getter and setter
-}
-----
-====
-
-Supported classes for the type `<T>` are `Integer`, `Long`, `Float`, `Double`, `Date` and classes that implement the
-`TemporalAccessor` interface.
-
-==== Mapped field names
-
-Without further configuration, Spring Data Elasticsearch will use the property name of an object as field name in Elasticsearch.
-This can be changed for individual field by using the `@Field` annotation on that property.
-
-It is also possible to define a `FieldNamingStrategy` in the configuration of the client (<<elasticsearch.clients>>).
-If for example a `SnakeCaseFieldNamingStrategy` is configured, the property _sampleProperty_ of the object would be mapped to _sample_property_ in Elasticsearch.
-A `FieldNamingStrategy` applies to all entities; it can be overwritten by setting a specific name with `@Field` on a property.
-
 [[elasticsearch.mapping.meta-model.rules]]
 === Mapping Rules
 
@@ -176,7 +117,6 @@ public class Person {              <1>
   String lastname;
 }
 ----
-
 [source,json]
 ----
 {
@@ -186,14 +126,13 @@ public class Person {              <1>
   "lastname" : "Connor"
 }
 ----
-
 <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
 ====
@@ -206,7 +145,6 @@ public class Person {
   // ...
 }
 ----
-
 [source,json]
 ----
 {
@@ -214,32 +152,11 @@ public class Person {
   "id" : ...
 }
 ----
-
 <1> The configured alias is used when writing the entity.
 ====
 
 NOTE: Type hints will not be written for nested Objects unless the properties type is `Object`, an interface or the actual value type does not match the properties declaration.
 
-===== Disabling Type Hints
-
-It may be necessary to disable writing of type hints when the index that should be used already exists without having the type hints defined in its mapping and with the mapping mode set to strict.
-In this case, writing the type hint will produce an error, as the field cannot be added automatically.
-
-Type hints can be disabled for the whole application by overriding the method `writeTypeHints()` in a configuration class derived from `AbstractElasticsearchConfiguration` (see <<elasticsearch.clients>>).
-
-As an alternativ they can be disabled for a single index with the `@Document` annotation:
-
-====
-[source,java]
-----
-@Document(indexName = "index", writeTypeHint = WriteTypeHint.FALSE)
-----
-====
-
-WARNING: We strongly advise against disabling Type Hints.
-Only do this if you are forced to.
-Disabling type hints can lead to documents not being retrieved correctly from Elasticsearch in case of polymorphic data or document retrieval may fail completely.
-
 ==== Geospatial Types
 
 Geospatial types like `Point` & `GeoPoint` are converted into _lat/lon_ pairs.
@@ -254,7 +171,6 @@ public class Address {
   Point location;
 }
 ----
-
 [source,json]
 ----
 {
@@ -265,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>>.
@@ -321,7 +197,6 @@ public class Person {
 
 }
 ----
-
 [source,json]
 ----
 {
@@ -349,7 +224,6 @@ public class Person {
 
 }
 ----
-
 [source,json]
 ----
 {
@@ -385,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
@@ -404,7 +289,7 @@ public class Config extends AbstractElasticsearchConfiguration {
     }
   }
 
-  @ReadingConverter                                                 <3>
+  @ReadingConverter                                                 <4>
   static class MapToAddress implements Converter<Map<String, Object>, Address> {
 
     @Override
@@ -416,7 +301,6 @@ public class Config extends AbstractElasticsearchConfiguration {
   }
 }
 ----
-
 [source,json]
 ----
 {
@@ -425,8 +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,40 +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.
-Details of the index that will be created can be set by using the `@Setting` annotation, refer to <<elasticsearc.misc.index.settings>> for further information.
-
-**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
@@ -54,14 +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]]
@@ -81,19 +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
 ====
@@ -129,7 +125,6 @@ public class TestController {
 }
 
 ----
-
 <1> Let Spring inject the provided `ElasticsearchOperations` bean in the constructor.
 <2> Store some entity in the Elasticsearch cluster.
 <3> Retrieve the entity with a query by id.
@@ -138,153 +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
-* Returned suggest results
-
-.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.
-
-[[elasticsearch.operations.queries]]
-== Queries
-
-Almost all of the methods defined in the `SearchOperations` and `ReactiveSearchOperations` interface take a `Query` parameter that defines the query to execute for searching. `Query` is an interface and Spring Data Elasticsearch provides three implementations: `CriteriaQuery`, `StringQuery` and `NativeSearchQuery`.
-
-[[elasticsearch.operations.criteriaquery]]
-=== CriteriaQuery
-
-`CriteriaQuery` based queries allow the creation of queries to search for data without knowing the syntax or basics of Elasticsearch queries.
-They allow the user to build queries by simply chaining and combining `Criteria` objects that specifiy the criteria the searched documents must fulfill.
-
-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.
-
-[[elasticsearch.operations.stringquery]]
-=== 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.
-
-[[elasticsearch.operations.nativesearchquery]]
-=== NativeSearchQuery
-
-`NativeSearchQuery` is the class to use when you have a complex query, or a query that cannot be expressed by using the `Criteria` API, for example when building queries and using aggregates.
-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. Details of the index that will be created can be set by using the `@Setting` annotation, refer to <<elasticsearc.misc.index.settings>> for further information.
-
 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.
 ====
@@ -131,7 +73,7 @@ class ProductService {
   public void setRepository(ProductRepository repository) {
     this.repository = repository;
   }
-}
+}                
 ----
 <1> Create a component by using the same calls as are used in the <<elasticsearch.operations>> chapter.
 <2> Let the CDI framework inject the Repository into your class.
@@ -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,56 +196,51 @@ 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`
+| `Not Supported Yet !`
 
 | `True`
 | `findByAvailableTrue`
 | `{ "query" : {
 "bool" : {
 "must" : [
-{ "query_string" : { "query" : "true", "fields" : [ "available" ] } }
-]
-}
+      { "query_string" : { "query" : "true", "fields" : [ "available" ] } }
+    ]
+  }
 }}`
 
 | `False`
@@ -257,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`
@@ -267,47 +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"}}]
 }`
 
-| `Exists`
-| `findByNameExists`
-| `{"query":{"bool":{"must":[{"exists":{"field":"name"}}]}}}`
-
-| `IsNull`
-| `findByNameIsNull`
-| `{"query":{"bool":{"must_not":[{"exists":{"field":"name"}}]}}}`
-
-| `IsNotNull`
-| `findByNameIsNotNull`
-| `{"query":{"bool":{"must":[{"exists":{"field":"name"}}]}}}`
-
-| `IsEmpty`
-| `findByNameIsEmpty`
-| `{"query":{"bool":{"must":[{"bool":{"must":[{"exists":{"field":"name"}}],"must_not":[{"wildcard":{"name":{"wildcard":"*"}}}]}}]}}}`
-
-| `IsNotEmpty`
-| `findByNameIsNotEmpty`
-| `{"query":{"bool":{"must":[{"wildcard":{"name":{"wildcard":"*"}}}]}}}`
-
 |===
 
-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
@@ -321,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/elasticsearch-routing.adoc

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

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

@@ -1,13 +0,0 @@
-[[elasticsearch.migration]]
-= Appendix E: Migration Guides
-
-// line breaks required otherwise the TOC breaks due to joining of first/last lines.
-:leveloffset: +1
-include::elasticsearch-migration-guide-3.2-4.0.adoc[]
-
-include::elasticsearch-migration-guide-4.0-4.1.adoc[]
-
-include::elasticsearch-migration-guide-4.1-4.2.adoc[]
-
-include::elasticsearch-migration-guide-4.2-4.3.adoc[]
-: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/ElasticsearchException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,33 @@
  */
 package org.springframework.data.elasticsearch;
 
-import org.springframework.dao.DataRetrievalFailureException;
-
 import java.util.Map;
 
 /**
- * @author Peter-Josef Meisch
- * @since 4.1
+ * ElasticsearchException
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
  */
-public class BulkFailureException extends DataRetrievalFailureException {
-	private final Map<String, String> failedDocuments;
+public class ElasticsearchException extends RuntimeException {
 
-	public BulkFailureException(String msg, Map<String, String> failedDocuments) {
-		super(msg);
+	private Map<String, String> failedDocuments;
+
+	public ElasticsearchException(String message) {
+		super(message);
+	}
+
+	public ElasticsearchException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public ElasticsearchException(String message, Throwable cause, Map<String, String> failedDocuments) {
+		super(message, cause);
+		this.failedDocuments = failedDocuments;
+	}
+
+	public ElasticsearchException(String message, Map<String, String> failedDocuments) {
+		super(message);
 		this.failedDocuments = failedDocuments;
 	}
 

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

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

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

@@ -1,49 +0,0 @@
-/*
- * Copyright 2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch;
-
-import org.springframework.dao.DataAccessException;
-
-/**
- * Exception class for REST status exceptions independent from the used client/backend.
- *
- * @author Peter-Josef Meisch
- * @since 4.3
- */
-public class RestStatusException extends DataAccessException {
-
-	// we do not use a dedicated status class from Elasticsearch, OpenSearch, Spring web or webflux here
-	private final int status;
-
-	public RestStatusException(int status, String msg) {
-		super(msg);
-		this.status = status;
-	}
-
-	public RestStatusException(int status, String msg, Throwable cause) {
-		super(msg, cause);
-		this.status = status;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	@Override
-	public String toString() {
-		return "RestStatusException{" + "status=" + status + "} " + super.toString();
-	}
-}

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

@@ -1,20 +1,7 @@
-/*
- * Copyright 2019-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.data.elasticsearch.annotations;
 
+import org.elasticsearch.search.suggest.completion.context.ContextMapping;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -26,7 +13,6 @@ import java.lang.annotation.Target;
  * Based on reference doc - https://www.elastic.co/guide/en/elasticsearch/reference/current/suggester-context.html
  *
  * @author Robert Gruendler
- * @author Peter-Josef Meisch
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
@@ -36,26 +22,8 @@ public @interface CompletionContext {
 
 	String name();
 
-	ContextMappingType type();
+	ContextMapping.Type type();
 
 	String precision() default "";
 
-	String path() default "";
-
-	/**
-	 * @since 4.3
-	 */
-	enum ContextMappingType {
-		CATEGORY("category"), GEO("geo");
-
-		private final String mappedName;
-
-		ContextMappingType(String mappedName) {
-			this.mappedName = mappedName;
-		}
-
-		public String getMappedName() {
-			return mappedName;
-		}
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-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.
@@ -23,15 +23,13 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Based on the reference doc -
- * https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
+ * Based on the reference doc - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
  *
  * @author Mewes Kochheim
  * @author Robert Gruendler
- * @author Peter-Josef Meisch
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Target(ElementType.FIELD)
 @Documented
 @Inherited
 public @interface CompletionField {

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

@@ -1,39 +0,0 @@
-/*
- * Copyright 2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-/**
- * Alias for a @Query annotation with the count parameter set to true.
- *
- * @author Peter-Josef Meisch
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-@Documented
-@Query(count = true)
-public @interface CountQuery {
-
-	@AliasFor(annotation = Query.class)
-	String value() default "";
-}

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.elasticsearch.index.VersionType;
+
 import org.springframework.data.annotation.Persistent;
 
 /**
@@ -31,8 +33,6 @@ import org.springframework.data.annotation.Persistent;
  * @author Mason Chan
  * @author Ivan Greene
  * @author Mark Paluch
- * @author Peter-Josef Meisch
- * @author Sascha Woo
  */
 @Persistent
 @Inherited
@@ -44,7 +44,7 @@ public @interface Document {
 	 * Name of the Elasticsearch index.
 	 * <ul>
 	 * <li>Lowercase only</li>
-	 * <li>Cannot include \, /, *, ?, ", &gt;, &lt;, |, ` ` (space character), ,, #</li>
+	 * <li><Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #/li>
 	 * <li>Cannot start with -, _, +</li>
 	 * <li>Cannot be . or ..</li>
 	 * <li>Cannot be longer than 255 bytes (note it is bytes, so multi-byte characters will count towards the 255 limit
@@ -54,46 +54,33 @@ public @interface Document {
 	String indexName();
 
 	/**
-	 * Use server-side settings when creating the index.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
+	 * Mapping type name.
+	 */
+	String type() default "";
+
+	/**
+	 * Use server-side settings when creating the index.
 	 */
-	@Deprecated
 	boolean useServerConfiguration() default false;
 
 	/**
-	 * Number of shards for the index {@link #indexName()}. Used for index creation. <br/>
-	 * With version 4.0, the default value is changed from 5 to 1 to reflect the change in the default settings of
-	 * Elasticsearch which changed to 1 as well in Elasticsearch 7.0.
-	 * ComposableAnnotationsUnitTest.documentAnnotationShouldBeComposable:60
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
+	 * Number of shards for the index {@link #indexName()}. Used for index creation.
 	 */
-	@Deprecated
-	short shards() default 1;
+	short shards() default 5;
 
 	/**
 	 * Number of replicas for the index {@link #indexName()}. Used for index creation.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	short replicas() default 1;
 
 	/**
 	 * Refresh interval for the index {@link #indexName()}. Used for index creation.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	String refreshInterval() default "1s";
 
 	/**
 	 * Index storage type for the index {@link #indexName()}. Used for index creation.
-	 *
-	 * @deprecated since 4.2, use the {@link Setting} annotation to configure settings
 	 */
-	@Deprecated
 	String indexStoreType() default "fs";
 
 	/**
@@ -105,25 +92,4 @@ public @interface Document {
 	 * Configuration of version management.
 	 */
 	VersionType versionType() default VersionType.EXTERNAL;
-
-	/**
-	 * Defines if type hints should be written. {@see WriteTypeHint}.
-	 *
-	 * @since 4.3
-	 */
-	WriteTypeHint writeTypeHint() default WriteTypeHint.DEFAULT;
-
-	/**
-	 * Controls how Elasticsearch dynamically adds fields to the document.
-	 *
-	 * @since 4.3
-	 */
-	Dynamic dynamic() default Dynamic.INHERIT;
-
-	/**
-	 * @since 4.3
-	 */
-	enum VersionType {
-		INTERNAL, EXTERNAL, EXTERNAL_GTE
-	}
 }

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

@@ -1,60 +0,0 @@
-/*
- * Copyright 2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-/**
- * Values for the {@code dynamic} mapping parameter.
- *
- * @author Sascha Woo
- * @since 4.3
- */
-public enum Dynamic {
-	/**
-	 * New fields are added to the mapping.
-	 */
-	TRUE("true"),
-	/**
-	 * New fields are added to the mapping as
-	 * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/runtime.html">runtime fields</a>. These
-	 * fields are not indexed, and are loaded from {@code _source} at query time.
-	 */
-	RUNTIME("runtime"),
-	/**
-	 * New fields are ignored. These fields will not be indexed or searchable, but will still appear in the
-	 * {@code _source} field of returned hits. These fields will not be added to the mapping, and new fields must be added
-	 * explicitly.
-	 */
-	FALSE("false"),
-	/**
-	 * If new fields are detected, an exception is thrown and the document is rejected. New fields must be explicitly
-	 * added to the mapping.
-	 */
-	STRICT("strict"),
-	/**
-	 * Inherit the dynamic setting from their parent object or from the mapping type.
-	 */
-	INHERIT("nherit");
-
-	private final String mappedName;
-
-	Dynamic(String mappedName) {
-		this.mappedName = mappedName;
-	}
-
-	public String getMappedName() {
-		return mappedName;
-	}
-}

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

@@ -1,40 +0,0 @@
-/*
- * Copyright 2019-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to set the dynamic mapping mode
- * {@see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic.html">elasticsearch doc</a>}
- * 
- * @author Peter-Josef Meisch
- * @author Sascha Woo
- * @since 4.0
- * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.FIELD })
-@Documented
-@Deprecated
-public @interface DynamicMapping {
-
-	DynamicMappingValue value() default DynamicMappingValue.True;
-}

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

@@ -9,17 +9,19 @@ import java.lang.annotation.Target;
 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.
+ * 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 ommited if {@link Mapping} annotation is used.
  *
  * @author Petr Kukral
  */
 @Persistent
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
+@Target({ElementType.TYPE})
 public @interface DynamicTemplates {
 
 	String mappingPath() default "";
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,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,21 +32,15 @@ import org.springframework.core.annotation.AliasFor;
  * @author Jakub Vavrik
  * @author Kevin Leturc
  * @author Peter-Josef Meisch
- * @author Xiao Yu
- * @author Aleksei Arsenev
- * @author Brian Kimmig
- * @author Morgan Lutz
- * @author Sascha Woo
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@Target(ElementType.FIELD)
 @Documented
 @Inherited
 public @interface Field {
 
 	/**
 	 * Alias for {@link #name}.
-	 *
 	 * @since 3.2
 	 */
 	@AliasFor("name")
@@ -54,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")
@@ -66,9 +58,9 @@ public @interface Field {
 
 	boolean index() default true;
 
-	DateFormat[] format() default { DateFormat.date_optional_time, DateFormat.epoch_millis };
+	DateFormat format() default DateFormat.none;
 
-	String[] pattern() default {};
+	String pattern() default "";
 
 	boolean store() default false;
 
@@ -85,130 +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;
-
-	/**
-	 * to be used in combination with {@link FieldType#Dense_Vector}
-	 *
-	 * @since 4.2
-	 */
-	int dims() default -1;
-
-	/**
-	 * Controls how Elasticsearch dynamically adds fields to the inner object within the document.<br>
-	 * To be used in combination with {@link FieldType#Object} or {@link FieldType#Nested}
-	 *
-	 * @since 4.3
-	 */
-	Dynamic dynamic() default Dynamic.INHERIT;
-
-	/**
-	 * marks this field to be excluded from the _source in Elasticsearch
-	 * (https://www.elastic.co/guide/en/elasticsearch/reference/7.15/mapping-source-field.html#include-exclude)
-	 *
-	 * @since 4.3
-	 */
-	boolean excludeFromSource() default false;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,57 +20,22 @@ package org.springframework.data.elasticsearch.annotations;
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Zeng Zetang
- * @author Peter-Josef Meisch
- * @author Aleksei Arsenev
- * @author Brian Kimmig
- * @author Morgan Lutz
  */
 public enum FieldType {
-	Auto("auto"), //
-	Text("text"), //
-	Keyword("keyword"), //
-	Long("long"), //
-	Integer("integer"), //
-	Short("short"), //
-	Byte("byte"), //
-	Double("double"), //
-	Float("float"), //
-	Half_Float("half_float"), //
-	Scaled_Float("scaled_float"), //
-	Date("date"), //
-	Date_Nanos("date_nanos"), //
-	Boolean("boolean"), //
-	Binary("binary"), //
-	Integer_Range("integer_range"), //
-	Float_Range("float_range"), //
-	Long_Range("long_range"), //
-	Double_Range("double_range"), //
-	Date_Range("date_range"), //
-	Ip_Range("ip_range"), //
-	Object("object"), //
-	Nested("nested"), //
-	Ip("ip"), //
-	TokenCount("token_count"), //
-	Percolator("percolator"), //
-	Flattened("flattened"), //
-	Search_As_You_Type("search_as_you_type"), //
-	/** @since 4.1 */
-	Rank_Feature("rank_feature"), //
-	/** @since 4.1 */
-	Rank_Features("rank_features"), //
-	/** since 4.2 */
-	Wildcard("wildcard"), //
-	/** @since 4.2 */
-	Dense_Vector("dense_vector") //
-	;
-
-	private final String mappedName;
-
-	FieldType(String mappedName) {
-		this.mappedName = mappedName;
-	}
-
-	public String getMappedName() {
-		return mappedName;
-	}
+	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/GeoPointField.java

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

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

@@ -1,44 +0,0 @@
-/*
- * Copyright 2017-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @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-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.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-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +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
- * @author Brian Kimmig
- * @author Morgan Lutz
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
+@Target(ElementType.FIELD)
 public @interface InnerField {
 
 	String suffix();
@@ -40,9 +35,9 @@ public @interface InnerField {
 
 	boolean index() default true;
 
-	DateFormat[] format() default { DateFormat.date_optional_time, DateFormat.epoch_millis };
+	DateFormat format() default DateFormat.none;
 
-	String[] pattern() default {};
+	String pattern() default "";
 
 	boolean store() default false;
 
@@ -53,100 +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;
-
-	/**
-	 * to be used in combination with {@link FieldType#Dense_Vector}
-	 *
-	 * @since 4.2
-	 */
-	int dims() default -1;
 }

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

@@ -1,36 +0,0 @@
-/*
- * Copyright 2020-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.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/Mapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,66 +15,20 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
+import java.lang.annotation.*;
 import org.springframework.data.annotation.Persistent;
 
 /**
  * Elasticsearch Mapping
  *
  * @author Mohsin Husen
- * @author Peter-Josef Meisch
  */
 @Persistent
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.FIELD })
+@Target({ElementType.TYPE, ElementType.FIELD})
 public @interface Mapping {
 
 	String mappingPath() default "";
 
-	/**
-	 * whether mappings are enabled
-	 *
-	 * @since 4.2
-	 */
-	boolean enabled() default true;
-
-	/**
-	 * whether date_detection is enabled
-	 *
-	 * @since 4.3
-	 */
-	Detection dateDetection() default Detection.DEFAULT;
-
-	/**
-	 * whether numeric_detection is enabled
-	 *
-	 * @since 4.3
-	 */
-	Detection numericDetection() default Detection.DEFAULT;
-
-	/**
-	 * custom dynamic date formats
-	 *
-	 * @since 4.3
-	 */
-	String[] dynamicDateFormats() default {};
-
-	/**
-	 * classpath to a JSON file containing the values for a runtime mapping definition. The file must contain the JSON
-	 * object that is written as the value of the runtime property. {@see <a href=
-	 * "https://www.elastic.co/guide/en/elasticsearch/reference/7.12/runtime-mapping-fields.html">elasticsearch doc</a>}
-	 *
-	 * @since 4.3
-	 */
-	String runtimeFieldsPath() default "";
-
-	enum Detection {
-		DEFAULT, TRUE, FALSE;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +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
- * @author Peter-Josef Meisch
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+@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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,21 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
+import java.lang.annotation.*;
+
+import org.springframework.data.annotation.Persistent;
+
 /**
- * @author Peter-Josef Meisch
- * @since 4.0
+ * Parent
+ *
+ * @author Philipp Jardas
  */
-public @interface IndexPrefixes {
-	int MIN_DEFAULT = 2;
-	int MAX_DEFAULT = 2;
 
-	int minChars() default MIN_DEFAULT;
+@Persistent
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Parent {
 
-	int maxChars() default MAX_DEFAULT;
+	String type();
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
-import org.springframework.data.annotation.QueryAnnotation;
 import java.lang.annotation.*;
 
 /**
@@ -23,34 +22,24 @@ import java.lang.annotation.*;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Peter-Josef Meisch
- * @author Steven Pearce
  */
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.METHOD)
 @Documented
-@QueryAnnotation
 public @interface Query {
 
 	/**
-	 * @return Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
+	 * Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
+	 *
+	 * @return
 	 */
 	String value() default "";
 
 	/**
 	 * Named Query Named looked up by repository.
 	 *
-	 * @deprecated since 4.2, not implemented and used anywhere
+	 * @return
 	 */
 	String name() default "";
-
-	/**
-	 * Returns whether the query defined should be executed as count projection.
-	 *
-	 * @return {@literal false} by default.
-	 * @since 4.2
-	 */
-	boolean count() default false;
 }
-

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

@@ -1,43 +0,0 @@
-/*
- * Copyright2020-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.data.annotation.Persistent;
-
-/**
- * Annotation to enable custom routing values for an entity.
- *
- * @author Peter-Josef Meisch
- * @since 4.2
- */
-@Persistent
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
-public @interface Routing {
-
-	/**
-	 * defines how the routing is determined. Can be either the name of a property or a SpEL expression. See the reference
-	 * documentation for examples how to use this annotation.
-	 */
-	String value();
-}

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

@@ -0,0 +1,23 @@
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.data.annotation.ReadOnlyProperty;
+
+/**
+ * Specifies that this field is used for storing the document score.
+ * 
+ * @author Sascha Woo
+ * @since 3.1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Documented
+@Inherited
+@ReadOnlyProperty
+public @interface Score {}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,7 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 import org.springframework.data.annotation.Persistent;
 
@@ -27,84 +23,14 @@ import org.springframework.data.annotation.Persistent;
  * Elasticsearch Setting
  *
  * @author Mohsin Husen
- * @author Peter-Josef Meisch
  */
 
 @Persistent
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE })
+@Target({ElementType.TYPE})
 public @interface Setting {
 
-	/**
-	 * Resource path for a settings configuration
-	 */
 	String settingPath() default "";
 
-	/**
-	 * Use server-side settings when creating the index.
-	 */
-	boolean useServerConfiguration() default false;
-
-	/**
-	 * Number of shards for the index. Used for index creation. <br/>
-	 * With version 4.0, the default value is changed from 5 to 1 to reflect the change in the default settings of
-	 * Elasticsearch which changed to 1 as well in Elasticsearch 7.0.
-	 */
-	short shards() default 1;
-
-	/**
-	 * Number of replicas for the index. Used for index creation.
-	 */
-	short replicas() default 1;
-
-	/**
-	 * Refresh interval for the index. Used for index creation.
-	 */
-	String refreshInterval() default "1s";
-
-	/**
-	 * Index storage type for the index. Used for index creation.
-	 */
-	String indexStoreType() default "fs";
-
-	/**
-	 * fields to define an index sorting
-	 *
-	 * @since 4.2
-	 */
-	String[] sortFields() default {};
-
-	/**
-	 * defines the order for {@link #sortFields()}. If present, it must have the same number of elements
-	 *
-	 * @since 4.2
-	 */
-	SortOrder[] sortOrders() default {};
-
-	/**
-	 * defines the mode for {@link #sortFields()}. If present, it must have the same number of elements
-	 *
-	 * @since 4.2
-	 */
-	SortMode[] sortModes() default {};
-
-	/**
-	 * defines the missing value for {@link #sortFields()}. If present, it must have the same number of elements
-	 *
-	 * @since 4.2
-	 */
-	SortMissing[] sortMissingValues() default {};
-
-	enum SortOrder {
-		asc, desc
-	}
-
-	enum SortMode {
-		min, max
-	}
-
-	enum SortMissing {
-		_last, _first
-	}
 }

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

@@ -1,36 +0,0 @@
-/*
- * Copyright 2019-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-/**
- * @author Peter-Josef Meisch
- * @since 4.0
- */
-public enum Similarity {
-	Default("default"), BM25("BM25"), classic("classic"), Boolean("boolean");
-
-	// need to use a custom name because 'boolean' can't be used as enum name
-	private final String toStringName;
-
-	Similarity(String name) {
-		this.toStringName = name;
-	}
-
-	@Override
-	public String toString() {
-		return toStringName;
-	}
-}

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

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

@@ -1,48 +0,0 @@
-/*
- * Copyright 2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.data.elasticsearch.core.mapping.PropertyValueConverter;
-
-/**
- * Annotation to put on a property of an entity to define a value converter which can convert the property to a type
- * that Elasticsearch understands and back.
- *
- * @author Peter-Josef Meisch
- * @since 4.3
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
-@Documented
-@Inherited
-public @interface ValueConverter {
-
-	/**
-	 * Defines the class implementing the {@link PropertyValueConverter} interface. If this is a normal class, it must
-	 * provide a default constructor with no arguments. If this is an enum and thus implementing a singleton by enum it
-	 * must only have one enum value.
-	 * 
-	 * @return the class to use for conversion
-	 */
-	Class<? extends PropertyValueConverter> value();
-}

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

@@ -1,40 +0,0 @@
-/*
- * Copyright 2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import org.springframework.data.mapping.context.MappingContext;
-
-/**
- * Defines if type hints should be written. Used by {@link Document} annotation.
- *
- * @author Peter-Josef Meisch
- * @since 4.3
- */
-public enum WriteTypeHint {
-
-	/**
-	 * Use the global settings from the {@link MappingContext}.
-	 */
-	DEFAULT,
-	/**
-	 * Always write type hints for the entity.
-	 */
-	TRUE,
-	/**
-	 * Never write type hints for the entity.
-	 */
-	FALSE
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,15 +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.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
-import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients;
 import org.springframework.http.HttpHeaders;
-import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
@@ -121,16 +117,16 @@ public interface ClientConfiguration {
 	boolean useSsl();
 
 	/**
-	 * Returns the {@link SSLContext} to use. Can be {@link Optional#empty()} if not configured.
+	 * Returns the {@link SSLContext} to use. Can be {@link Optional#empty()} if unconfigured.
 	 *
-	 * @return the {@link SSLContext} to use. Can be {@link Optional#empty()} if not configured.
+	 * @return the {@link SSLContext} to use. Can be {@link Optional#empty()} if unconfigured.
 	 */
 	Optional<SSLContext> getSslContext();
 
 	/**
-	 * Returns the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
+	 * Returns the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if unconfigured.
 	 *
-	 * @return the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
+	 * @return the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if unconfigured.
 	 */
 	Optional<HostnameVerifier> getHostNameVerifier();
 
@@ -155,16 +151,15 @@ 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();
 
@@ -173,25 +168,6 @@ public interface ClientConfiguration {
 	 */
 	Function<WebClient, WebClient> getWebClientConfigurer();
 
-	/**
-	 * @return the Rest Client configuration callback.
-	 * @since 4.2
-	 * @deprecated since 4.3 use {@link #getClientConfigurers()}
-	 */
-	@Deprecated
-	HttpClientConfigCallback getHttpClientConfigurer();
-
-	/**
-	 * @return the client configuration callbacks
-	 * @since 4.3
-	 */
-	<T> List<ClientConfigurationCallback<?>> getClientConfigurers();
-
-	/**
-	 * @return the supplier for custom headers.
-	 */
-	Supplier<HttpHeaders> getHeadersSupplier();
-
 	/**
 	 * @author Christoph Strobl
 	 */
@@ -283,7 +259,7 @@ public interface ClientConfiguration {
 		TerminalClientConfigurationBuilder withDefaultHeaders(HttpHeaders defaultHeaders);
 
 		/**
-		 * Configure the {@literal milliseconds} for the connect-timeout.
+		 * Configure the {@literal milliseconds} for the connect timeout.
 		 *
 		 * @param millis the timeout to use.
 		 * @return the {@link TerminalClientConfigurationBuilder}
@@ -339,7 +315,7 @@ public interface ClientConfiguration {
 		 *
 		 * @param pathPrefix the pathPrefix.
 		 * @return the {@link TerminalClientConfigurationBuilder}
-		 * @since 4.0
+		 * @since 3.2.4
 		 */
 		TerminalClientConfigurationBuilder withPathPrefix(String pathPrefix);
 
@@ -351,49 +327,12 @@ public interface ClientConfiguration {
 
 		/**
 		 * set customization hook in case of a reactive configuration
-		 *
+		 * 
 		 * @param webClientConfigurer function to configure the WebClient
 		 * @return the {@link TerminalClientConfigurationBuilder}.
-		 * @deprecated since 4.3, use {@link #withClientConfigurer(ClientConfigurationCallback)} with
-		 *             {@link ReactiveRestClients.WebClientConfigurationCallback}
 		 */
-		@Deprecated
 		TerminalClientConfigurationBuilder withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);
 
-		/**
-		 * Register a {HttpClientConfigCallback} to configure the non-reactive REST client.
-		 *
-		 * @param httpClientConfigurer configuration callback, must not be null.
-		 * @return the {@link TerminalClientConfigurationBuilder}.
-		 * @since 4.2
-		 * @deprecated since 4.3, use {@link #withClientConfigurer(ClientConfigurationCallback)} with
-		 *             {@link RestClients.RestClientConfigurationCallback}
-		 */
-		@Deprecated
-		TerminalClientConfigurationBuilder withHttpClientConfigurer(HttpClientConfigCallback httpClientConfigurer);
-
-		/**
-		 * Register a {@link ClientConfigurationCallback} to configure the client.
-		 *
-		 * @param clientConfigurer configuration callback, must not be {@literal null}.
-		 * @return the {@link TerminalClientConfigurationBuilder}.
-		 * @since 4.3
-		 */
-		TerminalClientConfigurationBuilder withClientConfigurer(ClientConfigurationCallback<?> clientConfigurer);
-
-		/**
-		 * 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.
 		 *
@@ -401,15 +340,4 @@ public interface ClientConfiguration {
 		 */
 		ClientConfiguration build();
 	}
-
-	/**
-	 * Callback to be executed to configure a client.
-	 *
-	 * @param <T> the type of the client configuration class.
-	 * @since 4.3
-	 */
-	@FunctionalInterface
-	interface ClientConfigurationCallback<T> {
-		T configure(T clientConfigurer);
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,14 @@ 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;
 import javax.net.ssl.SSLContext;
 
-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
-import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -50,21 +47,18 @@ import org.springframework.web.reactive.function.client.WebClient;
 class ClientConfigurationBuilder
 		implements ClientConfigurationBuilderWithRequiredEndpoint, MaybeSecureClientConfigurationBuilder {
 
-	private final List<InetSocketAddress> hosts = new ArrayList<>();
+	private List<InetSocketAddress> hosts = new ArrayList<>();
 	private HttpHeaders headers = HttpHeaders.EMPTY;
 	private boolean useSsl;
 	private @Nullable SSLContext sslContext;
 	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;
-	@Deprecated private HttpClientConfigCallback httpClientConfigurer = httpClientBuilder -> httpClientBuilder;
-	private List<ClientConfiguration.ClientConfigurationCallback<?>> clientConfigurers = new ArrayList<>();
+	private String username;
+	private String password;
+	private String pathPrefix;
+	private String proxy;
+	private Function<WebClient, WebClient> webClientConfigurer;
 
 	/*
 	 * (non-Javadoc)
@@ -202,43 +196,11 @@ 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");
 
 		this.webClientConfigurer = webClientConfigurer;
-		this.clientConfigurers.add(ReactiveRestClients.WebClientConfigurationCallback.from(webClientConfigurer));
-		return this;
-	}
-
-	@Override
-	public TerminalClientConfigurationBuilder withHttpClientConfigurer(HttpClientConfigCallback httpClientConfigurer) {
-
-		Assert.notNull(httpClientConfigurer, "httpClientConfigurer must not be null");
-
-		this.httpClientConfigurer = httpClientConfigurer;
-		this.clientConfigurers
-				.add(RestClients.RestClientConfigurationCallback.from(httpClientConfigurer::customizeHttpClient));
-		return this;
-	}
-
-	@Override
-	public TerminalClientConfigurationBuilder withClientConfigurer(
-			ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer) {
-
-		Assert.notNull(clientConfigurer, "clientConfigurer must not be null");
-
-		this.clientConfigurers.add(clientConfigurer);
-		return this;
-	}
-
-	@Override
-	public TerminalClientConfigurationBuilder withHeaders(Supplier<HttpHeaders> headers) {
-
-		Assert.notNull(headers, "headersSupplier must not be null");
-
-		this.headersSupplier = headers;
 		return this;
 	}
 
@@ -257,7 +219,7 @@ class ClientConfigurationBuilder
 		}
 
 		return new DefaultClientConfiguration(hosts, headers, useSsl, sslContext, soTimeout, connectTimeout, pathPrefix,
-				hostnameVerifier, proxy, webClientConfigurer, httpClientConfigurer, clientConfigurers, headersSupplier);
+				hostnameVerifier, proxy, webClientConfigurer);
 	}
 
 	private static InetSocketAddress parse(String hostAndPort) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Oliver Gierke
  * @since 3.1
- * @deprecated only used in {@link TransportClientFactoryBean}.
  */
-@SuppressWarnings("DeprecatedIsStillUsed")
-@Deprecated
 class ClusterNodes implements Streamable<TransportAddress> {
 
 	public static ClusterNodes DEFAULT = ClusterNodes.of("127.0.0.1:9300");
@@ -47,7 +44,7 @@ class ClusterNodes implements Streamable<TransportAddress> {
 
 	/**
 	 * Creates a new {@link ClusterNodes} by parsing the given source.
-	 *
+	 * 
 	 * @param source must not be {@literal null} or empty.
 	 */
 	private ClusterNodes(String source) {
@@ -69,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());
 	}
@@ -77,14 +74,15 @@ class ClusterNodes implements Streamable<TransportAddress> {
 	/**
 	 * Creates a new {@link ClusterNodes} by parsing the given source. The expected format is a comma separated list of
 	 * host-port-combinations separated by a colon: {@code host:port,host:port,…}.
-	 *
+	 * 
 	 * @param source must not be {@literal null} or empty.
+	 * @return
 	 */
 	public static ClusterNodes of(String source) {
 		return new ClusterNodes(source);
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
 	 * @see java.lang.Iterable#iterator()
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,10 @@ 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;
 
-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -49,19 +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 HttpClientConfigCallback httpClientConfigurer;
-	private final Supplier<HttpHeaders> headersSupplier;
-	private final List<ClientConfigurationCallback<?>> clientConfigurers;
 
 	DefaultClientConfiguration(List<InetSocketAddress> hosts, HttpHeaders headers, boolean useSsl,
 			@Nullable SSLContext sslContext, Duration soTimeout, Duration connectTimeout, @Nullable String pathPrefix,
-			@Nullable HostnameVerifier hostnameVerifier, @Nullable String proxy,
-			Function<WebClient, WebClient> webClientConfigurer, HttpClientConfigCallback httpClientConfigurer,
-			List<ClientConfigurationCallback<?>> clientConfigurers, Supplier<HttpHeaders> headersSupplier) {
+			@Nullable HostnameVerifier hostnameVerifier, String proxy, Function<WebClient, WebClient> webClientConfigurer) {
 
 		this.hosts = Collections.unmodifiableList(new ArrayList<>(hosts));
 		this.headers = new HttpHeaders(headers);
@@ -73,9 +66,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		this.hostnameVerifier = hostnameVerifier;
 		this.proxy = proxy;
 		this.webClientConfigurer = webClientConfigurer;
-		this.httpClientConfigurer = httpClientConfigurer;
-		this.clientConfigurers = clientConfigurers;
-		this.headersSupplier = headersSupplier;
 	}
 
 	@Override
@@ -113,7 +103,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return this.soTimeout;
 	}
 
-	@Nullable
 	@Override
 	public String getPathPrefix() {
 		return this.pathPrefix;
@@ -126,22 +115,6 @@ class DefaultClientConfiguration implements ClientConfiguration {
 
 	@Override
 	public Function<WebClient, WebClient> getWebClientConfigurer() {
-		return webClientConfigurer;
-	}
-
-	@Override
-	public HttpClientConfigCallback getHttpClientConfigurer() {
-		return httpClientConfigurer;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public <T> List<ClientConfigurationCallback<?>> getClientConfigurers() {
-		return clientConfigurers;
-	}
-
-	@Override
-	public Supplier<HttpHeaders> getHeadersSupplier() {
-		return headersSupplier;
+		return webClientConfigurer != null ? webClientConfigurer : Function.identity();
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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/InetSocketAddressParser.java

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

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

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

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

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client;
+
+import static java.util.Arrays.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+
+import org.elasticsearch.client.Client;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.logging.LogConfigurator;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.node.InternalSettingsPreparer;
+import org.elasticsearch.node.Node;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.transport.Netty4Plugin;
+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.InitializingBean;
+import org.springframework.util.StringUtils;
+
+/**
+ * NodeClientFactoryBean
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Ilkang Na
+ */
+public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingBean, DisposableBean {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
+	private boolean local;
+	private boolean enableHttp;
+	private String clusterName;
+	private NodeClient nodeClient;
+	private String pathData;
+	private String pathHome;
+	private String pathConfiguration;
+
+	public static class TestNode extends Node {
+
+		public TestNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
+
+			super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins, false);
+		}
+
+		protected void registerDerivedNodeNameWithLogger(String nodeName) {
+			try {
+				 LogConfigurator.setNodeName(nodeName);
+			} catch (Exception e) {
+				// nagh - just forget about it
+			}
+		}
+	}
+
+	NodeClientFactoryBean() {}
+
+	public NodeClientFactoryBean(boolean local) {
+		this.local = local;
+	}
+
+	@Override
+	public NodeClient getObject() throws Exception {
+		return nodeClient;
+	}
+
+	@Override
+	public Class<? extends Client> getObjectType() {
+		return NodeClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+
+		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 {
+		if (!StringUtils.isEmpty(pathConfiguration)) {
+			InputStream stream = getClass().getClassLoader().getResourceAsStream(pathConfiguration);
+			if (stream != null) {
+				return Settings.builder().loadFromStream(pathConfiguration,
+						getClass().getClassLoader().getResourceAsStream(pathConfiguration), false).build();
+			}
+			logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
+		}
+		return Settings.builder().build();
+	}
+
+	public void setLocal(boolean local) {
+		this.local = local;
+	}
+
+	public void setEnableHttp(boolean enableHttp) {
+		this.enableHttp = enableHttp;
+	}
+
+	public void setClusterName(String clusterName) {
+		this.clusterName = clusterName;
+	}
+
+	public void setPathData(String pathData) {
+		this.pathData = pathData;
+	}
+
+	public void setPathHome(String pathHome) {
+		this.pathHome = pathHome;
+	}
+
+	public void setPathConfiguration(String configuration) {
+		this.pathConfiguration = configuration;
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +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.Function;
-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;
@@ -37,7 +38,6 @@ import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.config.RequestConfig.Builder;
 import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.protocol.HttpContext;
 import org.elasticsearch.client.RestClient;
@@ -56,7 +56,6 @@ import org.springframework.util.Assert;
  * @author Huw Ayling-Miller
  * @author Henrique Amaral
  * @author Peter-Josef Meisch
- * @author Nic Hines
  * @since 3.2
  */
 public final class RestClients {
@@ -88,47 +87,46 @@ 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()) {
+
 				requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
+				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
 			}
 
-			Duration socketTimeout = clientConfiguration.getSocketTimeout();
-
-			if (!socketTimeout.isNegative()) {
-				requestConfigBuilder.setSocketTimeout(Math.toIntExact(socketTimeout.toMillis()));
-				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(socketTimeout.toMillis()));
+			if (!timeout.isNegative()) {
+				requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis()));
 			}
 
 			clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
 
 			clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);
 
-			for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
-					.getClientConfigurers()) {
-				if (clientConfigurer instanceof RestClientConfigurationCallback) {
-					RestClientConfigurationCallback restClientConfigurationCallback = (RestClientConfigurationCallback) clientConfigurer;
-					clientBuilder = restClientConfigurationCallback.configure(clientBuilder);
-				}
-			}
-
 			return clientBuilder;
 		});
 
@@ -136,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());
 	}
 
 	/**
@@ -190,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);
 			}
@@ -206,7 +198,7 @@ public final class RestClients {
 				}
 
 				ClientLogger.logRequest(logId, request.getRequestLine().getMethod(), request.getRequestLine().getUri(), "",
-						buffer::toString);
+						() -> new String(buffer.toByteArray()));
 			} else {
 				ClientLogger.logRequest(logId, request.getRequestLine().getMethod(), request.getRequestLine().getUri(), "");
 			}
@@ -214,50 +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);
-			}
-		}
-	}
-
-	/**
-	 * {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
-	 * the RestClient with a {@link HttpAsyncClientBuilder}
-	 *
-	 * @since 4.3
-	 */
-	public interface RestClientConfigurationCallback
-			extends ClientConfiguration.ClientConfigurationCallback<HttpAsyncClientBuilder> {
-
-		static RestClientConfigurationCallback from(
-				Function<HttpAsyncClientBuilder, HttpAsyncClientBuilder> clientBuilderCallback) {
-
-			Assert.notNull(clientBuilderCallback, "clientBuilderCallback must not be null");
-
-			// noinspection NullableProblems
-			return clientBuilderCallback::apply;
-		}
-	}
 }

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClient.Builder;
-import org.springframework.web.util.DefaultUriBuilderFactory;
 
 /**
  * Default {@link WebClientProvider} that uses cached {@link WebClient} instances per {@code hostAndPort}.
@@ -46,9 +45,8 @@ class DefaultWebClientProvider implements WebClientProvider {
 	private final @Nullable ClientHttpConnector connector;
 	private final Consumer<Throwable> errorListener;
 	private final HttpHeaders headers;
-	private final @Nullable String pathPrefix;
+	private final String pathPrefix;
 	private final Function<WebClient, WebClient> webClientConfigurer;
-	private final Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer;
 
 	/**
 	 * Create new {@link DefaultWebClientProvider} with empty {@link HttpHeaders} and no-op {@literal error listener}.
@@ -57,31 +55,28 @@ class DefaultWebClientProvider implements WebClientProvider {
 	 * @param connector can be {@literal null}.
 	 */
 	DefaultWebClientProvider(String scheme, @Nullable ClientHttpConnector connector) {
-		this(scheme, connector, e -> {}, HttpHeaders.EMPTY, null, Function.identity(), requestHeadersSpec -> {});
+		this(scheme, connector, e -> {}, HttpHeaders.EMPTY, null, Function.identity());
 	}
 
 	/**
 	 * Create new {@link DefaultWebClientProvider} with empty {@link HttpHeaders} and no-op {@literal error listener}.
 	 *
 	 * @param scheme must not be {@literal null}.
-	 * @param connector can be {@literal null}.
-	 * @param errorListener must not be {@literal null}.
-	 * @param headers must not be {@literal null}.
-	 * @param pathPrefix can be {@literal null}.
-	 * @param webClientConfigurer must not be {@literal null}.
-	 * @param requestConfigurer 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,
-			Function<WebClient, WebClient> webClientConfigurer, Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer) {
+			Function<WebClient, WebClient> webClientConfigurer) {
 
 		Assert.notNull(scheme, "Scheme must not be null! A common scheme would be 'http'.");
 		Assert.notNull(errorListener, "errorListener must not be null! You may want use a no-op one 'e -> {}' instead.");
 		Assert.notNull(headers, "headers must not be null! Think about using 'HttpHeaders.EMPTY' as an alternative.");
 		Assert.notNull(webClientConfigurer,
 				"webClientConfigurer must not be null! You may want use a no-op one 'Function.identity()' instead.");
-		Assert.notNull(requestConfigurer,
-				"requestConfigurer must not be null! You may want use a no-op one 'r -> {}' instead.\"");
 
 		this.cachedClients = new ConcurrentHashMap<>();
 		this.scheme = scheme;
@@ -90,7 +85,6 @@ class DefaultWebClientProvider implements WebClientProvider {
 		this.headers = headers;
 		this.pathPrefix = pathPrefix;
 		this.webClientConfigurer = webClientConfigurer;
-		this.requestConfigurer = requestConfigurer;
 	}
 
 	@Override
@@ -111,7 +105,6 @@ class DefaultWebClientProvider implements WebClientProvider {
 		return this.errorListener;
 	}
 
-	@Nullable
 	@Override
 	public String getPathPrefix() {
 		return pathPrefix;
@@ -126,17 +119,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 		merged.addAll(this.headers);
 		merged.addAll(headers);
 
-		return new DefaultWebClientProvider(scheme, connector, errorListener, merged, pathPrefix, webClientConfigurer,
-				requestConfigurer);
-	}
-
-	@Override
-	public WebClientProvider withRequestConfigurer(Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer) {
-
-		Assert.notNull(requestConfigurer, "requestConfigurer must not be null.");
-
-		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer,
-				requestConfigurer);
+		return new DefaultWebClientProvider(scheme, connector, errorListener, merged, pathPrefix, webClientConfigurer);
 	}
 
 	@Override
@@ -145,8 +128,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 		Assert.notNull(errorListener, "Error listener must not be null.");
 
 		Consumer<Throwable> listener = this.errorListener.andThen(errorListener);
-		return new DefaultWebClientProvider(scheme, this.connector, listener, headers, pathPrefix, webClientConfigurer,
-				requestConfigurer);
+		return new DefaultWebClientProvider(scheme, this.connector, listener, headers, pathPrefix, webClientConfigurer);
 	}
 
 	@Override
@@ -154,21 +136,19 @@ class DefaultWebClientProvider implements WebClientProvider {
 		Assert.notNull(pathPrefix, "pathPrefix must not be null.");
 
 		return new DefaultWebClientProvider(this.scheme, this.connector, this.errorListener, this.headers, pathPrefix,
-				webClientConfigurer, requestConfigurer);
+				webClientConfigurer);
 	}
 
 	@Override
 	public WebClientProvider withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer) {
-		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer,
-				requestConfigurer);
+		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer);
 
 	}
 
+
 	protected WebClient createWebClientForSocketAddress(InetSocketAddress socketAddress) {
 
-		Builder builder = WebClient.builder() //
-				.defaultHeaders(it -> it.addAll(getDefaultHeaders())) //
-				.defaultRequest(requestConfigurer);
+		Builder builder = WebClient.builder().defaultHeaders(it -> it.addAll(getDefaultHeaders()));
 
 		if (connector != null) {
 			builder = builder.clientConnector(connector);
@@ -176,16 +156,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 
 		String baseUrl = String.format("%s://%s:%d%s", this.scheme, socketAddress.getHostString(), socketAddress.getPort(),
 				pathPrefix == null ? "" : '/' + pathPrefix);
-
-		DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(baseUrl);
-		// the template will already be encoded by the RequestConverters methods
-		uriBuilderFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.VALUES_ONLY);
-		builder.uriBuilderFactory(uriBuilderFactory); //
-
-		WebClient webClient = builder //
-				.filter((request, next) -> next.exchange(request) //
-						.doOnError(errorListener)) //
-				.build(); //
+		WebClient webClient = builder.baseUrl(baseUrl).filter((request, next) -> next.exchange(request).doOnError(errorListener)).build();
 		return webClientConfigurer.apply(webClient);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,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;
 
@@ -34,21 +32,18 @@ import org.springframework.web.reactive.function.client.WebClient;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Peter-Josef Meisch
  * @since 3.2
  */
-public interface HostProvider<T extends HostProvider<T>> {
+public interface HostProvider {
 
 	/**
 	 * Create a new {@link HostProvider} best suited for the given {@link WebClientProvider} and number of hosts.
 	 *
 	 * @param clientProvider must not be {@literal null} .
-	 * @param headersSupplier to supply custom headers, must not be {@literal null}
 	 * @param 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.");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 
 import java.net.InetSocketAddress;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -29,8 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
@@ -43,12 +40,9 @@ import org.springframework.web.reactive.function.client.WebClient;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Peter-Josef Meisch
  * @since 3.2
  */
-class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
-
-	private final static Logger LOG = LoggerFactory.getLogger(MultiNodeHostProvider.class);
+class MultiNodeHostProvider implements HostProvider {
 
 	private final WebClientProvider clientProvider;
 	private final Map<InetSocketAddress, ElasticsearchHost> hosts;
@@ -60,17 +54,14 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 		for (InetSocketAddress endpoint : endpoints) {
 			this.hosts.put(endpoint, new ElasticsearchHost(endpoint, State.UNKNOWN));
 		}
-
-		LOG.debug("initialized with " + hosts);
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.reactive.HostProvider#clusterInfo()
 	 */
-	@Override
 	public Mono<ClusterInformation> clusterInfo() {
-		return checkNodes(null).map(this::updateNodeState).buffer(hosts.size())
+		return nodes(null).map(this::updateNodeState).buffer(hosts.size())
 				.then(Mono.just(new ClusterInformation(new LinkedHashSet<>(this.hosts.values()))));
 	}
 
@@ -90,19 +81,14 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	@Override
 	public Mono<InetSocketAddress> lookupActiveHost(Verification verification) {
 
-		LOG.trace("lookupActiveHost " + verification + " from " + hosts());
-
 		if (Verification.LAZY.equals(verification)) {
 			for (ElasticsearchHost entry : hosts()) {
 				if (entry.isOnline()) {
-					LOG.trace("lookupActiveHost returning " + entry);
 					return Mono.just(entry.getEndpoint());
 				}
 			}
-			LOG.trace("no online host found with LAZY");
 		}
 
-		LOG.trace("searching for active host");
 		return findActiveHostInKnownActives() //
 				.switchIfEmpty(findActiveHostInUnresolved()) //
 				.switchIfEmpty(findActiveHostInDead()) //
@@ -114,69 +100,47 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	}
 
 	private Mono<InetSocketAddress> findActiveHostInKnownActives() {
-		return findActiveForState(State.ONLINE);
+		return findActiveForSate(State.ONLINE);
 	}
 
 	private Mono<InetSocketAddress> findActiveHostInUnresolved() {
-		return findActiveForState(State.UNKNOWN);
+		return findActiveForSate(State.UNKNOWN);
 	}
 
 	private Mono<InetSocketAddress> findActiveHostInDead() {
-		return findActiveForState(State.OFFLINE);
+		return findActiveForSate(State.OFFLINE);
 	}
 
-	private Mono<InetSocketAddress> findActiveForState(State state) {
-
-		LOG.trace("findActiveForState state " + state + ", current hosts: " + hosts);
-
-		return checkNodes(state) //
-				.map(this::updateNodeState) //
-				.filter(ElasticsearchHost::isOnline) //
-				.map(elasticsearchHost -> {
-					LOG.trace("findActiveForState returning host " + elasticsearchHost);
-					return elasticsearchHost;
-				}).map(ElasticsearchHost::getEndpoint) //
-				.takeLast(1) //
-				.next();
+	private Mono<InetSocketAddress> findActiveForSate(State state) {
+		return nodes(state).map(this::updateNodeState).filter(ElasticsearchHost::isOnline)
+				.map(ElasticsearchHost::getEndpoint).next();
 	}
 
-	private ElasticsearchHost updateNodeState(Tuple2<InetSocketAddress, State> tuple2) {
+	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>> checkNodes(@Nullable State state) {
-
-		LOG.trace("checkNodes() with state " + state);
+	private Flux<Tuple2<InetSocketAddress, ClientResponse>> nodes(@Nullable State state) {
 
 		return Flux.fromIterable(hosts()) //
 				.filter(entry -> state == null || entry.getState().equals(state)) //
 				.map(ElasticsearchHost::getEndpoint) //
-				.concatMap(host -> {
+				.flatMap(host -> {
 
-					LOG.trace("checking host " + host);
+					Mono<ClientResponse> exchange = createWebClient(host) //
+							.head().uri("/").exchange().doOnError(throwable -> {
 
-					Mono<ClientResponse> clientResponseMono = createWebClient(host) //
-							.head().uri("/") //
-							.exchangeToMono(Mono::just) //
-							.timeout(Duration.ofSeconds(1)) //
-							.doOnError(throwable -> {
-								LOG.trace("error checking host " + host + ", " + throwable.getMessage());
 								hosts.put(host, new ElasticsearchHost(host, State.OFFLINE));
 								clientProvider.getErrorListener().accept(throwable);
 							});
 
-					return Mono.just(host) //
-							.zipWith(clientResponseMono.flatMap(it -> it.releaseBody() //
-									.thenReturn(it.statusCode().isError() ? State.OFFLINE : State.ONLINE)));
+					return Mono.just(host).zipWith(exchange);
 				}) //
-				.map(tuple -> {
-					LOG.trace("check result " + tuple);
-					return tuple;
-				}).onErrorContinue((throwable, o) -> clientProvider.getErrorListener().accept(throwable));
+				.onErrorContinue((throwable, o) -> clientProvider.getErrorListener().accept(throwable));
 	}
 
 	private List<ElasticsearchHost> hosts() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,7 @@
  */
 package org.springframework.data.elasticsearch.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/ReactiveRestClients.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,8 @@
  */
 package org.springframework.data.elasticsearch.client.reactive;
 
-import java.util.function.Function;
-
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.util.Assert;
-import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * Utility class for common access to reactive Elasticsearch clients. {@link ReactiveRestClients} consolidates set up
@@ -27,7 +24,6 @@ import org.springframework.web.reactive.function.client.WebClient;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Roman Puchkovskiy
  * @since 3.2
  */
 public final class ReactiveRestClients {
@@ -37,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) {
@@ -47,38 +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);
-	}
-
-	/**
-	 * {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
-	 * the ReactiveElasticsearchClient with a {@link WebClient}
-	 *
-	 * @since 4.3
-	 */
-	public interface WebClientConfigurationCallback extends ClientConfiguration.ClientConfigurationCallback<WebClient> {
-
-		static WebClientConfigurationCallback from(Function<WebClient, WebClient> webClientCallback) {
-
-			Assert.notNull(webClientCallback, "webClientCallback must not be null");
-
-			// noinspection NullableProblems
-			return webClientCallback::apply;
-		}
-	}
 }

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

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

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

@@ -1,277 +0,0 @@
-package org.springframework.data.elasticsearch.client.reactive;
-
-import java.io.IOException;
-import java.util.function.Function;
-
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
-import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
-import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.flush.FlushRequest;
-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.CreateIndexRequest;
-import org.elasticsearch.client.indices.GetFieldMappingsRequest;
-import org.elasticsearch.client.indices.GetIndexRequest;
-import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
-import org.elasticsearch.client.indices.GetMappingsRequest;
-import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
-import org.elasticsearch.client.indices.PutIndexTemplateRequest;
-import org.elasticsearch.client.indices.PutMappingRequest;
-import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import org.elasticsearch.index.reindex.UpdateByQueryRequest;
-import org.elasticsearch.script.mustache.SearchTemplateRequest;
-import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
-import org.springframework.data.elasticsearch.client.util.RequestConverters;
-
-/**
- * @author Roman Puchkovskiy
- * @author Farid Faoudi
- * @author George Popides
- * @since 4.0
- */
-public interface RequestCreator {
-
-	default Function<SearchRequest, Request> search() {
-		return RequestConverters::search;
-	}
-
-	default Function<SearchTemplateRequest, Request> searchTemplate() {
-		return RequestConverters::searchTemplate;
-	}
-
-	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;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<UpdateByQueryRequest, Request> updateByQuery() {
-		return RequestConverters::updateByQuery;
-	}
-
-	default Function<BulkRequest, Request> bulk() {
-
-		return request -> {
-
-			try {
-				return RequestConverters.bulk(request);
-			} catch (IOException e) {
-				throw new UncategorizedElasticsearchException("Could not parse request", e);
-			}
-		};
-	}
-
-	// --> INDICES
-
-	/**
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.get.GetIndexRequest, Request> indexExists() {
-		return RequestConverters::indexExists;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetIndexRequest, Request> indexExistsRequest() {
-		return RequestConverters::indexExists;
-	}
-
-	default Function<DeleteIndexRequest, Request> indexDelete() {
-		return RequestConverters::indexDelete;
-	}
-
-	/**
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.create.CreateIndexRequest, Request> indexCreate() {
-		return RequestConverters::indexCreate;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<CreateIndexRequest, Request> createIndexRequest() {
-		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;
-	}
-
-	/**
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest, Request> putMapping() {
-		return RequestConverters::putMapping;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<PutMappingRequest, Request> putMappingRequest() {
-		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
-	 * @deprecated since 4.2
-	 */
-	@Deprecated
-	default Function<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest, Request> getMapping() {
-		return RequestConverters::getMapping;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetMappingsRequest, Request> getMappingRequest() {
-		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;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetFieldMappingsRequest, Request> getFieldMapping() {
-		return RequestConverters::getFieldMapping;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<GetIndexRequest, Request> getIndex() {
-		return RequestConverters::getIndex;
-	}
-
-	/**
-	 * @since 4.2
-	 */
-	default Function<ClusterHealthRequest, Request> clusterHealth() {
-		return RequestConverters::clusterHealth;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-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.
@@ -30,10 +30,9 @@ import org.springframework.web.reactive.function.client.WebClient;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Peter-Josef Meisch
  * @since 3.2
  */
-class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
+class SingleNodeHostProvider implements HostProvider {
 
 	private final WebClientProvider clientProvider;
 	private final InetSocketAddress endpoint;
@@ -54,8 +53,9 @@ class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
 	public Mono<ClusterInformation> clusterInfo() {
 
 		return createWebClient(endpoint) //
-				.head().uri("/") //
-				.exchangeToMono(it -> {
+				.head().uri("/").exchange() //
+				.flatMap(it -> {
+
 					if (it.statusCode().isError()) {
 						state = ElasticsearchHost.offline(endpoint);
 					} else {
@@ -63,10 +63,12 @@ class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
 					}
 					return Mono.just(state);
 				}).onErrorResume(throwable -> {
+
 					state = ElasticsearchHost.offline(endpoint);
 					clientProvider.getErrorListener().accept(throwable);
 					return Mono.just(state);
-				}).map(elasticsearchHost -> new ClusterInformation(Collections.singleton(elasticsearchHost)));
+				}) //
+				.flatMap(it -> Mono.just(new ClusterInformation(Collections.singleton(it))));
 	}
 
 	/*
@@ -89,16 +91,14 @@ class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
 			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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,9 +103,8 @@ 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();
 
 	/**
@@ -129,27 +128,15 @@ public interface WebClientProvider {
 	 *
 	 * @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);
-
-	/**
-	 * Create a new instance of {@link WebClientProvider} calling the given {@link Consumer} to configure the requests of
-	 * this {@link WebClient}.
-	 *
-	 * @param requestConfigurer request configuration callback
-	 * @return new instance of {@link WebClientProvider}
-	 * @since 4.3
-	 */
-	WebClientProvider withRequestConfigurer(Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer);
 }

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,175 +0,0 @@
-/*
- * Copyright 2020-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client.util;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.elasticsearch.client.analytics.InferencePipelineAggregationBuilder;
-import org.elasticsearch.client.analytics.ParsedInference;
-import org.elasticsearch.client.analytics.ParsedStringStats;
-import org.elasticsearch.client.analytics.ParsedTopMetrics;
-import org.elasticsearch.client.analytics.StringStatsAggregationBuilder;
-import org.elasticsearch.client.analytics.TopMetricsAggregationBuilder;
-import org.elasticsearch.common.xcontent.ContextParser;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.common.xcontent.ParseField;
-import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.adjacency.ParsedAdjacencyMatrix;
-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.histogram.ParsedVariableWidthHistogram;
-import org.elasticsearch.search.aggregations.bucket.histogram.VariableWidthHistogramAggregationBuilder;
-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.*;
-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. The latest version used from Elasticsearch is 7.10.2.
- * </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(VariableWidthHistogramAggregationBuilder.NAME,
-				(p, c) -> ParsedVariableWidthHistogram.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(LongRareTerms.NAME, (p, c) -> ParsedLongRareTerms.fromXContent(p, (String) c));
-		map.put(StringRareTerms.NAME, (p, c) -> ParsedStringRareTerms.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(SignificantLongTerms.NAME, (p, c) -> ParsedSignificantLongTerms.fromXContent(p, (String) c));
-		map.put(SignificantStringTerms.NAME, (p, c) -> ParsedSignificantStringTerms.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));
-		map.put(StringStatsAggregationBuilder.NAME, (p, c) -> ParsedStringStats.PARSER.parse(p, (String) c));
-		map.put(TopMetricsAggregationBuilder.NAME, (p, c) -> ParsedTopMetrics.PARSER.parse(p, (String) c));
-		map.put(InferencePipelineAggregationBuilder.NAME, (p, c) -> ParsedInference.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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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,16 +61,13 @@ 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.GetFieldMappingsRequest;
-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;
+import org.elasticsearch.common.SuppressForbidden;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.lucene.uid.Versions;
+import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.DeprecationHandler;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -88,17 +76,13 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.core.SuppressForbidden;
-import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.rankeval.RankEvalRequest;
 import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.index.reindex.ReindexRequest;
 import org.elasticsearch.index.reindex.UpdateByQueryRequest;
 import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.script.mustache.SearchTemplateRequest;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
 import org.elasticsearch.tasks.TaskId;
 import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
@@ -107,9 +91,8 @@ import org.springframework.lang.Nullable;
 
 /**
  * <p>
- * Original implementation source {@link org.elasticsearch.client.RequestConverters},
- * {@link org.elasticsearch.client.IndicesRequestConverters} and
- * {@link org.elasticsearch.client.ClusterRequestConverters} by {@literal Elasticsearch}
+ * Original implementation source {@link org.elasticsearch.client.RequestConverters} and
+ * {@link org.elasticsearch.client.IndicesRequestConverters} by {@literal Elasticsearch}
  * (<a href="https://www.elastic.co">https://www.elastic.co</a>) licensed under the Apache License, Version 2.0.
  * </p>
  * Modified for usage with {@link ReactiveElasticsearchClient}.
@@ -118,10 +101,8 @@ import org.springframework.lang.Nullable;
  *
  * @author Christoph Strobl
  * @author Peter-Josef Meisch
- * @author Farid Faoudi
  * @since 3.2
  */
-@SuppressWarnings("JavadocReference")
 public class RequestConverters {
 
 	private static final XContentType REQUEST_BODY_CONTENT_TYPE = XContentType.JSON;
@@ -201,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());
@@ -221,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())) {
@@ -388,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;
 			}
@@ -413,27 +389,12 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request searchTemplate(SearchTemplateRequest templateRequest) {
-		SearchRequest searchRequest = templateRequest.getRequest();
-
-		String endpoint = new EndpointBuilder().addCommaSeparatedPathParts(templateRequest.getRequest().indices())
-				.addPathPart("_search").addPathPart("template").build();
-
-		Request request = new Request(HttpMethod.GET.name(), endpoint);
-		Params params = new Params(request);
-		addSearchRequestParams(params, searchRequest);
-
-		request.setEntity(createEntity(templateRequest, REQUEST_BODY_CONTENT_TYPE));
-
-		return request;
-	}
-
 	/**
 	 * Creates a count request.
 	 *
 	 * @param countRequest the search defining the data to be counted
 	 * @return Elasticsearch count request
-	 * @since 4.0
+	 * @since 3.2
 	 */
 	public static Request count(CountRequest countRequest) {
 		Request request = new Request(HttpMethod.POST.name(),
@@ -499,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"));
 
@@ -521,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"));
 
@@ -540,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())
@@ -554,38 +516,32 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) {
-		String endpoint = endpoint(updateByQueryRequest.indices(), "_update_by_query");
+	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()) //
-				.withPipeline(updateByQueryRequest.getPipeline()) //
-				.withRefresh(updateByQueryRequest.isRefresh()) //
-				.withTimeout(updateByQueryRequest.getTimeout()) //
-				.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards()) //
-				.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond()) //
-				.withIndicesOptions(updateByQueryRequest.indicesOptions()); //
-
+		Params params = new Params(request).withRouting(updateByQueryRequest.getRouting())
+				.withPipeline(updateByQueryRequest.getPipeline()).withRefresh(updateByQueryRequest.isRefresh())
+				.withTimeout(updateByQueryRequest.getTimeout())
+				.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards())
+				.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond())
+				.withIndicesOptions(updateByQueryRequest.indicesOptions());
 		if (!updateByQueryRequest.isAbortOnVersionConflict()) {
 			params.putParam("conflicts", "proceed");
 		}
-
 		if (updateByQueryRequest.getBatchSize() != AbstractBulkByScrollRequest.DEFAULT_SCROLL_SIZE) {
 			params.putParam("scroll_size", Integer.toString(updateByQueryRequest.getBatchSize()));
 		}
-
 		if (updateByQueryRequest.getScrollTime() != AbstractBulkByScrollRequest.DEFAULT_SCROLL_TIMEOUT) {
 			params.putParam("scroll", updateByQueryRequest.getScrollTime());
 		}
-
-		if (updateByQueryRequest.getMaxDocs() > 0) {
-			params.putParam("max_docs", Integer.toString(updateByQueryRequest.getMaxDocs()));
+		if (updateByQueryRequest.getSize() > 0) {
+			params.putParam("size", Integer.toString(updateByQueryRequest.getSize()));
 		}
-
 		request.setEntity(createEntity(updateByQueryRequest, REQUEST_BODY_CONTENT_TYPE));
 		return request;
 	}
 
-	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())
@@ -631,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);
@@ -645,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) {
@@ -709,22 +665,6 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request getIndex(org.elasticsearch.client.indices.GetIndexRequest getIndexRequest) {
-		String[] indices = getIndexRequest.indices() == null ? Strings.EMPTY_ARRAY : getIndexRequest.indices();
-
-		String endpoint = endpoint(indices);
-		Request request = new Request(HttpMethod.GET.name(), endpoint);
-
-		Params params = new Params(request);
-		params.withIndicesOptions(getIndexRequest.indicesOptions());
-		params.withLocal(getIndexRequest.local());
-		params.withIncludeDefaults(getIndexRequest.includeDefaults());
-		params.withHuman(getIndexRequest.humanReadable());
-		params.withMasterTimeout(getIndexRequest.masterNodeTimeout());
-
-		return request;
-	}
-
 	public static Request indexDelete(DeleteIndexRequest deleteIndexRequest) {
 		String endpoint = RequestConverters.endpoint(deleteIndexRequest.indices());
 		Request request = new Request(HttpMethod.DELETE.name(), endpoint);
@@ -752,22 +692,6 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request indexExists(org.elasticsearch.client.indices.GetIndexRequest getIndexRequest) {
-		// this can be called with no indices as argument by transport client, not via REST though
-		if (getIndexRequest.indices() == null || getIndexRequest.indices().length == 0) {
-			throw new IllegalArgumentException("indices are mandatory");
-		}
-		String endpoint = endpoint(getIndexRequest.indices(), "");
-		Request request = new Request(HttpMethod.HEAD.name(), endpoint);
-
-		Params params = new Params(request);
-		params.withLocal(getIndexRequest.local());
-		params.withHuman(getIndexRequest.humanReadable());
-		params.withIndicesOptions(getIndexRequest.indicesOptions());
-		params.withIncludeDefaults(getIndexRequest.includeDefaults());
-		return request;
-	}
-
 	public static Request indexOpen(OpenIndexRequest openIndexRequest) {
 		String endpoint = RequestConverters.endpoint(openIndexRequest.indices(), "_open");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);
@@ -804,32 +728,16 @@ public class RequestConverters {
 		return request;
 	}
 
-	public static Request indexCreate(org.elasticsearch.client.indices.CreateIndexRequest createIndexRequest) {
-		String endpoint = RequestConverters.endpoint(new String[] { createIndexRequest.index() });
-		Request request = new Request(HttpMethod.PUT.name(), endpoint);
-
-		Params parameters = new Params(request);
-		parameters.withTimeout(createIndexRequest.timeout());
-		parameters.withMasterTimeout(createIndexRequest.masterNodeTimeout());
-		parameters.withWaitForActiveShards(createIndexRequest.waitForActiveShards(), ActiveShardCount.DEFAULT);
-
-		request.setEntity(createEntity(createIndexRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
-		return request;
-	}
-
 	public static Request indexRefresh(RefreshRequest refreshRequest) {
 
 		String[] indices = refreshRequest.indices() == null ? Strings.EMPTY_ARRAY : refreshRequest.indices();
-		// 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());
 		return request;
 	}
 
-	@Deprecated
 	public static Request putMapping(PutMappingRequest putMappingRequest) {
 		// The concreteIndex is an internal concept, not applicable to requests made over the REST API.
 		if (putMappingRequest.getConcreteIndex() != null) {
@@ -837,22 +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) //
-				.withTimeout(putMappingRequest.timeout()) //
-				.withMasterTimeout(putMappingRequest.masterNodeTimeout());
-		request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
-		return request;
-	}
+		RequestConverters.Params parameters = new RequestConverters.Params(request);
+		parameters.withTimeout(putMappingRequest.timeout());
+		parameters.withMasterTimeout(putMappingRequest.masterNodeTimeout());
 
-	public static Request putMapping(org.elasticsearch.client.indices.PutMappingRequest putMappingRequest) {
-		Request request = new Request(HttpMethod.PUT.name(),
-				RequestConverters.endpoint(putMappingRequest.indices(), "_mapping"));
-
-		new RequestConverters.Params(request) //
-				.withTimeout(putMappingRequest.timeout()) //
-				.withMasterTimeout(putMappingRequest.masterNodeTimeout());
 		request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
 		return request;
 	}
@@ -868,157 +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());
-		return request;
-	}
-
-	public static Request getMapping(org.elasticsearch.client.indices.GetMappingsRequest getMappingsRequest) {
-		String[] indices = getMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY : getMappingsRequest.indices();
-
-		Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_mapping"));
-
-		RequestConverters.Params parameters = new RequestConverters.Params(request);
-		parameters.withMasterTimeout(getMappingsRequest.masterNodeTimeout());
-		parameters.withIndicesOptions(getMappingsRequest.indicesOptions());
-		parameters.withLocal(getMappingsRequest.local());
-		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;
-	}
-
-	public static Request getFieldMapping(GetFieldMappingsRequest getFieldMappingsRequest) {
-		String[] indices = getFieldMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY
-				: getFieldMappingsRequest.indices();
-		String[] fields = getFieldMappingsRequest.fields() == null ? Strings.EMPTY_ARRAY : getFieldMappingsRequest.fields();
-
-		final String endpoint = new EndpointBuilder().addCommaSeparatedPathParts(indices).addPathPartAsIs("_mapping")
-				.addPathPartAsIs("field").addCommaSeparatedPathParts(fields).build();
-
-		Request request = new Request(HttpMethod.GET.name(), endpoint);
-
-		RequestConverters.Params parameters = new Params(request);
-		parameters.withIndicesOptions(getFieldMappingsRequest.indicesOptions());
-		parameters.withIncludeDefaults(getFieldMappingsRequest.includeDefaults());
-		return request;
-	}
-
-	public static Request clusterHealth(ClusterHealthRequest healthRequest) {
-		String[] indices = healthRequest.indices() == null ? Strings.EMPTY_ARRAY : healthRequest.indices();
-		String endpoint = new EndpointBuilder().addPathPartAsIs(new String[] { "_cluster/health" })
-				.addCommaSeparatedPathParts(indices).build();
-
-		Request request = new Request("GET", endpoint);
-
-		RequestConverters.Params parameters = new Params(request);
-		parameters.withWaitForStatus(healthRequest.waitForStatus());
-		parameters.withWaitForNoRelocatingShards(healthRequest.waitForNoRelocatingShards());
-		parameters.withWaitForNoInitializingShards(healthRequest.waitForNoInitializingShards());
-		parameters.withWaitForActiveShards(healthRequest.waitForActiveShards(), ActiveShardCount.NONE);
-		parameters.withWaitForNodes(healthRequest.waitForNodes());
-		parameters.withWaitForEvents(healthRequest.waitForEvents());
-		parameters.withTimeout(healthRequest.timeout());
-		parameters.withMasterTimeout(healthRequest.masterNodeTimeout());
-		parameters.withLocal(healthRequest.local()).withLevel(healthRequest.level());
-		return request;
-	}
-
 	static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType) {
 
 		try {
@@ -1224,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;
 		}
@@ -1386,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;
 	}
@@ -1435,8 +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 `:`
-				// the authority must be an empty string and not null, else paths that being with slashes could have them
-				URI uri = new URI((String) null, "", "/" + pathPart, (String) null, (String) 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,70 +0,0 @@
-/*
- * Copyright 2020-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
-
-/**
- * Mutable state object holding scrollId to be used for scroll requests.
- *
- * @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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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,10 +30,11 @@ 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();
 
 	/**
@@ -42,13 +42,8 @@ public abstract class AbstractElasticsearchConfiguration extends ElasticsearchCo
 	 *
 	 * @return never {@literal null}.
 	 */
-	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-	public ElasticsearchOperations elasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
-			RestHighLevelClient elasticsearchClient) {
-
-		ElasticsearchRestTemplate template = new ElasticsearchRestTemplate(elasticsearchClient, elasticsearchConverter);
-		template.setRefreshPolicy(refreshPolicy());
-
-		return template;
+	@Bean(name = {"elasticsearchOperations", "elasticsearchTemplate"})
+	public ElasticsearchOperations elasticsearchOperations() {
+		return new ElasticsearchRestTemplate(elasticsearchClient(), elasticsearchConverter(), resultsMapper());
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,29 @@
 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.RefreshPolicy;
-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());
 
@@ -58,13 +58,13 @@ public abstract class AbstractReactiveElasticsearchConfiguration extends Elastic
 	}
 
 	/**
-	 * Set up the write {@link RefreshPolicy}. Default is set to null to use the cluster defaults..
+	 * Set up the write {@link RefreshPolicy}. Default is set to {@link RefreshPolicy#IMMEDIATE}.
 	 *
 	 * @return {@literal null} to use the server defaults.
 	 */
 	@Nullable
 	protected RefreshPolicy refreshPolicy() {
-		return null;
+		return RefreshPolicy.IMMEDIATE;
 	}
 
 	/**

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

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