Remove the integration of the deprecated RestHighLevelClient.

Original Pull Request #2560
Closes #2558

Author: sothawo

pom.xml

@@ -20,17 +20,12 @@
 		<properties>
 				<springdata.commons>3.2.0-SNAPSHOT</springdata.commons>
 
-				<!-- version of the RestHighLevelClient	-->
-				<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
-				<!-- version of the new ElasticsearchClient	-->
+				<!-- version of the ElasticsearchClient	-->
 				<elasticsearch-java>8.7.1</elasticsearch-java>
 
-				<log4j>2.18.0</log4j>
-				<!-- netty dependency can be removed once the WebClient code is gone -->
-				<netty>4.1.90.Final</netty>
-
 				<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
 				<hoverfly>0.14.4</hoverfly>
+				<log4j>2.18.0</log4j>
 				<jsonassert>1.5.1</jsonassert>
 				<testcontainers>1.18.0</testcontainers>
 				<wiremock>2.35.0</wiremock>
@@ -93,18 +88,6 @@
 				<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
 		</issueManagement>
 
-		<dependencyManagement>
-				<dependencies>
-						<dependency>
-								<groupId>io.netty</groupId>
-								<artifactId>netty-bom</artifactId>
-								<version>${netty}</version>
-								<type>pom</type>
-								<scope>import</scope>
-						</dependency>
-				</dependencies>
-		</dependencyManagement>
-
 		<dependencies>
 
 				<!-- Spring -->
@@ -132,33 +115,12 @@
 						<optional>true</optional>
 				</dependency>
 
-				<dependency>
-						<groupId>io.projectreactor.netty</groupId>
-						<artifactId>reactor-netty-http</artifactId>
-						<optional>true</optional>
-				</dependency>
-
 				<dependency>
 						<groupId>io.projectreactor</groupId>
 						<artifactId>reactor-test</artifactId>
 						<scope>test</scope>
 				</dependency>
 
-				<!-- optional Elasticsearch RestHighLevelClient, deprecated in SDE 5.0 -->
-				<dependency>
-						<groupId>org.elasticsearch.client</groupId>
-						<artifactId>elasticsearch-rest-high-level-client</artifactId>
-						<version>${elasticsearch-rhlc}</version>
-						<optional>true</optional>
-						<exclusions>
-								<exclusion>
-										<groupId>commons-logging</groupId>
-										<artifactId>commons-logging</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-
-				<!-- new Elasticsearch client, needs the low-level rest client and json api -->
 				<dependency>
 						<groupId>co.elastic.clients</groupId>
 						<artifactId>elasticsearch-java</artifactId>
@@ -340,6 +302,14 @@
 						<scope>test</scope>
 				</dependency>
 
+				<!--we need Murmur3Hash in a test, before 5.2 we had it from the old Elasticsearch dependency	-->
+				<dependency>
+						<groupId>commons-codec</groupId>
+						<artifactId>commons-codec</artifactId>
+						<version>1.15</version>
+						<scope>test</scope>
+				</dependency>
+
 		</dependencies>
 
 		<build>

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.elasticsearch.client.elc;
 
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
+import static org.springframework.data.elasticsearch.client.elc.TypeUtils.result;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.Time;
@@ -28,35 +28,20 @@
 
 import java.io.IOException;
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.data.elasticsearch.BulkFailureException;
 import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
-import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
-import org.springframework.data.elasticsearch.core.IndexOperations;
-import org.springframework.data.elasticsearch.core.IndexedObjectInformation;
-import org.springframework.data.elasticsearch.core.MultiGetItem;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.SearchScrollHits;
+import org.springframework.data.elasticsearch.core.*;
 import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
-import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.data.elasticsearch.core.query.SearchTemplateQuery;
-import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.elasticsearch.core.query.UpdateResponse;
 import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
 import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
@@ -638,6 +623,11 @@ public Query idsQuery(List<String> ids) {
 		return NativeQuery.builder().withQuery(qb -> qb.ids(iq -> iq.values(ids))).build();
 	}
 
+	@Override
+	public BaseQueryBuilder queryBuilderWithIds(List<String> ids) {
+		return NativeQuery.builder().withIds(ids);
+	}
+
 	/**
 	 * extract the list of {@link IndexedObjectInformation} from a {@link BulkResponse}.
 	 *