Release version 4.4.4 (2021.2.4).

See #2296

.gitignore

@@ -20,3 +20,7 @@ target
 *.ipr
 *.iws
 .idea
+/.env
+
+
+/zap.env

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2007-present the original author or authors.
  *
@@ -20,98 +21,95 @@ 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";
+	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 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";
+	/**
+	 * 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";
+	/**
+	 * 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());
+	public static void main(String args[]) {
+		System.out.println("- Downloader started");
+		File baseDirectory = new File(args[0]);
+		System.out.println("- Using transport 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);
+		// 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);
-        }
-    }
+		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();
-    }
+	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,3 @@
-#Mon Oct 11 14:30:32 CEST 2021
+#Fri Jun 03 09:39:36 CEST 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.3/apache-maven-3.8.3-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip

CONTRIBUTING.adoc

@@ -5,3 +5,7 @@ You find the contribution guidelines for Spring Data projects https://github.com
 == 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.
+
+== Class names of the test classes
+
+Tset classes that do depend on the client have either `ERHLC` (when using the deprecated Elasticsearch  `RestHighLevelClient`) or `ELC` (the new `ElasticsearchClient`) in their name.

Jenkinsfile

@@ -1,9 +1,15 @@
+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/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.7.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -12,10 +18,11 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (jdk8)") {
+		stage("test: baseline (main)") {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -25,14 +32,14 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES') }
 
 			environment {
-				DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				DOCKER_HUB = credentials("${p['docker.credentials']}")
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+					docker.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"
@@ -44,29 +51,30 @@ pipeline {
 
 		stage("Test other configurations") {
 			when {
+				beforeAgent(true)
 				allOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			parallel {
-				stage("test: baseline (jdk11)") {
+				stage("test: baseline (next)") {
 					agent {
 						label 'data'
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 
 					environment {
-						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+						DOCKER_HUB = credentials("${p['docker.credentials']}")
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 					}
 
 					steps {
 						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+							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=java11 ci/verify.sh'
+									sh 'PROFILE=none ci/verify.sh'
 									sh "ci/clean.sh"
 								}
 							}
@@ -74,23 +82,23 @@ pipeline {
 					}
 				}
 
-				stage("test: baseline (jdk17)") {
+				stage("test: baseline (LTS)") {
 					agent {
 						label 'data'
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 
 					environment {
-						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
-						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+						DOCKER_HUB = credentials("${p['docker.credentials']}")
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 					}
 
 					steps {
 						script {
-							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('openjdk:17-bullseye').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
+							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=java11 ci/verify.sh'
+									sh 'PROFILE=none ci/verify.sh'
 									sh "ci/clean.sh"
 								}
 							}
@@ -102,8 +110,9 @@ pipeline {
 
 		stage('Release to artifactory') {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'main'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -113,13 +122,13 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+					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} " +
@@ -133,34 +142,6 @@ pipeline {
 				}
 			}
 		}
-		stage('Publish documentation') {
-			when {
-				branch 'main'
-			}
-			agent {
-				label 'data'
-			}
-			options { timeout(time: 20, unit: 'MINUTES') }
-
-			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-			}
-
-			steps {
-				script {
-					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.distribution-repository=temp-private-local " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
-					}
-				}
-			}
-		}
 	}
 
 	post {

README.adoc

@@ -1,25 +1,52 @@
+
 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]]
 
 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
-The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine. Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with a Elasticsearch Documents and easily writing a Repository style data access layer.
+The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine.
+Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with a Elasticsearch Documents and easily writing a Repository style data access layer.
 
 This project is lead and maintained by the community.
 
 == Features
 
 * Spring configuration support using Java based `@Configuration` classes or an XML namespace for a ES clients instances.
-* `ElasticsearchRestTemplate` helper class that increases productivity performing common ES operations. Includes integrated object mapping between documents and POJOs.
+* `ElasticsearchOperations` class and implementations 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.
 * CDI support for repositories
 
+== About Elasticsearch versions and clients
+
+=== Elasticsearch 7.17 client libraries
+
+At the end of 2021 Elasticsearch with version 7.17 released the new version of their Java client and deprecated the `RestHighLevelCLient` which was the default way to access Elasticsearch up to then.
+
+Spring Data Elasticsearch will in version 4.4 offer the possibility to optionally use the new client as an alternative to the existing setup using the `RestHighLevelCLient`.
+The default client that is used still is the `RestHighLevelCLient`, first because the integration of the new client is not yet complete, the new client still has features missing and bugs which will hopefully be resolved soon.
+Second, and more important, the new Elasticsearch client forces users to switch from using `javax.json.spi.JsonProvider` to `jakarta.json.spi.JsonProvider`.
+Spring Data Elasticsearch cannot enforce this switch; Spring Boot will switch to `jakarta` with version 3 and then it's safe for Spring Data Elasticsearch to switch to the new client.
+
+So for version 4.4 Spring Data Elasticsearch will keep using the `RestHighLevelCLient` in version 7.17.x (as long as this will be available).
+
+=== Elasticsearch 8 client libraries
+
+In Elasticsearch 8, the `RestHighLevelCLient` has been removed.
+This means that a switch to this client version can only be done with the next major upgrade which will be Spring Data Elasticsearch 5, based on Spring Data 3, used by Spring Boot 3, based on Spring 6 and Java 17.
+
+=== Elasticsearch 8 cluster
+
+It should be possible to use the Elasticsearch 7 client to access a cluster running version 8 by setting the appropriate aompatibility headers (see the documentation at https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration). but I encountered and heard of cases where the response from the server is not parseable by the client although the headers are set, so use with care.
+
 == Code of Conduct
 
-This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct]. By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[Spring Code of Conduct].
+By participating, you are expected to uphold this code of conduct.
+Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 == Getting Started
 
@@ -58,31 +85,6 @@ public class MyService {
 }
 ----
 
-=== Using Transport Client
-
-NOTE: Usage of the TransportClient is deprecated as of version 4.0, use RestClient instead.
-
-
-[source,java]
-----
-@Configuration
-public class TransportClientConfig extends ElasticsearchConfigurationSupport {
-
-	@Bean
-	public Client elasticsearchClient() throws UnknownHostException {
-		Settings settings = Settings.builder().put("cluster.name", "elasticsearch").build();
-		TransportClient client = new PreBuiltTransportClient(settings);
-		client.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
-		return client;
-	}
-
-	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
-	public ElasticsearchTemplate elasticsearchTemplate() throws UnknownHostException {
-		return new ElasticsearchTemplate(elasticsearchClient());
-	}
-}
-----
-
 === Using the RestClient
 
 Provide a configuration like this:
@@ -161,7 +163,8 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 
 == Getting Help
 
-Having trouble with Spring Data? We’d love to help!
+Having trouble with Spring Data?
+We’d love to help!
 
 * Check the
 https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/[reference documentation], and https://docs.spring.io/spring-data/elasticsearch/docs/current/api/[Javadocs].
@@ -174,14 +177,16 @@ You can also chat with the community on https://gitter.im/spring-projects/spring
 
 == Reporting Issues
 
-Spring Data uses GitHub as issue tracking system to record bugs and feature requests. If you want to raise an issue, please follow the recommendations below:
+Spring Data uses GitHub as issue tracking system to record bugs and feature requests.
+If you want to raise an issue, please follow the recommendations below:
 
 * Before you log a bug, please search the
 https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] to see if someone has already reported the problem.
 * If the issue doesn’t already exist, https://github.com/spring-projects/spring-data-elasticsearch/issues/new[create a new issue].
 * Please provide as much information as possible with the issue report, we like to know the version of Spring Data Elasticsearch that you are using and JVM version.
 * If you need to paste code, or include a stack trace use Markdown +++```+++ escapes before and after your text.
-* If possible try to create a test-case or project that replicates the issue. Attach a link to your code or a compressed file containing your code.
+* If possible try to create a test-case or project that replicates the issue.
+Attach a link to your code or a compressed file containing your code.
 
 == Building from Source
 
@@ -197,11 +202,8 @@ If you want to build with the regular `mvn` command, you will need https://maven
 
 _Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests, and in particular please sign the https://cla.pivotal.io/sign/spring[Contributor’s Agreement] before submitting your first pull request._
 
-IMPORTANT: When contributing, please make sure an issue exists in https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] and comment on this issue with how you want to address it. By this we not only know that someone is working on an issue, we can also align architectural questions and possible solutions before work is invested
-. We
-so
-can prevent that much work is put into Pull Requests that have little
-or no chances of being merged.
+IMPORTANT: When contributing, please make sure an issue exists in https://github.com/spring-projects/spring-data-elasticsearch/issues[issue tracker] and comment on this issue with how you want to address it.
+By this we not only know that someone is working on an issue, we can also align architectural questions and possible solutions before work is invested . We so can prevent that much work is put into Pull Requests that have little or no chances of being merged.
 
 
 === Building reference documentation

ci/pipeline.properties

@@ -0,0 +1,29 @@
+# Java versions
+java.main.tag=8u332-b09-jdk
+java.next.tag=11.0.15_10-jdk
+java.lts.tag=17.0.3_7-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

mvnw

@@ -162,7 +162,7 @@ fi
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
 # traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
+# first directory with .mvn subdirectory is considered project transport directory
 find_maven_basedir() {
 
   if [ -z "$1" ]

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.3.0</version>
+	<version>4.4.4</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.4</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,11 +18,14 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<elasticsearch>7.15.2</elasticsearch>
-		<log4j>2.14.1</log4j>
+		<!-- version of the RestHighLevelClient	-->
+		<elasticsearch-rhlc>7.17.6</elasticsearch-rhlc>
+		<!-- version of the new ElasticsearchClient	-->
+		<elasticsearch-java>7.17.6</elasticsearch-java>
+		<log4j>2.17.1</log4j>
 		<netty>4.1.65.Final</netty>
-		<springdata.commons>2.6.0</springdata.commons>
-		<testcontainers>1.15.3</testcontainers>
+		<springdata.commons>2.7.4</springdata.commons>
+		<testcontainers>1.16.2</testcontainers>
 		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 
@@ -101,12 +104,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -140,24 +137,11 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- Elasticsearch -->
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>transport</artifactId>
-			<version>${elasticsearch}</version>
-		</dependency>
-
-		<dependency>
-			<!-- required by elasticsearch -->
-			<groupId>org.elasticsearch.plugin</groupId>
-			<artifactId>transport-netty4-client</artifactId>
-			<version>${elasticsearch}</version>
-		</dependency>
-
+		<!-- Elasticsearch  RestHighLevelClient, will be removed probably in SDE 5 -->
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>elasticsearch-rest-high-level-client</artifactId>
-			<version>${elasticsearch}</version>
+			<version>${elasticsearch-rhlc}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -166,19 +150,28 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Logging -->
+		<!-- new Elasticsearch client, needs the low-level rest client and json api -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-			<version>${slf4j}</version>
-			<scope>test</scope>
+			<groupId>co.elastic.clients</groupId>
+			<artifactId>elasticsearch-java</artifactId>
+			<version>${elasticsearch-java}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
+			<version>${elasticsearch-java}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Jackson JSON Mapper -->
@@ -196,7 +189,7 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.0.1</version>
+			<version>1.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -242,6 +235,18 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>${slf4j}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-to-slf4j</artifactId>
@@ -269,6 +274,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<!--suppress MavenPackageUpdate -->
 			<version>999999</version>
 			<scope>test</scope>
 		</dependency>
@@ -283,7 +289,7 @@
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock-jre8</artifactId>
-			<version>2.26.3</version>
+			<version>2.32.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- these exclusions are needed because of Elasticsearch JarHell-->
@@ -301,7 +307,7 @@
 		<dependency>
 			<groupId>io.specto</groupId>
 			<artifactId>hoverfly-java-junit5</artifactId>
-			<version>0.13.1</version>
+			<version>0.14.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -461,7 +467,9 @@
 								</module>
 							</checkstyleRules>
 							<includes>**/*</includes>
-							<excludes>.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy</excludes>
+							<excludes>
+								.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy
+							</excludes>
 							<sourceDirectories>./</sourceDirectories>
 						</configuration>
 					</plugin>
@@ -499,6 +507,7 @@
 			<id>local-maven-repo</id>
 			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
 		</repository>
+
 	</repositories>
 
 	<pluginRepositories>

src/main/asciidoc/preface.adoc

@@ -29,17 +29,21 @@ Requires an installation of https://www.elastic.co/products/elasticsearch[Elasti
 [[preface.versions]]
 === Versions
 
-The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring Data release train:
+The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of
+Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring
+Data release train. The Elasticsearch version given shows with which client libraries Spring Data Elasticsearch was
+built and tested.
 
 [cols="^,^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 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
+| 2021.2 (Raj) | 4.4.x | 7.17.6 | 5.3.x | 2.7.x
+| 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x
+| 2021.0 (Pascal) | 4.2.xfootnote:oom[Out of maintenance] | 7.12.0 | 5.3.x | 2.5.x
+| 2020.0 (Ockham)footnote:oom[] | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
+| Neumannfootnote:oom[] | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
+| Moorefootnote:oom[] | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
+| Lovelacefootnote:oom[] | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
 | Kayfootnote:oom[] | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
 | Ingallsfootnote:oom[] | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
 |===

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

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

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

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

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

@@ -0,0 +1,172 @@
+[[elasticsearch-migration-guide-4.3-4.4]]
+= Upgrading from 4.3.x to 4.4.x
+
+This section describes breaking changes from version 4.3.x to 4.4.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-4.3-4.4.deprecations]]
+== Deprecations
+
+=== org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations
+
+The method `<T> Publisher<T> execute(ClientCallback<Publisher<T>> callback)` has been deprecated.
+As there now are multiple implementations using different client libraries the `execute` method is still available in the different implementations, but there is no more method in the interface, because there is no common callback interface for the different clients.
+
+[[elasticsearch-migration-guide-4.3-4.4.breaking-changes]]
+== Breaking Changes
+
+=== Removal of deprecated classes
+
+==== `org.springframework.data.elasticsearch.core.ElasticsearchTemplate` has been removed
+
+As of version 4.4 Spring Data Elasticsearch does not use the `TransportClient` from Elasticsearch anymore (which itself is deprecated since Elasticsearch 7.0).
+This means that the `org.springframework.data.elasticsearch.core.ElasticsearchTemplate` class which was deprecated since Spring Data Elasticsearch 4.0 has been removed.
+This was the implementation of the `ElasticsearchOperations` interface that was using the `TransportClient`.
+Connections to Elasticsearch must be made using either the imperative `ElasticsearchRestTemplate` or the reactive `ReactiveElasticsearchTemplate`.
+
+=== Package changes
+
+In 4.3 two classes (`ElasticsearchAggregations` and `ElasticsearchAggregation`) had been moved to the `org.springframework.data.elasticsearch.core.clients.elasticsearch7` package in preparation for the integration of the new Elasticsearch client.
+The were moved back to the `org.springframework.data.elasticsearch.core` package as we keep the classes use the old Elasticsearch client where they were.
+
+=== Behaviour change
+
+The `ReactiveElasticsearchTemplate`, when created directly or by Spring Boot configuration had a default refresh policy of IMMEDIATE.
+This could cause performance issues on heavy indexing and was different than the default behaviour of Elasticsearch.
+This has been changed to that now the default refresh policy is NONE.
+When the
+`ReactiveElasticsearchTemplate` was provided by using the configuration like described in <<elasticsearch.clients.reactive>> the default refresh policy already was set to NONE.
+
+[[elasticsearch-migration-guide-4.3-4.4.new-clients]]
+== New Elasticsearch client
+
+Elasticsearch has introduced it's new `ElasticsearchClient` and has deprecated the previous `RestHighLevelClient`.
+Spring Data Elasticsearch 4.4 still uses the old client as the default client for the following reasons:
+
+* The new client forces applications to use the `jakarta.json.spi.JsonProvider` package whereas Spring Boot will stick to `javax.json.spi.JsonProvider` until version 3. So switching the default implementaiton in Spring Data Elasticsearch can only come with Spring Data Elasticsearch 5 (Spring Data 3, Spring 6).
+* There are still some bugs in the Elasticsearch client which need to be resolved
+* The implementation using the new client in Spring Data Elasticsearch is not yet complete, due to limited resources working on that - remember Spring Data Elasticsearch is a community driven project that lives from public contributions.
+
+=== How to use the new client
+
+CAUTION: The implementation using the new client is not complete, some operations will throw a `java.lang.UnsupportedOperationException` or might throw NPE (for example when the Elasticsearch cannot parse a response from the server, this still happens sometimes) +
+Use the new client to test the implementations but do not use it in productive code yet!
+
+In order to try and use the new client the following steps are necessary:
+
+==== Make sure not to configure the existing default client
+
+If using Spring Boot, exclude Spring Data Elasticsearch from the autoconfiguration
+
+====
+[source,java]
+----
+@SpringBootApplication(exclude = ElasticsearchDataAutoConfiguration.class)
+public class SpringdataElasticTestApplication {
+	// ...
+}
+
+----
+====
+
+Remove Spring Data Elasticsearch related properties from your application configuration.
+If Spring Data Elasticsearch was configured using a programmatic configuration (see <<elastisearch.clients>>), remove these beans from the Spring application context.
+
+==== Add dependencies
+
+The dependencies for the new Elasticsearch client are still optional in Spring Data Elasticsearch so they need to be added explicitly:
+
+====
+[source,xml]
+----
+<dependencies>
+    <dependency>
+        <groupId>co.elastic.clients</groupId>
+        <artifactId>elasticsearch-java</artifactId>
+        <version>7.17.6</version>
+        <exclusions>
+            <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>org.elasticsearch.client</groupId>
+        <artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
+        <version>7.17.6</version>
+        <exclusions>
+            <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+</dependencies>
+----
+====
+
+When using Spring Boot, it is necessary to set the following property in the _pom.xml_.
+
+====
+[source,xml]
+----
+<properties>
+    <jakarta-json.version>2.0.1</jakarta-json.version>
+</properties>
+----
+====
+
+==== New configuration classes
+
+===== Imperative style
+
+In order configure Spring Data Elasticsearch to use the new client, it is necessary to create a configuration bean that derives from `org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration`:
+
+====
+[source,java]
+----
+@Configuration
+public class NewRestClientConfig extends ElasticsearchConfiguration {
+
+	@Override
+	public ClientConfiguration clientConfiguration() {
+		return ClientConfiguration.builder() //
+			.connectedTo("localhost:9200") //
+			.build();
+	}
+}
+----
+====
+
+The configuration is done in the same way as with the old client, but it is not necessary anymore to create more than the configuration bean.
+With this configuration, the following beans will be available in the Spring application context:
+
+* a `RestClient` bean, that is the configured low level `RestClient` that is used by the Elasticsearch client
+* an `ElasticsearchClient` bean, this is the new client that uses the `RestClient`
+* an `ElasticsearchOperations` bean, available with the bean names _elasticsearchOperations_ and _elasticsearchTemplate_, this uses the `ElasticsearchClient`
+
+===== Reactive style
+
+To use the new client in a reactive environment the only difference is the class from which to derive the configuration:
+
+====
+[source,java]
+----
+@Configuration
+public class NewRestClientConfig extends ReactiveElasticsearchConfiguration {
+
+	@Override
+	public ClientConfiguration clientConfiguration() {
+		return ClientConfiguration.builder() //
+			.connectedTo("localhost:9200") //
+			.build();
+	}
+}
+----
+====
+
+With this configuration, the following beans will be available in the Spring application context:
+
+* a `RestClient` bean, that is the configured low level `RestClient` that is used by the Elasticsearch client
+* an `ReactiveElasticsearchClient` bean, this is the new reactive client that uses the `RestClient`
+* an `ReactiveElasticsearchOperations` bean, available with the bean names _reactiveElasticsearchOperations_ and _reactiveElasticsearchTemplate_, this uses the `ReactiveElasticsearchClient`

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

@@ -1,6 +1,12 @@
 [[new-features]]
 = What's new
 
+[[new-features.4-4-0]]
+== New in Spring Data Elasticsearch 4.4
+
+* Introduction of new imperative and reactive clients using the classes from the new Elasticsearch Java client
+* Upgrade to Elasticsearch 7.17.6.
+
 [[new-features.4-3-0]]
 == New in Spring Data Elasticsearch 4.3
 

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

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

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

@@ -312,8 +312,9 @@ Repository methods can be defined to have the following return types for returni
 [[elasticsearch.query-methods.at-query]]
 == Using @Query Annotation
 
-.Declare query at the method using the `@Query` annotation.
+.Declare query on the method using the `@Query` annotation.
 ====
+The arguments passed to the method can be inserted into placeholders in the query string. the placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -338,3 +339,24 @@ It will be sent to Easticsearch as value of the query element; if for example th
 }
 ----
 ====
+.`@Query` annotation on a method taking a Collection argument
+====
+A repository method such as
+[source,java]
+----
+@Query("{\"ids\": {\"values\": ?0 }}")
+List<SampleEntity> getByIds(Collection<String> ids);
+----
+would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents. So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
+[source,json]
+----
+{
+  "query": {
+    "ids": {
+      "values": ["id1", "id2", "id3"]
+    }
+  }
+}
+----
+====
+

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

@@ -10,4 +10,6 @@ include::elasticsearch-migration-guide-4.0-4.1.adoc[]
 include::elasticsearch-migration-guide-4.1-4.2.adoc[]
 
 include::elasticsearch-migration-guide-4.2-4.3.adoc[]
