Release version 5.2.1 (2023.1.1).

See #2771
Prepare 5.2.1 (2023.1.1).
2026-05-23 12:43:17 +00:00 · 2023-12-15 14:11:53 +01:00 · 2023-12-15 14:11:23 +01:00 · 2023-12-14 08:49:56 +01:00 · 2023-12-14 08:34:15 +01:00 · 2023-11-30 20:44:26 +01:00
602 changed files with 2155 additions and 7394 deletions
@@ -1,3 +1,3 @@
-#Thu Dec 14 08:40:44 CET 2023
+#Thu Dec 14 08:34:15 CET 2023
 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.9.6/apache-maven-3.9.6-bin.zip
@@ -9,7 +9,7 @@ pipeline {

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

 	options {
@@ -39,11 +39,9 @@ pipeline {

 			steps {
 				script {
-					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-							sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
-							sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+						sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+						sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
 					}
 				}
 			}
@@ -70,11 +68,9 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-									sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
-									sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
-								}
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+								sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
 							}
 						}
 					}
@@ -101,21 +97,19 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-								sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-									"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
-									"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
-									"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
-									"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root " +
-									"-Dartifactory.server=${p['artifactory.url']} " +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
-									"-Dartifactory.build-name=spring-data-elasticsearch " +
-									"-Dartifactory.build-number=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
-									"-Dmaven.test.skip=true clean deploy -U -B"
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+								"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
+								"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
+								"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
+								"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root " +
+								"-Dartifactory.server=${p['artifactory.url']} " +
+								"-Dartifactory.username=${ARTIFACTORY_USR} " +
+								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
+								"-Dartifactory.build-name=spring-data-elasticsearch " +
+								"-Dartifactory.build-number=${BUILD_NUMBER} " +
+								"-Dmaven.test.skip=true clean deploy -U -B"
 					}
 				}
 			}
@@ -1,4 +1,6 @@
-= 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]] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]
+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]] image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]

 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.

@@ -124,7 +126,8 @@ We’d love to help!
 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].
 * Learn the Spring basics – Spring Data builds on Spring Framework, check the https://spring.io[spring.io] web-site for a wealth of reference documentation.
 If you are just starting out with Spring, try one of the https://spring.io/guides[guides].
-* Ask a question or chat with the community on https://app.gitter.im/#/room/#spring-projects_spring-data:gitter.im[Gitter].
+* Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions tagged with https://stackoverflow.com/tags/spring-data[`spring-data-elasticsearch`].
+You can also chat with the community on https://gitter.im/spring-projects/spring-data[Gitter].
 * Report bugs with Spring Data for Elasticsearch at https://github.com/spring-projects/spring-data-elasticsearch/issues[https://github.com/spring-projects/spring-data-elasticsearch/issues].

 == Reporting Issues
@@ -3,8 +3,8 @@ java.main.tag=17.0.9_9-jdk-focal
 java.next.tag=21.0.1_12-jdk-jammy

 # Docker container images - standard
-docker.java.main.image=library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=library/eclipse-temurin:${java.next.tag}
+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}

 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.25
@@ -14,7 +14,6 @@ docker.mongodb.7.0.version=7.0.2

 # Supported versions of Redis
 docker.redis.6.version=6.2.13
-docker.redis.7.version=7.2.4

 # Supported versions of Cassandra
 docker.cassandra.3.version=3.11.16
@@ -26,8 +25,6 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
 # Credentials
 docker.registry=
 docker.credentials=hub.docker.com-springbuildmaster
-docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
-docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
 artifactory.url=https://repo.spring.io
 artifactory.repository.snapshot=libs-snapshot-local
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.3.2</version>
+	<version>5.2.1</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.3.2</version>
+		<version>3.2.1</version>
 	</parent>

 	<name>Spring Data Elasticsearch</name>
@@ -18,10 +18,10 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>

 	<properties>
-		<springdata.commons>3.3.2</springdata.commons>
+		<springdata.commons>3.2.1</springdata.commons>

 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>8.13.4</elasticsearch-java>
+		<elasticsearch-java>8.11.1</elasticsearch-java>

 		<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
 		<hoverfly>0.14.4</hoverfly>
@@ -324,13 +324,6 @@
 			<scope>test</scope>
 		</dependency>

-		<dependency>
-			<groupId>com.tngtech.archunit</groupId>
-			<artifactId>archunit-junit5</artifactId>
-			<version>${archunit}</version>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>

 	<build>
@@ -9,7 +9,7 @@
 *** xref:migration-guides/migration-guide-4.4-5.0.adoc[]
 *** xref:migration-guides/migration-guide-5.0-5.1.adoc[]
 *** xref:migration-guides/migration-guide-5.1-5.2.adoc[]
-*** xref:migration-guides/migration-guide-5.2-5.3.adoc[]
+

 * xref:elasticsearch.adoc[]
 ** xref:elasticsearch/clients.adoc[]
