Migrate from RestClient to new Rest5Client

Closes gh-46061

Author: wilkinsona

core/spring-boot-testcontainers/build.gradle

@@ -36,7 +36,6 @@ dependencies {
 	dockerTestImplementation("com.redis:testcontainers-redis")
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.awaitility:awaitility")
-	dockerTestImplementation("org.elasticsearch.client:elasticsearch-rest-client")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.mockito:mockito-core")

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc

@@ -314,7 +314,8 @@ Spring Boot provides a dedicated starter, `spring-boot-starter-data-elasticsearc
 [[data.nosql.elasticsearch.connecting-using-rest]]
 === Connecting to Elasticsearch Using REST clients
 
-Elasticsearch ships two different REST clients that you can use to query a cluster: the https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/java-rest-low.html[low-level client] from the `org.elasticsearch.client:elasticsearch-rest-client` module and the https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/index.html[Java API client] from the `co.elastic.clients:elasticsearch-java` module.
+Elasticsearch ships two different REST clients that you can use to query a cluster: the https://www.elastic.co/docs/reference/elasticsearch/clients/java/transport/rest5-client/[low-level client] and the https://www.elastic.co/docs/reference/elasticsearch/clients/java[Java API client].
+Both clients are provided by the `co.elastic.clients:elasticsearch-java` module.
 Additionally, Spring Boot provides support for a reactive client from the `org.springframework.data:spring-data-elasticsearch` module.
 By default, the clients will target `http://localhost:9200`.
 You can use `spring.elasticsearch.*` properties to further tune how the clients are configured, as shown in the following example:
@@ -332,16 +333,16 @@ spring:
 
 
 [[data.nosql.elasticsearch.connecting-using-rest.restclient]]
-==== Connecting to Elasticsearch Using RestClient
+==== Connecting to Elasticsearch Using Rest5Client
 
-If you have `elasticsearch-rest-client` on the classpath, Spring Boot will auto-configure and register a javadoc:org.springframework.web.client.RestClient[] bean.
-In addition to the properties described previously, to fine-tune the javadoc:org.springframework.web.client.RestClient[] you can register an arbitrary number of beans that implement javadoc:org.springframework.boot.elasticsearch.autoconfigure.RestClientBuilderCustomizer[] for more advanced customizations.
-To take full control over the clients' configuration, define a javadoc:org.elasticsearch.client.RestClientBuilder[] bean.
+If you have `co.elastic.clients:elasticsearch-java` on the classpath, Spring Boot will auto-configure and register a javadoc:co.elastic.clients.transport.rest5_client.low_level.Rest5Client[] bean.
+In addition to the properties described previously, to fine-tune the javadoc:co.elastic.clients.transport.rest5_client.low_level.Rest5Client[] you can register an arbitrary number of beans that implement javadoc:org.springframework.boot.elasticsearch.autoconfigure.Rest5ClientBuilderCustomizer[] for more advanced customizations.
+To take full control over the client's configuration, define a javadoc:co.elastic.clients.transport.rest5_client.low_level.Rest5ClientBuilder[] bean.
 
 
 
-Additionally, if `elasticsearch-rest-client-sniffer` is on the classpath, a javadoc:org.elasticsearch.client.sniff.Sniffer[] is auto-configured to automatically discover nodes from a running Elasticsearch cluster and set them on the javadoc:org.springframework.web.client.RestClient[] bean.
-You can further tune how javadoc:org.elasticsearch.client.sniff.Sniffer[] is configured, as shown in the following example:
+Additionally, a javadoc:co.elastic.clients.transport.rest5_client.low_level.sniffer.Sniffer[] is auto-configured to automatically discover nodes from a running Elasticsearch cluster and set them on the javadoc:co.elastic.clients.transport.rest5_client.low_level.Rest5Client[] bean.
+You can further tune how javadoc:co.elastic.clients.transport.rest5_client.low_level.sniffer.Sniffer[] is configured, as shown in the following example:
 
 [configprops,yaml]
 ----
@@ -360,9 +361,9 @@ spring:
 
 If you have `co.elastic.clients:elasticsearch-java` on the classpath, Spring Boot will auto-configure and register an javadoc:co.elastic.clients.elasticsearch.ElasticsearchClient[] bean.
 
-The javadoc:co.elastic.clients.elasticsearch.ElasticsearchClient[] uses a transport that depends upon the previously described javadoc:org.springframework.web.client.RestClient[].
+The javadoc:co.elastic.clients.elasticsearch.ElasticsearchClient[] uses a transport that depends upon the previously described javadoc:co.elastic.clients.transport.rest5_client.low_level.Rest5Client[].
 Therefore, the properties described previously can be used to configure the javadoc:co.elastic.clients.elasticsearch.ElasticsearchClient[].
-Furthermore, you can define a javadoc:co.elastic.clients.transport.rest_client.RestClientOptions[] bean to take further control of the behavior of the transport.
+Furthermore, you can define a javadoc:co.elastic.clients.transport.rest5_client.Rest5ClientOptions[] bean to take further control of the behavior of the transport.
 
 
 
@@ -372,9 +373,9 @@ Furthermore, you can define a javadoc:co.elastic.clients.transport.rest_client.R
 {url-spring-data-elasticsearch-site}[Spring Data Elasticsearch] ships javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient[] for querying Elasticsearch instances in a reactive fashion.
 If you have Spring Data Elasticsearch and Reactor on the classpath, Spring Boot will auto-configure and register a javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient[].
 
-The javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient[] uses a transport that depends upon the previously described javadoc:org.springframework.web.client.RestClient[].
+The javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient[] uses a transport that depends upon the previously described javadoc:co.elastic.clients.transport.rest5_client.low_level.Rest5Client[].
 Therefore, the properties described previously can be used to configure the javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient[].
-Furthermore, you can define a javadoc:co.elastic.clients.transport.rest_client.RestClientOptions[] bean to take further control of the behavior of the transport.
+Furthermore, you can define a javadoc:co.elastic.clients.transport.rest5_client.Rest5ClientOptions[] bean to take further control of the behavior of the transport.
 
 
 

module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicatorTests.java

@@ -20,12 +20,12 @@
 import java.util.Map;
 
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
-import co.elastic.clients.transport.rest_client.RestClientTransport;
+import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
+import co.elastic.clients.transport.rest5_client.low_level.ResponseException;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.apache.http.HttpHost;
-import org.elasticsearch.client.ResponseException;
-import org.elasticsearch.client.RestClient;
+import org.apache.hc.core5.http.HttpHost;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -59,8 +59,8 @@ class ElasticsearchReactiveHealthIndicatorTests {
 	void setup() throws Exception {
 		this.server = new MockWebServer();
 		this.server.start();
-		ReactiveElasticsearchClient client = new ReactiveElasticsearchClient(new RestClientTransport(
-				RestClient.builder(HttpHost.create(this.server.getHostName() + ":" + this.server.getPort())).build(),
+		ReactiveElasticsearchClient client = new ReactiveElasticsearchClient(new Rest5ClientTransport(
+				Rest5Client.builder(HttpHost.create(this.server.getHostName() + ":" + this.server.getPort())).build(),
 				new JacksonJsonpMapper()));
 		this.healthIndicator = new ElasticsearchReactiveHealthIndicator(client);
 	}

module/spring-boot-elasticsearch/build.gradle

@@ -27,20 +27,15 @@ description = "Spring Boot Elasticsearch"
 
 dependencies {
 	api(project(":core:spring-boot"))
-	api("org.elasticsearch.client:elasticsearch-rest-client")
+	api("co.elastic.clients:elasticsearch-java")
 
 	optional(project(":core:spring-boot-autoconfigure"))
 	optional(project(":core:spring-boot-docker-compose"))
 	optional(project(":core:spring-boot-testcontainers"))
 	optional(project(":module:spring-boot-health"))
 	optional(project(":module:spring-boot-jsonb"))
 	optional(project(":module:spring-boot-reactor"))
-	optional("co.elastic.clients:elasticsearch-java") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
-	optional("org.elasticsearch.client:elasticsearch-rest-client-sniffer") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
+
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("jakarta.json.bind:jakarta.json.bind-api")
 	optional("org.springframework.data:spring-data-elasticsearch") {

module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationIntegrationTests.java

@@ -18,11 +18,11 @@
 
 import java.io.InputStream;
 
+import co.elastic.clients.transport.rest5_client.low_level.Request;
+import co.elastic.clients.transport.rest5_client.low_level.Response;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.elasticsearch.client.Request;
-import org.elasticsearch.client.Response;
-import org.elasticsearch.client.RestClient;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -57,7 +57,7 @@ void restClientCanQueryElasticsearchNode() {
 			.withPropertyValues("spring.elasticsearch.uris=" + elasticsearch.getHttpHostAddress(),
 					"spring.elasticsearch.connection-timeout=120s", "spring.elasticsearch.socket-timeout=120s")
 			.run((context) -> {
-				RestClient client = context.getBean(RestClient.class);
+				Rest5Client client = context.getBean(Rest5Client.class);
 				Request index = new Request("PUT", "/test/_doc/2");
 				index.setJsonEntity("{" + "  \"a\": \"alpha\"," + "  \"b\": \"bravo\"" + "}");
 				client.performRequest(index);

module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfiguration.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.elasticsearch.autoconfigure;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
-import org.elasticsearch.client.RestClient;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -36,7 +36,7 @@
  */
 @AutoConfiguration(after = { ElasticsearchRestClientAutoConfiguration.class },
 		afterName = { "org.springframework.boot.jsonb.autoconfigure.JsonbAutoConfiguration" })
-@ConditionalOnBean(RestClient.class)
+@ConditionalOnBean(Rest5Client.class)
 @ConditionalOnClass(ElasticsearchClient.class)
 @Import({ JsonpMapperConfiguration.class, ElasticsearchTransportConfiguration.class,
 		ElasticsearchClientConfiguration.class })

module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientConfigurations.java

@@ -22,12 +22,12 @@
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
-import co.elastic.clients.transport.rest_client.RestClientOptions;
-import co.elastic.clients.transport.rest_client.RestClientTransport;
+import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
+import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.spi.JsonProvider;
-import org.elasticsearch.client.RestClient;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -89,9 +89,9 @@ SimpleJsonpMapper simpleJsonpMapper() {
 	static class ElasticsearchTransportConfiguration {
 
 		@Bean
-		RestClientTransport restClientTransport(RestClient restClient, JsonpMapper jsonMapper,
-				ObjectProvider<RestClientOptions> restClientOptions) {
-			return new RestClientTransport(restClient, jsonMapper, restClientOptions.getIfAvailable());
+		Rest5ClientTransport restClientTransport(Rest5Client restClient, JsonpMapper jsonMapper,
+				ObjectProvider<Rest5ClientOptions> restClientOptions) {
+			return new Rest5ClientTransport(restClient, jsonMapper, restClientOptions.getIfAvailable());
 		}
 
 	}

module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchReactiveClientAutoConfiguration.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.elasticsearch.autoconfigure;
 
 import co.elastic.clients.transport.ElasticsearchTransport;
-import org.elasticsearch.client.RestClient;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import reactor.core.publisher.Mono;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -38,7 +38,7 @@
  * @since 4.0.0
  */
 @AutoConfiguration(after = ElasticsearchClientAutoConfiguration.class)
-@ConditionalOnBean(RestClient.class)
+@ConditionalOnBean(Rest5Client.class)
 @ConditionalOnClass({ ReactiveElasticsearchClient.class, ElasticsearchTransport.class, Mono.class })
 @EnableConfigurationProperties(ElasticsearchProperties.class)
 @Import({ ElasticsearchClientConfigurations.JsonpMapperConfiguration.class,

module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfiguration.java

@@ -16,7 +16,7 @@
 
 package org.springframework.boot.elasticsearch.autoconfigure;
 
-import org.elasticsearch.client.RestClientBuilder;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5ClientBuilder;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -36,7 +36,7 @@
  * @since 4.0.0
  */
 @AutoConfiguration(after = SslAutoConfiguration.class)
-@ConditionalOnClass(RestClientBuilder.class)
+@ConditionalOnClass(Rest5ClientBuilder.class)
 @EnableConfigurationProperties(ElasticsearchProperties.class)
 @Import({ RestClientBuilderConfiguration.class, RestClientConfiguration.class, RestClientSnifferConfiguration.class })
 public final class ElasticsearchRestClientAutoConfiguration {