+
+include::elasticsearch-migration-guide-4.3-4.4.adoc[]
 :leveloffset: -1

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

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

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+/**
+ * Object describing an Elasticsearch error
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ElasticsearchErrorCause {
+	@Nullable private final String type;
+
+	private final String reason;
+
+	@Nullable private final String stackTrace;
+
+	@Nullable private final ElasticsearchErrorCause causedBy;
+
+	private final List<ElasticsearchErrorCause> rootCause;
+
+	private final List<ElasticsearchErrorCause> suppressed;
+
+	public ElasticsearchErrorCause(@Nullable String type, String reason, @Nullable String stackTrace,
+			@Nullable ElasticsearchErrorCause causedBy, List<ElasticsearchErrorCause> rootCause,
+			List<ElasticsearchErrorCause> suppressed) {
+		this.type = type;
+		this.reason = reason;
+		this.stackTrace = stackTrace;
+		this.causedBy = causedBy;
+		this.rootCause = rootCause;
+		this.suppressed = suppressed;
+	}
+
+	@Nullable
+	public String getType() {
+		return type;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	@Nullable
+	public String getStackTrace() {
+		return stackTrace;
+	}
+
+	@Nullable
+	public ElasticsearchErrorCause getCausedBy() {
+		return causedBy;
+	}
+
+	public List<ElasticsearchErrorCause> getRootCause() {
+		return rootCause;
+	}
+
+	public List<ElasticsearchErrorCause> getSuppressed() {
+		return suppressed;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,14 @@ public class NoSuchIndexException extends NonTransientDataAccessResourceExceptio
 
 	private final String index;
 
+	/**
+	 * @since 4.4
+	 */
+	public NoSuchIndexException(String index) {
+		super(String.format("Index %s not found.", index));
+		this.index = index;
+	}
+
 	public NoSuchIndexException(String index, Throwable cause) {
 		super(String.format("Index %s not found.", index), cause);
 		this.index = index;

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.springframework.data.elasticsearch;
 
 import org.springframework.dao.UncategorizedDataAccessException;
+import org.springframework.lang.Nullable;
 
 /**
  * @author Peter-Josef Meisch
@@ -23,11 +24,48 @@ import org.springframework.dao.UncategorizedDataAccessException;
  */
 public class UncategorizedElasticsearchException extends UncategorizedDataAccessException {
 
+	/**
+	 * the response status code from Elasticsearch if available
+	 *
+	 * @since 4.4
+	 */
+	@Nullable private final Integer statusCode;
+
+	/**
+	 * The response body from Elasticsearch if available
+	 *
+	 * @since 4.4
+	 */
+	@Nullable final String responseBody;
+
 	public UncategorizedElasticsearchException(String msg) {
-		super(msg, null);
+		this(msg, null);
 	}
 
-	public UncategorizedElasticsearchException(String msg, Throwable cause) {
+	public UncategorizedElasticsearchException(String msg, @Nullable Throwable cause) {
+		this(msg, null, null, cause);
+	}
+
+	public UncategorizedElasticsearchException(String msg, @Nullable Integer statusCode, @Nullable String responseBody,
+			@Nullable Throwable cause) {
 		super(msg, cause);
+		this.statusCode = statusCode;
+		this.responseBody = responseBody;
+	}
+
+	/**
+	 * @since 4.4
+	 */
+	@Nullable
+	public Integer getStatusCode() {
+		return statusCode;
+	}
+
+	/**
+	 * @since 4.4
+	 */
+	@Nullable
+	public String getResponseBody() {
+		return responseBody;
 	}
 }

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public @interface Document {
 	 * Name of the Elasticsearch index.
 	 * <ul>
 	 * <li>Lowercase only</li>
-	 * <li>Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #</li>
+	 * <li>Cannot include \, /, *, ?, ", &gt;, &lt;, |, ` ` (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
@@ -124,6 +124,22 @@ public @interface Document {
 	 * @since 4.3
 	 */
 	enum VersionType {
-		INTERNAL, EXTERNAL, EXTERNAL_GTE
+		INTERNAL("internal"), //
+		EXTERNAL("external"), //
+		EXTERNAL_GTE("external_gte"), //
+		/**
+		 * @since 4.4
+		 */
+		FORCE("force");
+
+		private final String esName;
+
+		VersionType(String esName) {
+			this.esName = esName;
+		}
+
+		public String getEsName() {
+			return esName;
+		}
 	}
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 /**
  * Annotation to set the dynamic mapping mode
  * {@see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic.html">elasticsearch doc</a>}
- * 
+ *
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @since 4.0

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,23 @@ package org.springframework.data.elasticsearch.annotations;
 
 /**
  * values for the {@link DynamicMapping annotation}
- * 
+ *
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @since 4.0
- * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead. 
+ * @deprecated since 4.3, use {@link Document#dynamic()} or {@link Field#dynamic()} instead.
  */
 @Deprecated
 public enum DynamicMappingValue {
-	True, False, Strict
+	True("true"), False("false"), Strict("strict");
+
+	private final String mappedName;
+
+	DynamicMappingValue(String mappedName) {
+		this.mappedName = mappedName;
+	}
+
+	public String getMappedName() {
+		return mappedName;
+	}
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public @interface InnerField {
 
 	/**
 	 * to be used in combination with {@link FieldType#Rank_Feature}
-	 * 
+	 *
 	 * @since 4.1
 	 */
 	boolean positiveScoreImpact() default true;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import java.lang.annotation.*;
  */
 
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Documented
 @QueryAnnotation
 public @interface Query {
@@ -53,4 +53,3 @@ public @interface Query {
 	 */
 	boolean count() default false;
 }
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,26 +17,24 @@ package org.springframework.data.elasticsearch.client;
 
 import java.util.function.Supplier;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
  * Logging Utility to log client requests and responses. Logs client requests and responses to Elasticsearch to a
- * dedicated logger: {@code org.springframework.data.elasticsearch.client.WIRE} on {@link org.slf4j.event.Level#TRACE}
- * level.
+ * dedicated logger: {@code org.springframework.data.elasticsearch.client.WIRE} on trace level.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Peter-Josef Meisch
  * @since 3.2
  */
 public abstract class ClientLogger {
 
-	private static final String lineSeparator = System.getProperty("line.separator");
-	private static final Logger WIRE_LOGGER = LoggerFactory
-			.getLogger("org.springframework.data.elasticsearch.client.WIRE");
+	private static final Log WIRE_LOGGER = LogFactory.getLog("org.springframework.data.elasticsearch.client.WIRE");
 
 	private ClientLogger() {}
 
@@ -52,7 +50,7 @@ public abstract class ClientLogger {
 	/**
 	 * Log an outgoing HTTP request.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param method HTTP method
 	 * @param endpoint URI
 	 * @param parameters optional parameters.
@@ -60,16 +58,33 @@ public abstract class ClientLogger {
 	public static void logRequest(String logId, String method, String endpoint, Object parameters) {
 
 		if (isEnabled()) {
+			WIRE_LOGGER.trace(String.format("[%s] Sending request %s %s with parameters: %s", logId, method.toUpperCase(),
+					endpoint, parameters));
+		}
+	}
 
-			WIRE_LOGGER.trace("[{}] Sending request {} {} with parameters: {}", logId, method.toUpperCase(), endpoint,
-					parameters);
+	/**
+	 * Log an outgoing HTTP request.
+	 *
+	 * @param logId the correlation id, see {@link #newLogId()}.
+	 * @param method HTTP method
+	 * @param endpoint URI
+	 * @param parameters optional parameters.
+	 * @param headers a String containing the headers
+	 * @since 4.4
+	 */
+	public static void logRequest(String logId, String method, String endpoint, Object parameters, String headers) {
+
+		if (isEnabled()) {
+			WIRE_LOGGER.trace(String.format("[%s] Sending request%n%s %s%nParameters: %s%nHeaders: %s", logId,
+					method.toUpperCase(), endpoint, parameters, headers));
 		}
 	}
 
 	/**
 	 * Log an outgoing HTTP request with a request body.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param method HTTP method
 	 * @param endpoint URI
 	 * @param parameters optional parameters.
@@ -79,43 +94,93 @@ public abstract class ClientLogger {
 			Supplier<Object> body) {
 
 		if (isEnabled()) {
+			WIRE_LOGGER.trace(String.format("[%s] Sending request %s %s with parameters: %s%nRequest body: %s", logId,
+					method.toUpperCase(), endpoint, parameters, body.get()));
+		}
+	}
 
-			WIRE_LOGGER.trace("[{}] Sending request {} {} with parameters: {}{}Request body: {}", logId, method.toUpperCase(),
-					endpoint, parameters, lineSeparator, body.get());
+	/**
+	 * Log an outgoing HTTP request with a request body.
+	 *
+	 * @param logId the correlation id, see {@link #newLogId()}.
+	 * @param method HTTP method
+	 * @param endpoint URI
+	 * @param parameters optional parameters.
+	 * @param headers a String containing the headers
+	 * @param body body content supplier.
+	 * @since 4.4
+	 */
+	public static void logRequest(String logId, String method, String endpoint, Object parameters, String headers,
+			Supplier<Object> body) {
+
+		if (isEnabled()) {
+			WIRE_LOGGER.trace(String.format("[%s] Sending request%n%s %s%nParameters: %s%nHeaders: %s%nRequest body: %s",
+					logId, method.toUpperCase(), endpoint, parameters, headers, body.get()));
 		}
 	}
 
 	/**
 	 * Log a raw HTTP response without logging the body.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param statusCode the HTTP status code.
 	 */
 	public static void logRawResponse(String logId, @Nullable HttpStatus statusCode) {
 
 		if (isEnabled()) {
-			WIRE_LOGGER.trace("[{}] Received raw response: {}", logId, statusCode);
+			WIRE_LOGGER.trace(String.format("[%s] Received raw response: %s", logId, statusCode));
+		}
+	}
+
+	/**
+	 * Log a raw HTTP response without logging the body.
+	 *
+	 * @param logId the correlation id, see {@link #newLogId()}.
+	 * @param statusCode the HTTP status code.
+	 * @param headers a String containing the headers
+	 */
+	public static void logRawResponse(String logId, @Nullable HttpStatus statusCode, String headers) {
+
+		if (isEnabled()) {
+			WIRE_LOGGER.trace(String.format("[%s] Received response: %s%n%s", logId, statusCode, headers));
 		}
 	}
 
 	/**
 	 * Log a raw HTTP response along with the body.
 	 *
-	 * @param logId the correlation Id, see {@link #newLogId()}.
+	 * @param logId the correlation id, see {@link #newLogId()}.
 	 * @param statusCode the HTTP status code.
 	 * @param body body content.
 	 */
 	public static void logResponse(String logId, HttpStatus statusCode, String body) {
 
 		if (isEnabled()) {
-			WIRE_LOGGER.trace("[{}] Received response: {}{}Response body: {}", logId, statusCode, lineSeparator, body);
+			WIRE_LOGGER.trace(String.format("[%s] Received response: %s%nResponse body: %s", logId, statusCode, body));
 		}
 	}
 
 	/**
-	 * Creates a new, unique correlation Id to improve tracing across log events.
+	 * Log a raw HTTP response along with the body.
 	 *
-	 * @return a new, unique correlation Id.
+	 * @param logId the correlation id, see {@link #newLogId()}.
+	 * @param statusCode the HTTP status code.
+	 * @param headers a String containing the headers
+	 * @param body body content.
+	 * @since 4.4
+	 */
+	public static void logResponse(String logId, @Nullable HttpStatus statusCode, String headers, String body) {
+
+		if (isEnabled()) {
+			WIRE_LOGGER.trace(String.format("[%s] Received response: %s%nHeaders: %s%nResponse body: %s", logId, statusCode,
+					headers, body));
+		}
+	}
+
+	/**
+	 * Creates a new, unique correlation id to improve tracing across log events.
+	 *
+	 * @return a new, unique correlation id.
 	 */
 	public static String newLogId() {
 

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -129,6 +129,7 @@ class DefaultClientConfiguration implements ClientConfiguration {
 		return webClientConfigurer;
 	}
 
+	@Deprecated
 	@Override
 	public HttpClientConfigCallback getHttpClientConfigurer() {
 		return httpClientConfigurer;

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@ package org.springframework.data.elasticsearch.client;
 import java.net.URL;
 import java.util.ArrayList;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.FactoryBeanNotInitializedException;
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
  */
 public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RestClientFactoryBean.class);
+	private static final Log LOGGER = LogFactory.getLog(RestClientFactoryBean.class);
 
 	private @Nullable RestHighLevelClient client;
 	private String hosts = "http://localhost:9200";

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

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

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

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

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client;
+
+/**
+ * Exception to be thrown by a backend implementation on operations that are not supported for that backend.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class UnsupportedBackendOperation extends RuntimeException {
+	public UnsupportedBackendOperation() {}
+
+	public UnsupportedBackendOperation(String message) {
+		super(message);
+	}
+
+	public UnsupportedBackendOperation(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public UnsupportedBackendOperation(Throwable cause) {
+		super(cause);
+	}
+
+	public UnsupportedBackendOperation(String message, Throwable cause, boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/Aggregation.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
+
+/**
+ * Class to combine an Elasticsearch {@link co.elastic.clients.elasticsearch._types.aggregations.Aggregate} with its
+ * name. Necessary as the Elasticsearch Aggregate does not know i"s name.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class Aggregation {
+
+	private final String name;
+	private final Aggregate aggregate;
+
+	public Aggregation(String name, Aggregate aggregate) {
+		this.name = name;
+		this.aggregate = aggregate;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public Aggregate getAggregate() {
+		return aggregate;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/AutoCloseableElasticsearchClient.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient;
+import co.elastic.clients.transport.ElasticsearchTransport;
+
+import org.elasticsearch.client.RestClient;
+import org.springframework.util.Assert;
+
+/**
+ * Extension of the {@link ElasticsearchClient} class that implements {@link AutoCloseable}. As the underlying
+ * {@link RestClient} must be closed properly this is handled in the {@link #close()} method.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class AutoCloseableElasticsearchClient extends ElasticsearchClient implements AutoCloseable {
+
+	public AutoCloseableElasticsearchClient(ElasticsearchTransport transport) {
+		super(transport);
+		Assert.notNull(transport, "transport must not be null");
+	}
+
+	@Override
+	public void close() throws Exception {
+		transport.close();
+	}
+
+	@Override
+	public ElasticsearchClusterClient cluster() {
+		return super.cluster();
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ChildTemplate.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.ApiClient;
+import co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient;
+import co.elastic.clients.json.JsonpMapper;
+
+import java.io.IOException;
+
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.util.Assert;
+
+/**
+ * base class for a template that uses one of the {@link co.elastic.clients.elasticsearch.ElasticsearchClient}'s child
+ * clients like {@link ElasticsearchClusterClient} or
+ * {@link co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesClient}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public abstract class ChildTemplate<CLIENT extends ApiClient> {
+
+	protected final CLIENT client;
+	protected final RequestConverter requestConverter;
+	protected final ResponseConverter responseConverter;
+	protected final ElasticsearchExceptionTranslator exceptionTranslator;
+
+	public ChildTemplate(CLIENT client, ElasticsearchConverter elasticsearchConverter) {
+		this.client = client;
+		JsonpMapper jsonpMapper = client._transport().jsonpMapper();
+		requestConverter = new RequestConverter(elasticsearchConverter, jsonpMapper);
+		responseConverter = new ResponseConverter(jsonpMapper);
+		exceptionTranslator = new ElasticsearchExceptionTranslator(jsonpMapper);
+	}
+
+	/**
+	 * Callback interface to be used with {@link #execute(ClientCallback)} for operating directly on the client.
+	 */
+	@FunctionalInterface
+	public interface ClientCallback<CLIENT, RESULT> {
+		RESULT doWithClient(CLIENT client) throws IOException;
+	}
+
+	/**
+	 * Execute a callback with the client and provide exception translation.
+	 *
+	 * @param callback the callback to execute, must not be {@literal null}
+	 * @param <RESULT> the type returned from the callback
+	 * @return the callback result
+	 */
+	public <RESULT> RESULT execute(ClientCallback<CLIENT, RESULT> callback) {
+
+		Assert.notNull(callback, "callback must not be null");
+
+		try {
+			return callback.doWithClient(client);
+		} catch (IOException | RuntimeException e) {
+			throw exceptionTranslator.translateException(e);
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ClusterTemplate.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient;
+import co.elastic.clients.elasticsearch.cluster.HealthRequest;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+
+import org.springframework.data.elasticsearch.core.cluster.ClusterHealth;
+import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+
+/**
+ * Implementation of the {@link ClusterOperations} interface using en {@link ElasticsearchClusterClient}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ClusterTemplate extends ChildTemplate<ElasticsearchClusterClient> implements ClusterOperations {
+
+	public ClusterTemplate(ElasticsearchClusterClient client, ElasticsearchConverter elasticsearchConverter) {
+		super(client, elasticsearchConverter);
+	}
+
+	@Override
+	public ClusterHealth health() {
+
+		HealthRequest healthRequest = requestConverter.clusterHealthRequest();
+		HealthResponse healthResponse = execute(client -> client.health(healthRequest));
+		return responseConverter.clusterHealth(healthResponse);
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaFilterProcessor.java

@@ -0,0 +1,343 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.GeoDistanceType;
+import co.elastic.clients.elasticsearch._types.GeoShapeRelation;
+import co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.GeoBoundingBoxQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.GeoDistanceQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.GeoShapeQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryVariant;
+import co.elastic.clients.json.JsonData;
+import co.elastic.clients.util.ObjectBuilder;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.data.elasticsearch.core.convert.GeoConverters;
+import org.springframework.data.elasticsearch.core.geo.GeoBox;
+import org.springframework.data.elasticsearch.core.geo.GeoJson;
+import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.data.geo.Box;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Metrics;
+import org.springframework.data.geo.Point;
+import org.springframework.util.Assert;
+
+/**
+ * Class to convert a {@link org.springframework.data.elasticsearch.core.query.CriteriaQuery} into an Elasticsearch
+ * filter.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+class CriteriaFilterProcessor {
+	/**
+	 * Creates a filter query from the given criteria.
+	 *
+	 * @param criteria the criteria to process
+	 * @return the optional query, empty if the criteria did not contain filter relevant elements
+	 */
+	public static Optional<Query> createQuery(Criteria criteria) {
+
+		Assert.notNull(criteria, "criteria must not be null");
+
+		List<Query> filterQueries = new ArrayList<>();
+
+		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {
+
+			if (chainedCriteria.isOr()) {
+				BoolQuery.Builder boolQueryBuilder = QueryBuilders.bool();
+				queriesForEntries(chainedCriteria).forEach(boolQueryBuilder::should);
+				filterQueries.add(new Query(boolQueryBuilder.build()));
+			} else if (chainedCriteria.isNegating()) {
+				Collection<? extends Query> negatingFilters = buildNegatingFilter(criteria.getField().getName(),
+						criteria.getFilterCriteriaEntries());
+				filterQueries.addAll(negatingFilters);
+			} else {
+				filterQueries.addAll(queriesForEntries(chainedCriteria));
+			}
+		}
+
+		if (filterQueries.isEmpty()) {
+			return Optional.empty();
+		} else {
+
+			if (filterQueries.size() == 1) {
+				return Optional.of(filterQueries.get(0));
+			} else {
+				BoolQuery.Builder boolQueryBuilder = QueryBuilders.bool();
+				filterQueries.forEach(boolQueryBuilder::must);
+				BoolQuery boolQuery = boolQueryBuilder.build();
+				return Optional.of(new Query(boolQuery));
+			}
+		}
+	}
+
+	private static Collection<? extends Query> buildNegatingFilter(String fieldName,
+			Set<Criteria.CriteriaEntry> filterCriteriaEntries) {
+
+		List<Query> negationFilters = new ArrayList<>();
+
+		filterCriteriaEntries.forEach(criteriaEntry -> {
+			Optional<Query> query = queryFor(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName);
+
+			if (query.isPresent()) {
+				BoolQuery negatingFilter = QueryBuilders.bool().mustNot(query.get()).build();
+				negationFilters.add(new Query(negatingFilter));
+			}
+		});
+
+		return negationFilters;
+	}
+
+	private static Collection<? extends Query> queriesForEntries(Criteria criteria) {
+
+		Assert.notNull(criteria.getField(), "criteria must have a field");
+		String fieldName = criteria.getField().getName();
+		Assert.notNull(fieldName, "Unknown field");
+
+		return criteria.getFilterCriteriaEntries().stream()
+				.map(entry -> queryFor(entry.getKey(), entry.getValue(), fieldName)) //
+				.filter(Optional::isPresent) //
+				.map(Optional::get) //
+				.collect(Collectors.toList());
+	}
+
+	private static Optional<Query> queryFor(Criteria.OperationKey key, Object value, String fieldName) {
+
+		ObjectBuilder<? extends QueryVariant> queryBuilder = null;
+
+		switch (key) {
+			case WITHIN:
+				Assert.isTrue(value instanceof Object[], "Value of a geo distance filter should be an array of two values.");
+				queryBuilder = withinQuery(fieldName, (Object[]) value);
+				break;
+			case BBOX:
+				Assert.isTrue(value instanceof Object[],
+						"Value of a boundedBy filter should be an array of one or two values.");
+				queryBuilder = boundingBoxQuery(fieldName, (Object[]) value);
+				break;
+			case GEO_INTERSECTS:
+				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_INTERSECTS filter must be a GeoJson object");
+				queryBuilder = geoJsonQuery(fieldName, (GeoJson<?>) value, "intersects");
+				break;
+			case GEO_IS_DISJOINT:
+				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_IS_DISJOINT filter must be a GeoJson object");
+				queryBuilder = geoJsonQuery(fieldName, (GeoJson<?>) value, "disjoint");
+				break;
+			case GEO_WITHIN:
+				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_WITHIN filter must be a GeoJson object");
+				queryBuilder = geoJsonQuery(fieldName, (GeoJson<?>) value, "within");
+				break;
+			case GEO_CONTAINS:
+				Assert.isTrue(value instanceof GeoJson<?>, "value of a GEO_CONTAINS filter must be a GeoJson object");
+				queryBuilder = geoJsonQuery(fieldName, (GeoJson<?>) value, "contains");
+				break;
+		}
+
+		return Optional.ofNullable(queryBuilder != null ? queryBuilder.build()._toQuery() : null);
+	}
+
+	private static ObjectBuilder<GeoDistanceQuery> withinQuery(String fieldName, Object[] values) {
+
+		Assert.noNullElements(values, "Geo distance filter takes 2 not null elements array as parameter.");
+		Assert.isTrue(values.length == 2, "Geo distance filter takes a 2-elements array as parameter.");
+		Assert.isTrue(values[0] instanceof GeoPoint || values[0] instanceof String || values[0] instanceof Point,
+				"First element of a geo distance filter must be a GeoPoint, a Point or a text");
+		Assert.isTrue(values[1] instanceof String || values[1] instanceof Distance,
+				"Second element of a geo distance filter must be a text or a Distance");
+
+		String dist = (values[1] instanceof Distance) ? extractDistanceString((Distance) values[1]) : (String) values[1];
+
+		return QueryBuilders.geoDistance() //
+				.field(fieldName) //
+				.distance(dist) //
+				.distanceType(GeoDistanceType.Plane) //
+				.location(location -> {
+					if (values[0] instanceof GeoPoint) {
+						GeoPoint loc = (GeoPoint) values[0];
+						location.latlon(latlon -> latlon.lat(loc.getLat()).lon(loc.getLon()));
+					} else if (values[0] instanceof Point) {
+						GeoPoint loc = GeoPoint.fromPoint((Point) values[0]);
+						location.latlon(latlon -> latlon.lat(loc.getLat()).lon(loc.getLon()));
+					} else {
+						String loc = (String) values[0];
+						if (loc.contains(",")) {
+							String[] c = loc.split(",");
+							location.latlon(latlon -> latlon.lat(Double.parseDouble(c[0])).lon(Double.parseDouble(c[1])));
+						} else {
+							location.geohash(geohash -> geohash.geohash(loc));
+						}
+					}
+					return location;
+				});
+	}
+
+	private static ObjectBuilder<GeoBoundingBoxQuery> boundingBoxQuery(String fieldName, Object[] values) {
+
+		Assert.noNullElements(values, "Geo boundedBy filter takes a not null element array as parameter.");
+
+		GeoBoundingBoxQuery.Builder queryBuilder = QueryBuilders.geoBoundingBox() //
+				.field(fieldName);
+
+		if (values.length == 1) {
+			// GeoEnvelop
+			oneParameterBBox(queryBuilder, values[0]);
+		} else if (values.length == 2) {
+			// 2x GeoPoint
+			// 2x text
+			twoParameterBBox(queryBuilder, values);
+		} else {
+			throw new IllegalArgumentException(
+					"Geo distance filter takes a 1-elements array(GeoBox) or 2-elements array(GeoPoints or Strings(format lat,lon or geohash)).");
+		}
+		return queryBuilder;
+	}
+
+	private static void oneParameterBBox(GeoBoundingBoxQuery.Builder queryBuilder, Object value) {
+		Assert.isTrue(value instanceof GeoBox || value instanceof Box,
+				"single-element of boundedBy filter must be type of GeoBox or Box");
+
+		GeoBox geoBBox;
+		if (value instanceof Box) {
+			geoBBox = GeoBox.fromBox((Box) value);
+		} else {
+			geoBBox = (GeoBox) value;
+		}
+
+		queryBuilder.boundingBox(bb -> bb //
+				.tlbr(tlbr -> tlbr //
+						.topLeft(glb -> glb //
+								.latlon(latlon -> latlon //
+										.lat(geoBBox.getTopLeft().getLat()) //
+										.lon(geoBBox.getTopLeft().getLon()))) //
+						.bottomRight(glb -> glb //
+								.latlon(latlon -> latlon //
+										.lat(geoBBox.getBottomRight().getLat())//
+										.lon(geoBBox.getBottomRight().getLon()// )
+										)))));
+	}
+
+	private static void twoParameterBBox(GeoBoundingBoxQuery.Builder queryBuilder, Object[] values) {
+
+		Assert.isTrue(allElementsAreOfType(values, GeoPoint.class) || allElementsAreOfType(values, String.class),
+				" both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
+
+		if (values[0] instanceof GeoPoint) {
+			GeoPoint topLeft = (GeoPoint) values[0];
+			GeoPoint bottomRight = (GeoPoint) values[1];
+			queryBuilder.boundingBox(bb -> bb //
+					.tlbr(tlbr -> tlbr //
+							.topLeft(glb -> glb //
+									.latlon(latlon -> latlon //
+											.lat(topLeft.getLat()) //
+											.lon(topLeft.getLon()))) //
+							.bottomRight(glb -> glb //
+									.latlon(latlon -> latlon //
+											.lat(bottomRight.getLat()) //
+											.lon(bottomRight.getLon()))) //
+					) //
+			);
+		} else {
+			String topLeft = (String) values[0];
+			String bottomRight = (String) values[1];
+			boolean isGeoHash = !topLeft.contains(",");
+			queryBuilder.boundingBox(bb -> bb //
+					.tlbr(tlbr -> tlbr //
+							.topLeft(glb -> {
+								if (isGeoHash) {
+									glb.geohash(gh -> gh.geohash(topLeft));
+								} else {
+									glb.text(topLeft);
+								}
+								return glb;
+							}) //
+							.bottomRight(glb -> {
+								if (isGeoHash) {
+									glb.geohash(gh -> gh.geohash(bottomRight));
+								} else {
+									glb.text(bottomRight);
+								}
+								return glb;
+							}) //
+					));
+		}
+	}
+
+	private static boolean allElementsAreOfType(Object[] array, Class<?> clazz) {
+		for (Object o : array) {
+			if (!clazz.isInstance(o)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static ObjectBuilder<? extends QueryVariant> geoJsonQuery(String fieldName, GeoJson<?> geoJson,
+			String relation) {
+		return buildGeoShapeQuery(fieldName, geoJson, relation);
+	}
+
+	private static ObjectBuilder<GeoShapeQuery> buildGeoShapeQuery(String fieldName, GeoJson<?> geoJson,
+			String relation) {
+		return QueryBuilders.geoShape().field(fieldName) //
+				.shape(gsf -> gsf //
+						.shape(JsonData.of(GeoConverters.GeoJsonToMapConverter.INSTANCE.convert(geoJson))) //
+						.relation(toRelation(relation))); //
+	}
+
+	private static GeoShapeRelation toRelation(String relation) {
+
+		for (GeoShapeRelation geoShapeRelation : GeoShapeRelation.values()) {
+
+			if (geoShapeRelation.name().equalsIgnoreCase(relation)) {
+				return geoShapeRelation;
+			}
+		}
+		throw new IllegalArgumentException("Unknown geo_shape relation: " + relation);
+	}
+
+	/**
+	 * extract the distance string from a {@link org.springframework.data.geo.Distance} object.
+	 *
+	 * @param distance distance object to extract string from
+	 */
+	private static String extractDistanceString(Distance distance) {
+
+		StringBuilder sb = new StringBuilder();
+		sb.append((int) distance.getValue());
+		switch ((Metrics) distance.getMetric()) {
+			case KILOMETERS:
+				sb.append("km");
+				break;
+			case MILES:
+				sb.append("mi");
+				break;
+		}
+
+		return sb.toString();
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import org.springframework.dao.UncategorizedDataAccessException;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class CriteriaQueryException extends UncategorizedDataAccessException {
+	public CriteriaQueryException(String msg) {
+		super(msg, null);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryProcessor.java

@@ -0,0 +1,368 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.data.elasticsearch.client.elc.QueryBuilders.*;
+import static org.springframework.util.StringUtils.*;
+
+import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.query_dsl.ChildScoreMode;
+import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.json.JsonData;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.lucene.queryparser.flexible.standard.QueryParserUtil;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.data.elasticsearch.core.query.Field;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Class to convert a {@link org.springframework.data.elasticsearch.core.query.CriteriaQuery} into an Elasticsearch
+ * query.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+class CriteriaQueryProcessor {
+
+	/**
+	 * creates a query from the criteria
+	 *
+	 * @param criteria the {@link Criteria}
+	 * @return the optional query, null if the criteria did not contain filter relevant elements
+	 */
+	@Nullable
+	public static Query createQuery(Criteria criteria) {
+
+		Assert.notNull(criteria, "criteria must not be null");
+
+		List<Query> shouldQueries = new ArrayList<>();
+		List<Query> mustNotQueries = new ArrayList<>();
+		List<Query> mustQueries = new ArrayList<>();
+
+		Query firstQuery = null;
+		boolean negateFirstQuery = false;
+
+		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {
+			Query queryFragment = queryForEntries(chainedCriteria);
+
+			if (queryFragment != null) {
+
+				if (firstQuery == null) {
+					firstQuery = queryFragment;
+					negateFirstQuery = chainedCriteria.isNegating();
+					continue;
+				}
+
+				if (chainedCriteria.isOr()) {
+					shouldQueries.add(queryFragment);
+				} else if (chainedCriteria.isNegating()) {
+					mustNotQueries.add(queryFragment);
+				} else {
+					mustQueries.add(queryFragment);
+				}
+			}
+		}
+
+		for (Criteria subCriteria : criteria.getSubCriteria()) {
+			Query subQuery = createQuery(subCriteria);
+			if (subQuery != null) {
+				if (criteria.isOr()) {
+					shouldQueries.add(subQuery);
+				} else if (criteria.isNegating()) {
+					mustNotQueries.add(subQuery);
+				} else {
+					mustQueries.add(subQuery);
+				}
+			}
+		}
+
+		if (firstQuery != null) {
+
+			if (!shouldQueries.isEmpty() && mustNotQueries.isEmpty() && mustQueries.isEmpty()) {
+				shouldQueries.add(0, firstQuery);
+			} else {
+
+				if (negateFirstQuery) {
+					mustNotQueries.add(0, firstQuery);
+				} else {
+					mustQueries.add(0, firstQuery);
+				}
+			}
+		}
+
+		if (shouldQueries.isEmpty() && mustNotQueries.isEmpty() && mustQueries.isEmpty()) {
+			return null;
+		}
+
+		Query query = new Query.Builder().bool(boolQueryBuilder -> {
+
+			if (!shouldQueries.isEmpty()) {
+				boolQueryBuilder.should(shouldQueries);
+			}
+
+			if (!mustNotQueries.isEmpty()) {
+				boolQueryBuilder.mustNot(mustNotQueries);
+			}
+
+			if (!mustQueries.isEmpty()) {
+				boolQueryBuilder.must(mustQueries);
+			}
+
+			return boolQueryBuilder;
+		}).build();
+
+		return query;
+	}
+
+	@Nullable
+	private static Query queryForEntries(Criteria criteria) {
+
+		Field field = criteria.getField();
+
+		if (field == null || criteria.getQueryCriteriaEntries().isEmpty())
+			return null;
+
+		String fieldName = field.getName();
+		Assert.notNull(fieldName, "Unknown field " + fieldName);
+
+		Iterator<Criteria.CriteriaEntry> it = criteria.getQueryCriteriaEntries().iterator();
+
+		Float boost = Float.isNaN(criteria.getBoost()) ? null : criteria.getBoost();
+		Query.Builder queryBuilder;
+
+		if (criteria.getQueryCriteriaEntries().size() == 1) {
+			queryBuilder = queryFor(it.next(), field, boost);
+		} else {
+			queryBuilder = new Query.Builder();
+			queryBuilder.bool(boolQueryBuilder -> {
+				while (it.hasNext()) {
+					Criteria.CriteriaEntry entry = it.next();
+					boolQueryBuilder.must(queryFor(entry, field, null).build());
+				}
+				boolQueryBuilder.boost(boost);
+				return boolQueryBuilder;
+			});
+
+		}
+
+		if (hasText(field.getPath())) {
+			final Query query = queryBuilder.build();
+			queryBuilder = new Query.Builder();
+			queryBuilder.nested(nqb -> nqb //
+					.path(field.getPath()) //
+					.query(query) //
+					.scoreMode(ChildScoreMode.Avg));
+		}
+
+		return queryBuilder.build();
+	}
+
+	private static Query.Builder queryFor(Criteria.CriteriaEntry entry, Field field, @Nullable Float boost) {
+
+		String fieldName = field.getName();
+		boolean isKeywordField = FieldType.Keyword == field.getFieldType();
+
+		Criteria.OperationKey key = entry.getKey();
+		Object value = key.hasValue() ? entry.getValue() : null;
+		String searchText = value != null ? QueryParserUtil.escape(value.toString()) : "UNKNOWN_VALUE";
+
+		Query.Builder queryBuilder = new Query.Builder();
+		switch (key) {
+			case EXISTS:
+				queryBuilder //
+						.exists(eb -> eb //
+								.field(fieldName) //
+								.boost(boost));
+				break;
+			case EMPTY:
+				queryBuilder //
+						.bool(bb -> bb //
+								.must(mb -> mb //
+										.exists(eb -> eb //
+												.field(fieldName) //
+										)) //
+								.mustNot(mnb -> mnb //
+										.wildcard(wb -> wb //
+												.field(fieldName) //
+												.wildcard("*"))) //
+								.boost(boost));
+				break;
+			case NOT_EMPTY:
+				queryBuilder //
+						.wildcard(wb -> wb //
+								.field(fieldName) //
+								.wildcard("*") //
+								.boost(boost));
+				break;
+			case EQUALS:
+				queryBuilder.queryString(queryStringQuery(fieldName, searchText, Operator.And, boost));
+				break;
+			case CONTAINS:
+				queryBuilder.queryString(queryStringQuery(fieldName, '*' + searchText + '*', true, boost));
+				break;
+			case STARTS_WITH:
+				queryBuilder.queryString(queryStringQuery(fieldName, searchText + '*', true, boost));
+				break;
+			case ENDS_WITH:
+				queryBuilder.queryString(queryStringQuery(fieldName, '*' + searchText, true, boost));
+				break;
+			case EXPRESSION:
+				queryBuilder.queryString(queryStringQuery(fieldName, value.toString(), boost));
+				break;
+			case LESS:
+				queryBuilder //
+						.range(rb -> rb //
+								.field(fieldName) //
+								.lt(JsonData.of(value)) //
+								.boost(boost)); //
+				break;
+			case LESS_EQUAL:
+				queryBuilder //
+						.range(rb -> rb //
+								.field(fieldName) //
+								.lte(JsonData.of(value)) //
+								.boost(boost)); //
+				break;
+			case GREATER:
+				queryBuilder //
+						.range(rb -> rb //
+								.field(fieldName) //
+								.gt(JsonData.of(value)) //
+								.boost(boost)); //
+				break;
+			case GREATER_EQUAL:
+				queryBuilder //
+						.range(rb -> rb //
+								.field(fieldName) //
+								.gte(JsonData.of(value)) //
+								.boost(boost)); //
+				break;
+			case BETWEEN:
+				Object[] ranges = (Object[]) value;
+				queryBuilder //
+						.range(rb -> {
+							rb.field(fieldName);
+							if (ranges[0] != null) {
+								rb.gte(JsonData.of(ranges[0]));
+							}
+
+							if (ranges[1] != null) {
+								rb.lte(JsonData.of(ranges[1]));
+							}
+							rb.boost(boost); //
+							return rb;
+						}); //
+
+				break;
+			case FUZZY:
+				queryBuilder //
+						.fuzzy(fb -> fb //
+								.field(fieldName) //
+								.value(FieldValue.of(searchText)) //
+								.boost(boost)); //
+				break;
+			case MATCHES:
+				queryBuilder.match(matchQuery(fieldName, value.toString(), Operator.Or, boost));
+				break;
+			case MATCHES_ALL:
+				queryBuilder.match(matchQuery(fieldName, value.toString(), Operator.And, boost));
+
+				break;
+			case IN:
+				if (value instanceof Iterable) {
+					Iterable<?> iterable = (Iterable<?>) value;
+					if (isKeywordField) {
+						queryBuilder.bool(bb -> bb //
+								.must(mb -> mb //
+										.terms(tb -> tb //
+												.field(fieldName) //
+												.terms(tsb -> tsb //
+														.value(toFieldValueList(iterable))))) //
+								.boost(boost)); //
+					} else {
+						queryBuilder //
+								.queryString(qsb -> qsb //
+										.fields(fieldName) //
+										.query(orQueryString(iterable)) //
+										.boost(boost)); //
+					}
+				} else {
+					throw new CriteriaQueryException("value for " + fieldName + " is not an Iterable");
+				}
+				break;
+			case NOT_IN:
+				if (value instanceof Iterable) {
+					Iterable<?> iterable = (Iterable<?>) value;
+					if (isKeywordField) {
+						queryBuilder.bool(bb -> bb //
+								.mustNot(mnb -> mnb //
+										.terms(tb -> tb //
+												.field(fieldName) //
+												.terms(tsb -> tsb //
+														.value(toFieldValueList(iterable))))) //
+								.boost(boost)); //
+					} else {
+						queryBuilder //
+								.queryString(qsb -> qsb //
+										.fields(fieldName) //
+										.query("NOT(" + orQueryString(iterable) + ')') //
+										.boost(boost)); //
+					}
+				} else {
+					throw new CriteriaQueryException("value for " + fieldName + " is not an Iterable");
+				}
+				break;
+			default:
+				throw new CriteriaQueryException("Could not build query for " + entry);
+		}
+
+		return queryBuilder;
+	}
+
+	private static List<FieldValue> toFieldValueList(Iterable<?> iterable) {
+		List<FieldValue> list = new ArrayList<>();
+		for (Object item : iterable) {
+			list.add(item != null ? FieldValue.of(item.toString()) : null);
+		}
+		return list;
+	}
+
+	private static String orQueryString(Iterable<?> iterable) {
+		StringBuilder sb = new StringBuilder();
+
+		for (Object item : iterable) {
+
+			if (item != null) {
+
+				if (sb.length() > 0) {
+					sb.append(' ');
+				}
+				sb.append('"');
+				sb.append(QueryParserUtil.escape(item.toString()));
+				sb.append('"');
+			}
+		}
+
+		return sb.toString();
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/DocumentAdapters.java

@@ -0,0 +1,224 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch.core.GetResponse;
+import co.elastic.clients.elasticsearch.core.MgetResponse;
+import co.elastic.clients.elasticsearch.core.explain.ExplanationDetail;
+import co.elastic.clients.elasticsearch.core.get.GetResult;
+import co.elastic.clients.elasticsearch.core.search.Hit;
+import co.elastic.clients.elasticsearch.core.search.NestedIdentity;
+import co.elastic.clients.json.JsonData;
+import co.elastic.clients.json.JsonpMapper;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.document.Explanation;
+import org.springframework.data.elasticsearch.core.document.NestedMetaData;
+import org.springframework.data.elasticsearch.core.document.SearchDocument;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentAdapter;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Utility class to adapt different Elasticsearch responses to a
+ * {@link org.springframework.data.elasticsearch.core.document.Document}
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+final class DocumentAdapters {
+
+	private static final Log LOGGER = LogFactory.getLog(DocumentAdapters.class);
+
+	private DocumentAdapters() {}
+
+	/**
+	 * Creates a {@link SearchDocument} from a {@link Hit} returned by the Elasticsearch client.
+	 *
+	 * @param hit the hit object
+	 * @param jsonpMapper to map JsonData objects
+	 * @return the created {@link SearchDocument}
+	 */
+	public static SearchDocument from(Hit<?> hit, JsonpMapper jsonpMapper) {
+
+		Assert.notNull(hit, "hit must not be null");
+
+		Map<String, List<String>> highlightFields = hit.highlight();
+
+		Map<String, SearchDocumentResponse> innerHits = new LinkedHashMap<>();
+		hit.innerHits().forEach((name, innerHitsResult) -> {
+			// noinspection ReturnOfNull
+			innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null,
+					searchDocument -> null, jsonpMapper));
+		});
+
+		NestedMetaData nestedMetaData = from(hit.nested());
+
+		Explanation explanation = from(hit.explanation());
+
+		List<String> matchedQueries = hit.matchedQueries();
+
+		Function<Map<String, JsonData>, EntityAsMap> fromFields = fields -> {
+			StringBuilder sb = new StringBuilder("{");
+			final boolean[] firstField = { true };
+			hit.fields().forEach((key, jsonData) -> {
+				if (!firstField[0]) {
+					sb.append(',');
+				}
+				sb.append('"').append(key).append("\":") //
+						.append(jsonData.toJson(jsonpMapper).toString());
+				firstField[0] = false;
+			});
+			sb.append('}');
+			return new EntityAsMap().fromJson(sb.toString());
+		};
+
+		EntityAsMap hitFieldsAsMap = fromFields.apply(hit.fields());
+
+		Map<String, List<Object>> documentFields = new LinkedHashMap<>();
+		hitFieldsAsMap.entrySet().forEach(entry -> {
+			if (entry.getValue() instanceof List) {
+				// noinspection unchecked
+				documentFields.put(entry.getKey(), (List<Object>) entry.getValue());
+			} else {
+				documentFields.put(entry.getKey(), Collections.singletonList(entry.getValue()));
+			}
+		});
+
+		Document document;
+		Object source = hit.source();
+		if (source == null) {
+			document = Document.from(hitFieldsAsMap);
+		} else {
+			if (source instanceof EntityAsMap) {
+				document = Document.from((EntityAsMap) source);
+			} else if (source instanceof JsonData) {
+				JsonData jsonData = (JsonData) source;
+				document = Document.from(jsonData.to(EntityAsMap.class));
+			} else {
+
+				if (LOGGER.isWarnEnabled()) {
+					LOGGER.warn(String.format("Cannot map from type " + source.getClass().getName()));
+				}
+				document = Document.create();
+			}
+		}
+		document.setIndex(hit.index());
+		document.setId(hit.id());
+
+		if (hit.version() != null) {
+			document.setVersion(hit.version());
+		}
+		document.setSeqNo(hit.seqNo() != null && hit.seqNo() >= 0 ? hit.seqNo() : -2); // -2 was the default value in the
+		// old client
+		document.setPrimaryTerm(hit.primaryTerm() != null && hit.primaryTerm() > 0 ? hit.primaryTerm() : 0);
+
+		float score = hit.score() != null ? hit.score().floatValue() : Float.NaN;
+		return new SearchDocumentAdapter(document, score, hit.sort().toArray(new String[0]), documentFields,
+				highlightFields, innerHits, nestedMetaData, explanation, matchedQueries, hit.routing());
+	}
+
+	@Nullable
+	private static Explanation from(@Nullable co.elastic.clients.elasticsearch.core.explain.Explanation explanation) {
+
+		if (explanation == null) {
+			return null;
+		}
+		List<Explanation> details = explanation.details().stream().map(DocumentAdapters::from).collect(Collectors.toList());
+		return new Explanation(true, (double) explanation.value(), explanation.description(), details);
+	}
+
+	private static Explanation from(ExplanationDetail explanationDetail) {
+
+		List<Explanation> details = explanationDetail.details().stream().map(DocumentAdapters::from)
+				.collect(Collectors.toList());
+		return new Explanation(null, (double) explanationDetail.value(), explanationDetail.description(), details);
+	}
+
+	@Nullable
+	private static NestedMetaData from(@Nullable NestedIdentity nestedIdentity) {
+
+		if (nestedIdentity == null) {
+			return null;
+		}
+
+		NestedMetaData child = from(nestedIdentity.nested());
+		return NestedMetaData.of(nestedIdentity.field(), nestedIdentity.offset(), child);
+	}
+
+	/**
+	 * Creates a {@link Document} from a {@link GetResponse} where the found document is contained as {@link EntityAsMap}.
+	 *
+	 * @param getResponse the response instance
+	 * @return the Document
+	 */
+	@Nullable
+	public static Document from(GetResult<EntityAsMap> getResponse) {
+
+		Assert.notNull(getResponse, "getResponse must not be null");
+
+		if (!getResponse.found()) {
+			return null;
+		}
+
+		Document document = getResponse.source() != null ? Document.from(getResponse.source()) : Document.create();
+		document.setIndex(getResponse.index());
+		document.setId(getResponse.id());
+
+		if (getResponse.version() != null) {
+			document.setVersion(getResponse.version());
+		}
+
+		if (getResponse.seqNo() != null) {
+			document.setSeqNo(getResponse.seqNo());
+		}
+
+		if (getResponse.primaryTerm() != null) {
+			document.setPrimaryTerm(getResponse.primaryTerm());
+		}
+
+		return document;
+	}
+
+	/**
+	 * Creates a list of {@link MultiGetItem}s from a {@link MgetResponse} where the data is contained as
+	 * {@link EntityAsMap} instances.
+	 *
+	 * @param mgetResponse the response instance
+	 * @return list of multiget items
+	 */
+	public static List<MultiGetItem<Document>> from(MgetResponse<EntityAsMap> mgetResponse) {
+
+		Assert.notNull(mgetResponse, "mgetResponse must not be null");
+
+		return mgetResponse.docs().stream() //
+				.map(itemResponse -> MultiGetItem.of( //
+						itemResponse.isFailure() ? null : from(itemResponse.result()), //
+						ResponseConverter.getFailure(itemResponse)))
+				.collect(Collectors.toList());
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchAggregation.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import org.springframework.data.elasticsearch.core.AggregationContainer;
+
+/**
+ * {@link AggregationContainer} for a {@link Aggregation} that holds Elasticsearch data.
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ElasticsearchAggregation implements AggregationContainer<Aggregation> {
+
+	private final Aggregation aggregation;
+
+	public ElasticsearchAggregation(Aggregation aggregation) {
+		this.aggregation = aggregation;
+	}
+
+	@Override
+	public Aggregation aggregation() {
+		return aggregation;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchAggregations.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.elasticsearch.core.AggregationsContainer;
+import org.springframework.util.Assert;
+
+/**
+ * AggregationsContainer implementation for the Elasticsearch aggregations.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ElasticsearchAggregations implements AggregationsContainer<List<ElasticsearchAggregation>> {
+
+	private final List<ElasticsearchAggregation> aggregations;
+
+	public ElasticsearchAggregations(List<ElasticsearchAggregation> aggregations) {
+
+		Assert.notNull(aggregations, "aggregations must not be null");
+
+		this.aggregations = aggregations;
+	}
+
+	/**
+	 * convenience constructor taking a map as it is returned from the new Elasticsearch client.
+	 *
+	 * @param aggregationsMap aggregate map
+	 */
+	public ElasticsearchAggregations(Map<String, Aggregate> aggregationsMap) {
+
+		Assert.notNull(aggregationsMap, "aggregationsMap must not be null");
+
+		aggregations = new ArrayList<>(aggregationsMap.size());
+		aggregationsMap
+				.forEach((name, aggregate) -> aggregations.add(new ElasticsearchAggregation(new Aggregation(name, aggregate))));
+	}
+
+	@Override
+	public List<ElasticsearchAggregation> aggregations() {
+		return aggregations;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchClients.java

@@ -0,0 +1,381 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.rest_client.RestClientOptions;
+import co.elastic.clients.transport.rest_client.RestClientTransport;
+
+import java.io.ByteArrayOutputStream;
+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.stream.Collectors;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.client.config.RequestConfig;
+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.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.client.ClientLogger;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * Utility class to create the different Elasticsearch clients
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public final class ElasticsearchClients {
+	/**
+	 * Name of whose value can be used to correlate log messages for this request.
+	 */
+	private static final String LOG_ID_ATTRIBUTE = ElasticsearchClients.class.getName() + ".LOG_ID";
+	private static final String X_SPRING_DATA_ELASTICSEARCH_CLIENT = "X-SpringDataElasticsearch-Client";
+	private static final String IMPERATIVE_CLIENT = "imperative";
+	private static final String REACTIVE_CLIENT = "reactive";
+
+	/**
+	 * Creates a new {@link ReactiveElasticsearchClient}
+	 *
+	 * @param clientConfiguration configuration options, must not be {@literal null}.
+	 * @return the {@link ReactiveElasticsearchClient}
+	 */
+	public static ReactiveElasticsearchClient createReactive(ClientConfiguration clientConfiguration) {
+
+		Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
+
+		return createReactive(getRestClient(clientConfiguration), null);
+	}
+
+	/**
+	 * Creates a new {@link ReactiveElasticsearchClient}
+	 *
+	 * @param clientConfiguration configuration options, must not be {@literal null}.
+	 * @param transportOptions options to be added to each request.
+	 * @return the {@link ReactiveElasticsearchClient}
+	 */
+	public static ReactiveElasticsearchClient createReactive(ClientConfiguration clientConfiguration,
+			@Nullable TransportOptions transportOptions) {
+
+		Assert.notNull(clientConfiguration, "ClientConfiguration must not be null!");
+
+		return createReactive(getRestClient(clientConfiguration), transportOptions);
+	}
+
+	/**
+	 * Creates a new {@link ReactiveElasticsearchClient}.
+	 *
+	 * @param restClient the underlying {@link RestClient}
+	 * @return the {@link ReactiveElasticsearchClient}
+	 */
+	public static ReactiveElasticsearchClient createReactive(RestClient restClient) {
+		return createReactive(restClient, null);
+	}
+
+	/**
+	 * Creates a new {@link ReactiveElasticsearchClient}.
+	 *
+	 * @param restClient the underlying {@link RestClient}
+	 * @param transportOptions options to be added to each request.
+	 * @return the {@link ReactiveElasticsearchClient}
+	 */
+	public static ReactiveElasticsearchClient createReactive(RestClient restClient,
+			@Nullable TransportOptions transportOptions) {
+		return new ReactiveElasticsearchClient(getElasticsearchTransport(restClient, REACTIVE_CLIENT, transportOptions));
+	}
+
+	/**
+	 * Creates a new imperative {@link ElasticsearchClient}
+	 *
+	 * @param clientConfiguration configuration options, must not be {@literal null}.
+	 * @return the {@link ElasticsearchClient}
+	 */
+	public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration) {
+		return createImperative(getRestClient(clientConfiguration), null);
+	}
+
+	/**
+	 * Creates a new imperative {@link ElasticsearchClient}
+	 *
+	 * @param clientConfiguration configuration options, must not be {@literal null}.
+	 * @param transportOptions options to be added to each request.
+	 * @return the {@link ElasticsearchClient}
+	 */
+	public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration,
+			TransportOptions transportOptions) {
+		return createImperative(getRestClient(clientConfiguration), transportOptions);
+	}
+
+	/**
+	 * Creates a new imperative {@link ElasticsearchClient}
+	 *
+	 * @param restClient the RestClient to use
+	 * @return the {@link ElasticsearchClient}
+	 */
+	public static ElasticsearchClient createImperative(RestClient restClient) {
+		return createImperative(restClient, null);
+	}
+
+	/**
+	 * Creates a new imperative {@link ElasticsearchClient}
+	 *
+	 * @param restClient the RestClient to use
+	 * @param transportOptions options to be added to each request.
+	 * @return the {@link ElasticsearchClient}
+	 */
+	public static ElasticsearchClient createImperative(RestClient restClient,
+			@Nullable TransportOptions transportOptions) {
+
+		Assert.notNull(restClient, "restClient must not be null");
+
+		ElasticsearchTransport transport = getElasticsearchTransport(restClient, IMPERATIVE_CLIENT, transportOptions);
+
+		return new AutoCloseableElasticsearchClient(transport);
+	}
+
+	/**
+	 * Creates a low level {@link RestClient} for the given configuration.
+	 *
+	 * @param clientConfiguration must not be {@literal null}
+	 * @return the {@link RestClient}
+	 */
+	public static RestClient getRestClient(ClientConfiguration clientConfiguration) {
+		return getRestClientBuilder(clientConfiguration).build();
+	}
+
+	private static RestClientBuilder getRestClientBuilder(ClientConfiguration clientConfiguration) {
+		HttpHost[] httpHosts = formattedHosts(clientConfiguration.getEndpoints(), clientConfiguration.useSsl()).stream()
+				.map(HttpHost::create).toArray(HttpHost[]::new);
+		RestClientBuilder builder = RestClient.builder(httpHosts);
+
+		if (clientConfiguration.getPathPrefix() != null) {
+			builder.setPathPrefix(clientConfiguration.getPathPrefix());
+		}
+
+		HttpHeaders headers = clientConfiguration.getDefaultHeaders();
+
+		if (!headers.isEmpty()) {
+			builder.setDefaultHeaders(toHeaderArray(headers));
+		}
+
+		builder.setHttpClientConfigCallback(clientBuilder -> {
+			clientConfiguration.getSslContext().ifPresent(clientBuilder::setSSLContext);
+			clientConfiguration.getHostNameVerifier().ifPresent(clientBuilder::setSSLHostnameVerifier);
+			clientBuilder.addInterceptorLast(new CustomHeaderInjector(clientConfiguration.getHeadersSupplier()));
+
+			if (ClientLogger.isEnabled()) {
+				HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+
+				clientBuilder.addInterceptorLast((HttpRequestInterceptor) interceptor);
+				clientBuilder.addInterceptorLast((HttpResponseInterceptor) interceptor);
+			}
+
+			RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+			Duration connectTimeout = clientConfiguration.getConnectTimeout();
+
+			if (!connectTimeout.isNegative()) {
+				requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
+			}
+
+			Duration socketTimeout = clientConfiguration.getSocketTimeout();
+
+			if (!socketTimeout.isNegative()) {
+				requestConfigBuilder.setSocketTimeout(Math.toIntExact(socketTimeout.toMillis()));
+				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(socketTimeout.toMillis()));
+			}
+
+			clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
+
+			clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);
+
+			for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
+					.getClientConfigurers()) {
+				if (clientConfigurer instanceof ElasticsearchClientConfigurationCallback) {
+					ElasticsearchClientConfigurationCallback restClientConfigurationCallback = (ElasticsearchClientConfigurationCallback) clientConfigurer;
+					clientBuilder = restClientConfigurationCallback.configure(clientBuilder);
+				}
+			}
+
+			return clientBuilder;
+		});
+		return builder;
+	}
+
+	private static ElasticsearchTransport getElasticsearchTransport(RestClient restClient, String clientType,
+			@Nullable TransportOptions transportOptions) {
+
+		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
+				: new RestClientOptions(RequestOptions.DEFAULT).toBuilder();
+		TransportOptions transportOptionsWithHeader = transportOptionsBuilder
+				.addHeader(X_SPRING_DATA_ELASTICSEARCH_CLIENT, clientType).build();
+
+		ElasticsearchTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper(),
+				transportOptionsWithHeader);
+		return transport;
+	}
+
+	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());
+	}
+
+	private static org.apache.http.Header[] toHeaderArray(HttpHeaders headers) {
+		return headers.entrySet().stream() //
+				.flatMap(entry -> entry.getValue().stream() //
+						.map(value -> new BasicHeader(entry.getKey(), value))) //
+				.toArray(org.apache.http.Header[]::new);
+	}
+
+	/**
+	 * Logging interceptors for Elasticsearch client logging.
+	 *
+	 * @see ClientLogger
+	 * @since 4.4
+	 */
+	private static class HttpLoggingInterceptor implements HttpResponseInterceptor, HttpRequestInterceptor {
+
+		@Override
+		public void process(HttpRequest request, HttpContext context) throws IOException {
+
+			String logId = (String) context.getAttribute(LOG_ID_ATTRIBUTE);
+
+			if (logId == null) {
+				logId = ClientLogger.newLogId();
+				context.setAttribute(LOG_ID_ATTRIBUTE, logId);
+			}
+
+			String headers = Arrays.stream(request.getAllHeaders())
+					.map(header -> header.getName()
+							+ ((header.getName().equals("Authorization")) ? ": *****" : ": " + header.getValue()))
+					.collect(Collectors.joining(", ", "[", "]"));
+
+			if (request instanceof HttpEntityEnclosingRequest && ((HttpEntityEnclosingRequest) request).getEntity() != null) {
+
+				HttpEntityEnclosingRequest entityRequest = (HttpEntityEnclosingRequest) request;
+				HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
+				ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+				entity.writeTo(buffer);
+
+				if (!entity.isRepeatable()) {
+					entityRequest.setEntity(new ByteArrayEntity(buffer.toByteArray()));
+				}
+
+				ClientLogger.logRequest(logId, request.getRequestLine().getMethod(), request.getRequestLine().getUri(), "",
+						headers, buffer::toString);
+			} else {
+				ClientLogger.logRequest(logId, request.getRequestLine().getMethod(), request.getRequestLine().getUri(), "",
+						headers);
+			}
+		}
+
+		@Override
+		public void process(HttpResponse response, HttpContext context) throws IOException {
+
+			String logId = (String) context.getAttribute(LOG_ID_ATTRIBUTE);
+
+			String headers = Arrays.stream(response.getAllHeaders())
+					.map(header -> header.getName()
+							+ ((header.getName().equals("Authorization")) ? ": *****" : ": " + header.getValue()))
+					.collect(Collectors.joining(", ", "[", "]"));
+
+			// no way of logging the body, in this callback, it is not read yset, later there is no callback possibility in
+			// RestClient or RestClientTransport
+			ClientLogger.logRawResponse(logId, HttpStatus.resolve(response.getStatusLine().getStatusCode()), headers);
+		}
+	}
+
+	/**
+	 * Interceptor to inject custom supplied headers.
+	 *
+	 * @since 4.4
+	 */
+	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.4
+	 */
+	public interface ElasticsearchClientConfigurationCallback
+			extends ClientConfiguration.ClientConfigurationCallback<HttpAsyncClientBuilder> {
+
+		static ElasticsearchClientConfigurationCallback from(
+				Function<HttpAsyncClientBuilder, HttpAsyncClientBuilder> clientBuilderCallback) {
+
+			Assert.notNull(clientBuilderCallback, "clientBuilderCallback must not be null");
+
+			// noinspection NullableProblems
+			return clientBuilderCallback::apply;
+		}
+	}
+
+	/**
+	 * {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
+	 * the ReactiveElasticsearchClient with a {@link WebClient}
+	 *
+	 * @since 4.4
+	 */
+	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/elc/ElasticsearchConfiguration.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.rest_client.RestClientOptions;
+
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.util.Assert;
+
+/**
+ * Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
+ * connection using the Elasticsearch Client.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
+
+	/**
+	 * Must be implemented by deriving classes to provide the {@link ClientConfiguration}.
+	 *
+	 * @return configuration, must not be {@literal null}
+	 */
+	@Bean
+	public abstract ClientConfiguration clientConfiguration();
+
+	/**
+	 * Provides the underlying low level RestClient.
+	 *
+	 * @param clientConfiguration configuration for the client, must not be {@literal null}
+	 * @return RestClient
+	 */
+	@Bean
+	public RestClient restClient(ClientConfiguration clientConfiguration) {
+
+		Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
+
+		return ElasticsearchClients.getRestClient(clientConfiguration);
+	}
+
+	/**
+	 * Provides the {@link ElasticsearchClient} to be used.
+	 *
+	 * @param restClient the low level RestClient to use
+	 * @return ElasticsearchClient instance
+	 */
+	@Bean
+	public ElasticsearchClient elasticsearchClient(RestClient restClient) {
+
+		Assert.notNull(restClient, "restClient must not be null");
+
+		return ElasticsearchClients.createImperative(restClient, transportOptions());
+	}
+
+	/**
+	 * Creates a {@link ElasticsearchOperations} implementation using an
+	 * {@link co.elastic.clients.elasticsearch.ElasticsearchClient}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
+	public ElasticsearchOperations elasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
+			ElasticsearchClient elasticsearchClient) {
+
+		ElasticsearchTemplate template = new ElasticsearchTemplate(elasticsearchClient, elasticsearchConverter);
+		template.setRefreshPolicy(refreshPolicy());
+
+		return template;
+	}
+
+	/**
+	 * @return the options that should be added to every request. Must not be {@literal null}
+	 */
+	public TransportOptions transportOptions() {
+		return new RestClientOptions(RequestOptions.DEFAULT);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchExceptionTranslator.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
+import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.json.JsonpMapper;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.elasticsearch.client.ResponseException;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.OptimisticLockingFailureException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.elasticsearch.NoSuchIndexException;
+import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
+import org.springframework.http.HttpStatus;
+
+/**
+ * Simple {@link PersistenceExceptionTranslator} for Elasticsearch. Convert the given runtime exception to an
+ * appropriate exception from the {@code org.springframework.dao} hierarchy. Return {@literal null} if no translation is
+ * appropriate: any other exception may have resulted from user code, and should not be translated.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {
+
+	private final JsonpMapper jsonpMapper;
+
+	public ElasticsearchExceptionTranslator(JsonpMapper jsonpMapper) {
+		this.jsonpMapper = jsonpMapper;
+	}
+
+	/**
+	 * translates an Exception if possible. Exceptions that are no {@link RuntimeException}s are wrapped in a
+	 * RuntimeException
+	 *
+	 * @param throwable the Exception to map
+	 * @return the potentially translated RuntimeException.
+	 */
+	public RuntimeException translateException(Throwable throwable) {
+
+		RuntimeException runtimeException = throwable instanceof RuntimeException ? (RuntimeException) throwable
+				: new RuntimeException(throwable.getMessage(), throwable);
+		RuntimeException potentiallyTranslatedException = translateExceptionIfPossible(runtimeException);
+
+		return potentiallyTranslatedException != null ? potentiallyTranslatedException : runtimeException;
+	}
+
+	@Override
+	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+
+		if (isSeqNoConflict(ex)) {
+			return new OptimisticLockingFailureException("Cannot index a document due to seq_no+primary_term conflict", ex);
+		}
+
+		if (ex instanceof ElasticsearchException) {
+			ElasticsearchException elasticsearchException = (ElasticsearchException) ex;
+
+			ErrorResponse response = elasticsearchException.response();
+
+			if (response.status() == HttpStatus.NOT_FOUND.value()
+					&& "index_not_found_exception".equals(response.error().type())) {
+
+				Pattern pattern = Pattern.compile(".*no such index \\[(.*)\\]");
+				String index = "";
+				Matcher matcher = pattern.matcher(response.error().reason());
+				if (matcher.matches()) {
+					index = matcher.group(1);
+				}
+				return new NoSuchIndexException(index);
+			}
+			String body = JsonUtils.toJson(response, jsonpMapper);
+
+			if (response.error().type().contains("validation_exception")) {
+				return new DataIntegrityViolationException(response.error().reason());
+			}
+
+			return new UncategorizedElasticsearchException(ex.getMessage(), response.status(), body, ex);
+		}
+
+		Throwable cause = ex.getCause();
+		if (cause instanceof IOException) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
+		}
+
+		return null;
+	}
+
+	private boolean isSeqNoConflict(Throwable exception) {
+		Integer status = null;
+		String message = null;
+
+
+		if (exception instanceof ResponseException) {
+			ResponseException responseException = (ResponseException) exception;
+			status = responseException.getResponse().getStatusLine().getStatusCode();
+			message = responseException.getMessage();
+		} else if (exception.getCause() != null) {
+			return isSeqNoConflict(exception.getCause());
+		}
+
+		if (status != null && message != null) {
+			return status == 409 && message.contains("type\":\"version_conflict_engine_exception")
+					&& message.contains("version conflict, required seqNo");
+		}
+
+		return false;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java

@@ -0,0 +1,561 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch.core.*;
+import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
+import co.elastic.clients.elasticsearch.core.msearch.MultiSearchResponseItem;
+import co.elastic.clients.elasticsearch.core.search.ResponseBody;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.transport.Version;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.data.elasticsearch.BulkFailureException;
+import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
+import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.IndexOperations;
+import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.SearchScrollHits;
+import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.BulkOptions;
+import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
+import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.UpdateResponse;
+import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
+import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Implementation of {@link org.springframework.data.elasticsearch.core.ElasticsearchOperations} using the new
+ * Elasticsearch client.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
+
+	private static final Log LOGGER = LogFactory.getLog(ElasticsearchTemplate.class);
+
+	private final ElasticsearchClient client;
+	private final RequestConverter requestConverter;
+	private final ResponseConverter responseConverter;
+	private final JsonpMapper jsonpMapper;
+	private final ElasticsearchExceptionTranslator exceptionTranslator;
+
+	// region _initialization
+	public ElasticsearchTemplate(ElasticsearchClient client, ElasticsearchConverter elasticsearchConverter) {
+		super(elasticsearchConverter);
+
+		Assert.notNull(client, "client must not be null");
+
+		this.client = client;
+		this.jsonpMapper = client._transport().jsonpMapper();
+		requestConverter = new RequestConverter(elasticsearchConverter, jsonpMapper);
+		responseConverter = new ResponseConverter(jsonpMapper);
+		exceptionTranslator = new ElasticsearchExceptionTranslator(jsonpMapper);
+	}
+
+	@Override
+	protected AbstractElasticsearchTemplate doCopy() {
+		return new ElasticsearchTemplate(client, elasticsearchConverter);
+	}
+	// endregion
+
+	// region child templates
+	@Override
+	public IndexOperations indexOps(Class<?> clazz) {
+		return new IndicesTemplate(client.indices(), elasticsearchConverter, clazz);
+	}
+
+	@Override
+	public IndexOperations indexOps(IndexCoordinates index) {
+		return new IndicesTemplate(client.indices(), elasticsearchConverter, index);
+	}
+
+	@Override
+	public ClusterOperations cluster() {
+		return new ClusterTemplate(client.cluster(), elasticsearchConverter);
+	}
+	// endregion
+
+	// region document operations
+	@Override
+	@Nullable
+	public <T> T get(String id, Class<T> clazz, IndexCoordinates index) {
+
+		GetRequest getRequest = requestConverter.documentGetRequest(elasticsearchConverter.convertId(id),
+				routingResolver.getRouting(), index, false);
+		GetResponse<EntityAsMap> getResponse = execute(client -> client.get(getRequest, EntityAsMap.class));
+
+		ReadDocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
+		return callback.doWith(DocumentAdapters.from(getResponse));
+	}
+
+	@Override
+	public <T> List<MultiGetItem<T>> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
+
+		MgetRequest request = requestConverter.documentMgetRequest(query, clazz, index);
+		MgetResponse<EntityAsMap> result = execute(client -> client.mget(request, EntityAsMap.class));
+
+		ReadDocumentCallback<T> callback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
+
+		return DocumentAdapters.from(result).stream() //
+				.map(multiGetItem -> MultiGetItem.of( //
+						multiGetItem.isFailed() ? null : callback.doWith(multiGetItem.getItem()), multiGetItem.getFailure())) //
+				.collect(Collectors.toList());
+	}
+
+	@Override
+	public void bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(bulkOptions, "bulkOptions must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		doBulkOperation(queries, bulkOptions, index);
+	}
+
+	@Override
+	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+
+		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, clazz, index,
+				getRefreshPolicy());
+
+		DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));
+
+		return responseConverter.byQueryResponse(response);
+	}
+
+	@Override
+	public UpdateResponse update(UpdateQuery updateQuery, IndexCoordinates index) {
+
+		UpdateRequest<Document, ?> request = requestConverter.documentUpdateRequest(updateQuery, index, getRefreshPolicy(),
+				routingResolver.getRouting());
+		co.elastic.clients.elasticsearch.core.UpdateResponse<Document> response = execute(
+				client -> client.update(request, Document.class));
+		return UpdateResponse.of(result(response.result()));
+	}
+
+	@Override
+	public ByQueryResponse updateByQuery(UpdateQuery updateQuery, IndexCoordinates index) {
+
+		Assert.notNull(updateQuery, "updateQuery must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		UpdateByQueryRequest request = requestConverter.documentUpdateByQueryRequest(updateQuery, index,
+				getRefreshPolicy());
+
+		UpdateByQueryResponse byQueryResponse = execute(client -> client.updateByQuery(request));
+		return responseConverter.byQueryResponse(byQueryResponse);
+	}
+
+	@Override
+	public String doIndex(IndexQuery query, IndexCoordinates indexCoordinates) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
+
+		IndexRequest<?> indexRequest = requestConverter.documentIndexRequest(query, indexCoordinates, refreshPolicy);
+
+		IndexResponse indexResponse = execute(client -> client.index(indexRequest));
+
+		Object queryObject = query.getObject();
+
+		if (queryObject != null) {
+			query.setObject(updateIndexedObject(queryObject, IndexedObjectInformation.of(indexResponse.id(),
+					indexResponse.seqNo(), indexResponse.primaryTerm(), indexResponse.version())));
+		}
+
+		return indexResponse.id();
+	}
+
+	@Override
+	protected boolean doExists(String id, IndexCoordinates index) {
+
+		Assert.notNull(id, "id must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		GetRequest request = requestConverter.documentGetRequest(id, routingResolver.getRouting(), index, true);
+
+		return execute(client -> client.get(request, EntityAsMap.class)).found();
+	}
+
+	@Override
+	protected String doDelete(String id, @Nullable String routing, IndexCoordinates index) {
+
+		Assert.notNull(id, "id must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		DeleteRequest request = requestConverter.documentDeleteRequest(elasticsearchConverter.convertId(id), routing, index,
+				getRefreshPolicy());
+		return execute(client -> client.delete(request)).id();
+	}
+
+	@Override
+	public ReindexResponse reindex(ReindexRequest reindexRequest) {
+
+		Assert.notNull(reindexRequest, "reindexRequest must not be null");
+
+		co.elastic.clients.elasticsearch.core.ReindexRequest reindexRequestES = requestConverter.reindex(reindexRequest,
+				true);
+		co.elastic.clients.elasticsearch.core.ReindexResponse reindexResponse = execute(
+				client -> client.reindex(reindexRequestES));
+		return responseConverter.reindexResponse(reindexResponse);
+	}
+
+	@Override
+	public String submitReindex(ReindexRequest reindexRequest) {
+
+		co.elastic.clients.elasticsearch.core.ReindexRequest reindexRequestES = requestConverter.reindex(reindexRequest,
+				false);
+		co.elastic.clients.elasticsearch.core.ReindexResponse reindexResponse = execute(
+				client -> client.reindex(reindexRequestES));
+
+		if (reindexResponse.task() == null) {
+			throw new UnsupportedBackendOperation("ElasticsearchClient did not return a task id on submit request");
+		}
+
+		return reindexResponse.task();
+	}
+
+	@Override
+	public List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
+			IndexCoordinates index) {
+
+		BulkRequest bulkRequest = requestConverter.documentBulkRequest(queries, bulkOptions, index, refreshPolicy);
+		BulkResponse bulkResponse = execute(client -> client.bulk(bulkRequest));
+		List<IndexedObjectInformation> indexedObjectInformationList = checkForBulkOperationFailure(bulkResponse);
+		updateIndexedObjectsWithQueries(queries, indexedObjectInformationList);
+		return indexedObjectInformationList;
+	}
+
+	// endregion
+
+	@Override
+	protected String getClusterVersion() {
+		return execute(client -> client.info().version().number());
+
+	}
+
+	@Override
+	protected String getVendor() {
+		return "Elasticsearch";
+	}
+
+	@Override
+	protected String getRuntimeLibraryVersion() {
+		return Version.VERSION.toString();
+	}
+
+	// region search operations
+	@Override
+	public long count(Query query, @Nullable Class<?> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, true, false);
+
+		SearchResponse<EntityAsMap> searchResponse = execute(client -> client.search(searchRequest, EntityAsMap.class));
+
+		return searchResponse.hits().total().value();
+	}
+
+	@Override
+	public <T> SearchHits<T> search(Query query, Class<T> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, false, false);
+		SearchResponse<EntityAsMap> searchResponse = execute(client -> client.search(searchRequest, EntityAsMap.class));
+
+		ReadDocumentCallback<T> readDocumentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
+		SearchDocumentResponse.EntityCreator<T> entityCreator = getEntityCreator(readDocumentCallback);
+		SearchDocumentResponseCallback<SearchHits<T>> callback = new ReadSearchDocumentResponseCallback<>(clazz, index);
+
+		return callback.doWith(SearchDocumentResponseBuilder.from(searchResponse, entityCreator, jsonpMapper));
+	}
+
+	@Override
+	protected <T> SearchHits<T> doSearch(MoreLikeThisQuery query, Class<T> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		return search(NativeQuery.builder() //
+				.withQuery(q -> q.moreLikeThis(requestConverter.moreLikeThisQuery(query, index)))//
+				.withPageable(query.getPageable()) //
+				.build(), clazz, index);
+	}
+
+	@Override
+	protected <T> SearchScrollHits<T> searchScrollStart(long scrollTimeInMillis, Query query, Class<T> clazz,
+			IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(query.getPageable(), "pageable of query must not be null.");
+
+		SearchRequest request = requestConverter.searchRequest(query, clazz, index, false, scrollTimeInMillis);
+		SearchResponse<EntityAsMap> response = execute(client -> client.search(request, EntityAsMap.class));
+
+		return getSearchScrollHits(clazz, index, response);
+	}
+
+	@Override
+	protected <T> SearchScrollHits<T> searchScrollContinue(String scrollId, long scrollTimeInMillis, Class<T> clazz,
+			IndexCoordinates index) {
+
+		Assert.notNull(scrollId, "scrollId must not be null");
+
+		ScrollRequest request = ScrollRequest
+				.of(sr -> sr.scrollId(scrollId).scroll(Time.of(t -> t.time(scrollTimeInMillis + "ms"))));
+		ScrollResponse<EntityAsMap> response = execute(client -> client.scroll(request, EntityAsMap.class));
+
+		return getSearchScrollHits(clazz, index, response);
+	}
+
+	private <T> SearchScrollHits<T> getSearchScrollHits(Class<T> clazz, IndexCoordinates index,
+			ResponseBody<EntityAsMap> response) {
+		ReadDocumentCallback<T> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz, index);
+		SearchDocumentResponseCallback<SearchScrollHits<T>> callback = new ReadSearchScrollDocumentResponseCallback<>(clazz,
+				index);
+
+		return callback
+				.doWith(SearchDocumentResponseBuilder.from(response, getEntityCreator(documentCallback), jsonpMapper));
+	}
+
+	@Override
+	protected void searchScrollClear(List<String> scrollIds) {
+
+		Assert.notNull(scrollIds, "scrollIds must not be null");
+
+		if (!scrollIds.isEmpty()) {
+			ClearScrollRequest request = ClearScrollRequest.of(csr -> csr.scrollId(scrollIds));
+			execute(client -> client.clearScroll(request));
+		}
+	}
+
+	@Override
+	public <T> List<SearchHits<T>> multiSearch(List<? extends Query> queries, Class<T> clazz, IndexCoordinates index) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
+
+		List<MultiSearchQueryParameter> multiSearchQueryParameters = new ArrayList<>(queries.size());
+		for (Query query : queries) {
+			multiSearchQueryParameters.add(new MultiSearchQueryParameter(query, clazz, getIndexCoordinatesFor(clazz)));
+		}
+
+		// noinspection unchecked
+		return doMultiSearch(multiSearchQueryParameters).stream().map(searchHits -> (SearchHits<T>) searchHits)
+				.collect(Collectors.toList());
+	}
+
+	@Override
+	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(classes, "classes must not be null");
+		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
+
+		List<MultiSearchQueryParameter> multiSearchQueryParameters = new ArrayList<>(queries.size());
+		Iterator<Class<?>> it = classes.iterator();
+		for (Query query : queries) {
+			Class<?> clazz = it.next();
+			multiSearchQueryParameters.add(new MultiSearchQueryParameter(query, clazz, getIndexCoordinatesFor(clazz)));
+		}
+
+		return doMultiSearch(multiSearchQueryParameters);
+	}
+
+	@Override
+	public List<SearchHits<?>> multiSearch(List<? extends Query> queries, List<Class<?>> classes,
+			IndexCoordinates index) {
+
+		Assert.notNull(queries, "queries must not be null");
+		Assert.notNull(classes, "classes must not be null");
+		Assert.notNull(index, "index must not be null");
+		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");
+
+		List<MultiSearchQueryParameter> multiSearchQueryParameters = new ArrayList<>(queries.size());
+		Iterator<Class<?>> it = classes.iterator();
+		for (Query query : queries) {
+			Class<?> clazz = it.next();
+			multiSearchQueryParameters.add(new MultiSearchQueryParameter(query, clazz, index));
+		}
+
+		return doMultiSearch(multiSearchQueryParameters);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private List<SearchHits<?>> doMultiSearch(List<MultiSearchQueryParameter> multiSearchQueryParameters) {
+
+		MsearchRequest request = requestConverter.searchMsearchRequest(multiSearchQueryParameters);
+
+		MsearchResponse<EntityAsMap> msearchResponse = execute(client -> client.msearch(request, EntityAsMap.class));
+		List<MultiSearchResponseItem<EntityAsMap>> responseItems = msearchResponse.responses();
+
+		Assert.isTrue(multiSearchQueryParameters.size() == responseItems.size(),
+				"number of response items does not match number of requests");
+
+		List<SearchHits<?>> searchHitsList = new ArrayList<>(multiSearchQueryParameters.size());
+
+		Iterator<MultiSearchQueryParameter> queryIterator = multiSearchQueryParameters.iterator();
+		Iterator<MultiSearchResponseItem<EntityAsMap>> responseIterator = responseItems.iterator();
+
+		while (queryIterator.hasNext()) {
+			MultiSearchQueryParameter queryParameter = queryIterator.next();
+			MultiSearchResponseItem<EntityAsMap> responseItem = responseIterator.next();
+
+			if (responseItem.isResult()) {
+
+				Class clazz = queryParameter.clazz;
+				ReadDocumentCallback<?> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz,
+						queryParameter.index);
+				SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(clazz,
+						queryParameter.index);
+
+				SearchHits<?> searchHits = callback.doWith(
+						SearchDocumentResponseBuilder.from(responseItem.result(), getEntityCreator(documentCallback), jsonpMapper));
+
+				searchHitsList.add(searchHits);
+			} else {
+				if (LOGGER.isWarnEnabled()) {
+					LOGGER
+							.warn(String.format("multisearch responsecontains failure: {}", responseItem.failure().error().reason()));
+				}
+			}
+		}
+
+		return searchHitsList;
+	}
+
+	/**
+	 * value class combining the information needed for a single query in a multisearch request.
+	 */
+	static class MultiSearchQueryParameter {
+		final Query query;
+		final Class<?> clazz;
+		final IndexCoordinates index;
+
+		public MultiSearchQueryParameter(Query query, Class<?> clazz, IndexCoordinates index) {
+			this.query = query;
+			this.clazz = clazz;
+			this.index = index;
+		}
+	}
+	// endregion
+
+	// region client callback
+	/**
+	 * Callback interface to be used with {@link #execute(ElasticsearchTemplate.ClientCallback)} for operating directly on
+	 * the {@link ElasticsearchClient}.
+	 */
+	@FunctionalInterface
+	public interface ClientCallback<T> {
+		T doWithClient(ElasticsearchClient client) throws IOException;
+	}
+
+	/**
+	 * Execute a callback with the {@link ElasticsearchClient} and provide exception translation.
+	 *
+	 * @param callback the callback to execute, must not be {@literal null}
+	 * @param <T> the type returned from the callback
+	 * @return the callback result
+	 */
+	public <T> T execute(ElasticsearchTemplate.ClientCallback<T> callback) {
+
+		Assert.notNull(callback, "callback must not be null");
+
+		try {
+			return callback.doWithClient(client);
+		} catch (IOException | RuntimeException e) {
+			throw exceptionTranslator.translateException(e);
+		}
+	}
+	// endregion
+
+	// region helper methods
+	@Override
+	public Query matchAllQuery() {
+		return NativeQuery.builder().withQuery(qb -> qb.matchAll(mab -> mab)).build();
+	}
+
+	@Override
+	public Query idsQuery(List<String> ids) {
+		return NativeQuery.builder().withQuery(qb -> qb.ids(iq -> iq.values(ids))).build();
+	}
+
+	/**
+	 * extract the list of {@link IndexedObjectInformation} from a {@link BulkResponse}.
+	 *
+	 * @param bulkResponse the response to evaluate
+	 * @return the list of the {@link IndexedObjectInformation}s
+	 */
+	protected List<IndexedObjectInformation> checkForBulkOperationFailure(BulkResponse bulkResponse) {
+
+		if (bulkResponse.errors()) {
+			Map<String, String> failedDocuments = new HashMap<>();
+			for (BulkResponseItem item : bulkResponse.items()) {
+
+				if (item.error() != null) {
+					failedDocuments.put(item.id(), item.error().reason());
+				}
+			}
+			throw new BulkFailureException(
+					"Bulk operation has failures. Use ElasticsearchException.getFailedDocuments() for detailed messages ["
+							+ failedDocuments + ']',
+					failedDocuments);
+		}
+
+		return bulkResponse.items().stream()
+				.map(item -> IndexedObjectInformation.of(item.id(), item.seqNo(), item.primaryTerm(), item.version()))
+				.collect(Collectors.toList());
+
+	}
+	// endregion
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/EntityAsMap.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
+
+/**
+ * A Map<String,Object> to represent any entity as it's returned from Elasticsearch and before it is converted to a
+ * {@link org.springframework.data.elasticsearch.core.document.Document}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class EntityAsMap extends DefaultStringObjectMap<EntityAsMap> {}

src/main/java/org/springframework/data/elasticsearch/client/elc/HighlightQueryBuilder.java

@@ -0,0 +1,228 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.elasticsearch.core.query.highlight.Highlight;
+import org.springframework.data.elasticsearch.core.query.highlight.HighlightField;
+import org.springframework.data.elasticsearch.core.query.highlight.HighlightFieldParameters;
+import org.springframework.data.elasticsearch.core.query.highlight.HighlightParameters;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+
+/**
+ * Converts the {@link Highlight} annotation from a method to an ElasticsearchClient
+ * {@link co.elastic.clients.elasticsearch.core.search.Highlight}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+class HighlightQueryBuilder {
+	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+
+	HighlightQueryBuilder(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+		this.mappingContext = mappingContext;
+	}
+
+	public co.elastic.clients.elasticsearch.core.search.Highlight getHighlight(Highlight highlight,
+			@Nullable Class<?> type) {
+
+		co.elastic.clients.elasticsearch.core.search.Highlight.Builder highlightBuilder = new co.elastic.clients.elasticsearch.core.search.Highlight.Builder();
+
+		// in the old implementation we could use one addParameters method, but in the new Elasticsearch client
+		// the builder for highlight and highlightfield share no code
+		addParameters(highlight.getParameters(), highlightBuilder);
+
+		for (HighlightField highlightField : highlight.getFields()) {
+			String mappedName = mapFieldName(highlightField.getName(), type);
+			highlightBuilder.fields(mappedName, hf -> {
+				addParameters(highlightField.getParameters(), hf, type);
+				return hf;
+			});
+		}
+
+		return highlightBuilder.build();
+	}
+
+	/*
+	 * the builder for highlight and highlight fields don't share code, so we have these two methods here that basically are almost copies
+	 */
+	private void addParameters(HighlightParameters parameters,
+			co.elastic.clients.elasticsearch.core.search.Highlight.Builder builder) {
+
+		if (StringUtils.hasLength(parameters.getBoundaryChars())) {
+			builder.boundaryChars(parameters.getBoundaryChars());
+		}
+
+		if (parameters.getBoundaryMaxScan() > -1) {
+			builder.boundaryMaxScan(parameters.getBoundaryMaxScan());
+		}
+
+		if (StringUtils.hasLength(parameters.getBoundaryScanner())) {
+			builder.boundaryScanner(boundaryScanner(parameters.getBoundaryScanner()));
+		}
+
+		if (StringUtils.hasLength(parameters.getBoundaryScannerLocale())) {
+			builder.boundaryScannerLocale(parameters.getBoundaryScannerLocale());
+		}
+
+		if (StringUtils.hasLength(parameters.getFragmenter())) {
+			builder.fragmenter(highlighterFragmenter(parameters.getFragmenter()));
+		}
+
+		if (parameters.getFragmentSize() > -1) {
+			builder.fragmentSize(parameters.getFragmentSize());
+		}
+
+		if (parameters.getNoMatchSize() > -1) {
+			builder.noMatchSize(parameters.getNoMatchSize());
+		}
+
+		if (parameters.getNumberOfFragments() > -1) {
+			builder.numberOfFragments(parameters.getNumberOfFragments());
+		}
+
+		if (StringUtils.hasLength(parameters.getOrder())) {
+			builder.order(highlighterOrder(parameters.getOrder()));
+		}
+
+		if (parameters.getPreTags().length > 0) {
+			builder.preTags(Arrays.asList(parameters.getPreTags()));
+		}
+
+		if (parameters.getPostTags().length > 0) {
+			builder.postTags(Arrays.asList(parameters.getPostTags()));
+		}
+
+		if (!parameters.getRequireFieldMatch()) { // default is true
+			builder.requireFieldMatch(false);
+		}
+
+		if (StringUtils.hasLength(parameters.getType())) {
+			builder.type(highlighterType(parameters.getType()));
+		}
+
+		if (StringUtils.hasLength(parameters.getEncoder())) {
+			builder.encoder(highlighterEncoder(parameters.getEncoder()));
+		}
+
+		if (StringUtils.hasLength(parameters.getTagsSchema())) {
+			builder.tagsSchema(highlighterTagsSchema(parameters.getTagsSchema()));
+		}
+	}
+
+	/*
+	 * the builder for highlight and highlight fields don't share code, so we have these two methods here that basically are almost copies
+	 */
+	private void addParameters(HighlightFieldParameters parameters,
+			co.elastic.clients.elasticsearch.core.search.HighlightField.Builder builder, Class<?> type) {
+
+		if (StringUtils.hasLength(parameters.getBoundaryChars())) {
+			builder.boundaryChars(parameters.getBoundaryChars());
+		}
+
+		if (parameters.getBoundaryMaxScan() > -1) {
+			builder.boundaryMaxScan(parameters.getBoundaryMaxScan());
+		}
+
+		if (StringUtils.hasLength(parameters.getBoundaryScanner())) {
+			builder.boundaryScanner(boundaryScanner(parameters.getBoundaryScanner()));
+		}
+
+		if (StringUtils.hasLength(parameters.getBoundaryScannerLocale())) {
+			builder.boundaryScannerLocale(parameters.getBoundaryScannerLocale());
+		}
+
+		if (parameters.getForceSource()) { // default is false
+			builder.forceSource(parameters.getForceSource());
+		}
+
+		if (StringUtils.hasLength(parameters.getFragmenter())) {
+			builder.fragmenter(highlighterFragmenter(parameters.getFragmenter()));
+		}
+
+		if (parameters.getFragmentSize() > -1) {
+			builder.fragmentSize(parameters.getFragmentSize());
+		}
+
+		if (parameters.getNoMatchSize() > -1) {
+			builder.noMatchSize(parameters.getNoMatchSize());
+		}
+
+		if (parameters.getNumberOfFragments() > -1) {
+			builder.numberOfFragments(parameters.getNumberOfFragments());
+		}
+
+		if (StringUtils.hasLength(parameters.getOrder())) {
+			builder.order(highlighterOrder(parameters.getOrder()));
+		}
+
+		if (parameters.getPhraseLimit() > -1) {
+			builder.phraseLimit(parameters.getPhraseLimit());
+		}
+
+		if (parameters.getPreTags().length > 0) {
+			builder.preTags(Arrays.asList(parameters.getPreTags()));
+		}
+
+		if (parameters.getPostTags().length > 0) {
+			builder.postTags(Arrays.asList(parameters.getPostTags()));
+		}
+
+		if (!parameters.getRequireFieldMatch()) { // default is true
+			builder.requireFieldMatch(false);
+		}
+
+		if (StringUtils.hasLength(parameters.getType())) {
+			builder.type(highlighterType(parameters.getType()));
+		}
+
+		if ((parameters).getFragmentOffset() > -1) {
+			builder.fragmentOffset(parameters.getFragmentOffset());
+		}
+
+		if (parameters.getMatchedFields().length > 0) {
+			builder.matchedFields(Arrays.stream(parameters.getMatchedFields()).map(fieldName -> mapFieldName(fieldName, type)) //
+					.collect(Collectors.toList()));
+		}
+	}
+
+	private String mapFieldName(String fieldName, @Nullable Class<?> type) {
+
+		if (type != null) {
+			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(type);
+
+			if (persistentEntity != null) {
+				ElasticsearchPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(fieldName);
+
+				if (persistentProperty != null) {
+					return persistentProperty.getFieldName();
+				}
+			}
+		}
+
+		return fieldName;
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/IndicesTemplate.java

@@ -0,0 +1,354 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.util.StringUtils.*;
+
+import co.elastic.clients.elasticsearch.indices.*;
+import co.elastic.clients.transport.endpoints.BooleanResponse;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
+import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.core.IndexInformation;
+import org.springframework.data.elasticsearch.core.IndexOperations;
+import org.springframework.data.elasticsearch.core.ResourceUtil;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.index.AliasActions;
+import org.springframework.data.elasticsearch.core.index.AliasData;
+import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.MappingBuilder;
+import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.Settings;
+import org.springframework.data.elasticsearch.core.index.TemplateData;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Implementation of the {@link IndexOperations} interface using en {@link ElasticsearchIndicesClient}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class IndicesTemplate extends ChildTemplate<ElasticsearchIndicesClient> implements IndexOperations {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(IndicesTemplate.class);
+
+	protected final ElasticsearchConverter elasticsearchConverter;
+	@Nullable protected final Class<?> boundClass;
+	@Nullable protected final IndexCoordinates boundIndex;
+
+	public IndicesTemplate(ElasticsearchIndicesClient client, ElasticsearchConverter elasticsearchConverter,
+			Class<?> boundClass) {
+		super(client, elasticsearchConverter);
+
+		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null");
+		Assert.notNull(boundClass, "boundClass may not be null");
+
+		this.elasticsearchConverter = elasticsearchConverter;
+		this.boundClass = boundClass;
+		this.boundIndex = null;
+
+	}
+
+	public IndicesTemplate(ElasticsearchIndicesClient client, ElasticsearchConverter elasticsearchConverter,
+			IndexCoordinates boundIndex) {
+		super(client, elasticsearchConverter);
+
+		Assert.notNull(elasticsearchConverter, "elasticsearchConverter must not be null");
+		Assert.notNull(boundIndex, "boundIndex must not be null");
+
+		this.elasticsearchConverter = elasticsearchConverter;
+		this.boundClass = null;
+		this.boundIndex = boundIndex;
+
+	}
+
+	protected Class<?> checkForBoundClass() {
+		if (boundClass == null) {
+			throw new InvalidDataAccessApiUsageException("IndexOperations are not bound");
+		}
+		return boundClass;
+	}
+
+	@Override
+	public boolean create() {
+
+		Settings settings = boundClass != null ? createSettings(boundClass) : new Settings();
+		return doCreate(getIndexCoordinates(), settings, null);
+	}
+
+	@Override
+	public boolean create(Map<String, Object> settings) {
+
+		Assert.notNull(settings, "settings must not be null");
+
+		return doCreate(getIndexCoordinates(), settings, null);
+	}
+
+	@Override
+	public boolean create(Map<String, Object> settings, Document mapping) {
+
+		Assert.notNull(settings, "settings must not be null");
+		Assert.notNull(mapping, "mapping must not be null");
+
+		return doCreate(getIndexCoordinates(), settings, mapping);
+	}
+
+	@Override
+	public boolean createWithMapping() {
+		return doCreate(getIndexCoordinates(), createSettings(), createMapping());
+	}
+
+	protected boolean doCreate(IndexCoordinates indexCoordinates, Map<String, Object> settings,
+			@Nullable Document mapping) {
+
+		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
+		Assert.notNull(settings, "settings must not be null");
+
+		CreateIndexRequest createIndexRequest = requestConverter.indicesCreateRequest(indexCoordinates, settings, mapping);
+		CreateIndexResponse createIndexResponse = execute(client -> client.create(createIndexRequest));
+		return Boolean.TRUE.equals(createIndexResponse.acknowledged());
+	}
+
+	@Override
+	public boolean delete() {
+		return doDelete(getIndexCoordinates());
+	}
+
+	private boolean doDelete(IndexCoordinates indexCoordinates) {
+
+		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
+
+		if (doExists(indexCoordinates)) {
+			DeleteIndexRequest deleteIndexRequest = requestConverter.indicesDeleteRequest(indexCoordinates);
+			DeleteIndexResponse deleteIndexResponse = execute(client -> client.delete(deleteIndexRequest));
+			return deleteIndexResponse.acknowledged();
+		}
+
+		return false;
+	}
+
+	@Override
+	public boolean exists() {
+		return doExists(getIndexCoordinates());
+	}
+
+	private boolean doExists(IndexCoordinates indexCoordinates) {
+
+		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
+
+		ExistsRequest existsRequest = requestConverter.indicesExistsRequest(indexCoordinates);
+		BooleanResponse existsResponse = execute(client -> client.exists(existsRequest));
+		return existsResponse.value();
+	}
+
+	@Override
+	public void refresh() {
+
+		RefreshRequest refreshRequest = requestConverter.indicesRefreshRequest(getIndexCoordinates());
+		execute(client -> client.refresh(refreshRequest));
+	}
+
+	@Override
+	public Document createMapping() {
+		return createMapping(checkForBoundClass());
+	}
+
+	@Override
+	public Document createMapping(Class<?> clazz) {
+
+		Assert.notNull(clazz, "clazz must not be null");
+
+		// load mapping specified in Mapping annotation if present
+		// noinspection DuplicatedCode
+		Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
+
+		if (mappingAnnotation != null) {
+			String mappingPath = mappingAnnotation.mappingPath();
+
+			if (hasText(mappingPath)) {
+				String mappings = ResourceUtil.readFileFromClasspath(mappingPath);
+
+				if (hasText(mappings)) {
+					return Document.parse(mappings);
+				}
+			}
+		}
+
+		// build mapping from field annotations
+		try {
+			String mapping = new MappingBuilder(elasticsearchConverter).buildPropertyMapping(clazz);
+			return Document.parse(mapping);
+		} catch (Exception e) {
+			throw new UncategorizedElasticsearchException("Failed to build mapping for " + clazz.getSimpleName(), e);
+		}
+	}
+
+	@Override
+	public boolean putMapping(Document mapping) {
+
+		Assert.notNull(mapping, "mapping must not be null");
+
+		PutMappingRequest putMappingRequest = requestConverter.indicesPutMappingRequest(getIndexCoordinates(), mapping);
+		PutMappingResponse putMappingResponse = execute(client -> client.putMapping(putMappingRequest));
+		return putMappingResponse.acknowledged();
+	}
+
+	@Override
+	public Map<String, Object> getMapping() {
+
+		IndexCoordinates indexCoordinates = getIndexCoordinates();
+		GetMappingRequest getMappingRequest = requestConverter.indicesGetMappingRequest(indexCoordinates);
+		GetMappingResponse getMappingResponse = execute(client -> client.getMapping(getMappingRequest));
+
+		Document mappingResponse = responseConverter.indicesGetMapping(getMappingResponse, indexCoordinates);
+		return mappingResponse;
+	}
+
+	@Override
+	public Settings createSettings() {
+		return createSettings(checkForBoundClass());
+	}
+
+	@Override
+	public Settings createSettings(Class<?> clazz) {
+
+		Assert.notNull(clazz, "clazz must not be null");
+
+		ElasticsearchPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(clazz);
+		String settingPath = persistentEntity.settingPath();
+		return hasText(settingPath) //
+				? Settings.parse(ResourceUtil.readFileFromClasspath(settingPath)) //
+				: persistentEntity.getDefaultSettings();
+
+	}
+
+	@Override
+	public Settings getSettings() {
+		return getSettings(false);
+	}
+
+	@Override
+	public Settings getSettings(boolean includeDefaults) {
+
+		GetIndicesSettingsRequest getIndicesSettingsRequest = requestConverter
+				.indicesGetSettingsRequest(getIndexCoordinates(), includeDefaults);
+		GetIndicesSettingsResponse getIndicesSettingsResponse = execute(
+				client -> client.getSettings(getIndicesSettingsRequest));
+		return responseConverter.indicesGetSettings(getIndicesSettingsResponse, getIndexCoordinates().getIndexName());
+	}
+
+	@Override
+	public boolean alias(AliasActions aliasActions) {
+
+		Assert.notNull(aliasActions, "aliasActions must not be null");
+
+		UpdateAliasesRequest updateAliasesRequest = requestConverter.indicesUpdateAliasesRequest(aliasActions);
+		UpdateAliasesResponse updateAliasesResponse = execute(client -> client.updateAliases(updateAliasesRequest));
+		return updateAliasesResponse.acknowledged();
+	}
+
+	@Override
+	public Map<String, Set<AliasData>> getAliases(String... aliasNames) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	public Map<String, Set<AliasData>> getAliasesForIndex(String... indexNames) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	public boolean putTemplate(PutTemplateRequest putTemplateRequest) {
+
+		Assert.notNull(putTemplateRequest, "putTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.PutTemplateRequest putTemplateRequestES = requestConverter
+				.indicesPutTemplateRequest(putTemplateRequest);
+		return execute(client -> client.putTemplate(putTemplateRequestES)).acknowledged();
+	}
+
+	@Override
+	public TemplateData getTemplate(GetTemplateRequest getTemplateRequest) {
+
+		Assert.notNull(getTemplateRequest, "getTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.GetTemplateRequest getTemplateRequestES = requestConverter
+				.indicesGetTemplateRequest(getTemplateRequest);
+		GetTemplateResponse getTemplateResponse = execute(client -> client.getTemplate(getTemplateRequestES));
+
+		return responseConverter.indicesGetTemplateData(getTemplateResponse, getTemplateRequest.getTemplateName());
+	}
+
+	@Override
+	public boolean existsTemplate(ExistsTemplateRequest existsTemplateRequest) {
+
+		Assert.notNull(existsTemplateRequest, "existsTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.ExistsTemplateRequest existsTemplateRequestSO = requestConverter
+				.indicesExistsTemplateRequest(existsTemplateRequest);
+		return execute(client -> client.existsTemplate(existsTemplateRequestSO)).value();
+	}
+
+	@Override
+	public boolean deleteTemplate(DeleteTemplateRequest deleteTemplateRequest) {
+
+		Assert.notNull(deleteTemplateRequest, "deleteTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.DeleteTemplateRequest deleteTemplateRequestES = requestConverter
+				.indicesDeleteTemplateRequest(deleteTemplateRequest);
+		return execute(client -> client.deleteTemplate(deleteTemplateRequestES)).acknowledged();
+	}
+
+	@Override
+	public List<IndexInformation> getInformation(IndexCoordinates indexCoordinates) {
+
+		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
+
+		GetIndexRequest getIndexRequest = requestConverter.indicesGetIndexRequest(indexCoordinates);
+		GetIndexResponse getIndexResponse = execute(client -> client.get(getIndexRequest));
+		return responseConverter.indicesGetIndexInformations(getIndexResponse);
+	}
+
+	// region Helper functions
+	ElasticsearchPersistentEntity<?> getRequiredPersistentEntity(Class<?> clazz) {
+		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz);
+	}
+
+	@Override
+	public IndexCoordinates getIndexCoordinates() {
+		return (boundClass != null) ? getIndexCoordinatesFor(boundClass) : Objects.requireNonNull(boundIndex);
+	}
+
+	public IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
+		return getRequiredPersistentEntity(clazz).getIndexCoordinates();
+	}
+	// endregion
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/JsonUtils.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.json.JsonpMapper;
+import jakarta.json.stream.JsonGenerator;
+
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+final class JsonUtils {
+
+	private static final Log LOGGER = LogFactory.getLog(JsonUtils.class);
+
+	private JsonUtils() {}
+
+	public static String toJson(Object object, JsonpMapper mapper) {
+
+		// noinspection SpellCheckingInspection
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		JsonGenerator generator = mapper.jsonProvider().createGenerator(baos);
+		mapper.serialize(object, generator);
+		generator.close();
+		String jsonMapping = "{}";
+		try {
+			jsonMapping = baos.toString("UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			LOGGER.warn("could not read json", e);
+		}
+
+		return jsonMapping;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/NativeQuery.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch.core.search.FieldCollapse;
+import co.elastic.clients.elasticsearch.core.search.Suggester;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.elasticsearch.core.query.BaseQuery;
+import org.springframework.data.elasticsearch.core.query.RescorerQuery;
+import org.springframework.data.elasticsearch.core.query.ScriptedField;
+import org.springframework.lang.Nullable;
+
+/**
+ * A {@link org.springframework.data.elasticsearch.core.query.Query} implementation using query builders from the new
+ * Elasticsearch Client library.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class NativeQuery extends BaseQuery {
+
+	@Nullable private final Query query;
+	@Nullable private Query filter;
+	// note: the new client does not have pipeline aggs, these are just set up as normal aggs
+	private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
+	@Nullable private Suggester suggester;
+	@Nullable private FieldCollapse fieldCollapse;
+	private List<ScriptedField> scriptedFields = Collections.emptyList();
+	private List<RescorerQuery> rescorerQueries = Collections.emptyList();
+
+	public NativeQuery(NativeQueryBuilder builder) {
+		super(builder);
+		this.query = builder.getQuery();
+		this.filter = builder.getFilter();
+		this.aggregations.putAll(builder.getAggregations());
+		this.suggester = builder.getSuggester();
+		this.fieldCollapse = builder.getFieldCollapse();
+		this.scriptedFields = builder.getScriptedFields();
+		this.rescorerQueries = builder.getRescorerQueries();
+	}
+
+	public NativeQuery(@Nullable Query query) {
+		this.query = query;
+	}
+
+	public static NativeQueryBuilder builder() {
+		return new NativeQueryBuilder();
+	}
+
+	@Nullable
+	public Query getQuery() {
+		return query;
+	}
+
+	@Nullable
+	public Query getFilter() {
+		return filter;
+	}
+
+	public Map<String, Aggregation> getAggregations() {
+		return aggregations;
+	}
+
+	@Nullable
+	public Suggester getSuggester() {
+		return suggester;
+	}
+
+	@Nullable
+	public FieldCollapse getFieldCollapse() {
+		return fieldCollapse;
+	}
+
+	public List<ScriptedField> getScriptedFields() {
+		return scriptedFields;
+	}
+
+	@Override
+	public List<RescorerQuery> getRescorerQueries() {
+		return rescorerQueries;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/NativeQueryBuilder.java

@@ -0,0 +1,142 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch.core.search.FieldCollapse;
+import co.elastic.clients.elasticsearch.core.search.Suggester;
+import co.elastic.clients.util.ObjectBuilder;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.RescorerQuery;
+import org.springframework.data.elasticsearch.core.query.ScriptedField;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQueryBuilder> {
+
+	@Nullable private Query query;
+	@Nullable private Query filter;
+	private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
+	@Nullable private Suggester suggester;
+	@Nullable private FieldCollapse fieldCollapse;
+	private final List<ScriptedField> scriptedFields = new ArrayList<>();
+	private List<RescorerQuery> rescorerQueries = new ArrayList<>();
+
+	public NativeQueryBuilder() {}
+
+	@Nullable
+	public Query getQuery() {
+		return query;
+	}
+
+	@Nullable
+	public Query getFilter() {
+		return this.filter;
+	}
+
+	public Map<String, Aggregation> getAggregations() {
+		return aggregations;
+	}
+
+	@Nullable
+	public Suggester getSuggester() {
+		return suggester;
+	}
+
+	@Nullable
+	public FieldCollapse getFieldCollapse() {
+		return fieldCollapse;
+	}
+
+	public List<ScriptedField> getScriptedFields() {
+		return scriptedFields;
+	}
+
+	public List<RescorerQuery> getRescorerQueries() {
+		return rescorerQueries;
+	}
+
+	public NativeQueryBuilder withQuery(Query query) {
+
+		Assert.notNull(query, "query must not be null");
+
+		this.query = query;
+		return this;
+	}
+
+	public NativeQueryBuilder withFilter(@Nullable Query filter) {
+		this.filter = filter;
+		return this;
+	}
+
+	public NativeQueryBuilder withQuery(Function<Query.Builder, ObjectBuilder<Query>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return withQuery(fn.apply(new Query.Builder()).build());
+	}
+
+	public NativeQueryBuilder withAggregation(String name, Aggregation aggregation) {
+
+		Assert.notNull(name, "name must not be null");
+		Assert.notNull(aggregation, "aggregation must not be null");
+
+		this.aggregations.put(name, aggregation);
+		return this;
+	}
+
+	public NativeQueryBuilder withSuggester(@Nullable Suggester suggester) {
+		this.suggester = suggester;
+		return this;
+	}
+
+	public NativeQueryBuilder withFieldCollapse(@Nullable FieldCollapse fieldCollapse) {
+		this.fieldCollapse = fieldCollapse;
+		return this;
+	}
+
+	public NativeQueryBuilder withScriptedField(ScriptedField scriptedField) {
+
+		Assert.notNull(scriptedField, "scriptedField must not be null");
+
+		this.scriptedFields.add(scriptedField);
+		return this;
+	}
+
+	public NativeQueryBuilder withResorerQuery(RescorerQuery resorerQuery) {
+
+		Assert.notNull(resorerQuery, "resorerQuery must not be null");
+
+		this.rescorerQueries.add(resorerQuery);
+		return this;
+	}
+
+	public NativeQuery build() {
+		return new NativeQuery(this);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/QueryBuilders.java

@@ -0,0 +1,171 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.FieldValue;
+import co.elastic.clients.elasticsearch._types.LatLonGeoLocation;
+import co.elastic.clients.elasticsearch._types.query_dsl.IdsQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.MatchAllQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.MatchQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.Operator;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryStringQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.TermQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.WildcardQuery;
+import co.elastic.clients.elasticsearch._types.query_dsl.WrapperQuery;
+import co.elastic.clients.util.ObjectBuilder;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.function.Function;
+
+import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Utility class simplifying the creation of some more complex queries and type.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public final class QueryBuilders {
+
+	private QueryBuilders() {}
+
+	public static IdsQuery idsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		return IdsQuery.of(i -> i.values(ids));
+	}
+
+	public static Query idsQueryAsQuery(List<String> ids) {
+
+		Assert.notNull(ids, "ids must not be null");
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.ids(idsQuery(ids));
+
+		return builder.apply(new Query.Builder()).build();
+	}
+	public static MatchQuery matchQuery(String fieldName, String query, @Nullable Operator operator,
+			@Nullable Float boost) {
+
+		Assert.notNull(fieldName, "fieldName must not be null");
+		Assert.notNull(query, "query must not be null");
+
+		return MatchQuery.of(mb -> mb.field(fieldName).query(FieldValue.of(query)).operator(operator).boost(boost));
+	}
+
+	public static Query matchQueryAsQuery(String fieldName, String query, @Nullable Operator operator,
+			@Nullable Float boost) {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.match(matchQuery(fieldName, query, operator, boost));
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static MatchAllQuery matchAllQuery() {
+
+		return MatchAllQuery.of(b -> b);
+	}
+
+	public static Query matchAllQueryAsQuery() {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = b -> b.matchAll(matchAllQuery());
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, @Nullable Float boost) {
+		return queryStringQuery(fieldName, query, null, null, boost);
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, Operator defaultOperator,
+			@Nullable Float boost) {
+		return queryStringQuery(fieldName, query, null, defaultOperator, boost);
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, @Nullable Boolean analyzeWildcard,
+			@Nullable Float boost) {
+		return queryStringQuery(fieldName, query, analyzeWildcard, null, boost);
+	}
+
+	public static QueryStringQuery queryStringQuery(String fieldName, String query, @Nullable Boolean analyzeWildcard,
+			@Nullable Operator defaultOperator, @Nullable Float boost) {
+
+		Assert.notNull(fieldName, "fieldName must not be null");
+		Assert.notNull(query, "query must not be null");
+
+		return QueryStringQuery.of(qs -> qs.fields(fieldName).query(query).analyzeWildcard(analyzeWildcard)
+				.defaultOperator(defaultOperator).boost(boost));
+	}
+
+	public static TermQuery termQuery(String fieldName, String value) {
+
+		Assert.notNull(fieldName, "fieldName must not be null");
+		Assert.notNull(value, "value must not be null");
+
+		return TermQuery.of(t -> t.field(fieldName).value(FieldValue.of(value)));
+	}
+
+	public static Query termQueryAsQuery(String fieldName, String value) {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = q -> q.term(termQuery(fieldName, value));
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static WildcardQuery wildcardQuery(String field, String value) {
+
+		Assert.notNull(field, "field must not be null");
+		Assert.notNull(value, "value must not be null");
+
+		return WildcardQuery.of(w -> w.field(field).wildcard(value));
+	}
+
+	public static Query wildcardQueryAsQuery(String field, String value) {
+		Function<Query.Builder, ObjectBuilder<Query>> builder = q -> q.wildcard(wildcardQuery(field, value));
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static Query wrapperQueryAsQuery(String query) {
+
+		Function<Query.Builder, ObjectBuilder<Query>> builder = q -> q.wrapper(wrapperQuery(query));
+
+		return builder.apply(new Query.Builder()).build();
+	}
+
+	public static WrapperQuery wrapperQuery(String query) {
+
+		Assert.notNull(query, "query must not be null");
+
+		String encodedValue = Base64.getEncoder().encodeToString(query.getBytes(StandardCharsets.UTF_8));
+
+		return WrapperQuery.of(wq -> wq.query(encodedValue));
+	}
+
+	public static LatLonGeoLocation latLon(GeoPoint geoPoint) {
+
+		Assert.notNull(geoPoint, "geoPoint must not be null");
+
+		return latLon(geoPoint.getLat(), geoPoint.getLon());
+	}
+
+	public static LatLonGeoLocation latLon(double lat, double lon) {
+		return LatLonGeoLocation.of(_0 -> _0.lat(lat).lon(lon));
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveChildTemplate.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.ApiClient;
+import co.elastic.clients.json.JsonpMapper;
+import reactor.core.publisher.Flux;
+
+import org.reactivestreams.Publisher;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.util.Assert;
+
+/**
+ * base class for a reactive template that uses on of the {@link ReactiveElasticsearchClient}'s child clients.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ReactiveChildTemplate<CLIENT extends ApiClient> {
+	protected final CLIENT client;
+	protected final ElasticsearchConverter elasticsearchConverter;
+	protected final RequestConverter requestConverter;
+	protected final ResponseConverter responseConverter;
+	private final JsonpMapper jsonpMapper;
+	protected final ElasticsearchExceptionTranslator exceptionTranslator;
+
+	public ReactiveChildTemplate(CLIENT client, ElasticsearchConverter elasticsearchConverter) {
+		this.client = client;
+		this.elasticsearchConverter = elasticsearchConverter;
+		jsonpMapper = client._transport().jsonpMapper();
+		requestConverter = new RequestConverter(elasticsearchConverter, jsonpMapper);
+		responseConverter = new ResponseConverter(jsonpMapper);
+		exceptionTranslator = new ElasticsearchExceptionTranslator(jsonpMapper);
+	}
+
+	/**
+	 * Callback interface to be used with {@link #execute(ClientCallback)} for operating directly on the client.
+	 */
+	@FunctionalInterface
+	public interface ClientCallback<CLIENT, RESULT extends Publisher<?>> {
+		RESULT doWithClient(CLIENT client);
+	}
+
+	/**
+	 * Execute a callback with the client and provide exception translation.
+	 *
+	 * @param callback the callback to execute, must not be {@literal null}
+	 * @param <RESULT> the type returned from the callback
+	 * @return the callback result
+	 */
+	public <RESULT> Publisher<RESULT> execute(ClientCallback<CLIENT, Publisher<RESULT>> callback) {
+
+		Assert.notNull(callback, "callback must not be null");
+
+		return Flux.defer(() -> callback.doWithClient(client)).onErrorMap(exceptionTranslator::translateException);
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveClusterTemplate.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch.cluster.HealthRequest;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+import reactor.core.publisher.Mono;
+
+import org.springframework.data.elasticsearch.core.cluster.ClusterHealth;
+import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+
+/**
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ReactiveClusterTemplate extends ReactiveChildTemplate<ReactiveElasticsearchClusterClient>
+		implements ReactiveClusterOperations {
+
+	public ReactiveClusterTemplate(ReactiveElasticsearchClusterClient client,
+			ElasticsearchConverter elasticsearchConverter) {
+		super(client, elasticsearchConverter);
+	}
+
+	@Override
+	public Mono<ClusterHealth> health() {
+
+		HealthRequest healthRequest = requestConverter.clusterHealthRequest();
+		Mono<HealthResponse> healthResponse = Mono.from(execute(client -> client.health(healthRequest)));
+		return healthResponse.map(responseConverter::clusterHealth);
+	}
+
+}

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

@@ -0,0 +1,281 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.ApiClient;
+import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch.core.*;
+import co.elastic.clients.elasticsearch.core.search.ResponseBody;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.JsonEndpoint;
+import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.endpoints.BooleanResponse;
+import co.elastic.clients.transport.endpoints.EndpointWithResponseMapperAttr;
+import co.elastic.clients.util.ObjectBuilder;
+import reactor.core.publisher.Mono;
+
+import java.util.function.Function;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Reactive version of {@link co.elastic.clients.elasticsearch.ElasticsearchClient}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ReactiveElasticsearchClient extends ApiClient<ElasticsearchTransport, ReactiveElasticsearchClient>
+		implements AutoCloseable {
+
+	public ReactiveElasticsearchClient(ElasticsearchTransport transport) {
+		super(transport, null);
+	}
+
+	public ReactiveElasticsearchClient(ElasticsearchTransport transport, @Nullable TransportOptions transportOptions) {
+		super(transport, transportOptions);
+	}
+
+	@Override
+	public ReactiveElasticsearchClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+		return new ReactiveElasticsearchClient(transport, transportOptions);
+	}
+
+	@Override
+	public void close() throws Exception {
+		transport.close();
+	}
+
+	// region child clients
+
+	public ReactiveElasticsearchClusterClient cluster() {
+		return new ReactiveElasticsearchClusterClient(transport, transportOptions);
+	}
+
+	public ReactiveElasticsearchIndicesClient indices() {
+		return new ReactiveElasticsearchIndicesClient(transport, transportOptions);
+	}
+
+	// endregion
+	// region info
+
+	public Mono<InfoResponse> info() {
+		return Mono
+				.fromFuture(transport.performRequestAsync(InfoRequest._INSTANCE, InfoRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BooleanResponse> ping() {
+		return Mono
+				.fromFuture(transport.performRequestAsync(PingRequest._INSTANCE, PingRequest._ENDPOINT, transportOptions));
+	}
+
+	// endregion
+	// region document
+
+	public <T> Mono<IndexResponse> index(IndexRequest<T> request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, IndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public <T> Mono<IndexResponse> index(Function<IndexRequest.Builder<T>, ObjectBuilder<IndexRequest<T>>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return index(fn.apply(new IndexRequest.Builder<>()).build());
+	}
+
+	public Mono<BulkResponse> bulk(BulkRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, BulkRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BulkResponse> bulk(Function<BulkRequest.Builder, ObjectBuilder<BulkRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return bulk(fn.apply(new BulkRequest.Builder()).build());
+	}
+
+	public <T> Mono<GetResponse<T>> get(GetRequest request, Class<T> tClass) {
+
+		Assert.notNull(request, "request must not be null");
+
+		// code adapted from
+		// co.elastic.clients.elasticsearch.ElasticsearchClient.get(co.elastic.clients.elasticsearch.core.GetRequest,
+		// java.lang.Class<TDocument>)
+		// noinspection unchecked
+		JsonEndpoint<GetRequest, GetResponse<T>, ErrorResponse> endpoint = (JsonEndpoint<GetRequest, GetResponse<T>, ErrorResponse>) GetRequest._ENDPOINT;
+		endpoint = new EndpointWithResponseMapperAttr<>(endpoint, "co.elastic.clients:Deserializer:_global.get.TDocument",
+				getDeserializer(tClass));
+
+		return Mono.fromFuture(transport.performRequestAsync(request, endpoint, transportOptions));
+	}
+
+	public <T, P> Mono<UpdateResponse<T>> update(UpdateRequest<T, P> request, Class<T> clazz) {
+
+		Assert.notNull(request, "request must not be null");
+
+		// noinspection unchecked
+		JsonEndpoint<UpdateRequest<?, ?>, UpdateResponse<T>, ErrorResponse> endpoint = new EndpointWithResponseMapperAttr(
+				UpdateRequest._ENDPOINT, "co.elastic.clients:Deserializer:_global.update.TDocument",
+				this.getDeserializer(clazz));
+		return Mono.fromFuture(transport.performRequestAsync(request, endpoint, this.transportOptions));
+	}
+
+	public <T, P> Mono<UpdateResponse<T>> update(
+			Function<UpdateRequest.Builder<T, P>, ObjectBuilder<UpdateRequest<T, P>>> fn, Class<T> clazz) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return update(fn.apply(new UpdateRequest.Builder<>()).build(), clazz);
+	}
+
+	public <T> Mono<GetResponse<T>> get(Function<GetRequest.Builder, ObjectBuilder<GetRequest>> fn, Class<T> tClass) {
+		Assert.notNull(fn, "fn must not be null");
+
+		return get(fn.apply(new GetRequest.Builder()).build(), tClass);
+	}
+
+	public <T> Mono<MgetResponse<T>> mget(MgetRequest request, Class<T> clazz) {
+
+		Assert.notNull(request, "request must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
+
+		// noinspection unchecked
+		JsonEndpoint<MgetRequest, MgetResponse<T>, ErrorResponse> endpoint = (JsonEndpoint<MgetRequest, MgetResponse<T>, ErrorResponse>) MgetRequest._ENDPOINT;
+		endpoint = new EndpointWithResponseMapperAttr<>(endpoint, "co.elastic.clients:Deserializer:_global.mget.TDocument",
+				this.getDeserializer(clazz));
+
+		return Mono.fromFuture(transport.performRequestAsync(request, endpoint, transportOptions));
+	}
+
+	public <T> Mono<MgetResponse<T>> mget(Function<MgetRequest.Builder, ObjectBuilder<MgetRequest>> fn, Class<T> clazz) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return mget(fn.apply(new MgetRequest.Builder()).build(), clazz);
+	}
+
+	public Mono<ReindexResponse> reindex(ReindexRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, ReindexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ReindexResponse> reindex(Function<ReindexRequest.Builder, ObjectBuilder<ReindexRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return reindex(fn.apply(new ReindexRequest.Builder()).build());
+	}
+
+	public Mono<DeleteResponse> delete(DeleteRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteResponse> delete(Function<DeleteRequest.Builder, ObjectBuilder<DeleteRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return delete(fn.apply(new DeleteRequest.Builder()).build());
+	}
+
+	public Mono<DeleteByQueryResponse> deleteByQuery(DeleteByQueryRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteByQueryRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteByQueryResponse> deleteByQuery(
+			Function<DeleteByQueryRequest.Builder, ObjectBuilder<DeleteByQueryRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return deleteByQuery(fn.apply(new DeleteByQueryRequest.Builder()).build());
+	}
+
+	// endregion
+	// region search
+
+	public <T> Mono<ResponseBody<T>> search(SearchRequest request, Class<T> tDocumentClass) {
+
+		Assert.notNull(request, "request must not be null");
+		Assert.notNull(tDocumentClass, "tDocumentClass must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request,
+				SearchRequest.createSearchEndpoint(this.getDeserializer(tDocumentClass)), transportOptions));
+	}
+
+	public <T> Mono<ResponseBody<T>> search(Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>> fn,
+			Class<T> tDocumentClass) {
+
+		Assert.notNull(fn, "fn must not be null");
+		Assert.notNull(tDocumentClass, "tDocumentClass must not be null");
+
+		return search(fn.apply(new SearchRequest.Builder()).build(), tDocumentClass);
+	}
+
+	public <T> Mono<ScrollResponse<T>> scroll(ScrollRequest request, Class<T> tDocumentClass) {
+
+		Assert.notNull(request, "request must not be null");
+		Assert.notNull(tDocumentClass, "tDocumentClass must not be null");
+
+		// code adapted from
+		// co.elastic.clients.elasticsearch.ElasticsearchClient.scroll(co.elastic.clients.elasticsearch.core.ScrollRequest,
+		// java.lang.Class<TDocument>)
+		// noinspection unchecked
+		JsonEndpoint<ScrollRequest, ScrollResponse<T>, ErrorResponse> endpoint = (JsonEndpoint<ScrollRequest, ScrollResponse<T>, ErrorResponse>) ScrollRequest._ENDPOINT;
+		endpoint = new EndpointWithResponseMapperAttr<>(endpoint,
+				"co.elastic.clients:Deserializer:_global.scroll.TDocument", getDeserializer(tDocumentClass));
+
+		return Mono.fromFuture(transport.performRequestAsync(request, endpoint, transportOptions));
+	}
+
+	public <T> Mono<ScrollResponse<T>> scroll(Function<ScrollRequest.Builder, ObjectBuilder<ScrollRequest>> fn,
+			Class<T> tDocumentClass) {
+
+		Assert.notNull(fn, "fn must not be null");
+		Assert.notNull(tDocumentClass, "tDocumentClass must not be null");
+
+		return scroll(fn.apply(new ScrollRequest.Builder()).build(), tDocumentClass);
+	}
+
+	public Mono<ClearScrollResponse> clearScroll(ClearScrollRequest request) {
+
+		Assert.notNull(request, "request must not be null");
+
+		return Mono.fromFuture(transport.performRequestAsync(request, ClearScrollRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ClearScrollResponse> clearScroll(
+			Function<ClearScrollRequest.Builder, ObjectBuilder<ClearScrollRequest>> fn) {
+
+		Assert.notNull(fn, "fn must not be null");
+
+		return clearScroll(fn.apply(new ClearScrollRequest.Builder()).build());
+	}
+	// endregion
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchClusterClient.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.ApiClient;
+import co.elastic.clients.elasticsearch.cluster.HealthRequest;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.util.ObjectBuilder;
+import reactor.core.publisher.Mono;
+
+import java.util.function.Function;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * Reactive version of the {@link co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient}
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ReactiveElasticsearchClusterClient
+		extends ApiClient<ElasticsearchTransport, ReactiveElasticsearchClusterClient> {
+
+	public ReactiveElasticsearchClusterClient(ElasticsearchTransport transport,
+			@Nullable TransportOptions transportOptions) {
+		super(transport, transportOptions);
+	}
+
+	@Override
+	public ReactiveElasticsearchClusterClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+		return new ReactiveElasticsearchClusterClient(transport, transportOptions);
+	}
+
+	public Mono<HealthResponse> health(HealthRequest healthRequest) {
+		return Mono.fromFuture(transport.performRequestAsync(healthRequest, HealthRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<HealthResponse> health(Function<HealthRequest.Builder, ObjectBuilder<HealthRequest>> fn) {
+		return health(fn.apply(new HealthRequest.Builder()).build());
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchConfiguration.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.rest_client.RestClientOptions;
+
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.util.Assert;
+
+/**
+ * Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
+ * connection using the {@link ReactiveElasticsearchClient}.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
+
+	/**
+	 * Must be implemented by deriving classes to provide the {@link ClientConfiguration}.
+	 *
+	 * @return configuration, must not be {@literal null}
+	 */
+	@Bean
+	public abstract ClientConfiguration clientConfiguration();
+
+	/**
+	 * Provides the underlying low level RestClient.
+	 *
+	 * @param clientConfiguration configuration for the client, must not be {@literal null}
+	 * @return RestClient
+	 */
+	@Bean
+	public RestClient restClient(ClientConfiguration clientConfiguration) {
+
+		Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
+
+		return ElasticsearchClients.getRestClient(clientConfiguration);
+	}
+
+	/**
+	 * Provides the {@link ReactiveElasticsearchClient} instance used.
+	 *
+	 * @param restClient the low level RestClient to use
+	 * @return ReactiveElasticsearchClient instance.
+	 */
+	@Bean
+	public ReactiveElasticsearchClient reactiveElasticsearchClient(RestClient restClient) {
+
+		Assert.notNull(restClient, "restClient must not be null");
+
+		return ElasticsearchClients.createReactive(restClient, transportOptions());
+	}
+
+	/**
+	 * Creates {@link ReactiveElasticsearchOperations}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Bean(name = { "reactiveElasticsearchOperations", "reactiveElasticsearchTemplate" })
+	public ReactiveElasticsearchOperations reactiveElasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
+			ReactiveElasticsearchClient reactiveElasticsearchClient) {
+
+		ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(reactiveElasticsearchClient,
+				elasticsearchConverter);
+		template.setRefreshPolicy(refreshPolicy());
+
+		return template;
+	}
+
+	/**
+	 * @return the options that should be added to every request. Must not be {@literal null}
+	 */
+	public TransportOptions transportOptions() {
+		return new RestClientOptions(RequestOptions.DEFAULT).toBuilder().build();
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchIndicesClient.java

@@ -0,0 +1,576 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.ApiClient;
+import co.elastic.clients.elasticsearch.indices.*;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.endpoints.BooleanResponse;
+import co.elastic.clients.util.ObjectBuilder;
+import reactor.core.publisher.Mono;
+
+import java.util.function.Function;
+
+import org.springframework.lang.Nullable;
+
+/**
+ * Reactive version of the {@link co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesClient}
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ReactiveElasticsearchIndicesClient
+		extends ApiClient<ElasticsearchTransport, ReactiveElasticsearchIndicesClient> {
+
+	public ReactiveElasticsearchIndicesClient(ElasticsearchTransport transport,
+			@Nullable TransportOptions transportOptions) {
+		super(transport, transportOptions);
+	}
+
+	@Override
+	public ReactiveElasticsearchIndicesClient withTransportOptions(@Nullable TransportOptions transportOptions) {
+		return new ReactiveElasticsearchIndicesClient(transport, transportOptions);
+	}
+
+	public Mono<AddBlockResponse> addBlock(AddBlockRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, AddBlockRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<AddBlockResponse> addBlock(Function<AddBlockRequest.Builder, ObjectBuilder<AddBlockRequest>> fn) {
+		return addBlock(fn.apply(new AddBlockRequest.Builder()).build());
+	}
+
+	public Mono<AnalyzeResponse> analyze(AnalyzeRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, AnalyzeRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<AnalyzeResponse> analyze(Function<AnalyzeRequest.Builder, ObjectBuilder<AnalyzeRequest>> fn) {
+		return analyze(fn.apply(new AnalyzeRequest.Builder()).build());
+	}
+
+	public Mono<AnalyzeResponse> analyze() {
+		return analyze(builder -> builder);
+	}
+
+	public Mono<ClearCacheResponse> clearCache(ClearCacheRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ClearCacheRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ClearCacheResponse> clearCache(Function<ClearCacheRequest.Builder, ObjectBuilder<ClearCacheRequest>> fn) {
+		return clearCache(fn.apply(new ClearCacheRequest.Builder()).build());
+	}
+
+	public Mono<ClearCacheResponse> clearCache() {
+		return clearCache(builder -> builder);
+	}
+
+	public Mono<CloneIndexResponse> clone(CloneIndexRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, CloneIndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<CloneIndexResponse> clone(Function<CloneIndexRequest.Builder, ObjectBuilder<CloneIndexRequest>> fn) {
+		return clone(fn.apply(new CloneIndexRequest.Builder()).build());
+	}
+
+	public Mono<CloseIndexResponse> close(CloseIndexRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, CloseIndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<CloseIndexResponse> close(Function<CloseIndexRequest.Builder, ObjectBuilder<CloseIndexRequest>> fn) {
+		return close(fn.apply(new CloseIndexRequest.Builder()).build());
+	}
+
+	public Mono<CreateIndexResponse> create(CreateIndexRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, CreateIndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<CreateIndexResponse> create(Function<CreateIndexRequest.Builder, ObjectBuilder<CreateIndexRequest>> fn) {
+		return create(fn.apply(new CreateIndexRequest.Builder()).build());
+	}
+
+	public Mono<CreateDataStreamResponse> createDataStream(CreateDataStreamRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, CreateDataStreamRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<CreateDataStreamResponse> createDataStream(
+			Function<CreateDataStreamRequest.Builder, ObjectBuilder<CreateDataStreamRequest>> fn) {
+		return createDataStream(fn.apply(new CreateDataStreamRequest.Builder()).build());
+	}
+
+	public Mono<DataStreamsStatsResponse> dataStreamsStats(DataStreamsStatsRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, DataStreamsStatsRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DataStreamsStatsResponse> dataStreamsStats(
+			Function<DataStreamsStatsRequest.Builder, ObjectBuilder<DataStreamsStatsRequest>> fn) {
+		return dataStreamsStats(fn.apply(new DataStreamsStatsRequest.Builder()).build());
+	}
+
+	public Mono<DataStreamsStatsResponse> dataStreamsStats() {
+		return dataStreamsStats(builder -> builder);
+	}
+
+	public Mono<DeleteIndexResponse> delete(DeleteIndexRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteIndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteIndexResponse> delete(Function<DeleteIndexRequest.Builder, ObjectBuilder<DeleteIndexRequest>> fn) {
+		return delete(fn.apply(new DeleteIndexRequest.Builder()).build());
+	}
+
+	public Mono<DeleteAliasResponse> deleteAlias(DeleteAliasRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteAliasRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteAliasResponse> deleteAlias(
+			Function<DeleteAliasRequest.Builder, ObjectBuilder<DeleteAliasRequest>> fn) {
+		return deleteAlias(fn.apply(new DeleteAliasRequest.Builder()).build());
+	}
+
+	public Mono<DeleteDataStreamResponse> deleteDataStream(DeleteDataStreamRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteDataStreamRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteDataStreamResponse> deleteDataStream(
+			Function<DeleteDataStreamRequest.Builder, ObjectBuilder<DeleteDataStreamRequest>> fn) {
+		return deleteDataStream(fn.apply(new DeleteDataStreamRequest.Builder()).build());
+	}
+
+	public Mono<DeleteIndexTemplateResponse> deleteIndexTemplate(DeleteIndexTemplateRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, DeleteIndexTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteIndexTemplateResponse> deleteIndexTemplate(
+			Function<DeleteIndexTemplateRequest.Builder, ObjectBuilder<DeleteIndexTemplateRequest>> fn) {
+		return deleteIndexTemplate(fn.apply(new DeleteIndexTemplateRequest.Builder()).build());
+	}
+
+	public Mono<DeleteTemplateResponse> deleteTemplate(DeleteTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, DeleteTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DeleteTemplateResponse> deleteTemplate(
+			Function<DeleteTemplateRequest.Builder, ObjectBuilder<DeleteTemplateRequest>> fn) {
+		return deleteTemplate(fn.apply(new DeleteTemplateRequest.Builder()).build());
+	}
+
+	public Mono<DiskUsageResponse> diskUsage(DiskUsageRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, DiskUsageRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<DiskUsageResponse> diskUsage(Function<DiskUsageRequest.Builder, ObjectBuilder<DiskUsageRequest>> fn) {
+		return diskUsage(fn.apply(new DiskUsageRequest.Builder()).build());
+	}
+
+	public Mono<BooleanResponse> exists(ExistsRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ExistsRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BooleanResponse> exists(Function<ExistsRequest.Builder, ObjectBuilder<ExistsRequest>> fn) {
+		return exists(fn.apply(new ExistsRequest.Builder()).build());
+	}
+
+	public Mono<BooleanResponse> existsAlias(ExistsAliasRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ExistsAliasRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BooleanResponse> existsAlias(Function<ExistsAliasRequest.Builder, ObjectBuilder<ExistsAliasRequest>> fn) {
+		return existsAlias(fn.apply(new ExistsAliasRequest.Builder()).build());
+	}
+
+	public Mono<BooleanResponse> existsIndexTemplate(ExistsIndexTemplateRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, ExistsIndexTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BooleanResponse> existsIndexTemplate(
+			Function<ExistsIndexTemplateRequest.Builder, ObjectBuilder<ExistsIndexTemplateRequest>> fn) {
+		return existsIndexTemplate(fn.apply(new ExistsIndexTemplateRequest.Builder()).build());
+	}
+
+	public Mono<BooleanResponse> existsTemplate(ExistsTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ExistsTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<BooleanResponse> existsTemplate(
+			Function<ExistsTemplateRequest.Builder, ObjectBuilder<ExistsTemplateRequest>> fn) {
+		return existsTemplate(fn.apply(new ExistsTemplateRequest.Builder()).build());
+	}
+
+	public Mono<FlushResponse> flush(FlushRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, FlushRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<FlushResponse> flush(Function<FlushRequest.Builder, ObjectBuilder<FlushRequest>> fn) {
+		return flush(fn.apply(new FlushRequest.Builder()).build());
+	}
+
+	public Mono<FlushResponse> flush() {
+		return flush(builder -> builder);
+	}
+
+	@SuppressWarnings("SpellCheckingInspection")
+	public Mono<ForcemergeResponse> forcemerge(ForcemergeRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ForcemergeRequest._ENDPOINT, transportOptions));
+	}
+
+	@SuppressWarnings("SpellCheckingInspection")
+	public Mono<ForcemergeResponse> forcemerge(Function<ForcemergeRequest.Builder, ObjectBuilder<ForcemergeRequest>> fn) {
+		return forcemerge(fn.apply(new ForcemergeRequest.Builder()).build());
+	}
+
+	@SuppressWarnings("SpellCheckingInspection")
+	public Mono<ForcemergeResponse> forcemerge() {
+		return forcemerge(builder -> builder);
+	}
+
+	public Mono<GetIndexResponse> get(GetIndexRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, GetIndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetIndexResponse> get(Function<GetIndexRequest.Builder, ObjectBuilder<GetIndexRequest>> fn) {
+		return get(fn.apply(new GetIndexRequest.Builder()).build());
+	}
+
+	public Mono<GetAliasResponse> getAlias(GetAliasRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, GetAliasRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetAliasResponse> getAlias(Function<GetAliasRequest.Builder, ObjectBuilder<GetAliasRequest>> fn) {
+		return getAlias(fn.apply(new GetAliasRequest.Builder()).build());
+	}
+
+	public Mono<GetAliasResponse> getAlias() {
+		return getAlias(builder -> builder);
+	}
+
+	public Mono<GetDataStreamResponse> getDataStream(GetDataStreamRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, GetDataStreamRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetDataStreamResponse> getDataStream(
+			Function<GetDataStreamRequest.Builder, ObjectBuilder<GetDataStreamRequest>> fn) {
+		return getDataStream(fn.apply(new GetDataStreamRequest.Builder()).build());
+	}
+
+	public Mono<GetDataStreamResponse> getDataStream() {
+		return getDataStream(builder -> builder);
+	}
+
+	public Mono<GetFieldMappingResponse> getFieldMapping(GetFieldMappingRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, GetFieldMappingRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetFieldMappingResponse> getFieldMapping(
+			Function<GetFieldMappingRequest.Builder, ObjectBuilder<GetFieldMappingRequest>> fn) {
+		return getFieldMapping(fn.apply(new GetFieldMappingRequest.Builder()).build());
+	}
+
+	public Mono<GetIndexTemplateResponse> getIndexTemplate(GetIndexTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, GetIndexTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetIndexTemplateResponse> getIndexTemplate(
+			Function<GetIndexTemplateRequest.Builder, ObjectBuilder<GetIndexTemplateRequest>> fn) {
+		return getIndexTemplate(fn.apply(new GetIndexTemplateRequest.Builder()).build());
+	}
+
+	public Mono<GetIndexTemplateResponse> getIndexTemplate() {
+		return getIndexTemplate(builder -> builder);
+	}
+
+	public Mono<GetMappingResponse> getMapping(GetMappingRequest getMappingRequest) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(getMappingRequest, GetMappingRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetMappingResponse> getMapping(Function<GetMappingRequest.Builder, ObjectBuilder<GetMappingRequest>> fn) {
+		return getMapping(fn.apply(new GetMappingRequest.Builder()).build());
+	}
+
+	public Mono<GetMappingResponse> getMapping() {
+		return getMapping(builder -> builder);
+	}
+
+	public Mono<GetIndicesSettingsResponse> getSettings(GetIndicesSettingsRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, GetIndicesSettingsRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetIndicesSettingsResponse> getSettings(
+			Function<GetIndicesSettingsRequest.Builder, ObjectBuilder<GetIndicesSettingsRequest>> fn) {
+		return getSettings(fn.apply(new GetIndicesSettingsRequest.Builder()).build());
+	}
+
+	public Mono<GetIndicesSettingsResponse> getSettings() {
+		return getSettings(builder -> builder);
+	}
+
+	public Mono<GetTemplateResponse> getTemplate(GetTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, GetTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<GetTemplateResponse> getTemplate(
+			Function<GetTemplateRequest.Builder, ObjectBuilder<GetTemplateRequest>> fn) {
+		return getTemplate(fn.apply(new GetTemplateRequest.Builder()).build());
+	}
+
+	public Mono<GetTemplateResponse> getTemplate() {
+		return getTemplate(builder -> builder);
+	}
+
+	public Mono<MigrateToDataStreamResponse> migrateToDataStream(MigrateToDataStreamRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, MigrateToDataStreamRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<MigrateToDataStreamResponse> migrateToDataStream(
+			Function<MigrateToDataStreamRequest.Builder, ObjectBuilder<MigrateToDataStreamRequest>> fn) {
+		return migrateToDataStream(fn.apply(new MigrateToDataStreamRequest.Builder()).build());
+	}
+
+	public Mono<OpenResponse> open(OpenRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, OpenRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<OpenResponse> open(Function<OpenRequest.Builder, ObjectBuilder<OpenRequest>> fn) {
+		return open(fn.apply(new OpenRequest.Builder()).build());
+	}
+
+	public Mono<PromoteDataStreamResponse> promoteDataStream(PromoteDataStreamRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, PromoteDataStreamRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PromoteDataStreamResponse> promoteDataStream(
+			Function<PromoteDataStreamRequest.Builder, ObjectBuilder<PromoteDataStreamRequest>> fn) {
+		return promoteDataStream(fn.apply(new PromoteDataStreamRequest.Builder()).build());
+	}
+
+	public Mono<PutAliasResponse> putAlias(PutAliasRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, PutAliasRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PutAliasResponse> putAlias(Function<PutAliasRequest.Builder, ObjectBuilder<PutAliasRequest>> fn) {
+		return putAlias(fn.apply(new PutAliasRequest.Builder()).build());
+	}
+
+	public Mono<PutIndexTemplateResponse> putIndexTemplate(PutIndexTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, PutIndexTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PutIndexTemplateResponse> putIndexTemplate(
+			Function<PutIndexTemplateRequest.Builder, ObjectBuilder<PutIndexTemplateRequest>> fn) {
+		return putIndexTemplate(fn.apply(new PutIndexTemplateRequest.Builder()).build());
+	}
+
+	public Mono<PutMappingResponse> putMapping(PutMappingRequest putMappingRequest) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(putMappingRequest, PutMappingRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PutMappingResponse> putMapping(Function<PutMappingRequest.Builder, ObjectBuilder<PutMappingRequest>> fn) {
+		return putMapping(fn.apply(new PutMappingRequest.Builder()).build());
+	}
+
+	public Mono<PutIndicesSettingsResponse> putSettings(PutIndicesSettingsRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, PutIndicesSettingsRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PutIndicesSettingsResponse> putSettings(
+			Function<PutIndicesSettingsRequest.Builder, ObjectBuilder<PutIndicesSettingsRequest>> fn) {
+		return putSettings(fn.apply(new PutIndicesSettingsRequest.Builder()).build());
+	}
+
+	public Mono<PutIndicesSettingsResponse> putSettings() {
+		return putSettings(builder -> builder);
+	}
+
+	public Mono<PutTemplateResponse> putTemplate(PutTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, PutTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<PutTemplateResponse> putTemplate(
+			Function<PutTemplateRequest.Builder, ObjectBuilder<PutTemplateRequest>> fn) {
+		return putTemplate(fn.apply(new PutTemplateRequest.Builder()).build());
+	}
+
+	public Mono<RecoveryResponse> recovery(RecoveryRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, RecoveryRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<RecoveryResponse> recovery(Function<RecoveryRequest.Builder, ObjectBuilder<RecoveryRequest>> fn) {
+		return recovery(fn.apply(new RecoveryRequest.Builder()).build());
+	}
+
+	public Mono<RecoveryResponse> recovery() {
+		return recovery(builder -> builder);
+	}
+
+	public Mono<RefreshResponse> refresh(RefreshRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, RefreshRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<RefreshResponse> refresh(Function<RefreshRequest.Builder, ObjectBuilder<RefreshRequest>> fn) {
+		return refresh(fn.apply(new RefreshRequest.Builder()).build());
+	}
+
+	public Mono<RefreshResponse> refresh() {
+		return refresh(builder -> builder);
+	}
+
+	public Mono<ReloadSearchAnalyzersResponse> reloadSearchAnalyzers(ReloadSearchAnalyzersRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, ReloadSearchAnalyzersRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ReloadSearchAnalyzersResponse> reloadSearchAnalyzers(
+			Function<ReloadSearchAnalyzersRequest.Builder, ObjectBuilder<ReloadSearchAnalyzersRequest>> fn) {
+		return reloadSearchAnalyzers(fn.apply(new ReloadSearchAnalyzersRequest.Builder()).build());
+	}
+
+	public Mono<ResolveIndexResponse> resolveIndex(ResolveIndexRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ResolveIndexRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ResolveIndexResponse> resolveIndex(
+			Function<ResolveIndexRequest.Builder, ObjectBuilder<ResolveIndexRequest>> fn) {
+		return resolveIndex(fn.apply(new ResolveIndexRequest.Builder()).build());
+	}
+
+	public Mono<RolloverResponse> rollover(RolloverRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, RolloverRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<RolloverResponse> rollover(Function<RolloverRequest.Builder, ObjectBuilder<RolloverRequest>> fn) {
+		return rollover(fn.apply(new RolloverRequest.Builder()).build());
+	}
+
+	public Mono<SegmentsResponse> segments(SegmentsRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, SegmentsRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<SegmentsResponse> segments(Function<SegmentsRequest.Builder, ObjectBuilder<SegmentsRequest>> fn) {
+		return segments(fn.apply(new SegmentsRequest.Builder()).build());
+	}
+
+	public Mono<SegmentsResponse> segments() {
+		return segments(builder -> builder);
+	}
+
+	public Mono<ShardStoresResponse> shardStores(ShardStoresRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ShardStoresRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ShardStoresResponse> shardStores(
+			Function<ShardStoresRequest.Builder, ObjectBuilder<ShardStoresRequest>> fn) {
+		return shardStores(fn.apply(new ShardStoresRequest.Builder()).build());
+	}
+
+	public Mono<ShardStoresResponse> shardStores() {
+		return shardStores(builder -> builder);
+	}
+
+	public Mono<ShrinkResponse> shrink(ShrinkRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ShrinkRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ShrinkResponse> shrink(Function<ShrinkRequest.Builder, ObjectBuilder<ShrinkRequest>> fn) {
+		return shrink(fn.apply(new ShrinkRequest.Builder()).build());
+	}
+
+	public Mono<SimulateIndexTemplateResponse> simulateIndexTemplate(SimulateIndexTemplateRequest request) {
+		return Mono
+				.fromFuture(transport.performRequestAsync(request, SimulateIndexTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<SimulateIndexTemplateResponse> simulateIndexTemplate(
+			Function<SimulateIndexTemplateRequest.Builder, ObjectBuilder<SimulateIndexTemplateRequest>> fn) {
+		return simulateIndexTemplate(fn.apply(new SimulateIndexTemplateRequest.Builder()).build());
+	}
+
+	public Mono<SimulateTemplateResponse> simulateTemplate(SimulateTemplateRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, SimulateTemplateRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<SimulateTemplateResponse> simulateTemplate(
+			Function<SimulateTemplateRequest.Builder, ObjectBuilder<SimulateTemplateRequest>> fn) {
+		return simulateTemplate(fn.apply(new SimulateTemplateRequest.Builder()).build());
+	}
+
+	public Mono<SimulateTemplateResponse> simulateTemplate() {
+		return simulateTemplate(builder -> builder);
+	}
+
+	public Mono<SplitResponse> split(SplitRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, SplitRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<SplitResponse> split(Function<SplitRequest.Builder, ObjectBuilder<SplitRequest>> fn) {
+		return split(fn.apply(new SplitRequest.Builder()).build());
+	}
+
+	public Mono<IndicesStatsResponse> stats(IndicesStatsRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, IndicesStatsRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<IndicesStatsResponse> stats(
+			Function<IndicesStatsRequest.Builder, ObjectBuilder<IndicesStatsRequest>> fn) {
+		return stats(fn.apply(new IndicesStatsRequest.Builder()).build());
+	}
+
+	public Mono<IndicesStatsResponse> stats() {
+		return stats(builder -> builder);
+	}
+
+	public Mono<UnfreezeResponse> unfreeze(UnfreezeRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, UnfreezeRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<UnfreezeResponse> unfreeze(Function<UnfreezeRequest.Builder, ObjectBuilder<UnfreezeRequest>> fn) {
+		return unfreeze(fn.apply(new UnfreezeRequest.Builder()).build());
+	}
+
+	public Mono<UpdateAliasesResponse> updateAliases(UpdateAliasesRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, UpdateAliasesRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<UpdateAliasesResponse> updateAliases(
+			Function<UpdateAliasesRequest.Builder, ObjectBuilder<UpdateAliasesRequest>> fn) {
+		return updateAliases(fn.apply(new UpdateAliasesRequest.Builder()).build());
+	}
+
+	public Mono<UpdateAliasesResponse> updateAliases() {
+		return updateAliases(builder -> builder);
+	}
+
+	public Mono<ValidateQueryResponse> validateQuery(ValidateQueryRequest request) {
+		return Mono.fromFuture(transport.performRequestAsync(request, ValidateQueryRequest._ENDPOINT, transportOptions));
+	}
+
+	public Mono<ValidateQueryResponse> validateQuery(
+			Function<ValidateQueryRequest.Builder, ObjectBuilder<ValidateQueryRequest>> fn) {
+		return validateQuery(fn.apply(new ValidateQueryRequest.Builder()).build());
+	}
+
+	public Mono<ValidateQueryResponse> validateQuery() {
+		return validateQuery(builder -> builder);
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveElasticsearchTemplate.java

@@ -0,0 +1,543 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+
+import co.elastic.clients.elasticsearch._types.Result;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch.core.*;
+import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
+import co.elastic.clients.elasticsearch.core.get.GetResult;
+import co.elastic.clients.elasticsearch.core.search.ResponseBody;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.transport.Version;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.elasticsearch.search.suggest.Suggest;
+import org.elasticsearch.search.suggest.SuggestBuilder;
+import org.reactivestreams.Publisher;
+import org.springframework.data.elasticsearch.BulkFailureException;
+import org.springframework.data.elasticsearch.NoSuchIndexException;
+import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
+import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
+import org.springframework.data.elasticsearch.client.util.ScrollState;
+import org.springframework.data.elasticsearch.core.AbstractReactiveElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.AggregationContainer;
+import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
+import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.document.SearchDocument;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.BulkOptions;
+import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
+import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.UpdateResponse;
+import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
+import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * Implementation of {@link org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations} using the new
+ * Elasticsearch client.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate {
+
+	private final ReactiveElasticsearchClient client;
+	private final RequestConverter requestConverter;
+	private final ResponseConverter responseConverter;
+	private final JsonpMapper jsonpMapper;
+	private final ElasticsearchExceptionTranslator exceptionTranslator;
+
+	protected ReactiveElasticsearchTemplate(ReactiveElasticsearchClient client, ElasticsearchConverter converter) {
+		super(converter);
+
+		Assert.notNull(client, "client must not be null");
+
+		this.client = client;
+		this.jsonpMapper = client._transport().jsonpMapper();
+		requestConverter = new RequestConverter(converter, jsonpMapper);
+		responseConverter = new ResponseConverter(jsonpMapper);
+		exceptionTranslator = new ElasticsearchExceptionTranslator(jsonpMapper);
+	}
+
+	// region Document operations
+	@Override
+	protected <T> Mono<Tuple2<T, IndexResponseMetaData>> doIndex(T entity, IndexCoordinates index) {
+
+		IndexRequest<?> indexRequest = requestConverter.documentIndexRequest(getIndexQuery(entity), index,
+				getRefreshPolicy());
+		return Mono.just(entity) //
+				.zipWith(//
+						Mono.from(execute((ClientCallback<Publisher<IndexResponse>>) client -> client.index(indexRequest))) //
+								.map(indexResponse -> new IndexResponseMetaData(indexResponse.id(), //
+										indexResponse.seqNo(), //
+										indexResponse.primaryTerm(), //
+										indexResponse.version() //
+								)));
+	}
+
+	@Override
+	public <T> Flux<T> saveAll(Mono<? extends Collection<? extends T>> entitiesPublisher, IndexCoordinates index) {
+
+		Assert.notNull(entitiesPublisher, "entitiesPublisher must not be null!");
+
+		return entitiesPublisher //
+				.flatMapMany(entities -> Flux.fromIterable(entities) //
+						.concatMap(entity -> maybeCallBeforeConvert(entity, index)) //
+				).collectList() //
+				.map(Entities::new) //
+				.flatMapMany(entities -> {
+
+					if (entities.isEmpty()) {
+						return Flux.empty();
+					}
+
+					return doBulkOperation(entities.indexQueries(), BulkOptions.defaultOptions(), index)//
+							.index() //
+							.flatMap(indexAndResponse -> {
+								T savedEntity = entities.entityAt(indexAndResponse.getT1());
+								BulkResponseItem response = indexAndResponse.getT2();
+								updateIndexedObject(savedEntity, IndexedObjectInformation.of(response.id(), response.seqNo(),
+										response.primaryTerm(), response.version()));
+								return maybeCallAfterSave(savedEntity, index);
+							});
+				});
+	}
+
+	@Override
+	public <T> Mono<T> get(String id, Class<T> entityType, IndexCoordinates index) {
+
+		Assert.notNull(id, "id must not be null");
+		Assert.notNull(entityType, "entityType must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		GetRequest getRequest = requestConverter.documentGetRequest(id, routingResolver.getRouting(), index, false);
+
+		Mono<GetResponse<EntityAsMap>> getResponse = Mono.from(execute(
+				(ClientCallback<Publisher<GetResponse<EntityAsMap>>>) client -> client.get(getRequest, EntityAsMap.class)));
+
+		ReadDocumentCallback<T> callback = new ReadDocumentCallback<>(converter, entityType, index);
+		return getResponse.flatMap(response -> callback.toEntity(DocumentAdapters.from(response)));
+	}
+
+	@Override
+	public Mono<ReindexResponse> reindex(ReindexRequest reindexRequest) {
+
+		Assert.notNull(reindexRequest, "reindexRequest must not be null");
+
+		co.elastic.clients.elasticsearch.core.ReindexRequest reindexRequestES = requestConverter.reindex(reindexRequest,
+				true);
+
+		return Mono.from(execute( //
+				(ClientCallback<Publisher<co.elastic.clients.elasticsearch.core.ReindexResponse>>) client -> client
+						.reindex(reindexRequestES)))
+				.map(responseConverter::reindexResponse);
+	}
+
+	@Override
+	public Mono<String> submitReindex(ReindexRequest reindexRequest) {
+
+		Assert.notNull(reindexRequest, "reindexRequest must not be null");
+
+		co.elastic.clients.elasticsearch.core.ReindexRequest reindexRequestES = requestConverter.reindex(reindexRequest,
+				false);
+
+		return Mono.from(execute( //
+				(ClientCallback<Publisher<co.elastic.clients.elasticsearch.core.ReindexResponse>>) client -> client
+						.reindex(reindexRequestES)))
+				.flatMap(response -> (response.task() == null) ? Mono.error(
+						new UnsupportedBackendOperation("ElasticsearchClient did not return a task id on submit request"))
+						: Mono.just(response.task()));
+	}
+
+	@Override
+	public Mono<Void> bulkUpdate(List<UpdateQuery> queries, BulkOptions bulkOptions, IndexCoordinates index) {
+
+		Assert.notNull(queries, "List of UpdateQuery must not be null");
+		Assert.notNull(bulkOptions, "BulkOptions must not be null");
+		Assert.notNull(index, "Index must not be null");
+
+		return doBulkOperation(queries, bulkOptions, index).then();
+	}
+
+	private Flux<BulkResponseItem> doBulkOperation(List<?> queries, BulkOptions bulkOptions, IndexCoordinates index) {
+
+		BulkRequest bulkRequest = requestConverter.documentBulkRequest(queries, bulkOptions, index, getRefreshPolicy());
+		return client.bulk(bulkRequest)
+				.onErrorMap(e -> new UncategorizedElasticsearchException("Error executing bulk request", e))
+				.flatMap(this::checkForBulkOperationFailure) //
+				.flatMapMany(response -> Flux.fromIterable(response.items()));
+
+	}
+
+	private Mono<BulkResponse> checkForBulkOperationFailure(BulkResponse bulkResponse) {
+
+		if (bulkResponse.errors()) {
+			Map<String, String> failedDocuments = new HashMap<>();
+
+			for (BulkResponseItem item : bulkResponse.items()) {
+
+				if (item.error() != null) {
+					failedDocuments.put(item.id(), item.error().reason());
+				}
+			}
+			BulkFailureException exception = new BulkFailureException(
+					"Bulk operation has failures. Use ElasticsearchException.getFailedDocuments() for detailed messages ["
+							+ failedDocuments + ']',
+					failedDocuments);
+			return Mono.error(exception);
+		} else {
+			return Mono.just(bulkResponse);
+		}
+	}
+
+	@Override
+	protected Mono<String> doDeleteById(String id, @Nullable String routing, IndexCoordinates index) {
+
+		Assert.notNull(id, "id must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		return Mono.defer(() -> {
+			DeleteRequest deleteRequest = requestConverter.documentDeleteRequest(id, routing, index, getRefreshPolicy());
+			return doDelete(deleteRequest);
+		});
+	}
+
+	private Mono<String> doDelete(DeleteRequest request) {
+
+		return Mono.from(execute((ClientCallback<Publisher<DeleteResponse>>) client -> client.delete(request))) //
+				.flatMap(deleteResponse -> {
+					if (deleteResponse.result() == Result.NotFound) {
+						return Mono.empty();
+					}
+					return Mono.just(deleteResponse.id());
+				}).onErrorResume(NoSuchIndexException.class, it -> Mono.empty());
+	}
+
+	@Override
+	public <T> Flux<MultiGetItem<T>> multiGet(Query query, Class<T> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(clazz, "clazz must not be null");
+
+		MgetRequest request = requestConverter.documentMgetRequest(query, clazz, index);
+
+		ReadDocumentCallback<T> callback = new ReadDocumentCallback<>(converter, clazz, index);
+
+		Publisher<MgetResponse<EntityAsMap>> response = execute(
+				(ClientCallback<Publisher<MgetResponse<EntityAsMap>>>) client -> client.mget(request, EntityAsMap.class));
+
+		return Mono.from(response)//
+				.flatMapMany(it -> Flux.fromIterable(DocumentAdapters.from(it))) //
+				.flatMap(multiGetItem -> {
+					if (multiGetItem.isFailed()) {
+						return Mono.just(MultiGetItem.of(null, multiGetItem.getFailure()));
+					} else {
+						return callback.toEntity(multiGetItem.getItem()) //
+								.map(t -> MultiGetItem.of(t, multiGetItem.getFailure()));
+					}
+				});
+	}
+
+	// endregion
+
+	@Override
+	protected ReactiveElasticsearchTemplate doCopy() {
+		return new ReactiveElasticsearchTemplate(client, converter);
+	}
+
+	@Override
+	protected Mono<Boolean> doExists(String id, IndexCoordinates index) {
+
+		Assert.notNull(id, "id must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		GetRequest getRequest = requestConverter.documentGetRequest(id, routingResolver.getRouting(), index, true);
+
+		return Mono.from(execute(
+				((ClientCallback<Publisher<GetResponse<EntityAsMap>>>) client -> client.get(getRequest, EntityAsMap.class))))
+				.map(GetResult::found) //
+				.onErrorReturn(NoSuchIndexException.class, false);
+	}
+
+	@Override
+	public Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+
+		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, entityType, index,
+				getRefreshPolicy());
+		return Mono
+				.from(execute((ClientCallback<Publisher<DeleteByQueryResponse>>) client -> client.deleteByQuery(request)))
+				.map(responseConverter::byQueryResponse);
+	}
+
+	// region search operations
+
+	@Override
+	protected Flux<SearchDocument> doFind(Query query, Class<?> clazz, IndexCoordinates index) {
+
+		return Flux.defer(() -> {
+			boolean useScroll = !(query.getPageable().isPaged() || query.isLimiting());
+			SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, false, useScroll);
+
+			if (useScroll) {
+				return doScroll(searchRequest);
+			} else {
+				return doFind(searchRequest);
+			}
+		});
+
+	}
+
+	private Flux<SearchDocument> doScroll(SearchRequest searchRequest) {
+
+		Time scrollTimeout = searchRequest.scroll() != null ? searchRequest.scroll() : Time.of(t -> t.time("1m"));
+
+		Flux<ResponseBody<EntityAsMap>> searchResponses = Flux.usingWhen(Mono.fromSupplier(ScrollState::new), //
+				state -> {
+					return Mono
+							.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client1 -> client1
+									.search(searchRequest, EntityAsMap.class))) //
+							.expand(entityAsMapSearchResponse -> {
+
+								state.updateScrollId(entityAsMapSearchResponse.scrollId());
+
+								if (entityAsMapSearchResponse.hits() == null
+										|| CollectionUtils.isEmpty(entityAsMapSearchResponse.hits().hits())) {
+									return Mono.empty();
+								}
+
+								return Mono.from(execute((ClientCallback<Publisher<ScrollResponse<EntityAsMap>>>) client1 -> {
+									ScrollRequest scrollRequest = ScrollRequest
+											.of(sr -> sr.scrollId(state.getScrollId()).scroll(scrollTimeout));
+									return client1.scroll(scrollRequest, EntityAsMap.class);
+								}));
+							});
+				},
+				this::cleanupScroll, (state, ex) -> cleanupScroll(state), this::cleanupScroll);
+
+		return searchResponses.flatMapIterable(entityAsMapSearchResponse -> entityAsMapSearchResponse.hits().hits())
+				.map(entityAsMapHit -> DocumentAdapters.from(entityAsMapHit, jsonpMapper));
+	}
+
+	private Publisher<?> cleanupScroll(ScrollState state) {
+
+		return execute((ClientCallback<Publisher<ClearScrollResponse>>) client -> client
+				.clearScroll(ClearScrollRequest.of(csr -> csr.scrollId(state.getScrollIds()))));
+	}
+
+	@Override
+	protected Mono<Long> doCount(Query query, Class<?> entityType, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		SearchRequest searchRequest = requestConverter.searchRequest(query, entityType, index, true, false);
+
+		return Mono
+				.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client.search(searchRequest,
+						EntityAsMap.class)))
+				.map(searchResponse -> searchResponse.hits().total() != null ? searchResponse.hits().total().value() : 0L);
+	}
+
+	private Flux<SearchDocument> doFind(SearchRequest searchRequest) {
+
+		return Mono
+				.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client.search(searchRequest,
+						EntityAsMap.class))) //
+				.flatMapIterable(entityAsMapSearchResponse -> entityAsMapSearchResponse.hits().hits()) //
+				.map(entityAsMapHit -> DocumentAdapters.from(entityAsMapHit, jsonpMapper));
+	}
+
+	@Override
+	protected <T> Mono<SearchDocumentResponse> doFindForResponse(Query query, Class<?> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+		Assert.notNull(index, "index must not be null");
+
+		SearchRequest searchRequest = requestConverter.searchRequest(query, clazz, index, false, false);
+
+		// noinspection unchecked
+		SearchDocumentCallback<T> callback = new ReadSearchDocumentCallback<>((Class<T>) clazz, index);
+		SearchDocumentResponse.EntityCreator<T> entityCreator = searchDocument -> callback.toEntity(searchDocument)
+				.toFuture();
+
+		return Mono
+				.from(execute((ClientCallback<Publisher<ResponseBody<EntityAsMap>>>) client -> client.search(searchRequest,
+						EntityAsMap.class)))
+				.map(searchResponse -> SearchDocumentResponseBuilder.from(searchResponse, entityCreator, jsonpMapper));
+	}
+
+	@Override
+	public Flux<? extends AggregationContainer<?>> aggregate(Query query, Class<?> entityType, IndexCoordinates index) {
+
+		return doFindForResponse(query, entityType, index).flatMapMany(searchDocumentResponse -> {
+			ElasticsearchAggregations aggregations = (ElasticsearchAggregations) searchDocumentResponse.getAggregations();
+			return aggregations == null ? Flux.empty() : Flux.fromIterable(aggregations.aggregations());
+		});
+	}
+
+	// endregion
+
+	@Override
+	protected Mono<String> getVendor() {
+		return Mono.just("Elasticsearch");
+	}
+
+	@Override
+	protected Mono<String> getRuntimeLibraryVersion() {
+		return Mono.just(Version.VERSION != null ? Version.VERSION.toString() : "null");
+	}
+
+	@Override
+	protected Mono<String> getClusterVersion() {
+		return Mono.from(execute(ReactiveElasticsearchClient::info)).map(infoResponse -> infoResponse.version().number());
+	}
+
+	@Override
+	public Mono<UpdateResponse> update(UpdateQuery updateQuery, IndexCoordinates index) {
+
+		Assert.notNull(updateQuery, "UpdateQuery must not be null");
+		Assert.notNull(index, "Index must not be null");
+
+		UpdateRequest<Document, ?> request = requestConverter.documentUpdateRequest(updateQuery, index, getRefreshPolicy(),
+				routingResolver.getRouting());
+
+		return Mono.from(execute(
+				(ClientCallback<Publisher<co.elastic.clients.elasticsearch.core.UpdateResponse<Document>>>) client -> client
+						.update(request, Document.class)))
+				.flatMap(response -> {
+					UpdateResponse.Result result = result(response.result());
+					return result == null ? Mono.empty() : Mono.just(UpdateResponse.of(result));
+				});
+	}
+
+	@Override
+	public Mono<ByQueryResponse> updateByQuery(UpdateQuery updateQuery, IndexCoordinates index) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	@Deprecated
+	public <T> Publisher<T> execute(ReactiveElasticsearchOperations.ClientCallback<Publisher<T>> callback) {
+		throw new UnsupportedBackendOperation("direct execution on the WebClient is not supported for this class");
+	}
+
+	@Override
+	public <T> Publisher<T> executeWithIndicesClient(IndicesClientCallback<Publisher<T>> callback) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	public <T> Publisher<T> executeWithClusterClient(ClusterClientCallback<Publisher<T>> callback) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	public ReactiveIndexOperations indexOps(IndexCoordinates index) {
+		return new ReactiveIndicesTemplate(client.indices(), converter, index);
+	}
+
+	@Override
+	public ReactiveIndexOperations indexOps(Class<?> clazz) {
+		return new ReactiveIndicesTemplate(client.indices(), converter, clazz);
+	}
+
+	@Override
+	public ReactiveClusterOperations cluster() {
+		return new ReactiveClusterTemplate(client.cluster(), converter);
+	}
+
+	@Override
+	public Flux<Suggest> suggest(SuggestBuilder suggestion, Class<?> entityType) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	public Flux<Suggest> suggest(SuggestBuilder suggestion, IndexCoordinates index) {
+		throw new UnsupportedOperationException("not implemented");
+	}
+
+	@Override
+	public Query matchAllQuery() {
+		return NativeQuery.builder().withQuery(QueryBuilders.matchAllQueryAsQuery()).build();
+	}
+
+	@Override
+	public Query idsQuery(List<String> ids) {
+		return NativeQuery.builder().withQuery(QueryBuilders.idsQueryAsQuery(ids)).build();
+	}
+
+	/**
+	 * Callback interface to be used with {@link #execute(ReactiveElasticsearchOperations.ClientCallback)} for operating
+	 * directly on {@link ReactiveElasticsearchClient}.
+	 *
+	 * @param <T>
+	 */
+	interface ClientCallback<T extends Publisher<?>> {
+
+		T doWithClient(ReactiveElasticsearchClient client);
+	}
+
+	/**
+	 * Execute a callback with the {@link ReactiveElasticsearchClient} and provide exception translation.
+	 *
+	 * @param callback the callback to execute, must not be {@literal null}
+	 * @param <T> the type returned from the callback
+	 * @return the callback result
+	 */
+	public <T> Publisher<T> execute(ReactiveElasticsearchTemplate.ClientCallback<Publisher<T>> callback) {
+		return Flux.defer(() -> callback.doWithClient(client)).onErrorMap(this::translateException);
+	}
+
+	/**
+	 * translates an Exception if possible. Exceptions that are no {@link RuntimeException}s are wrapped in a
+	 * RuntimeException
+	 *
+	 * @param throwable the Exception to map
+	 * @return the potentially translated RuntimeException.
+	 */
+	private RuntimeException translateException(Throwable throwable) {
+
+		RuntimeException runtimeException = throwable instanceof RuntimeException ? (RuntimeException) throwable
+				: new RuntimeException(throwable.getMessage(), throwable);
+		RuntimeException potentiallyTranslatedException = exceptionTranslator
+				.translateExceptionIfPossible(runtimeException);
+
+		return potentiallyTranslatedException != null ? potentiallyTranslatedException : runtimeException;
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ReactiveIndicesTemplate.java

@@ -0,0 +1,342 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.util.StringUtils.*;
+
+import co.elastic.clients.elasticsearch._types.AcknowledgedResponseBase;
+import co.elastic.clients.elasticsearch.indices.*;
+import co.elastic.clients.transport.endpoints.BooleanResponse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.elasticsearch.NoSuchIndexException;
+import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.core.IndexInformation;
+import org.springframework.data.elasticsearch.core.ReactiveIndexOperations;
+import org.springframework.data.elasticsearch.core.ReactiveResourceUtil;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.index.AliasActions;
+import org.springframework.data.elasticsearch.core.index.AliasData;
+import org.springframework.data.elasticsearch.core.index.DeleteTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.ExistsTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.GetTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
+import org.springframework.data.elasticsearch.core.index.ReactiveMappingBuilder;
+import org.springframework.data.elasticsearch.core.index.Settings;
+import org.springframework.data.elasticsearch.core.index.TemplateData;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * @author Peter-Josef Meisch
+ */
+public class ReactiveIndicesTemplate extends ReactiveChildTemplate<ReactiveElasticsearchIndicesClient>
+		implements ReactiveIndexOperations {
+
+	@Nullable private final Class<?> boundClass;
+	private final IndexCoordinates boundIndexCoordinates;
+
+	public ReactiveIndicesTemplate(ReactiveElasticsearchIndicesClient client,
+			ElasticsearchConverter elasticsearchConverter, IndexCoordinates index) {
+
+		super(client, elasticsearchConverter);
+
+		Assert.notNull(index, "index must not be null");
+
+		this.boundClass = null;
+		this.boundIndexCoordinates = index;
+	}
+
+	public ReactiveIndicesTemplate(ReactiveElasticsearchIndicesClient client,
+			ElasticsearchConverter elasticsearchConverter, Class<?> clazz) {
+
+		super(client, elasticsearchConverter);
+
+		Assert.notNull(clazz, "clazz must not be null");
+
+		this.boundClass = clazz;
+		this.boundIndexCoordinates = getIndexCoordinatesFor(clazz);
+	}
+
+	@Override
+	public Mono<Boolean> create() {
+
+		IndexCoordinates indexCoordinates = getIndexCoordinates();
+
+		if (boundClass != null) {
+			return createSettings(boundClass).flatMap(settings -> doCreate(indexCoordinates, settings, null));
+		} else {
+			return doCreate(indexCoordinates, new Settings(), null);
+		}
+	}
+
+	@Override
+	public Mono<Boolean> create(Map<String, Object> settings) {
+
+		Assert.notNull(settings, "settings must not be null");
+
+		return doCreate(getIndexCoordinates(), settings, null);
+	}
+
+	@Override
+	public Mono<Boolean> create(Map<String, Object> settings, Document mapping) {
+
+		Assert.notNull(settings, "settings must not be null");
+		Assert.notNull(mapping, "mapping must not be null");
+
+		return doCreate(getIndexCoordinates(), settings, mapping);
+	}
+
+	@Override
+	public Mono<Boolean> createWithMapping() {
+		return createSettings() //
+				.flatMap(settings -> //
+				createMapping().flatMap(mapping -> //
+				doCreate(getIndexCoordinates(), settings, mapping))); //
+	}
+
+	private Mono<Boolean> doCreate(IndexCoordinates indexCoordinates, Map<String, Object> settings,
+			@Nullable Document mapping) {
+
+		CreateIndexRequest createIndexRequest = requestConverter.indicesCreateRequest(indexCoordinates, settings, mapping);
+		Mono<CreateIndexResponse> createIndexResponse = Mono.from(execute(client -> client.create(createIndexRequest)));
+		return createIndexResponse.map(CreateIndexResponse::acknowledged);
+	}
+
+	@Override
+	public Mono<Boolean> delete() {
+		return exists().flatMap(exists -> {
+
+			if (exists) {
+				DeleteIndexRequest deleteIndexRequest = requestConverter.indicesDeleteRequest(getIndexCoordinates());
+				return Mono.from(execute(client -> client.delete(deleteIndexRequest))) //
+						.map(DeleteIndexResponse::acknowledged) //
+						.onErrorResume(NoSuchIndexException.class, e -> Mono.just(false));
+			} else {
+				return Mono.just(false);
+			}
+		});
+
+	}
+
+	@Override
+	public Mono<Boolean> exists() {
+
+		ExistsRequest existsRequest = requestConverter.indicesExistsRequest(getIndexCoordinates());
+		Mono<BooleanResponse> existsResponse = Mono.from(execute(client -> client.exists(existsRequest)));
+		return existsResponse.map(BooleanResponse::value);
+	}
+
+	@Override
+	public Mono<Void> refresh() {
+		return Mono.from(execute(client1 -> client1.refresh())).then();
+	}
+
+	@Override
+	public Mono<Document> createMapping() {
+		return createMapping(checkForBoundClass());
+	}
+
+	@Override
+	public Mono<Document> createMapping(Class<?> clazz) {
+
+		Assert.notNull(clazz, "clazz must not be null");
+
+		Mapping mappingAnnotation = AnnotatedElementUtils.findMergedAnnotation(clazz, Mapping.class);
+
+		if (mappingAnnotation != null) {
+			String mappingPath = mappingAnnotation.mappingPath();
+
+			if (hasText(mappingPath)) {
+				return ReactiveResourceUtil.loadDocument(mappingAnnotation.mappingPath(), "@Mapping");
+			}
+		}
+
+		return new ReactiveMappingBuilder(elasticsearchConverter).buildReactivePropertyMapping(clazz).map(Document::parse);
+	}
+
+	@Override
+	public Mono<Boolean> putMapping(Mono<Document> mapping) {
+
+		Assert.notNull(mapping, "mapping must not be null");
+
+		Mono<PutMappingResponse> putMappingResponse = mapping
+				.map(document -> requestConverter.indicesPutMappingRequest(getIndexCoordinates(), document)) //
+				.flatMap(putMappingRequest -> Mono.from(client.putMapping(putMappingRequest)));
+		return putMappingResponse.map(PutMappingResponse::acknowledged);
+	}
+
+	@Override
+	public Mono<Document> getMapping() {
+
+		IndexCoordinates indexCoordinates = getIndexCoordinates();
+		GetMappingRequest getMappingRequest = requestConverter.indicesGetMappingRequest(indexCoordinates);
+		Mono<GetMappingResponse> getMappingResponse = Mono.from(execute(client -> client.getMapping(getMappingRequest)));
+		return getMappingResponse.map(response -> responseConverter.indicesGetMapping(response, indexCoordinates));
+	}
+
+	@Override
+	public Mono<Settings> createSettings() {
+		return createSettings(checkForBoundClass());
+	}
+
+	@Override
+	public Mono<Settings> createSettings(Class<?> clazz) {
+
+		Assert.notNull(clazz, "clazz must not be null");
+
+		ElasticsearchPersistentEntity<?> persistentEntity = elasticsearchConverter.getMappingContext()
+				.getRequiredPersistentEntity(clazz);
+		String settingPath = persistentEntity.settingPath();
+		return hasText(settingPath) //
+				? ReactiveResourceUtil.loadDocument(settingPath, "@Setting") //
+						.map(Settings::new) //
+				: Mono.just(persistentEntity.getDefaultSettings());
+	}
+
+	@Override
+	public Mono<Settings> getSettings(boolean includeDefaults) {
+
+		GetIndicesSettingsRequest getSettingsRequest = requestConverter.indicesGetSettingsRequest(getIndexCoordinates(),
+				includeDefaults);
+		Mono<GetIndicesSettingsResponse> getSettingsResponse = Mono
+				.from(execute(client -> client.getSettings(getSettingsRequest)));
+		return getSettingsResponse
+				.map(response -> responseConverter.indicesGetSettings(response, getIndexCoordinates().getIndexName()));
+	}
+
+	@Override
+	public Mono<Boolean> alias(AliasActions aliasActions) {
+
+		Assert.notNull(aliasActions, "aliasActions must not be null");
+
+		UpdateAliasesRequest updateAliasesRequest = requestConverter.indicesUpdateAliasesRequest(aliasActions);
+		Mono<UpdateAliasesResponse> updateAliasesResponse = Mono
+				.from(execute(client -> client.updateAliases(updateAliasesRequest)));
+		return updateAliasesResponse.map(AcknowledgedResponseBase::acknowledged);
+	}
+
+	@Override
+	public Mono<Map<String, Set<AliasData>>> getAliases(String... aliasNames) {
+		return getAliases(aliasNames, null);
+	}
+
+	@Override
+	public Mono<Map<String, Set<AliasData>>> getAliasesForIndex(String... indexNames) {
+		return getAliases(null, indexNames);
+	}
+
+	private Mono<Map<String, Set<AliasData>>> getAliases(@Nullable String[] aliasNames, @Nullable String[] indexNames) {
+
+		GetAliasRequest getAliasRequest = requestConverter.indicesGetAliasRequest(aliasNames, indexNames);
+		Mono<GetAliasResponse> getAliasResponse = Mono.from(execute(client -> client.getAlias(getAliasRequest)));
+		return getAliasResponse.map(responseConverter::indicesGetAliasData);
+	}
+
+	@Override
+	public Mono<Boolean> putTemplate(PutTemplateRequest putTemplateRequest) {
+
+		Assert.notNull(putTemplateRequest, "putTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.PutTemplateRequest putTemplateRequestES = requestConverter
+				.indicesPutTemplateRequest(putTemplateRequest);
+		Mono<PutTemplateResponse> putTemplateResponse = Mono
+				.from(execute(client -> client.putTemplate(putTemplateRequestES)));
+		return putTemplateResponse.map(PutTemplateResponse::acknowledged);
+	}
+
+	@Override
+	public Mono<TemplateData> getTemplate(GetTemplateRequest getTemplateRequest) {
+
+		Assert.notNull(getTemplateRequest, "getTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.GetTemplateRequest getTemplateRequestES = requestConverter
+				.indicesGetTemplateRequest(getTemplateRequest);
+		Mono<GetTemplateResponse> getTemplateResponse = Mono
+				.from(execute(client -> client.getTemplate(getTemplateRequestES)));
+
+		return getTemplateResponse.flatMap(response -> {
+			if (response != null) {
+				TemplateData templateData = responseConverter.indicesGetTemplateData(response,
+						getTemplateRequest.getTemplateName());
+				if (templateData != null) {
+					return Mono.just(templateData);
+				}
+			}
+			return Mono.empty();
+		});
+	}
+
+	@Override
+	public Mono<Boolean> existsTemplate(ExistsTemplateRequest existsTemplateRequest) {
+
+		Assert.notNull(existsTemplateRequest, "existsTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.ExistsTemplateRequest existsTemplateRequestES = requestConverter
+				.indicesExistsTemplateRequest(existsTemplateRequest);
+		return Mono.from(execute(client -> client.existsTemplate(existsTemplateRequestES))).map(BooleanResponse::value);
+	}
+
+	@Override
+	public Mono<Boolean> deleteTemplate(DeleteTemplateRequest deleteTemplateRequest) {
+
+		Assert.notNull(deleteTemplateRequest, "deleteTemplateRequest must not be null");
+
+		co.elastic.clients.elasticsearch.indices.DeleteTemplateRequest deleteTemplateRequestES = requestConverter
+				.indicesDeleteTemplateRequest(deleteTemplateRequest);
+		return Mono.from(execute(client -> client.deleteTemplate(deleteTemplateRequestES)))
+				.map(DeleteTemplateResponse::acknowledged);
+	}
+
+	@Override
+	public Flux<IndexInformation> getInformation(IndexCoordinates index) {
+
+		GetIndexRequest request = requestConverter.indicesGetIndexRequest(index);
+
+		return Mono.from(execute(client -> client.get(request))) //
+				.map(responseConverter::indicesGetIndexInformations) //
+				.flatMapMany(Flux::fromIterable);
+	}
+
+	@Override
+	public IndexCoordinates getIndexCoordinates() {
+		return (boundClass != null) ? getIndexCoordinatesFor(boundClass) : Objects.requireNonNull(boundIndexCoordinates);
+	}
+
+	// region helper functions
+	private IndexCoordinates getIndexCoordinatesFor(Class<?> clazz) {
+		return elasticsearchConverter.getMappingContext().getRequiredPersistentEntity(clazz).getIndexCoordinates();
+	}
+
+	private Class<?> checkForBoundClass() {
+		if (boundClass == null) {
+			throw new InvalidDataAccessApiUsageException("IndexOperations are not bound");
+		}
+		return boundClass;
+	}
+	// endregion
+
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java

@@ -0,0 +1,440 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import static org.springframework.data.elasticsearch.client.elc.JsonUtils.*;
+
+import co.elastic.clients.elasticsearch._types.BulkIndexByScrollFailure;
+import co.elastic.clients.elasticsearch._types.ErrorCause;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
+import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
+import co.elastic.clients.elasticsearch.core.UpdateByQueryResponse;
+import co.elastic.clients.elasticsearch.core.mget.MultiGetError;
+import co.elastic.clients.elasticsearch.core.mget.MultiGetResponseItem;
+import co.elastic.clients.elasticsearch.indices.*;
+import co.elastic.clients.elasticsearch.indices.get_mapping.IndexMappingRecord;
+import co.elastic.clients.json.JsonpMapper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
+import org.springframework.data.elasticsearch.core.IndexInformation;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.cluster.ClusterHealth;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.index.AliasData;
+import org.springframework.data.elasticsearch.core.index.Settings;
+import org.springframework.data.elasticsearch.core.index.TemplateData;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
+import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
+import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Class to convert Elasticsearch responses into Spring Data Elasticsearch classes.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+class ResponseConverter {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ResponseConverter.class);
+
+	private final JsonpMapper jsonpMapper;
+
+	public ResponseConverter(JsonpMapper jsonpMapper) {
+		this.jsonpMapper = jsonpMapper;
+	}
+
+	// region cluster client
+	public ClusterHealth clusterHealth(HealthResponse healthResponse) {
+
+		Assert.notNull(healthResponse, "healthResponse must not be null");
+
+		return ClusterHealth.builder() //
+				.withActivePrimaryShards(healthResponse.activePrimaryShards()) //
+				.withActiveShards(healthResponse.activeShards()) //
+				.withActiveShardsPercent(Double.parseDouble(healthResponse.activeShardsPercentAsNumber()))//
+				.withClusterName(healthResponse.clusterName()) //
+				.withDelayedUnassignedShards(healthResponse.delayedUnassignedShards()) //
+				.withInitializingShards(healthResponse.initializingShards()) //
+				.withNumberOfDataNodes(healthResponse.numberOfDataNodes()) //
+				.withNumberOfInFlightFetch(healthResponse.numberOfInFlightFetch()) //
+				.withNumberOfNodes(healthResponse.numberOfNodes()) //
+				.withNumberOfPendingTasks(healthResponse.numberOfPendingTasks()) //
+				.withRelocatingShards(healthResponse.relocatingShards()) //
+				.withStatus(healthResponse.status().toString()) //
+				.withTaskMaxWaitingTimeMillis(Long.parseLong(healthResponse.taskMaxWaitingInQueueMillis())) //
+				.withTimedOut(healthResponse.timedOut()) //
+				.withUnassignedShards(healthResponse.unassignedShards()) //
+				.build(); //
+	}
+	// endregion
+
+	// region indices client
+	public Settings indicesGetSettings(GetIndicesSettingsResponse getIndicesSettingsResponse, String indexName) {
+
+		Assert.notNull(getIndicesSettingsResponse, "getIndicesSettingsResponse must not be null");
+		Assert.notNull(indexName, "indexName must not be null");
+
+		Settings settings = new Settings();
+		IndexState indexState = getIndicesSettingsResponse.get(indexName);
+
+		if (indexState != null) {
+
+			Function<IndexSettings, Settings> indexSettingsToSettings = indexSettings -> {
+				Settings parsedSettings = Settings.parse(toJson(indexSettings, jsonpMapper));
+				return (indexSettings.index() != null) ? parsedSettings : new Settings().append("index", parsedSettings);
+			};
+
+			if (indexState.defaults() != null) {
+				Settings defaultSettings = indexSettingsToSettings.apply(indexState.defaults());
+				settings.merge(defaultSettings);
+			}
+
+			if (indexState.settings() != null) {
+				Settings nonDefaultSettings = indexSettingsToSettings.apply(indexState.settings());
+				settings.merge(nonDefaultSettings);
+			}
+		}
+
+		return settings;
+	}
+
+	public Document indicesGetMapping(GetMappingResponse getMappingResponse, IndexCoordinates indexCoordinates) {
+
+		Assert.notNull(getMappingResponse, "getMappingResponse must not be null");
+		Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
+
+		Map<String, IndexMappingRecord> mappings = getMappingResponse.result();
+
+		if (mappings == null || mappings.size() == 0) {
+			return Document.create();
+		}
+
+		IndexMappingRecord indexMappingRecord = mappings.get(indexCoordinates.getIndexName());
+
+		// this can happen when the mapping was requested with an alias
+		if (indexMappingRecord == null) {
+
+			if (mappings.size() != 1) {
+			LOGGER.warn("no mapping returned for index {}", indexCoordinates.getIndexName());
+			return Document.create();
+		}
+		String index = mappings.keySet().iterator().next();
+		indexMappingRecord = mappings.get(index);
+		}
+
+		return Document.parse(toJson(indexMappingRecord.mappings(), jsonpMapper));
+	}
+
+	public List<IndexInformation> indicesGetIndexInformations(GetIndexResponse getIndexResponse) {
+
+		Assert.notNull(getIndexResponse, "getIndexResponse must not be null");
+
+		List<IndexInformation> indexInformationList = new ArrayList<>();
+
+		getIndexResponse.result().forEach((indexName, indexState) -> {
+			Settings settings = indexState.settings() != null ? Settings.parse(toJson(indexState.settings(), jsonpMapper))
+					: new Settings();
+			Document mappings = indexState.mappings() != null ? Document.parse(toJson(indexState.mappings(), jsonpMapper))
+					: Document.create();
+
+			List<AliasData> aliasDataList = new ArrayList<>();
+			indexState.aliases().forEach((aliasName, alias) -> aliasDataList.add(indicesGetAliasData(aliasName, alias)));
+
+			indexInformationList.add(IndexInformation.of(indexName, settings, mappings, aliasDataList));
+
+		});
+		return indexInformationList;
+	}
+
+	public Map<String, Set<AliasData>> indicesGetAliasData(GetAliasResponse getAliasResponse) {
+
+		Assert.notNull(getAliasResponse, "getAliasResponse must not be null");
+
+		Map<String, Set<AliasData>> aliasDataMap = new HashMap<>();
+		getAliasResponse.result().forEach((indexName, alias) -> {
+			Set<AliasData> aliasDataSet = new HashSet<>();
+			alias.aliases()
+					.forEach((aliasName, aliasDefinition) -> aliasDataSet.add(indicesGetAliasData(aliasName, aliasDefinition)));
+			aliasDataMap.put(indexName, aliasDataSet);
+		});
+		return aliasDataMap;
+	}
+
+	private AliasData indicesGetAliasData(String aliasName, Alias alias) {
+		Query filter = alias.filter();
+		String filterJson = filter != null ? toJson(filter, jsonpMapper) : null;
+		Document filterDocument = filterJson != null ? Document.parse(filterJson) : null;
+		return AliasData.of(aliasName, filterDocument, alias.indexRouting(), alias.searchRouting(), alias.isWriteIndex(),
+				alias.isHidden());
+	}
+
+	private AliasData indicesGetAliasData(String aliasName, AliasDefinition alias) {
+		Query filter = alias.filter();
+		String filterJson = filter != null ? toJson(filter, jsonpMapper) : null;
+		Document filterDocument = filterJson != null ? Document.parse(filterJson) : null;
+		return AliasData.of(aliasName, filterDocument, alias.indexRouting(), alias.searchRouting(), alias.isWriteIndex(),
+				null);
+	}
+
+	@Nullable
+	public TemplateData indicesGetTemplateData(GetTemplateResponse getTemplateResponse, String templateName) {
+
+		Assert.notNull(getTemplateResponse, "getTemplateResponse must not be null");
+		Assert.notNull(templateName, "templateName must not be null");
+
+		TemplateMapping templateMapping = getTemplateResponse.get(templateName);
+		if (templateMapping != null) {
+
+			Settings settings = new Settings();
+			templateMapping.settings().forEach((key, jsonData) -> {
+
+				if (key.contains(".")) {
+					// returned string contains " quotes
+					settings.put(key, jsonData.toJson().toString().replaceAll("^\"|\"$", ""));
+				} else {
+					settings.put(key, new DefaultStringObjectMap<>().fromJson(jsonData.toJson().toString()));
+				}
+			});
+
+			Function<? super Map.Entry<String, Alias>, String> keyMapper = Map.Entry::getKey;
+			Function<? super Map.Entry<String, Alias>, AliasData> valueMapper = entry -> indicesGetAliasData(entry.getKey(),
+					entry.getValue());
+
+			Map<String, AliasData> aliases = templateMapping.aliases().entrySet().stream()
+					.collect(Collectors.toMap(keyMapper, valueMapper));
+
+			Document mapping = Document.parse(toJson(templateMapping.mappings(), jsonpMapper));
+
+			TemplateData.TemplateDataBuilder builder = TemplateData.builder() //
+					.withIndexPatterns(templateMapping.indexPatterns().toArray(new String[0])) //
+					.withOrder(templateMapping.order()) //
+					.withSettings(settings) //
+					.withMapping(mapping) //
+					.withAliases(aliases) //
+			;
+
+			if (templateMapping.version() != null) {
+				builder.withVersion(templateMapping.version().intValue());
+			}
+
+			return builder.build();
+		}
+
+		return null;
+	}
+
+	// endregion
+
+	// region document operations
+	public ReindexResponse reindexResponse(co.elastic.clients.elasticsearch.core.ReindexResponse reindexResponse) {
+
+		Assert.notNull(reindexResponse, "reindexResponse must not be null");
+
+		List<ReindexResponse.Failure> failures = reindexResponse.failures() //
+				.stream() //
+				.map(this::reindexResponseFailureOf) //
+				.collect(Collectors.toList());
+
+		// noinspection ConstantConditions
+		return ReindexResponse.builder() //
+				.withTook(timeToLong(reindexResponse.took())) //
+				.withTimedOut(reindexResponse.timedOut()) //
+				.withTotal(reindexResponse.total()) //
+				.withCreated(reindexResponse.created()) //
+				.withUpdated(reindexResponse.updated()) //
+				.withDeleted(reindexResponse.deleted()) //
+				.withBatches(reindexResponse.batches()) //
+				.withVersionConflicts(reindexResponse.versionConflicts()) //
+				.withNoops(reindexResponse.noops()) //
+				.withBulkRetries(reindexResponse.retries().bulk()) //
+				.withSearchRetries(reindexResponse.retries().search()) //
+				.withThrottledMillis(Long.parseLong(reindexResponse.throttledMillis())) //
+				.withRequestsPerSecond(reindexResponse.requestsPerSecond()) //
+				.withThrottledUntilMillis(Long.parseLong(reindexResponse.throttledUntilMillis())).withFailures(failures) //
+				.build();
+	}
+
+	private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
+		return ReindexResponse.Failure.builder() //
+				.withIndex(failure.index()) //
+				.withType(failure.type()) //
+				.withId(failure.id()) //
+				.withStatus(failure.status())//
+				.withErrorCause(toErrorCause(failure.cause())) //
+				// seqno, term, aborted are not available in the new client
+				.build();
+	}
+
+	private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
+		return ByQueryResponse.Failure.builder() //
+				.withIndex(failure.index()) //
+				.withType(failure.type()) //
+				.withId(failure.id()) //
+				.withStatus(failure.status())//
+				.withErrorCause(toErrorCause(failure.cause())).build();
+	}
+
+	@Nullable
+	public static MultiGetItem.Failure getFailure(MultiGetResponseItem<EntityAsMap> itemResponse) {
+
+		MultiGetError responseFailure = itemResponse.isFailure() ? itemResponse.failure() : null;
+
+		return responseFailure != null
+				? MultiGetItem.Failure.of(responseFailure.index(), null, responseFailure.id(), null,
+						toErrorCause(responseFailure.error()))
+				: null;
+	}
+
+	public ByQueryResponse byQueryResponse(DeleteByQueryResponse response) {
+		// the code for the methods taking a DeleteByQueryResponse or a UpdateByQueryResponse is duplicated because the
+		// Elasticsearch responses do not share a common class
+		// noinspection DuplicatedCode
+		List<ByQueryResponse.Failure> failures = response.failures().stream().map(this::byQueryResponseFailureOf)
+				.collect(Collectors.toList());
+
+		ByQueryResponse.ByQueryResponseBuilder builder = ByQueryResponse.builder();
+
+		if (response.took() != null) {
+			builder.withTook(response.took());
+		}
+
+		if (response.timedOut() != null) {
+			builder.withTimedOut(response.timedOut());
+		}
+
+		if (response.total() != null) {
+			builder.withTotal(response.total());
+		}
+
+		if (response.deleted() != null) {
+			builder.withDeleted(response.deleted());
+		}
+
+		if (response.batches() != null) {
+			builder.withBatches(Math.toIntExact(response.batches()));
+		}
+
+		if (response.versionConflicts() != null) {
+			builder.withVersionConflicts(response.versionConflicts());
+		}
+
+		if (response.noops() != null) {
+			builder.withNoops(response.noops());
+		}
+
+		if (response.retries() != null) {
+			builder.withBulkRetries(response.retries().bulk());
+			builder.withSearchRetries(response.retries().search());
+		}
+
+		builder.withFailures(failures);
+
+		return builder.build();
+	}
+
+	public ByQueryResponse byQueryResponse(UpdateByQueryResponse response) {
+		// the code for the methods taking a DeleteByQueryResponse or a UpdateByQueryResponse is duplicated because the
+		// Elasticsearch responses do not share a common class
+		// noinspection DuplicatedCode
+		List<ByQueryResponse.Failure> failures = response.failures().stream().map(this::byQueryResponseFailureOf)
+				.collect(Collectors.toList());
+
+		ByQueryResponse.ByQueryResponseBuilder builder = ByQueryResponse.builder();
+
+		if (response.took() != null) {
+			builder.withTook(response.took());
+		}
+
+		if (response.timedOut() != null) {
+			builder.withTimedOut(response.timedOut());
+		}
+
+		if (response.total() != null) {
+			builder.withTotal(response.total());
+		}
+
+		if (response.deleted() != null) {
+			builder.withDeleted(response.deleted());
+		}
+
+		if (response.batches() != null) {
+			builder.withBatches(Math.toIntExact(response.batches()));
+		}
+
+		if (response.versionConflicts() != null) {
+			builder.withVersionConflicts(response.versionConflicts());
+		}
+
+		if (response.noops() != null) {
+			builder.withNoops(response.noops());
+		}
+
+		if (response.retries() != null) {
+			builder.withBulkRetries(response.retries().bulk());
+			builder.withSearchRetries(response.retries().search());
+		}
+
+		builder.withFailures(failures);
+
+		return builder.build();
+	}
+
+	// endregion
+	// region helper functions
+
+	private long timeToLong(Time time) {
+
+		if (time.isTime()) {
+			return Long.parseLong(time.time());
+		} else {
+			return time.offset();
+		}
+	}
+
+	@Nullable
+	private static ElasticsearchErrorCause toErrorCause(@Nullable ErrorCause errorCause) {
+
+		if (errorCause != null) {
+			return new ElasticsearchErrorCause( //
+					errorCause.type(), //
+					errorCause.reason(), //
+					errorCause.stackTrace(), //
+					toErrorCause(errorCause.causedBy()), //
+					errorCause.rootCause().stream().map(ResponseConverter::toErrorCause).collect(Collectors.toList()), //
+					errorCause.suppressed().stream().map(ResponseConverter::toErrorCause).collect(Collectors.toList()));
+		} else {
+			return null;
+		}
+	}
+
+	// endregion
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/SearchDocumentResponseBuilder.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright 2021-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
+import co.elastic.clients.elasticsearch.core.SearchResponse;
+import co.elastic.clients.elasticsearch.core.search.Hit;
+import co.elastic.clients.elasticsearch.core.search.HitsMetadata;
+import co.elastic.clients.elasticsearch.core.search.ResponseBody;
+import co.elastic.clients.elasticsearch.core.search.Suggestion;
+import co.elastic.clients.elasticsearch.core.search.TotalHits;
+import co.elastic.clients.json.JsonpMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.elasticsearch.search.SearchHits;
+import org.springframework.data.elasticsearch.core.TotalHitsRelation;
+import org.springframework.data.elasticsearch.core.document.SearchDocument;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
+import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * Factory class to create {@link SearchDocumentResponse} instances.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+class SearchDocumentResponseBuilder {
+	/**
+	 * creates a SearchDocumentResponse from the {@link SearchResponse}
+	 *
+	 * @param responseBody the Elasticsearch response body
+	 * @param entityCreator function to create an entity from a {@link SearchDocument}
+	 * @param jsonpMapper to map JsonData objects
+	 * @return the SearchDocumentResponse
+	 */
+	@SuppressWarnings("DuplicatedCode")
+	public static <T> SearchDocumentResponse from(ResponseBody<EntityAsMap> responseBody,
+			SearchDocumentResponse.EntityCreator<T> entityCreator, JsonpMapper jsonpMapper) {
+
+		Assert.notNull(responseBody, "responseBody must not be null");
+		Assert.notNull(entityCreator, "entityCreator must not be null");
+
+		HitsMetadata<EntityAsMap> hitsMetadata = responseBody.hits();
+		String scrollId = responseBody.scrollId();
+		Map<String, Aggregate> aggregations = responseBody.aggregations();
+		Map<String, List<Suggestion<EntityAsMap>>> suggest = responseBody.suggest();
+
+		return from(hitsMetadata, scrollId, aggregations, suggest, entityCreator, jsonpMapper);
+	}
+
+	/**
+	 * creates a {@link SearchDocumentResponseBuilder} from {@link SearchHits} with the given scrollId aggregations and
+	 * suggestES
+	 *
+	 * @param <T> entity type
+	 * @param hitsMetadata the {@link SearchHits} to process
+	 * @param scrollId scrollId
+	 * @param aggregations aggregations
+	 * @param suggestES the suggestion response from Elasticsearch
+	 * @param entityCreator function to create an entity from a {@link SearchDocument}, needed in mapping the suggest data
+	 * @param jsonpMapper to map JsonData objects
+	 * @return the {@link SearchDocumentResponse}
+	 */
+	public static <T> SearchDocumentResponse from(HitsMetadata<?> hitsMetadata, @Nullable String scrollId,
+			Map<String, Aggregate> aggregations, Map<String, List<Suggestion<EntityAsMap>>> suggestES,
+			SearchDocumentResponse.EntityCreator<T> entityCreator, JsonpMapper jsonpMapper) {
+
+		Assert.notNull(hitsMetadata, "hitsMetadata must not be null");
+
+		long totalHits;
+		String totalHitsRelation;
+
+		TotalHits responseTotalHits = hitsMetadata.total();
+		if (responseTotalHits != null) {
+			totalHits = responseTotalHits.value();
+			switch (responseTotalHits.relation().jsonValue()) {
+				case "eq":
+					totalHitsRelation = TotalHitsRelation.EQUAL_TO.name();
+					break;
+				case "gte":
+					totalHitsRelation = TotalHitsRelation.GREATER_THAN_OR_EQUAL_TO.name();
+					break;
+				default:
+					totalHitsRelation = TotalHitsRelation.OFF.name();
+			}
+		} else {
+			totalHits = hitsMetadata.hits().size();
+			totalHitsRelation = "OFF";
+		}
+
+		float maxScore = hitsMetadata.maxScore() != null ? hitsMetadata.maxScore().floatValue() : Float.NaN;
+
+		List<SearchDocument> searchDocuments = new ArrayList<>();
+		for (Hit<?> hit : hitsMetadata.hits()) {
+			searchDocuments.add(DocumentAdapters.from(hit, jsonpMapper));
+		}
+
+		ElasticsearchAggregations aggregationsContainer = aggregations != null ? new ElasticsearchAggregations(aggregations)
+				: null;
+
+		// todo #2154
+		Suggest suggest = null;
+
+		return new SearchDocumentResponse(totalHits, totalHitsRelation, maxScore, scrollId, searchDocuments,
+				aggregationsContainer, suggest);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/elc/TypeUtils.java

@@ -0,0 +1,383 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client.elc;
+
+import co.elastic.clients.elasticsearch._types.*;
+import co.elastic.clients.elasticsearch._types.mapping.FieldType;
+import co.elastic.clients.elasticsearch.core.search.BoundaryScanner;
+import co.elastic.clients.elasticsearch.core.search.BuiltinHighlighterType;
+import co.elastic.clients.elasticsearch.core.search.HighlighterEncoder;
+import co.elastic.clients.elasticsearch.core.search.HighlighterFragmenter;
+import co.elastic.clients.elasticsearch.core.search.HighlighterOrder;
+import co.elastic.clients.elasticsearch.core.search.HighlighterTagsSchema;
+import co.elastic.clients.elasticsearch.core.search.HighlighterType;
+import co.elastic.clients.elasticsearch.core.search.ScoreMode;
+
+import java.time.Duration;
+
+import org.springframework.data.elasticsearch.core.RefreshPolicy;
+import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.Order;
+import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.core.query.RescorerQuery;
+import org.springframework.data.elasticsearch.core.query.UpdateResponse;
+import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
+import org.springframework.lang.Nullable;
+
+/**
+ * Utility to handle new Elasticsearch client type values.
+ *
+ * @author Peter-Josef Meisch
+ * @since 4.4
+ */
+final class TypeUtils {
+
+	@Nullable
+	static BoundaryScanner boundaryScanner(@Nullable String value) {
+
+		if (value != null) {
+			switch (value.toLowerCase()) {
+				case "chars":
+					return BoundaryScanner.Chars;
+				case "sentence":
+					return BoundaryScanner.Sentence;
+				case "word":
+					return BoundaryScanner.Word;
+				default:
+					return null;
+			}
+		}
+		return null;
+	}
+
+	static Conflicts conflicts(ReindexRequest.Conflicts conflicts) {
+		switch (conflicts) {
+			case ABORT:
+				return Conflicts.Abort;
+			case PROCEED:
+				return Conflicts.Proceed;
+		}
+
+		throw new IllegalArgumentException("Cannot map conflicts value " + conflicts.name());
+	}
+
+	@Nullable
+	static DistanceUnit distanceUnit(String unit) {
+
+		switch (unit.toLowerCase()) {
+			case "in":
+			case "inch":
+				return DistanceUnit.Inches;
+			case "yd":
+			case "yards":
+				return DistanceUnit.Yards;
+			case "ft":
+			case "feet":
+				return DistanceUnit.Feet;
+			case "km":
+			case "kilometers":
+				return DistanceUnit.Kilometers;
+			case "nm":
+			case "nmi":
+				return DistanceUnit.NauticMiles;
+			case "mm":
+			case "millimeters":
+				return DistanceUnit.Millimeters;
+			case "cm":
+			case "centimeters":
+				return DistanceUnit.Centimeters;
+			case "mi":
+			case "miles":
+				return DistanceUnit.Miles;
+			case "m":
+			case "meters":
+				return DistanceUnit.Meters;
+		}
+		return null;
+	}
+
+	@Nullable
+	static FieldType fieldType(String type) {
+
+		for (FieldType fieldType : FieldType.values()) {
+
+			if (fieldType.jsonValue().equals(type)) {
+				return fieldType;
+			}
+		}
+		return null;
+	}
+
+	@Nullable
+	static GeoDistanceType geoDistanceType(GeoDistanceOrder.DistanceType distanceType) {
+
+		switch (distanceType) {
+			case arc:
+				return GeoDistanceType.Arc;
+			case plane:
+				return GeoDistanceType.Plane;
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static HighlighterFragmenter highlighterFragmenter(@Nullable String value) {
+
+		if (value != null) {
+			switch (value.toLowerCase()) {
+				case "simple":
+					return HighlighterFragmenter.Simple;
+				case "span":
+					return HighlighterFragmenter.Span;
+				default:
+					return null;
+			}
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static HighlighterOrder highlighterOrder(@Nullable String value) {
+
+		if (value != null) {
+			if ("score".equals(value.toLowerCase())) {
+				return HighlighterOrder.Score;
+			}
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static HighlighterType highlighterType(@Nullable String value) {
+
+		if (value != null) {
+			switch (value.toLowerCase()) {
+				case "unified":
+					return HighlighterType.of(b -> b.builtin(BuiltinHighlighterType.Unified));
+				case "plain":
+					return HighlighterType.of(b -> b.builtin(BuiltinHighlighterType.Plain));
+				case "fvh":
+					return HighlighterType.of(b -> b.builtin(BuiltinHighlighterType.FastVector));
+				default:
+					return null;
+			}
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static HighlighterEncoder highlighterEncoder(@Nullable String value) {
+
+		if (value != null) {
+			switch (value.toLowerCase()) {
+				case "default":
+					return HighlighterEncoder.Default;
+				case "html":
+					return HighlighterEncoder.Html;
+				default:
+					return null;
+			}
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static HighlighterTagsSchema highlighterTagsSchema(@Nullable String value) {
+
+		if (value != null) {
+			if ("styled".equals(value.toLowerCase())) {
+				return HighlighterTagsSchema.Styled;
+			}
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static OpType opType(@Nullable IndexQuery.OpType opType) {
+
+		if (opType != null) {
+			switch (opType) {
+				case INDEX:
+					return OpType.Index;
+				case CREATE:
+					return OpType.Create;
+			}
+		}
+		return null;
+	}
+
+	static Refresh refresh(@Nullable RefreshPolicy refreshPolicy) {
+
+		if (refreshPolicy == null) {
+			return Refresh.False;
+		}
+
+		switch (refreshPolicy) {
+			case IMMEDIATE:
+				return Refresh.True;
+			case WAIT_UNTIL:
+				return Refresh.WaitFor;
+			case NONE:
+			default:
+				return Refresh.False;
+		}
+	}
+
+	@Nullable
+	static UpdateResponse.Result result(@Nullable Result result) {
+
+		if (result == null) {
+			return null;
+		}
+
+		switch (result) {
+			case Created:
+				return UpdateResponse.Result.CREATED;
+			case Updated:
+				return UpdateResponse.Result.UPDATED;
+			case Deleted:
+				return UpdateResponse.Result.DELETED;
+			case NotFound:
+				return UpdateResponse.Result.NOT_FOUND;
+			case NoOp:
+				return UpdateResponse.Result.NOOP;
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static ScoreMode scoreMode(@Nullable RescorerQuery.ScoreMode scoreMode) {
+
+		if (scoreMode == null) {
+			return null;
+		}
+
+		switch (scoreMode) {
+			case Default:
+				return null;
+			case Avg:
+				return ScoreMode.Avg;
+			case Max:
+				return ScoreMode.Max;
+			case Min:
+				return ScoreMode.Min;
+			case Total:
+				return ScoreMode.Total;
+			case Multiply:
+				return ScoreMode.Multiply;
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static SearchType searchType(@Nullable Query.SearchType searchType) {
+
+		if (searchType == null) {
+			return null;
+		}
+
+		switch (searchType) {
+			case QUERY_THEN_FETCH:
+				return SearchType.QueryThenFetch;
+			case DFS_QUERY_THEN_FETCH:
+				return SearchType.DfsQueryThenFetch;
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static SortMode sortMode(Order.Mode mode) {
+
+		switch (mode) {
+			case min:
+				return SortMode.Min;
+			case max:
+				return SortMode.Max;
+			case median:
+				return SortMode.Median;
+			case avg:
+				return SortMode.Avg;
+		}
+
+		return null;
+	}
+
+	@Nullable
+	static Time time(@Nullable Duration duration) {
+
+		if (duration == null) {
+			return null;
+		}
+
+		return Time.of(t -> t.time(duration.toMillis() + "ms"));
+	}
+
+	@Nullable
+	static String timeStringMs(@Nullable Duration duration) {
+
+		if (duration == null) {
+			return null;
+		}
+
+		return duration.toMillis() + "ms";
+	}
+
+	@Nullable
+	static VersionType versionType(
+			@Nullable org.springframework.data.elasticsearch.annotations.Document.VersionType versionType) {
+
+		if (versionType != null) {
+			switch (versionType) {
+				case INTERNAL:
+					return VersionType.Internal;
+				case EXTERNAL:
+					return VersionType.External;
+				case EXTERNAL_GTE:
+					return VersionType.ExternalGte;
+				case FORCE:
+					return VersionType.Force;
+			}
+		}
+
+		return null;
+	}
+
+	static Integer waitForActiveShardsCount(@Nullable String value) {
+		// values taken from the RHLC implementation
+		if (value == null) {
+			return -2;
+		} else if ("all".equals(value.toUpperCase())) {
+			return -1;
+		} else {
+			try {
+				return Integer.parseInt(value);
+			} catch (NumberFormatException e) {
+				throw new IllegalArgumentException("Illegale value for waitForActiveShards" + value);
+			}
+		}
+	}
+
+}

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains classes that use the new Elasticsearch client library (co.elastic.clients:elasticsearch-java)
+ * to access Elasticsearch.
+ */
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.client.elc;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 the original author or authors.
+ * Copyright 2018-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,33 +15,19 @@
  */
 package org.springframework.data.elasticsearch.client.reactive;
 
-import io.netty.channel.ChannelOption;
-import io.netty.handler.ssl.ApplicationProtocolConfig;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.IdentityCipherSuiteFilter;
-import io.netty.handler.ssl.JdkSslContext;
-import io.netty.handler.timeout.ReadTimeoutHandler;
-import io.netty.handler.timeout.WriteTimeoutHandler;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.netty.http.client.HttpClient;
-import reactor.netty.transport.ProxyProvider;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.util.Collection;
 import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import javax.net.ssl.SSLContext;
-
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
@@ -83,14 +69,12 @@ import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.GetAliasesResponse;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.indices.*;
-import org.elasticsearch.common.xcontent.DeprecationHandler;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.client.tasks.TaskSubmissionResponse;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.reindex.BulkByScrollResponse;
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
+import org.elasticsearch.index.reindex.ReindexRequest;
 import org.elasticsearch.index.reindex.UpdateByQueryRequest;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestStatus;
@@ -100,6 +84,10 @@ import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.suggest.Suggest;
+import org.elasticsearch.xcontent.DeprecationHandler;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentType;
 import org.reactivestreams.Publisher;
 import org.springframework.data.elasticsearch.RestStatusException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
@@ -118,7 +106,6 @@ import org.springframework.data.util.Lazy;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -143,6 +130,7 @@ import org.springframework.web.reactive.function.client.WebClient.RequestBodySpe
  * @author Brian Clozel
  * @author Farid Faoudi
  * @author George Popides
+ * @author Sijia Liu
  * @since 3.2
  * @see ClientConfiguration
  * @see ReactiveRestClients
@@ -226,7 +214,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 		Assert.notNull(clientConfiguration, "ClientConfiguration must not be null");
 		Assert.notNull(requestCreator, "RequestCreator must not be null");
 
-		WebClientProvider provider = getWebClientProvider(clientConfiguration);
+		WebClientProvider provider = WebClientProvider.getWebClientProvider(clientConfiguration);
 
 		HostProvider<?> hostProvider = HostProvider.provider(provider, clientConfiguration.getHeadersSupplier(),
 				clientConfiguration.getEndpoints().toArray(new InetSocketAddress[0]));
@@ -238,83 +226,6 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 		return client;
 	}
 
-	private static WebClientProvider getWebClientProvider(ClientConfiguration clientConfiguration) {
-
-		Duration connectTimeout = clientConfiguration.getConnectTimeout();
-		Duration soTimeout = clientConfiguration.getSocketTimeout();
-
-		HttpClient httpClient = HttpClient.create().compress(true);
-
-		if (!connectTimeout.isNegative()) {
-			httpClient = httpClient.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, Math.toIntExact(connectTimeout.toMillis()));
-		}
-
-		if (!soTimeout.isNegative()) {
-			httpClient = httpClient.doOnConnected(connection -> connection //
-					.addHandlerLast(new ReadTimeoutHandler(soTimeout.toMillis(), TimeUnit.MILLISECONDS))
-					.addHandlerLast(new WriteTimeoutHandler(soTimeout.toMillis(), TimeUnit.MILLISECONDS)));
-		}
-
-		if (clientConfiguration.getProxy().isPresent()) {
-			String proxy = clientConfiguration.getProxy().get();
-			String[] hostPort = proxy.split(":");
-
-			if (hostPort.length != 2) {
-				throw new IllegalArgumentException("invalid proxy configuration " + proxy + ", should be \"host:port\"");
-			}
-			httpClient = httpClient.proxy(proxyOptions -> proxyOptions.type(ProxyProvider.Proxy.HTTP).host(hostPort[0])
-					.port(Integer.parseInt(hostPort[1])));
-		}
-
-		String scheme = "http";
-
-		if (clientConfiguration.useSsl()) {
-
-			Optional<SSLContext> sslContext = clientConfiguration.getSslContext();
-
-			if (sslContext.isPresent()) {
-				httpClient = httpClient
-						.secure(sslContextSpec -> sslContextSpec.sslContext(new JdkSslContext(sslContext.get(), true, null,
-								IdentityCipherSuiteFilter.INSTANCE, ApplicationProtocolConfig.DISABLED, ClientAuth.NONE, null, false)));
-			} else {
-				httpClient = httpClient.secure();
-			}
-
-			scheme = "https";
-		}
-
-		WebClientProvider provider = WebClientProvider.create(scheme, new ReactorClientHttpConnector(httpClient));
-
-		if (clientConfiguration.getPathPrefix() != null) {
-			provider = provider.withPathPrefix(clientConfiguration.getPathPrefix());
-		}
-
-		Function<WebClient, WebClient> webClientConfigurer = webClient -> {
-			for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
-					.getClientConfigurers()) {
-
-				if (clientConfigurer instanceof ReactiveRestClients.WebClientConfigurationCallback) {
-					ReactiveRestClients.WebClientConfigurationCallback webClientConfigurationCallback = (ReactiveRestClients.WebClientConfigurationCallback) clientConfigurer;
-					webClient = webClientConfigurationCallback.configure(webClient);
-				}
-			}
-			return webClient;
-		};
-
-		provider = provider //
-				.withDefaultHeaders(clientConfiguration.getDefaultHeaders()) //
-				.withWebClientConfigurer(webClientConfigurer) //
-				.withRequestConfigurer(requestHeadersSpec -> requestHeadersSpec.headers(httpHeaders -> {
-					HttpHeaders suppliedHeaders = clientConfiguration.getHeadersSupplier().get();
-
-					if (suppliedHeaders != null && suppliedHeaders != HttpHeaders.EMPTY) {
-						httpHeaders.addAll(suppliedHeaders);
-					}
-				}));
-
-		return provider;
-	}
-
 	public void setHeadersSupplier(Supplier<HttpHeaders> headersSupplier) {
 
 		Assert.notNull(headersSupplier, "headersSupplier must not be null");
@@ -508,6 +419,17 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 				.next();
 	}
 
+	@Override
+	public Mono<BulkByScrollResponse> reindex(HttpHeaders headers, ReindexRequest reindexRequest) {
+		return sendRequest(reindexRequest, requestCreator.reindex(), BulkByScrollResponse.class, headers).next();
+	}
+
+	@Override
+	public Mono<String> submitReindex(HttpHeaders headers, ReindexRequest reindexRequest) {
+		return sendRequest(reindexRequest, requestCreator.submitReindex(), TaskSubmissionResponse.class, headers).next()
+				.map(TaskSubmissionResponse::getTask);
+	}
+
 	@Override
 	public <T> Mono<T> execute(ReactiveElasticsearchClientCallback<T> callback) {
 

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

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