@@ -150,7 +150,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()
    return headers;
  })
  .withClientConfigurer(                                                <.>
-    ElasticsearchHttpClientConfigurationCallback.from(clientBuilder -> {
+    ElasticsearchClientConfigurationCallback.from(clientBuilder -> {
  	  // ...
      return clientBuilder;
  	}))
@@ -192,7 +192,6 @@ This callback provides a `org.elasticsearch.client.RestClientBuilder` that can b
 [source,java]
 ----
 ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
    .withClientConfigurer(ElasticsearchClients.ElasticsearchRestClientConfigurationCallback.from(restClientBuilder -> {
        // configure the Elasticsearch RestClient
        return restClientBuilder;
@@ -211,7 +210,6 @@ used by the `RestClient`.
 [source,java]
 ----
 ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
    .withClientConfigurer(ElasticsearchClients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
        // configure the HttpAsyncClient
        return httpAsyncClientBuilder;
@@ -1,22 +1,6 @@
 [[new-features]]
 = What's new

-[[new-features.5-3-1]]
-== New in Spring Data Elasticsearch 5.3.1
-
-* Upgrade to Elasticsearch 8.13.4.
-
-[[new-features.5-3-0]]
-== New in Spring Data Elasticsearch 5.3
-
-* Upgrade to Elasticsearch 8.13.2.
-* Add support for highlight queries in highlighting.
-* Add shard statistics to the `SearchHit` class.
-* Add support for multi search template API.
-* Add support for SpEL in @Query.
-* Add support for field aliases in the index mapping.
-* Add support for has_child and has_parent queries.
-
 [[new-features.5-2-0]]
 == New in Spring Data Elasticsearch 5.2

@@ -52,7 +52,7 @@ public class Statement {
        return routing;
    }

-    public void setRouting(String routing) {
+    public void setRouting(Routing routing) {
        this.routing = routing;
    }

@@ -199,7 +199,7 @@ void init() {
    repository.save(
        Statement.builder()
            .withText("+1 for the sun")
-            .withRouting(savedWeather.getId())
+            ,withRouting(savedWeather.getId())
            .withRelation(new JoinField<>("vote", sunnyAnswer.getId()))         <5>
            .build());
 }
@@ -226,7 +226,6 @@ SearchHits<Statement> hasVotes() {
 	Query query = NativeQuery.builder()
 		.withQuery(co.elastic.clients.elasticsearch._types.query_dsl.Query.of(qb -> qb
 			.hasChild(hc -> hc
-				.type("answer")
 				.queryName("vote")
 				.query(matchAllQueryAsQuery())
 				.scoreMode(ChildScoreMode.None)
@@ -192,7 +192,8 @@ public String getProperty() {

 This annotation can be set on a String property of an entity.
 This property will not be written to the mapping, it will not be stored in Elasticsearch and its value will not be read from an Elasticsearch document.
-After an entity is persisted, for example with a call to `ElasticsearchOperations.save(T entity)`, the entity returned from that call will contain the name of the index that an entity was saved to in that property.
+After an entity is persisted, for example with a call to `ElasticsearchOperations.save(T entity)`, the entity
+returned from that call will contain the name of the index that an entity was saved to in that property.
 This is useful when the index name is dynamically set by a bean, or when writing to a write alias.

 Putting some value into such a property does not set the index into which an entity is stored!
@@ -422,6 +423,7 @@ Looking at the `Configuration` from the xref:elasticsearch/object-mapping.adoc#e
@Configuration
 public class Config extends ElasticsearchConfiguration  {

+	@NonNull
 	@Override
 	public ClientConfiguration clientConfiguration() {
 		return ClientConfiguration.builder() //
@@ -12,10 +12,10 @@ class Book {
    @Id
    private String id;

-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.text)
    private String name;

-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.text)
    private String summary;

    @Field(type = FieldType.Integer)
@@ -316,7 +316,7 @@ Repository methods can be defined to have the following return types for returni

 .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.
+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> {
@@ -361,202 +361,3 @@ would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/qu
 }
 ----
 ====
-
-[[elasticsearch.query-methods.at-query.spel]]
-=== Using SpEL Expressions
-
-.Declare query on the method using the `@Query` annotation with SpEL expression.
-====
-https://docs.spring.io/spring-framework/reference/core/expressions.html[SpEL expression] is also supported when defining query in `@Query`.
-
-
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("""
-        {
-          "bool":{
-            "must":[
-              {
-                "term":{
-                  "name": "#{#name}"
-                }
-              }
-            ]
-          }
-        }
-        """)
-    Page<Book> findByName(String name, Pageable pageable);
-}
----
-
-If for example the function is called with the parameter _John_, it would produce the following query body:
-
-[source,json]
----
-{
-  "bool":{
-    "must":[
-      {
-        "term":{
-          "name": "John"
-        }
-      }
-    ]
-  }
-}
----
-====
-
-.accessing parameter property.
-====
-Supposing that we have the following class as query parameter type:
-[source,java]
----
-public record QueryParameter(String value) {
-}
----
-
-It's easy to access the parameter by `#` symbol, then reference the property `value` with a simple `.`:
-
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("""
-            {
-              "bool":{
-                "must":[
-                  {
-                    "term":{
-                      "name": "#{#parameter.value}"
-                    }
-                  }
-                ]
-              }
-            }
-            """)
-    Page<Book> findByName(QueryParameter parameter, Pageable pageable);
-}
----
-
-We can pass `new QueryParameter("John")` as the parameter now, and it will produce the same query string as above.
-====
-
-.accessing bean property.
-====
-https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access. Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("""
-            {
-              "bool":{
-                "must":[
-                  {
-                    "term":{
-                      "name": "#{@queryParameter.value}"
-                    }
-                  }
-                ]
-              }
-            }
-            """)
-    Page<Book> findByName(Pageable pageable);
-}
----
-====
-
-.SpEL and `Collection` param.
-====
-`Collection` parameter is also supported and is as easy to use as normal `String`, such as the following `terms` query:
-
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("""
-            {
-              "bool":{
-                "must":[
-                  {
-                    "terms":{
-                      "name": #{#names}
-                    }
-                  }
-                ]
-              }
-            }
-            """)
-    Page<Book> findByName(Collection<String> names, Pageable pageable);
-}
----
-
-NOTE: collection values should not be quoted when declaring the elasticsearch json query.
-
-A collection of `names` like `List.of("name1", "name2")` will produce the following terms query:
-[source,json]
----
-{
-  "bool":{
-    "must":[
-      {
-        "terms":{
-          "name": ["name1", "name2"]
-        }
-      }
-    ]
-  }
-}
----
-====
-
-.access property in the `Collection` param.
-====
-https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/collection-projection.html[SpEL Collection Projection] is convenient to use when values in the `Collection` parameter is not plain `String`:
-
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("""
-            {
-              "bool":{
-                "must":[
-                  {
-                    "terms":{
-                      "name": #{#parameters.![value]}
-                    }
-                  }
-                ]
-              }
-            }
-            """)
-    Page<Book> findByName(Collection<QueryParameter> parameters, Pageable pageable);
-}
----
-This will extract all the `value` property values as a new `Collection` from `QueryParameter` collection, thus takes the same effect as above.
-====
-
-.alter parameter name by using `@Param`
-====
-When accessing the parameter by SpEL, it's also useful to alter the parameter name to another one by `@Param` annotation in Sping Data:
-
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @Query("""
-            {
-              "bool":{
-                "must":[
-                  {
-                    "terms":{
-                      "name": #{#another.![value]}
-                    }
-                  }
-                ]
-              }
-            }
-            """)
-    Page<Book> findByName(@Param("another") Collection<QueryParameter> parameters, Pageable pageable);
-}
----
-
-====
@@ -194,7 +194,7 @@ In the following code this is used to run a query for a given gender and maximum

        var runtimeField = new RuntimeField("age", "long", """                    <.>
                                Instant currentDate = Instant.ofEpochMilli(new Date().getTime());
-                                Instant startDate = doc['birthDate'].value.toInstant();
+                                Instant startDate = doc['birth-date'].value.toInstant();
                                emit (ChronoUnit.DAYS.between(startDate, currentDate) / 365);
                """);

@@ -1,24 +1,24 @@
 [[preface.versions]]
 = Versions

-The following table shows the Elasticsearch and Spring versions that are used by Spring Data release trains and the version of Spring Data Elasticsearch included in that.
+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"]
+[cols="^,^,^,^,^",options="header"]
 |===
-| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2024.0  | 5.3.1 | 8.13.4 | 6.1.x
-| 2023.1 (Vaughan) | 5.2.x | 8.11.1 | 6.1.x
-| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x
-| 2022.0 (Turing) | 5.0.xfootnote:oom[Out of maintenance] | 8.5.3 | 6.0.x
-| 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x
-| 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x
-| 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x
-| 2020.0 (Ockham) | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2
-| Neumann | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12
-| Moore | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12
-| Lovelace | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19
-| Kay | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13
-| Ingalls | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25
+| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
+| 2023.1 (Vaughan) | 5.2.x | 8.11.1 | 6.1.x | 3.2.x
+| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x | 3.1.x
+| 2022.0 (Turing) | 5.0.xfootnote:oom[Out of maintenance] | 8.5.3 | 6.0.x | 3.0.x
+| 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x | 2.7.x
+| 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x | 2.6.x
+| 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x | 2.5.x
+| 2020.0 (Ockham) | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
+| Neumann | 4.0.xfootnote:oom[] | 7.6.2 | 5.2.12 |2.3.x
+| Moore | 3.2.xfootnote:oom[] |6.8.12 | 5.2.12| 2.2.x
+| Lovelace | 3.1.xfootnote:oom[] | 6.2.2 | 5.1.19 |2.1.x
+| Kay | 3.0.xfootnote:oom[] | 5.5.0 | 5.0.13 | 2.0.x
+| Ingalls | 2.1.xfootnote:oom[] | 2.4.0 | 4.3.25 | 1.5.x
 |===

 Support for upcoming versions of Elasticsearch is being tracked and general compatibility should be given assuming the usage of the xref:elasticsearch/template.adoc[ElasticsearchOperations interface].
@@ -49,7 +49,7 @@ Also the reactive implementation that was provided up to now has been moved here
 If you are using `ElasticsearchRestTemplate` directly and not the `ElasticsearchOperations` interface you'll need to adjust your imports as well.

 When working with the `NativeSearchQuery` class, you'll need to switch to the `NativeQuery` class, which can take a
-`Query` instance coming from the new Elasticsearch client libraries.
+`Query` instance comign from the new Elasticsearch client libraries.
 You'll find plenty of examples in the test code.

 [[elasticsearch-migration-guide-4.4-5.0.breaking-changes-records]]
@@ -1,18 +0,0 @@
-[[elasticsearch-migration-guide-5.2-5.3]]
-= Upgrading from 5.2.x to 5.3.x
-
-This section describes breaking changes from version 5.2.x to 5.3.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-5.2-5.3.breaking-changes]]
-== Breaking Changes
-During the parameter replacement in `@Query` annotated repository methods previous versions wrote the String _"null"_ into the query that was sent to Elasticsearch 
-when the actual parameter value was `null`. As Elasticsearch does not store `null` values, this behaviour could lead to problems, for example whent the fields to be 
-searched contains the string `"null"`. In Version 5.3 a `null` value in a parameter will cause a `ConversionException` to be thrown. If you are using `"null"` as the 
-`null_value` defined in a field mapping, then pass that string into the query instead of a Java `null`.
-
-[[elasticsearch-migration-guide-5.2-5.3.deprecations]]
-== Deprecations
-
-=== Removals
-The deprecated classes `org.springframework.data.elasticsearch.ELCQueries`
- and `org.springframework.data.elasticsearch.client.elc.QueryBuilders` have been removed, use `org.springframework.data.elasticsearch.client.elc.Queries` instead.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,173 +39,41 @@ public enum DateFormat {
 	basic_t_time("'T'HHmmss.SSSXXX"), //
 	basic_t_time_no_millis("'T'HHmmssXXX"), //
 	basic_week_date("YYYY'W'wwe"), // week-based-year!
-	/**
-	 * @since 5.3
-	 */
-	strict_basic_week_date("YYYY'W'wwe"), // week-based-year!
 	basic_week_date_time("YYYY'W'wwe'T'HHmmss.SSSX"), // here Elasticsearch uses a different zone format
-	/**
-	 * @since 5.3
-	 */
-	strict_basic_week_date_time("YYYY'W'wwe'T'HHmmss.SSSX"), // here Elasticsearch uses a different zone format
 	basic_week_date_time_no_millis("YYYY'W'wwe'T'HHmmssX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_basic_week_date_time_no_millis("YYYY'W'wwe'T'HHmmssX"), //
 	date("uuuu-MM-dd"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date("uuuu-MM-dd"), //
 	date_hour("uuuu-MM-dd'T'HH"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_hour("uuuu-MM-dd'T'HH"), //
 	date_hour_minute("uuuu-MM-dd'T'HH:mm"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_hour_minute("uuuu-MM-dd'T'HH:mm"), //
 	date_hour_minute_second("uuuu-MM-dd'T'HH:mm:ss"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_hour_minute_second("uuuu-MM-dd'T'HH:mm:ss"), //
 	date_hour_minute_second_fraction("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_hour_minute_second_fraction("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
 	date_hour_minute_second_millis("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_hour_minute_second_millis("uuuu-MM-dd'T'HH:mm:ss.SSS"), //
 	date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_optional_time("uuuu-MM-dd['T'HH:mm:ss.SSSXXX]"), //
 	strict_date_optional_time_nanos("uuuu-MM-dd['T'HH:mm:ss.SSSSSSXXX]"), //
 	date_time("uuuu-MM-dd'T'HH:mm:ss.SSSXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_date_time("uuuu-MM-dd'T'HH:mm:ss.SSSXXX"), //
 	date_time_no_millis("uuuu-MM-dd'T'HH:mm:ssVV"), // here Elasticsearch uses the zone-id in its implementation
-	/**
-	 * @since 5.3
-	 */
-	strict_date_time_no_millis("uuuu-MM-dd'T'HH:mm:ssVV"), // here Elasticsearch uses the zone-id in its implementation
 	epoch_millis("epoch_millis"), //
 	epoch_second("epoch_second"), //
 	hour("HH"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_hour("HH"), //
 	hour_minute("HH:mm"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_hour_minute("HH:mm"), //
 	hour_minute_second("HH:mm:ss"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_hour_minute_second("HH:mm:ss"), //
 	hour_minute_second_fraction("HH:mm:ss.SSS"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_hour_minute_second_fraction("HH:mm:ss.SSS"), //
 	hour_minute_second_millis("HH:mm:ss.SSS"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_hour_minute_second_millis("HH:mm:ss.SSS"), //
 	ordinal_date("uuuu-DDD"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_ordinal_date("uuuu-DDD"), //
 	ordinal_date_time("uuuu-DDD'T'HH:mm:ss.SSSXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_ordinal_date_time("uuuu-DDD'T'HH:mm:ss.SSSXXX"), //
 	ordinal_date_time_no_millis("uuuu-DDD'T'HH:mm:ssXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_ordinal_date_time_no_millis("uuuu-DDD'T'HH:mm:ssXXX"), //
 	time("HH:mm:ss.SSSXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_time("HH:mm:ss.SSSXXX"), //
 	time_no_millis("HH:mm:ssXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_time_no_millis("HH:mm:ssXXX"), //
 	t_time("'T'HH:mm:ss.SSSXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_t_time("'T'HH:mm:ss.SSSXXX"), //
 	t_time_no_millis("'T'HH:mm:ssXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_t_time_no_millis("'T'HH:mm:ssXXX"), //
 	week_date("YYYY-'W'ww-e"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_week_date("YYYY-'W'ww-e"), //
 	week_date_time("YYYY-'W'ww-e'T'HH:mm:ss.SSSXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_week_date_time("YYYY-'W'ww-e'T'HH:mm:ss.SSSXXX"), //
 	week_date_time_no_millis("YYYY-'W'ww-e'T'HH:mm:ssXXX"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_week_date_time_no_millis("YYYY-'W'ww-e'T'HH:mm:ssXXX"), //
 	weekyear(""), // no TemporalAccessor available for these 3
-	/**
-	 * @since 5.3
-	 */
-	strict_weekyear(""), // no TemporalAccessor available for these 3
 	weekyear_week(""), //
-	/**
-	 * @since 5.3
-	 */
-	strict_weekyear_week(""), //
 	weekyear_week_day(""), //
-	/**
-	 * @since 5.3
-	 */
-	strict_strict_weekyear_week_day(""), //
 	year("uuuu"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_year("uuuu"), //
 	year_month("uuuu-MM"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_year_month("uuuu-MM"), //
-	year_month_day("uuuu-MM-dd"), //
-	/**
-	 * @since 5.3
-	 */
-	strict_year_month_day("uuuu-MM-dd"); //
+	year_month_day("uuuu-MM-dd"); //

 	private final String pattern;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.lang.annotation.RetentionPolicy;

 /**
 * @author Peter-Josef Meisch
- * @author Haibo Liu
 * @since 4.0
 */
@Documented
@@ -60,8 +59,6 @@ public @interface HighlightParameters {

 	int numberOfFragments() default -1;

-	Query highlightQuery() default @Query;
-
 	String order() default "";

 	int phraseLimit() default -1;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,6 +15,9 @@
 */
 package org.springframework.data.elasticsearch.annotations;

+import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.annotation.Transient;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -22,10 +25,10 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

 /**
- * Annotation to mark a String property of an entity to be filled with the name of the index where the entity was stored
- * after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created or when a
- * document was indexed into a write alias.
- * <p>
+ * Annotation to mark a String property of an entity to be filled with the name of the index where the entity was
+ * stored after it is indexed into Elasticsearch. This can be used when the name of the index is dynamically created
+ * or when a document was indexed into a write alias.
+ *
 * This can not be used to specify the index where an entity should be written to.
 *
 * @author Peter-Josef Meisch
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -74,14 +74,7 @@ public @interface Mapping {
 	 */
 	String runtimeFieldsPath() default "";

-	/**
-	 * field alias definitions to be written to the index mapping
-	 *
-	 * @since 5.3
-	 */
-	MappingAlias[] aliases() default {};
-
 	enum Detection {
-		DEFAULT, TRUE, FALSE
+		DEFAULT, TRUE, FALSE;
 	}
 }
@@ -1,45 +0,0 @@
-/*
- * Copyright 2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Defines a field alias in the index mapping.
- *
- * @author Peter-Josef Meisch
- * @since 5.3
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-@Inherited
-public @interface MappingAlias {
-	/**
-	 * the name of the alias.
-	 */
-	String name();
-
-	/**
-	 * the path of the alias.
-	 */
-	String path();
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@ import org.springframework.data.util.ReactiveWrappers;
 */
 public class ElasticsearchAotPredicates {

-	public static final Predicate<ReactiveWrappers.ReactiveLibrary> IS_REACTIVE_LIBRARY_AVAILABLE = (
+	public static final Predicate<ReactiveWrappers.ReactiveLibrary> IS_REACTIVE_LIBARARY_AVAILABLE = (
 			lib) -> ReactiveWrappers.isAvailable(lib);

 	public static boolean isReactorPresent() {
-		return IS_REACTIVE_LIBRARY_AVAILABLE.test(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR);
+		return IS_REACTIVE_LIBARARY_AVAILABLE.test(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR);
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -233,15 +233,6 @@ public interface ClientConfiguration {
 		 */
 		TerminalClientConfigurationBuilder usingSsl();

-		/**
-		 * Connects using https if flag is true.
-		 *
-		 * @param flag whether to use https in the connection
-		 * @return the {@link TerminalClientConfigurationBuilder}
-		 * @since 5.3
-		 */
-		TerminalClientConfigurationBuilder usingSsl(boolean flag);
-
 		/**
 		 * Connect via {@literal https} using the given {@link SSLContext}.<br />
 		 * <strong>NOTE</strong> You need to leave out the protocol in
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2023 the original author 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,7 @@ import java.util.function.Supplier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

+import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
@@ -105,13 +106,6 @@ class ClientConfigurationBuilder
 		return this;
 	}

-	@Override
-	public TerminalClientConfigurationBuilder usingSsl(boolean flag) {
-
-		this.useSsl = flag;
-		return this;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder#usingSsl(javax.net.ssl.SSLContext)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,70 +0,0 @@
-/*
- * Copyright 2024 the original author 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 java.util.function.Consumer;
-
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.lang.Nullable;
-
-/**
- * An abstract class that serves as a base for query processors. It provides a common interface and basic functionality
- * for query processing.
- *
- * @author Aouichaoui Youssef
- * @since 5.3
- */
-public abstract class AbstractQueryProcessor {
-
-	/**
-	 * Convert a spring-data-elasticsearch {@literal query} to an Elasticsearch {@literal query}.
-	 *
-	 * @param query spring-data-elasticsearch {@literal query}.
-	 * @param queryConverter correct mapped field names and the values to the converted values.
-	 * @return an Elasticsearch {@literal query}.
-	 */
-	@Nullable
-	static co.elastic.clients.elasticsearch._types.query_dsl.Query getEsQuery(@Nullable Query query,
-			@Nullable Consumer<Query> queryConverter) {
-		if (query == null) {
-			return null;
-		}
-
-		if (queryConverter != null) {
-			queryConverter.accept(query);
-		}
-
-		co.elastic.clients.elasticsearch._types.query_dsl.Query esQuery = null;
-
-		if (query instanceof CriteriaQuery criteriaQuery) {
-			esQuery = CriteriaQueryProcessor.createQuery(criteriaQuery.getCriteria());
-		} else if (query instanceof StringQuery stringQuery) {
-			esQuery = Queries.wrapperQueryAsQuery(stringQuery.getSource());
-		} else if (query instanceof NativeQuery nativeQuery) {
-			if (nativeQuery.getQuery() != null) {
-				esQuery = nativeQuery.getQuery();
-			} else if (nativeQuery.getSpringDataQuery() != null) {
-				esQuery = getEsQuery(nativeQuery.getSpringDataQuery(), queryConverter);
-			}
-		} else {
-			throw new IllegalArgumentException("unhandled Query implementation " + query.getClass().getName());
-		}
-
-		return esQuery;
-	}
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author 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.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;
@@ -39,4 +40,9 @@ public class AutoCloseableElasticsearchClient extends ElasticsearchClient implem
 	public void close() throws Exception {
 		transport.close();
 	}
+
+	@Override
+	public ElasticsearchClusterClient cluster() {
+		return super.cluster();
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@ 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.elasticsearch.utils.geohash.Geohash;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
@@ -51,7 +50,6 @@ import org.springframework.util.Assert;
 * filter.
 *
 * @author Peter-Josef Meisch
- * @author Junghoon Ban
 * @since 4.4
 */
 class CriteriaFilterProcessor {
@@ -70,17 +68,10 @@ class CriteriaFilterProcessor {
 		for (Criteria chainedCriteria : criteria.getCriteriaChain()) {

 			if (chainedCriteria.isOr()) {
-				Collection<? extends Query> queriesForEntries = queriesForEntries(chainedCriteria);
-
-				if (!queriesForEntries.isEmpty()) {
-					BoolQuery.Builder boolQueryBuilder = QueryBuilders.bool();
-					queriesForEntries.forEach(boolQueryBuilder::should);
-					filterQueries.add(new Query(boolQueryBuilder.build()));
-				}
+				BoolQuery.Builder boolQueryBuilder = QueryBuilders.bool();
+				queriesForEntries(chainedCriteria).forEach(boolQueryBuilder::should);
+				filterQueries.add(new Query(boolQueryBuilder.build()));
 			} else if (chainedCriteria.isNegating()) {
-
-				Assert.notNull(criteria.getField(), "criteria must have a field");
-
 				Collection<? extends Query> negatingFilters = buildNegatingFilter(criteria.getField().getName(),
 						criteria.getFilterCriteriaEntries());
 				filterQueries.addAll(negatingFilters);
@@ -124,7 +115,6 @@ class CriteriaFilterProcessor {
 	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");

@@ -179,17 +169,17 @@ class CriteriaFilterProcessor {
 		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 distance) ? extractDistanceString(distance) : (String) values[1];
+		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 loc) {
+					if (values[0]instanceof GeoPoint loc) {
 						location.latlon(latlon -> latlon.lat(loc.getLat()).lon(loc.getLon()));
-					} else if (values[0] instanceof Point point) {
-						GeoPoint loc = GeoPoint.fromPoint(point);
+					} 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];
@@ -230,8 +220,8 @@ class CriteriaFilterProcessor {
 				"single-element of boundedBy filter must be type of GeoBox or Box");

 		GeoBox geoBBox;
-		if (value instanceof Box box) {
-			geoBBox = GeoBox.fromBox(box);
+		if (value instanceof Box) {
+			geoBBox = GeoBox.fromBox((Box) value);
 		} else {
 			geoBBox = (GeoBox) value;
 		}
@@ -254,7 +244,7 @@ class CriteriaFilterProcessor {
 		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 topLeft) {
+		if (values[0]instanceof GeoPoint topLeft) {
 			GeoPoint bottomRight = (GeoPoint) values[1];
 			queryBuilder.boundingBox(bb -> bb //
 					.tlbr(tlbr -> tlbr //
@@ -276,10 +266,7 @@ class CriteriaFilterProcessor {
 					.tlbr(tlbr -> tlbr //
 							.topLeft(glb -> {
 								if (isGeoHash) {
-									// although the builder in 8.13.2 supports geohash, the server throws an error, so we convert to a
-									// lat,lon string here
-									glb.text(Geohash.toLatLon(topLeft));
-									// glb.geohash(gh -> gh.geohash(topLeft));
+									glb.geohash(gh -> gh.geohash(topLeft));
 								} else {
 									glb.text(topLeft);
 								}
@@ -287,8 +274,7 @@ class CriteriaFilterProcessor {
 							}) //
 							.bottomRight(glb -> {
 								if (isGeoHash) {
-									glb.text(Geohash.toLatLon(bottomRight));
-									// glb.geohash(gh -> gh.geohash(bottomRight));
+									glb.geohash(gh -> gh.geohash(bottomRight));
 								} else {
 									glb.text(bottomRight);
 								}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author 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,27 +16,21 @@
 package org.springframework.data.elasticsearch.client.elc;

 import static org.springframework.data.elasticsearch.client.elc.Queries.*;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
 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.elasticsearch.core.search.InnerHits;
 import co.elastic.clients.json.JsonData;

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

 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.data.elasticsearch.core.query.HasChildQuery;
-import org.springframework.data.elasticsearch.core.query.HasParentQuery;
-import org.springframework.data.elasticsearch.core.query.InnerHitsQuery;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

@@ -48,7 +42,7 @@ import org.springframework.util.Assert;
 * @author Ezequiel Antúnez Camacho
 * @since 4.4
 */
-class CriteriaQueryProcessor extends AbstractQueryProcessor {
+class CriteriaQueryProcessor {

 	/**
 	 * creates a query from the criteria
@@ -116,18 +110,11 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 			}
 		}

-		var filterQuery = CriteriaFilterProcessor.createQuery(criteria);
 		if (shouldQueries.isEmpty() && mustNotQueries.isEmpty() && mustQueries.isEmpty()) {
-
-			if (filterQuery.isEmpty()) {
-				return null;
-			}
-
-			// we need something to add the filter to
-			mustQueries.add(Query.of(qb -> qb.matchAll(m -> m)));
+			return null;
 		}

-        return new Query.Builder().bool(boolQueryBuilder -> {
+		Query query = new Query.Builder().bool(boolQueryBuilder -> {

 			if (!shouldQueries.isEmpty()) {
 				boolQueryBuilder.should(shouldQueries);
@@ -141,10 +128,10 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 				boolQueryBuilder.must(mustQueries);
 			}

-			filterQuery.ifPresent(boolQueryBuilder::filter);
-
 			return boolQueryBuilder;
 		}).build();
+
+		return query;
 	}

 	@Nullable
@@ -187,12 +174,6 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 					.scoreMode(ChildScoreMode.Avg));
 		}

-		if (criteria.isNegating() && criteria.isOr()) {
-			final Query query = queryBuilder.build();
-			queryBuilder = new Query.Builder();
-			queryBuilder.bool(mnqb -> mnqb.mustNot(query));
-		}
-
 		return queryBuilder.build();
 	}

@@ -246,7 +227,7 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 				queryBuilder.queryString(queryStringQuery(fieldName, '*' + searchText, true, boost));
 				break;
 			case EXPRESSION:
-				queryBuilder.queryString(queryStringQuery(fieldName, Objects.requireNonNull(value).toString(), boost));
+				queryBuilder.queryString(queryStringQuery(fieldName, value.toString(), boost));
 				break;
 			case LESS:
 				queryBuilder //
@@ -278,7 +259,6 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 				break;
 			case BETWEEN:
 				Object[] ranges = (Object[]) value;
-				Assert.notNull(value, "value for a between condition must not be null");
 				queryBuilder //
 						.range(rb -> {
 							rb.field(fieldName);
@@ -302,10 +282,10 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 								.boost(boost)); //
 				break;
 			case MATCHES:
-				queryBuilder.match(matchQuery(fieldName, Objects.requireNonNull(value).toString(), Operator.Or, boost));
+				queryBuilder.match(matchQuery(fieldName, value.toString(), Operator.Or, boost));
 				break;
 			case MATCHES_ALL:
-				queryBuilder.match(matchQuery(fieldName, Objects.requireNonNull(value).toString(), Operator.And, boost));
+				queryBuilder.match(matchQuery(fieldName, value.toString(), Operator.And, boost));

 				break;
 			case IN:
@@ -354,35 +334,9 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 				queryBuilder //
 						.regexp(rb -> rb //
 								.field(fieldName) //
-								.value(Objects.requireNonNull(value).toString()) //
+								.value(value.toString()) //
 								.boost(boost)); //
 				break;
-			case HAS_CHILD:
-				if (value instanceof HasChildQuery query) {
-					queryBuilder.hasChild(hcb -> hcb
-							.type(query.getType())
-							.query(getEsQuery(query.getQuery(), null))
-							.innerHits(getInnerHits(query.getInnerHitsQuery()))
-							.ignoreUnmapped(query.getIgnoreUnmapped())
-							.minChildren(query.getMinChildren())
-							.maxChildren(query.getMaxChildren())
-							.scoreMode(scoreMode(query.getScoreMode())));
-				} else {
-					throw new CriteriaQueryException("value for " + fieldName + " is not a has_child query");
-				}
-				break;
-			case HAS_PARENT:
-				if (value instanceof HasParentQuery query) {
-					queryBuilder.hasParent(hpb -> hpb
-							.parentType(query.getParentType())
-							.query(getEsQuery(query.getQuery(), null))
-							.innerHits(getInnerHits(query.getInnerHitsQuery()))
-							.ignoreUnmapped(query.getIgnoreUnmapped())
-							.score(query.getScore()));
-				} else {
-					throw new CriteriaQueryException("value for " + fieldName + " is not a has_parent query");
-				}
-				break;
 			default:
 				throw new CriteriaQueryException("Could not build query for " + entry);
 		}
@@ -405,7 +359,7 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {

 			if (item != null) {

-				if (!sb.isEmpty()) {
+				if (sb.length() > 0) {
 					sb.append(' ');
 				}
 				sb.append('"');
@@ -437,19 +391,4 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 		return sb.toString();
 	}

-	/**
-	 * Convert a spring-data-elasticsearch {@literal inner_hits} to an Elasticsearch {@literal inner_hits} query.
-	 *
-	 * @param query spring-data-elasticsearch {@literal inner_hits}.
-	 * @return an Elasticsearch {@literal inner_hits} query.
-	 */
-	@Nullable
-	private static InnerHits getInnerHits(@Nullable InnerHitsQuery query) {
-		if (query == null) {
-			return null;
-		}
-
-		return InnerHits.of(iqb -> iqb.from(query.getFrom()).size(query.getSize()).name(query.getName()));
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -49,7 +49,6 @@ import org.springframework.util.Assert;
 * {@link org.springframework.data.elasticsearch.core.document.Document}
 *
 * @author Peter-Josef Meisch
- * @author Haibo Liu
 * @since 4.4
 */
 final class DocumentAdapters {
@@ -74,7 +73,7 @@ final class DocumentAdapters {
 		Map<String, SearchDocumentResponse> innerHits = new LinkedHashMap<>();
 		hit.innerHits().forEach((name, innerHitsResult) -> {
 			// noinspection ReturnOfNull
-			innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null, null, null,
+			innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null, null,
 					searchDocument -> null, jsonpMapper));
 		});

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,10 +31,6 @@ import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.util.Assert;

-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
 /**
 * Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
 * connection using the Elasticsearch Client. This class exposes different parts of the setup as Spring beans. Deriving
@@ -122,13 +118,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
 	 */
 	@Bean
 	public JsonpMapper jsonpMapper() {
-		// we need to create our own objectMapper that keeps null values in order to provide the storeNullValue
-		// functionality. The one Elasticsearch would provide removes the nulls. We remove unwanted nulls before they get
-		// into this mapper, so we can safely keep them here.
-		var objectMapper = (new ObjectMapper())
-				.configure(SerializationFeature.INDENT_OUTPUT, false)
-				.setSerializationInclusion(JsonInclude.Include.ALWAYS);
-		return new JacksonJsonpMapper(objectMapper);
+		return new JacksonJsonpMapper();
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@ import org.springframework.data.elasticsearch.VersionConflictException;
 * appropriate: any other exception may have resulted from user code, and should not be translated.
 *
 * @author Peter-Josef Meisch
- * @author Junghoon Ban
 * @since 4.4
 */
 public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {
@@ -60,7 +59,7 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 	 */
 	public RuntimeException translateException(Throwable throwable) {

-		RuntimeException runtimeException = throwable instanceof RuntimeException ex ? ex
+		RuntimeException runtimeException = throwable instanceof RuntimeException ? (RuntimeException) throwable
 				: new RuntimeException(throwable.getMessage(), throwable);
 		RuntimeException potentiallyTranslatedException = translateExceptionIfPossible(runtimeException);

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import co.elastic.clients.transport.Version;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -51,7 +50,14 @@ import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverte
 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.*;
+import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
+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.SearchTemplateQuery;
+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;
@@ -66,7 +72,6 @@ import org.springframework.util.Assert;
 * @author Peter-Josef Meisch
 * @author Hamid Rahimi
 * @author Illia Ulianov
- * @author Haibo Liu
 * @since 4.4
 */
 public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
@@ -170,11 +175,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		doBulkOperation(queries, bulkOptions, index);
 	}

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

@@ -188,18 +188,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		return responseConverter.byQueryResponse(response);
 	}

-	@Override
-	public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinates index) {
-		Assert.notNull(query, "query must not be null");
-
-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
-				clazz, index, getRefreshPolicy());
-
-		DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));
-
-		return responseConverter.byQueryResponse(response);
-	}
-
 	@Override
 	public UpdateResponse update(UpdateQuery updateQuery, IndexCoordinates index) {

@@ -449,10 +437,13 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(queries, "queries must not be null");
 		Assert.notNull(clazz, "clazz must not be null");

-		int size = queries.size();
+		List<MultiSearchQueryParameter> multiSearchQueryParameters = new ArrayList<>(queries.size());
+		for (Query query : queries) {
+			multiSearchQueryParameters.add(new MultiSearchQueryParameter(query, clazz, getIndexCoordinatesFor(clazz)));
+		}
+
 		// noinspection unchecked
-		return multiSearch(queries, Collections.nCopies(size, clazz), Collections.nCopies(size, index))
-				.stream().map(searchHits -> (SearchHits<T>) searchHits)
+		return doMultiSearch(multiSearchQueryParameters).stream().map(searchHits -> (SearchHits<T>) searchHits)
 				.collect(Collectors.toList());
 	}

@@ -463,7 +454,14 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(classes, "classes must not be null");
 		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");

-		return multiSearch(queries, classes, classes.stream().map(this::getIndexCoordinatesFor).toList());
+		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
@@ -475,7 +473,14 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Assert.notNull(index, "index must not be null");
 		Assert.isTrue(queries.size() == classes.size(), "queries and classes must have the same size");

-		return multiSearch(queries, classes, Collections.nCopies(queries.size(), index));
+		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);
 	}

 	@Override
@@ -492,50 +497,16 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Iterator<Class<?>> it = classes.iterator();
 		Iterator<IndexCoordinates> indexesIt = indexes.iterator();

-		Assert.isTrue(!queries.isEmpty(), "queries should have at least 1 query");
-		boolean isSearchTemplateQuery = queries.get(0) instanceof SearchTemplateQuery;
-
 		for (Query query : queries) {
-			Assert.isTrue((query instanceof SearchTemplateQuery) == isSearchTemplateQuery,
-					"SearchTemplateQuery can't be mixed with other types of query in multiple search");
-
 			Class<?> clazz = it.next();
 			IndexCoordinates index = indexesIt.next();
 			multiSearchQueryParameters.add(new MultiSearchQueryParameter(query, clazz, index));
 		}

-		return multiSearch(multiSearchQueryParameters, isSearchTemplateQuery);
-	}
-
-	private List<SearchHits<?>> multiSearch(List<MultiSearchQueryParameter> multiSearchQueryParameters,
-			boolean isSearchTemplateQuery) {
-		return isSearchTemplateQuery ? doMultiTemplateSearch(multiSearchQueryParameters.stream()
-				.map(p -> new MultiSearchTemplateQueryParameter((SearchTemplateQuery) p.query, p.clazz, p.index))
-				.toList())
-				: doMultiSearch(multiSearchQueryParameters);
-	}
-
-	private List<SearchHits<?>> doMultiTemplateSearch(
-			List<MultiSearchTemplateQueryParameter> mSearchTemplateQueryParameters) {
-		MsearchTemplateRequest request = requestConverter.searchMsearchTemplateRequest(mSearchTemplateQueryParameters,
-				routingResolver.getRouting());
-
-		MsearchTemplateResponse<EntityAsMap> response = execute(
-				client -> client.msearchTemplate(request, EntityAsMap.class));
-		List<MultiSearchResponseItem<EntityAsMap>> responseItems = response.responses();
-
-		Assert.isTrue(mSearchTemplateQueryParameters.size() == responseItems.size(),
-				"number of response items does not match number of requests");
-
-		int size = mSearchTemplateQueryParameters.size();
-		List<Class<?>> classes = mSearchTemplateQueryParameters
-				.stream().map(MultiSearchTemplateQueryParameter::clazz).collect(Collectors.toList());
-		List<IndexCoordinates> indices = mSearchTemplateQueryParameters
-				.stream().map(MultiSearchTemplateQueryParameter::index).collect(Collectors.toList());
-
-		return getSearchHitsFromMsearchResponse(size, classes, indices, responseItems);
+		return doMultiSearch(multiSearchQueryParameters);
 	}

+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private List<SearchHits<?>> doMultiSearch(List<MultiSearchQueryParameter> multiSearchQueryParameters) {

 		MsearchRequest request = requestConverter.searchMsearchRequest(multiSearchQueryParameters,
@@ -547,37 +518,22 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		Assert.isTrue(multiSearchQueryParameters.size() == responseItems.size(),
 				"number of response items does not match number of requests");

-		int size = multiSearchQueryParameters.size();
-		List<Class<?>> classes = multiSearchQueryParameters
-				.stream().map(MultiSearchQueryParameter::clazz).collect(Collectors.toList());
-		List<IndexCoordinates> indices = multiSearchQueryParameters
-				.stream().map(MultiSearchQueryParameter::index).collect(Collectors.toList());
+		List<SearchHits<?>> searchHitsList = new ArrayList<>(multiSearchQueryParameters.size());

-		return getSearchHitsFromMsearchResponse(size, classes, indices, responseItems);
-	}
-
-	/**
-	 * {@link MsearchResponse} and {@link MsearchTemplateResponse} share the same {@link MultiSearchResponseItem}
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private List<SearchHits<?>> getSearchHitsFromMsearchResponse(int size, List<Class<?>> classes,
-			List<IndexCoordinates> indices, List<MultiSearchResponseItem<EntityAsMap>> responseItems) {
-		List<SearchHits<?>> searchHitsList = new ArrayList<>(size);
-		Iterator<Class<?>> clazzIter = classes.iterator();
-		Iterator<IndexCoordinates> indexIter = indices.iterator();
+		Iterator<MultiSearchQueryParameter> queryIterator = multiSearchQueryParameters.iterator();
 		Iterator<MultiSearchResponseItem<EntityAsMap>> responseIterator = responseItems.iterator();

-		while (clazzIter.hasNext() && indexIter.hasNext()) {
+		while (queryIterator.hasNext()) {
+			MultiSearchQueryParameter queryParameter = queryIterator.next();
 			MultiSearchResponseItem<EntityAsMap> responseItem = responseIterator.next();

 			if (responseItem.isResult()) {

-				Class clazz = clazzIter.next();
-				IndexCoordinates index = indexIter.next();
+				Class clazz = queryParameter.clazz;
 				ReadDocumentCallback<?> documentCallback = new ReadDocumentCallback<>(elasticsearchConverter, clazz,
-						index);
+						queryParameter.index);
 				SearchDocumentResponseCallback<SearchHits<?>> callback = new ReadSearchDocumentResponseCallback<>(clazz,
-						index);
+						queryParameter.index);

 				SearchHits<?> searchHits = callback.doWith(
 						SearchDocumentResponseBuilder.from(responseItem.result(), getEntityCreator(documentCallback), jsonpMapper));
@@ -585,8 +541,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 				searchHitsList.add(searchHits);
 			} else {
 				if (LOGGER.isWarnEnabled()) {
-					LOGGER.warn(String.format("multisearch response contains failure: %s",
-							responseItem.failure().error().reason()));
+					LOGGER
+							.warn(String.format("multisearch responsecontains failure: {}", responseItem.failure().error().reason()));
 				}
 			}
 		}
@@ -600,12 +556,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 	record MultiSearchQueryParameter(Query query, Class<?> clazz, IndexCoordinates index) {
 	}

-	/**
-	 * value class combining the information needed for a single query in a template multisearch request.
-	 */
-	record MultiSearchTemplateQueryParameter(SearchTemplateQuery query, Class<?> clazz, IndexCoordinates index) {
-	}
-
 	@Override
 	public String openPointInTime(IndexCoordinates index, Duration keepAlive, Boolean ignoreUnavailable) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,17 +35,14 @@ import org.springframework.util.StringUtils;
 * {@link co.elastic.clients.elasticsearch.core.search.Highlight}.
 *
 * @author Peter-Josef Meisch
- * @author Haibo Liu
 * @since 4.4
 */
 class HighlightQueryBuilder {
 	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
-	private final RequestConverter requestConverter;

 	HighlightQueryBuilder(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext, RequestConverter requestConverter) {
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
 		this.mappingContext = mappingContext;
-		this.requestConverter = requestConverter;
 	}

 	public co.elastic.clients.elasticsearch.core.search.Highlight getHighlight(Highlight highlight,
@@ -55,7 +52,7 @@ class HighlightQueryBuilder {

 		// 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, type);
+		addParameters(highlight.getParameters(), highlightBuilder);

 		for (HighlightField highlightField : highlight.getFields()) {
 			String mappedName = mapFieldName(highlightField.getName(), type);
@@ -72,7 +69,7 @@ class HighlightQueryBuilder {
 	 * 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, @Nullable Class<?> type) {
+			co.elastic.clients.elasticsearch.core.search.Highlight.Builder builder) {

 		if (StringUtils.hasLength(parameters.getBoundaryChars())) {
 			builder.boundaryChars(parameters.getBoundaryChars());
@@ -106,10 +103,6 @@ class HighlightQueryBuilder {
 			builder.numberOfFragments(parameters.getNumberOfFragments());
 		}

-		if (parameters.getHighlightQuery() != null) {
-			builder.highlightQuery(requestConverter.getQuery(parameters.getHighlightQuery(), type));
-		}
-
 		if (StringUtils.hasLength(parameters.getOrder())) {
 			builder.order(highlighterOrder(parameters.getOrder()));
 		}
@@ -181,10 +174,6 @@ class HighlightQueryBuilder {
 			builder.numberOfFragments(parameters.getNumberOfFragments());
 		}

-		if (parameters.getHighlightQuery() != null) {
-			builder.highlightQuery(requestConverter.getQuery(parameters.getHighlightQuery(), type));
-		}
-
 		if (StringUtils.hasLength(parameters.getOrder())) {
 			builder.order(highlighterOrder(parameters.getOrder()));
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import co.elastic.clients.json.JsonpMapper;
 import jakarta.json.stream.JsonGenerator;

 import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;

 import org.apache.commons.logging.Log;
@@ -43,13 +44,17 @@ final class JsonUtils {
 		mapper.serialize(object, generator);
 		generator.close();
 		String json = "{}";
-		json = baos.toString(StandardCharsets.UTF_8);
+		try {
+			json = baos.toString("UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			LOGGER.warn("could not read json", e);
+		}
+
 		return json;
 	}

 	@Nullable
-	public static String queryToJson(@Nullable co.elastic.clients.elasticsearch._types.query_dsl.Query query,
-			JsonpMapper mapper) {
+	public static String queryToJson(@Nullable co.elastic.clients.elasticsearch._types.query_dsl.Query query, JsonpMapper mapper) {

 		if (query == null) {
 			return null;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author 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,7 +16,6 @@
 package org.springframework.data.elasticsearch.client.elc;

 import co.elastic.clients.elasticsearch._types.KnnQuery;
-import co.elastic.clients.elasticsearch._types.KnnSearch;
 import co.elastic.clients.elasticsearch._types.SortOptions;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
@@ -55,7 +54,6 @@ public class NativeQuery extends BaseQuery {

 	private Map<String, JsonData> searchExtensions = Collections.emptyMap();
 	@Nullable private KnnQuery knnQuery;
-	@Nullable private List<KnnSearch> knnSearches = Collections.emptyList();

 	public NativeQuery(NativeQueryBuilder builder) {
 		super(builder);
@@ -73,7 +71,6 @@ public class NativeQuery extends BaseQuery {
 		}
 		this.springDataQuery = builder.getSpringDataQuery();
 		this.knnQuery = builder.getKnnQuery();
-		this.knnSearches = builder.getKnnSearches();
 	}

 	public NativeQuery(@Nullable Query query) {
@@ -132,14 +129,6 @@ public class NativeQuery extends BaseQuery {
 		return knnQuery;
 	}

-	/**
-	 * @since 5.3.1
-	 */
-	@Nullable
-	public List<KnnSearch> getKnnSearches() {
-		return knnSearches;
-	}
-
 	@Nullable
 	public org.springframework.data.elasticsearch.core.query.Query getSpringDataQuery() {
 		return springDataQuery;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author 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,7 +16,6 @@
 package org.springframework.data.elasticsearch.client.elc;

 import co.elastic.clients.elasticsearch._types.KnnQuery;
-import co.elastic.clients.elasticsearch._types.KnnSearch;
 import co.elastic.clients.elasticsearch._types.SortOptions;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
@@ -27,7 +26,6 @@ import co.elastic.clients.util.ObjectBuilder;

 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,12 +47,11 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 	private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
 	@Nullable private Suggester suggester;
 	@Nullable private FieldCollapse fieldCollapse;
-	private final List<SortOptions> sortOptions = new ArrayList<>();
-	private final Map<String, JsonData> searchExtensions = new LinkedHashMap<>();
+	private List<SortOptions> sortOptions = new ArrayList<>();
+	private Map<String, JsonData> searchExtensions = new LinkedHashMap<>();

 	@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
 	@Nullable private KnnQuery knnQuery;
-	@Nullable private List<KnnSearch> knnSearches = Collections.emptyList();

 	public NativeQueryBuilder() {}

@@ -95,14 +92,6 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 		return knnQuery;
 	}

-	/**
-	 * @since 5.3.1
-	 */
-	@Nullable
-	public List<KnnSearch> getKnnSearches() {
-		return knnSearches;
-	}
-
 	@Nullable
 	public org.springframework.data.elasticsearch.core.query.Query getSpringDataQuery() {
 		return springDataQuery;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2022-2023 the original author 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
+ * @deprecated since 5.1, use {@link Queries} instead.
+ */
+@Deprecated(forRemoval = true)
+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));
+	}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -61,7 +61,6 @@ import org.springframework.data.elasticsearch.core.query.BaseQuery;
 import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.BulkOptions;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
-import org.springframework.data.elasticsearch.core.query.DeleteQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.SearchTemplateQuery;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
@@ -80,7 +79,6 @@ import org.springframework.util.StringUtils;
 *
 * @author Peter-Josef Meisch
 * @author Illia Ulianov
- * @author Junghoon Ban
 * @since 4.4
 */
 public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearchTemplate {
@@ -181,15 +179,6 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 		return Mono.from(execute(client -> client.deleteByQuery(request))).map(responseConverter::byQueryResponse);
 	}

-	@Override
-	public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType, IndexCoordinates index) {
-		Assert.notNull(query, "query must not be null");
-
-		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
-				entityType, index, getRefreshPolicy());
-		return Mono.from(execute(client -> client.deleteByQuery(request))).map(responseConverter::byQueryResponse);
-	}
-
 	@Override
 	public <T> Mono<T> get(String id, Class<T> entityType, IndexCoordinates index) {

@@ -395,28 +384,7 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 			Function<PitSearchAfter, Publisher<? extends ResponseBody<EntityAsMap>>> resourceClosure = psa -> {

 				baseQuery.setPointInTime(new Query.PointInTime(psa.getPit(), pitKeepAlive));
-
-				// only add _shard_doc if there is not a field_collapse and a sort with the same name
-				boolean addShardDoc = true;
-
-				if (query instanceof NativeQuery nativeQuery && nativeQuery.getFieldCollapse() != null) {
-					var field = nativeQuery.getFieldCollapse().field();
-
-					if (nativeQuery.getSortOptions().stream()
-							.anyMatch(sortOptions -> sortOptions.isField() && sortOptions.field().field().equals(field))) {
-						addShardDoc = false;
-					}
-
-					if (query.getSort() != null
-							&& query.getSort().stream().anyMatch(order -> order.getProperty().equals(field))) {
-						addShardDoc = false;
-					}
-				}
-
-				if (addShardDoc) {
-					baseQuery.addSort(Sort.by("_shard_doc"));
-				}
-
+				baseQuery.addSort(Sort.by("_shard_doc"));
 				SearchRequest firstSearchRequest = requestConverter.searchRequest(baseQuery, routingResolver.getRouting(),
 						clazz, index, false, true);

@@ -652,7 +620,7 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 	 *
 	 * @param <T>
 	 */
-	public interface ClientCallback<T extends Publisher<?>> {
+	interface ClientCallback<T extends Publisher<?>> {

 		T doWithClient(ReactiveElasticsearchClient client);
 	}
@@ -677,7 +645,7 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
 	 */
 	private RuntimeException translateException(Throwable throwable) {

-		RuntimeException runtimeException = throwable instanceof RuntimeException ex ? ex
+		RuntimeException runtimeException = throwable instanceof RuntimeException ? (RuntimeException) throwable
 				: new RuntimeException(throwable.getMessage(), throwable);
 		RuntimeException potentiallyTranslatedException = exceptionTranslator
 				.translateExceptionIfPossible(runtimeException);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author 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,6 @@ import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
 import co.elastic.clients.elasticsearch.core.bulk.UpdateOperation;
 import co.elastic.clients.elasticsearch.core.mget.MultiGetOperation;
 import co.elastic.clients.elasticsearch.core.msearch.MultisearchBody;
-import co.elastic.clients.elasticsearch.core.msearch.MultisearchHeader;
 import co.elastic.clients.elasticsearch.core.search.Highlight;
 import co.elastic.clients.elasticsearch.core.search.Rescore;
 import co.elastic.clients.elasticsearch.core.search.SourceConfig;
@@ -55,7 +54,6 @@ import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
-import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonParser;

 import java.io.ByteArrayInputStream;
@@ -68,7 +66,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;

@@ -108,11 +105,10 @@ import org.springframework.util.StringUtils;
 * @author Sascha Woo
 * @author cdalxndr
 * @author scoobyzhang
- * @author Haibo Liu
 * @since 4.4
 */
@SuppressWarnings("ClassCanBeRecord")
-class RequestConverter extends AbstractQueryProcessor {
+class RequestConverter {

 	private static final Log LOGGER = LogFactory.getLog(RequestConverter.class);

@@ -157,6 +153,7 @@ class RequestConverter extends AbstractQueryProcessor {
 						aliasActions.getActions().forEach(aliasAction -> {
 							if (aliasAction instanceof AliasAction.Add add) {
 								var parameters = add.getParameters();
+								// noinspection DuplicatedCode
 								String[] parametersAliases = parameters.getAliases();
 								if (parametersAliases != null) {
 									for (String aliasName : parametersAliases) {
@@ -172,6 +169,7 @@ class RequestConverter extends AbstractQueryProcessor {

 	private Alias.Builder buildAlias(AliasActionParameters parameters, Alias.Builder aliasBuilder) {

+		// noinspection DuplicatedCode
 		if (parameters.getRouting() != null) {
 			aliasBuilder.routing(parameters.getRouting());
 		}
@@ -398,7 +396,10 @@ class RequestConverter extends AbstractQueryProcessor {
 				.order(putTemplateRequest.getOrder());

 		if (putTemplateRequest.getSettings() != null) {
-			Map<String, JsonData> settings = getTemplateParams(putTemplateRequest.getSettings().entrySet());
+			Function<Map.Entry<String, Object>, String> keyMapper = Map.Entry::getKey;
+			Function<Map.Entry<String, Object>, JsonData> valueMapper = entry -> JsonData.of(entry.getValue(), jsonpMapper);
+			Map<String, JsonData> settings = putTemplateRequest.getSettings().entrySet().stream()
+					.collect(Collectors.toMap(keyMapper, valueMapper));
 			builder.settings(settings);
 		}

@@ -414,6 +415,7 @@ class RequestConverter extends AbstractQueryProcessor {
 		if (aliasActions != null) {
 			aliasActions.getActions().forEach(aliasAction -> {
 				AliasActionParameters parameters = aliasAction.getParameters();
+				// noinspection DuplicatedCode
 				String[] parametersAliases = parameters.getAliases();

 				if (parametersAliases != null) {
@@ -447,6 +449,7 @@ class RequestConverter extends AbstractQueryProcessor {
 						aliasActions.getActions().forEach(aliasAction -> {
 							if (aliasAction instanceof AliasAction.Add add) {
 								var parameters = add.getParameters();
+								// noinspection DuplicatedCode
 								String[] parametersAliases = parameters.getAliases();
 								if (parametersAliases != null) {
 									for (String aliasName : parametersAliases) {
@@ -542,12 +545,13 @@ class RequestConverter extends AbstractQueryProcessor {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			builder
-					.id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
+			builder //
+					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
 		} else if (query.getSource() != null) {
-			builder
-					.id(query.getId())
+			builder //
+					.id(query.getId()) //
 					.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
 		} else {
 			throw new InvalidDataAccessApiUsageException(
@@ -593,13 +597,12 @@ class RequestConverter extends AbstractQueryProcessor {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			builder
-					.id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
+			builder //
+					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
 		} else if (query.getSource() != null) {
-			builder
-					.id(query.getId())
-					.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
+			builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
 		} else {
 			throw new InvalidDataAccessApiUsageException(
 					"object or source is null, failed to index the document [id: " + query.getId() + ']');
@@ -635,13 +638,12 @@ class RequestConverter extends AbstractQueryProcessor {
 		Object queryObject = query.getObject();

 		if (queryObject != null) {
-			builder
-					.id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
+			builder //
+					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
 		} else if (query.getSource() != null) {
-			builder
-					.id(query.getId())
-					.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
+			builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
 		} else {
 			throw new InvalidDataAccessApiUsageException(
 					"object or source is null, failed to index the document [id: " + query.getId() + ']');
@@ -964,78 +966,6 @@ class RequestConverter extends AbstractQueryProcessor {
 		});
 	}

-	public DeleteByQueryRequest documentDeleteByQueryRequest(DeleteQuery query, @Nullable String routing, Class<?> clazz,
-			IndexCoordinates index, @Nullable RefreshPolicy refreshPolicy) {
-		Assert.notNull(query, "query must not be null");
-		Assert.notNull(index, "index must not be null");
-
-		return DeleteByQueryRequest.of(dqb -> {
-			dqb.index(Arrays.asList(index.getIndexNames())) //
-					.query(getQuery(query.getQuery(), clazz))//
-					.refresh(deleteByQueryRefresh(refreshPolicy))
-					.requestsPerSecond(query.getRequestsPerSecond())
-					.maxDocs(query.getMaxDocs())
-					.scroll(time(query.getScroll()))
-					.scrollSize(query.getScrollSize());
-
-			if (query.getRouting() != null) {
-				dqb.routing(query.getRouting());
-			} else if (StringUtils.hasText(routing)) {
-				dqb.routing(routing);
-			}
-
-			if (query.getQ() != null) {
-				dqb.q(query.getQ())
-						.analyzer(query.getAnalyzer())
-						.analyzeWildcard(query.getAnalyzeWildcard())
-						.defaultOperator(operator(query.getDefaultOperator()))
-						.df(query.getDf())
-						.lenient(query.getLenient());
-			}
-
-			if (query.getExpandWildcards() != null && !query.getExpandWildcards().isEmpty()) {
-				dqb.expandWildcards(expandWildcards(query.getExpandWildcards()));
-			}
-			if (query.getStats() != null && !query.getStats().isEmpty()) {
-				dqb.stats(query.getStats());
-			}
-			if (query.getSlices() != null) {
-				dqb.slices(sb -> sb.value(query.getSlices()));
-			}
-			if (query.getSort() != null) {
-				ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntity(clazz);
-				List<SortOptions> sortOptions = getSortOptions(query.getSort(), persistentEntity);
-
-				if (!sortOptions.isEmpty()) {
-					dqb.sort(
-							sortOptions.stream()
-									.map(sortOption -> {
-										String order = "asc";
-										var sortField = sortOption.field();
-										if (sortField.order() != null) {
-											order = sortField.order().jsonValue();
-										}
-
-										return sortField.field() + ":" + order;
-									})
-									.collect(Collectors.toList()));
-				}
-			}
-			dqb.allowNoIndices(query.getAllowNoIndices())
-					.conflicts(conflicts(query.getConflicts()))
-					.ignoreUnavailable(query.getIgnoreUnavailable())
-					.preference(query.getPreference())
-					.requestCache(query.getRequestCache())
-					.searchType(searchType(query.getSearchType()))
-					.searchTimeout(time(query.getSearchTimeout()))
-					.terminateAfter(query.getTerminateAfter())
-					.timeout(time(query.getTimeout()))
-					.version(query.getVersion());
-
-			return dqb;
-		});
-	}
-
 	public UpdateRequest<Document, ?> documentUpdateRequest(UpdateQuery query, IndexCoordinates index,
 			@Nullable RefreshPolicy refreshPolicy, @Nullable String routing) {

@@ -1210,40 +1140,11 @@ class RequestConverter extends AbstractQueryProcessor {
 			builder.routing(routing);
 		}

-		addPostFilter(query, builder);
+		addFilter(query, builder);

 		return builder.build();
 	}

-	public MsearchTemplateRequest searchMsearchTemplateRequest(
-			List<ElasticsearchTemplate.MultiSearchTemplateQueryParameter> multiSearchTemplateQueryParameters,
-			@Nullable String routing) {
-
-		// basically the same stuff as in template search
-		return MsearchTemplateRequest.of(mtrb -> {
-			multiSearchTemplateQueryParameters.forEach(param -> {
-				var query = param.query();
-				mtrb.searchTemplates(stb -> stb
-						.header(msearchHeaderBuilder(query, param.index(), routing))
-						.body(bb -> {
-							bb //
-									.explain(query.getExplain()) //
-									.id(query.getId()) //
-									.source(query.getSource()) //
-							;
-
-							if (!CollectionUtils.isEmpty(query.getParams())) {
-								Map<String, JsonData> params = getTemplateParams(query.getParams().entrySet());
-								bb.params(params);
-							}
-
-							return bb;
-						}));
-			});
-			return mtrb;
-		});
-	}
-
 	public MsearchRequest searchMsearchRequest(
 			List<ElasticsearchTemplate.MultiSearchQueryParameter> multiSearchQueryParameters, @Nullable String routing) {

@@ -1255,7 +1156,28 @@ class RequestConverter extends AbstractQueryProcessor {

 				var query = param.query();
 				mrb.searches(sb -> sb //
-						.header(msearchHeaderBuilder(query, param.index(), routing)) //
+						.header(h -> {
+							var searchType = (query instanceof NativeQuery nativeQuery && nativeQuery.getKnnQuery() != null) ? null
+									: searchType(query.getSearchType());
+
+							h //
+									.index(Arrays.asList(param.index().getIndexNames())) //
+									.searchType(searchType) //
+									.requestCache(query.getRequestCache()) //
+							;
+
+							if (StringUtils.hasText(query.getRoute())) {
+								h.routing(query.getRoute());
+							} else if (StringUtils.hasText(routing)) {
+								h.routing(routing);
+							}
+
+							if (query.getPreference() != null) {
+								h.preference(query.getPreference());
+							}
+
+							return h;
+						}) //
 						.body(bb -> {
 							bb //
 									.query(getQuery(query, param.clazz()))//
@@ -1361,35 +1283,6 @@ class RequestConverter extends AbstractQueryProcessor {
 		});
 	}

-	/**
-	 * {@link MsearchRequest} and {@link MsearchTemplateRequest} share the same {@link MultisearchHeader}
-	 */
-	private Function<MultisearchHeader.Builder, ObjectBuilder<MultisearchHeader>> msearchHeaderBuilder(Query query,
-			IndexCoordinates index, @Nullable String routing) {
-		return h -> {
-			var searchType = (query instanceof NativeQuery nativeQuery && nativeQuery.getKnnQuery() != null) ? null
-					: searchType(query.getSearchType());
-
-			h //
-					.index(Arrays.asList(index.getIndexNames())) //
-					.searchType(searchType) //
-					.requestCache(query.getRequestCache()) //
-			;
-
-			if (StringUtils.hasText(query.getRoute())) {
-				h.routing(query.getRoute());
-			} else if (StringUtils.hasText(routing)) {
-				h.routing(routing);
-			}
-
-			if (query.getPreference() != null) {
-				h.preference(query.getPreference());
-			}
-
-			return h;
-		};
-	}
-
 	private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nullable Class<T> clazz,
 			IndexCoordinates indexCoordinates, SearchRequest.Builder builder, boolean forCount, boolean forBatchedSearch) {

@@ -1477,8 +1370,8 @@ class RequestConverter extends AbstractQueryProcessor {
 		if (query instanceof NativeQuery nativeQuery) {
 			prepareNativeSearch(nativeQuery, builder);
 		}
-		// query.getSort() must be checked after prepareNativeSearch as this already might have a sort set
-		// that must have higher priority
+		// query.getSort() must be checked after prepareNativeSearch as this already might hav a sort set that must have
+		// higher priority
 		if (query.getSort() != null) {
 			List<SortOptions> sortOptions = getSortOptions(query.getSort(), persistentEntity);

@@ -1500,15 +1393,7 @@ class RequestConverter extends AbstractQueryProcessor {
 		}

 		if (!isEmpty(query.getSearchAfter())) {
-			var fieldValues = query.getSearchAfter().stream().map(TypeUtils::toFieldValue).toList();
-
-			// when there is a field collapse on a native query, and we have a search_after, then the search_after
-			// must only have one entry
-			if (query instanceof NativeQuery nativeQuery && nativeQuery.getFieldCollapse() != null) {
-				builder.searchAfter(fieldValues.get(0));
-			} else {
-				builder.searchAfter(fieldValues);
-			}
+			builder.searchAfter(query.getSearchAfter().stream().map(TypeUtils::toFieldValue).toList());
 		}

 		query.getRescorerQueries().forEach(rescorerQuery -> builder.rescore(getRescore(rescorerQuery)));
@@ -1609,7 +1494,7 @@ class RequestConverter extends AbstractQueryProcessor {
 	private void addHighlight(Query query, SearchRequest.Builder builder) {

 		Highlight highlight = query.getHighlightQuery()
-				.map(highlightQuery -> new HighlightQueryBuilder(elasticsearchConverter.getMappingContext(), this)
+				.map(highlightQuery -> new HighlightQueryBuilder(elasticsearchConverter.getMappingContext())
 						.getHighlight(highlightQuery.getHighlight(), highlightQuery.getType()))
 				.orElse(null);

@@ -1619,7 +1504,7 @@ class RequestConverter extends AbstractQueryProcessor {
 	private void addHighlight(Query query, MultisearchBody.Builder builder) {

 		Highlight highlight = query.getHighlightQuery()
-				.map(highlightQuery -> new HighlightQueryBuilder(elasticsearchConverter.getMappingContext(), this)
+				.map(highlightQuery -> new HighlightQueryBuilder(elasticsearchConverter.getMappingContext())
 						.getHighlight(highlightQuery.getHighlight(), highlightQuery.getType()))
 				.orElse(null);

@@ -1727,18 +1612,7 @@ class RequestConverter extends AbstractQueryProcessor {
 		;

 		if (query.getKnnQuery() != null) {
-			var kq = query.getKnnQuery();
-			builder.knn(ksb -> ksb
-					.field(kq.field())
-					.queryVector(kq.queryVector())
-					.numCandidates(kq.numCandidates())
-					.filter(kq.filter())
-					.similarity(kq.similarity()));
-
-		}
-
-		if (!isEmpty(query.getKnnSearches())) {
-			builder.knn(query.getKnnSearches());
+			builder.knn(query.getKnnQuery());
 		}

 		if (!isEmpty(query.getAggregations())) {
@@ -1759,18 +1633,7 @@ class RequestConverter extends AbstractQueryProcessor {
 				.sort(query.getSortOptions());

 		if (query.getKnnQuery() != null) {
-			var kq = query.getKnnQuery();
-			builder.knn(ksb -> ksb
-					.field(kq.field())
-					.queryVector(kq.queryVector())
-					.numCandidates(kq.numCandidates())
-					.filter(kq.filter())
-					.similarity(kq.similarity()));
-
-		}
-
-		if (!isEmpty(query.getKnnSearches())) {
-			builder.knn(query.getKnnSearches());
+			builder.knn(query.getKnnQuery());
 		}

 		if (!isEmpty(query.getAggregations())) {
@@ -1783,23 +1646,46 @@ class RequestConverter extends AbstractQueryProcessor {
 	}

 	@Nullable
-	co.elastic.clients.elasticsearch._types.query_dsl.Query getQuery(@Nullable Query query,
+	private co.elastic.clients.elasticsearch._types.query_dsl.Query getQuery(@Nullable Query query,
 			@Nullable Class<?> clazz) {
-		return getEsQuery(query, (q) -> elasticsearchConverter.updateQuery(q, clazz));
+
+		if (query == null) {
+			return null;
+		}
+
+		elasticsearchConverter.updateQuery(query, clazz);
+
+		co.elastic.clients.elasticsearch._types.query_dsl.Query esQuery = null;
+
+		if (query instanceof CriteriaQuery) {
+			esQuery = CriteriaQueryProcessor.createQuery(((CriteriaQuery) query).getCriteria());
+		} else if (query instanceof StringQuery) {
+			esQuery = Queries.wrapperQueryAsQuery(((StringQuery) query).getSource());
+		} else if (query instanceof NativeQuery nativeQuery) {
+
+			if (nativeQuery.getQuery() != null) {
+				esQuery = nativeQuery.getQuery();
+			} else if (nativeQuery.getSpringDataQuery() != null) {
+				esQuery = getQuery(nativeQuery.getSpringDataQuery(), clazz);
+			}
+		} else {
+			throw new IllegalArgumentException("unhandled Query implementation " + query.getClass().getName());
+		}
+
+		return esQuery;
 	}

-	@SuppressWarnings("StatementWithEmptyBody")
-	private void addPostFilter(Query query, SearchRequest.Builder builder) {
+	private void addFilter(Query query, SearchRequest.Builder builder) {

-		// we only need to handle NativeQuery here. filter from a CriteriaQuery are added into the query and not as post
-		// filter anymore, StringQuery do not have post filters
-		if (query instanceof NativeQuery nativeQuery) {
-
-			if (nativeQuery.getFilter() != null) {
-				builder.postFilter(nativeQuery.getFilter());
-			} else if (nativeQuery.getSpringDataQuery() != null) {
-				addPostFilter(nativeQuery.getSpringDataQuery(), builder);
-			}
+		if (query instanceof CriteriaQuery) {
+			CriteriaFilterProcessor.createQuery(((CriteriaQuery) query).getCriteria()).ifPresent(builder::postFilter);
+		} else // noinspection StatementWithEmptyBody
+		if (query instanceof StringQuery) {
+			// no filter for StringQuery
+		} else if (query instanceof NativeQuery) {
+			builder.postFilter(((NativeQuery) query).getFilter());
+		} else {
+			throw new IllegalArgumentException("unhandled Query implementation " + query.getClass().getName());
 		}
 	}

@@ -1883,8 +1769,7 @@ class RequestConverter extends AbstractQueryProcessor {
 					.id(query.getId()) //
 					.index(Arrays.asList(index.getIndexNames())) //
 					.preference(query.getPreference()) //
-					.searchType(searchType(query.getSearchType())) //
-					.source(query.getSource()) //
+					.searchType(searchType(query.getSearchType())).source(query.getSource()) //
 			;

 			if (query.getRoute() != null) {
@@ -1903,7 +1788,10 @@ class RequestConverter extends AbstractQueryProcessor {
 			}

 			if (!CollectionUtils.isEmpty(query.getParams())) {
-				Map<String, JsonData> params = getTemplateParams(query.getParams().entrySet());
+				Function<Map.Entry<String, Object>, String> keyMapper = Map.Entry::getKey;
+				Function<Map.Entry<String, Object>, JsonData> valueMapper = entry -> JsonData.of(entry.getValue(), jsonpMapper);
+				Map<String, JsonData> params = query.getParams().entrySet().stream()
+						.collect(Collectors.toMap(keyMapper, valueMapper));
 				builder.params(params);
 			}

@@ -1911,14 +1799,6 @@ class RequestConverter extends AbstractQueryProcessor {
 		});
 	}

-	@NotNull
-	private Map<String, JsonData> getTemplateParams(Set<Map.Entry<String, Object>> query) {
-		Function<Map.Entry<String, Object>, String> keyMapper = Map.Entry::getKey;
-		Function<Map.Entry<String, Object>, JsonData> valueMapper = entry -> JsonData.of(entry.getValue(), jsonpMapper);
-		return query.stream()
-				.collect(Collectors.toMap(keyMapper, valueMapper));
-	}
-
 	// endregion

 	public PutScriptRequest scriptPut(Script script) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2023 the original author 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,8 +15,9 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

-import static org.springframework.data.elasticsearch.client.elc.JsonUtils.*;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+import static org.springframework.data.elasticsearch.client.elc.JsonUtils.toJson;
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.removePrefixFromJson;
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.typeMapping;

 import co.elastic.clients.elasticsearch._types.BulkIndexByScrollFailure;
 import co.elastic.clients.elasticsearch._types.ErrorCause;
@@ -35,12 +36,7 @@ import co.elastic.clients.elasticsearch.indices.get_index_template.IndexTemplate
 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.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

@@ -51,11 +47,7 @@ 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.index.TemplateResponse;
-import org.springframework.data.elasticsearch.core.index.TemplateResponseData;
+import org.springframework.data.elasticsearch.core.index.*;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
@@ -129,7 +121,8 @@ class ResponseConverter {
 				.build();
 	}

-	private TemplateResponseData clusterGetComponentTemplateData(ComponentTemplateSummary componentTemplateSummary) {
+	private TemplateResponseData clusterGetComponentTemplateData(
+			ComponentTemplateSummary componentTemplateSummary) {

 		var mapping = typeMapping(componentTemplateSummary.mappings());
 		var settings = new Settings();
@@ -190,7 +183,7 @@ class ResponseConverter {

 		Map<String, IndexMappingRecord> mappings = getMappingResponse.result();

-		if (mappings == null || mappings.isEmpty()) {
+		if (mappings == null || mappings.size() == 0) {
 			return Document.create();
 		}

@@ -333,7 +326,7 @@ class ResponseConverter {
 	}

 	private TemplateResponseData indexGetComponentTemplateData(IndexTemplateSummary indexTemplateSummary,
-			List<String> composedOf) {
+																														 List<String> composedOf) {
 		var mapping = typeMapping(indexTemplateSummary.mappings());

 		Function<IndexSettings, Settings> indexSettingsToSettings = indexSettings -> {
@@ -548,7 +541,7 @@ class ResponseConverter {
 	}

 	@Nullable
-	static ElasticsearchErrorCause toErrorCause(@Nullable ErrorCause errorCause) {
+	private static ElasticsearchErrorCause toErrorCause(@Nullable ErrorCause errorCause) {

 		if (errorCause != null) {
 			return new ElasticsearchErrorCause( //
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	76187a4934	Release version 5.2.1 (2023.1.1). See #2771	2023-12-15 14:11:53 +01:00
Mark Paluch	b693494e17	Prepare 5.2.1 (2023.1.1). See #2771	2023-12-15 14:11:23 +01:00
Mark Paluch	b324935d22	Update CI properties. See #2771	2023-12-14 08:49:56 +01:00
Mark Paluch	920f7c029f	Upgrade to Maven Wrapper 3.9.6. See #2799	2023-12-14 08:34:15 +01:00
Peter-Josef Meisch	051777ee25	Removed junk characters from code. (cherry picked from commit `415d5e0385`)	2023-11-30 20:44:26 +01:00
Peter-Josef Meisch	0fb98eda39	Fix type of returned sort values. Original Pull Request #2786 Closes #2777 (cherry picked from commit `3833975a1a`)	2023-11-30 20:44:25 +01:00
Mark Paluch	df76b43cb4	Introduce property for Jenkins user and Artifactory server details. Closes #2781	2023-11-27 14:23:49 +01:00
Runbing	b681197d0f	Fixed the URL for the Spring Data Commons documentation. I fixed broken links in the Spring Data Elasticsearch documentation for Spring Data Commons. Closes #2776	2023-11-20 11:31:58 +01:00
Mark Paluch	8a1323c11a	Update CI trigger versions. See #2737	2023-11-17 14:53:43 +01:00
Mark Paluch	033d71ccb6	After release cleanups. See #2737	2023-11-17 14:33:56 +01:00
Mark Paluch	0ae2a52de8	Prepare next development iteration. See #2737	2023-11-17 14:33:54 +01:00