Polish "Upgrade to Elasticsearch Client 9.2.0"

This commit configures the new Jackson 3 support for Elasticsearch if
available. As for other auto-configurations, Jackson 2 is still
supported in a deprecated fashion.

Closes gh-47847

Author: snicoll

module/spring-boot-elasticsearch/build.gradle

@@ -42,6 +42,7 @@ dependencies {
 		exclude group: "org.elasticsearch.client", module: "transport"
 	}
 	optional("org.testcontainers:testcontainers-elasticsearch")
+	optional("tools.jackson.core:jackson-databind")
 
 	dockerTestImplementation(project(":core:spring-boot-test"))
 	dockerTestImplementation(project(":module:spring-boot-jackson"))

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

@@ -19,6 +19,7 @@
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.SimpleJsonpMapper;
+import co.elastic.clients.json.jackson.Jackson3JsonpMapper;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
@@ -28,6 +29,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.spi.JsonProvider;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -44,17 +46,30 @@
  */
 class ElasticsearchClientConfigurations {
 
-	@Import({ JacksonJsonpMapperConfiguration.class, JsonbJsonpMapperConfiguration.class,
-			SimpleJsonpMapperConfiguration.class })
+	@Import({ JacksonJsonpMapperConfiguration.class, Jackson2JsonpMapperConfiguration.class,
+			JsonbJsonpMapperConfiguration.class, SimpleJsonpMapperConfiguration.class })
 	static class JsonpMapperConfiguration {
 
 	}
 
-	@ConditionalOnMissingBean(JsonpMapper.class)
-	@ConditionalOnClass(ObjectMapper.class)
 	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnMissingBean(JsonpMapper.class)
+	@ConditionalOnClass(JsonMapper.class)
 	static class JacksonJsonpMapperConfiguration {
 
+		@Bean
+		Jackson3JsonpMapper jacksonJsonpMapper() {
+			return new Jackson3JsonpMapper();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnMissingBean(JsonpMapper.class)
+	@ConditionalOnClass(ObjectMapper.class)
+	@Deprecated(since = "4.0.0", forRemoval = true)
+	static class Jackson2JsonpMapperConfiguration {
+
 		@Bean
 		JacksonJsonpMapper jacksonJsonpMapper() {
 			return new JacksonJsonpMapper();

module/spring-boot-elasticsearch/src/test/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfigurationTests.java

@@ -19,13 +19,15 @@
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.SimpleJsonpMapper;
+import co.elastic.clients.json.jackson.Jackson3JsonpMapper;
 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.rest5_client.Rest5ClientTransport;
 import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
@@ -65,15 +67,15 @@ void withRestClientAutoConfigurationShouldDefineClientAndSupportingBeans() {
 
 	@Test
 	void withoutJsonbOrJacksonShouldDefineSimpleMapper() {
-		this.contextRunner.withClassLoader(new FilteredClassLoader(ObjectMapper.class))
+		this.contextRunner.withClassLoader(new FilteredClassLoader(JsonMapper.class, ObjectMapper.class))
 			.withUserConfiguration(RestClientConfiguration.class)
 			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
 				.hasSingleBean(SimpleJsonpMapper.class));
 	}
 
 	@Test
 	void withJsonbShouldDefineJsonbMapper() {
-		this.contextRunner.withClassLoader(new FilteredClassLoader(ObjectMapper.class))
+		this.contextRunner.withClassLoader(new FilteredClassLoader(JsonMapper.class, ObjectMapper.class))
 			.withConfiguration(AutoConfigurations.of(JsonbAutoConfiguration.class))
 			.withUserConfiguration(RestClientConfiguration.class)
 			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
@@ -83,6 +85,16 @@ void withJsonbShouldDefineJsonbMapper() {
 	@Test
 	void withJacksonShouldDefineJacksonMapper() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
+			.withUserConfiguration(RestClientConfiguration.class)
+			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
+				.hasSingleBean(Jackson3JsonpMapper.class));
+	}
+
+	@Test
+	@Deprecated(since = "4.0.0", forRemoval = true)
+	void withoutJackson3ShouldDefineJackson2Mapper() {
+		this.contextRunner.withClassLoader(new FilteredClassLoader(JsonMapper.class))
+			.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
 			.withUserConfiguration(RestClientConfiguration.class)
 			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
 				.hasSingleBean(JacksonJsonpMapper.class));
@@ -94,7 +106,7 @@ void withJacksonAndJsonbShouldDefineJacksonMapper() {
 			.withConfiguration(AutoConfigurations.of(JsonbAutoConfiguration.class, JacksonAutoConfiguration.class))
 			.withUserConfiguration(RestClientConfiguration.class)
 			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
-				.hasSingleBean(JacksonJsonpMapper.class));
+				.hasSingleBean(Jackson3JsonpMapper.class));
 	}
 
 	@Test
@@ -122,6 +134,20 @@ void withCustomTransportClientShouldUseIt() {
 	@Test
 	void jacksonJsonpMapperDoesNotUseGlobalObjectMapper() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
+			.withUserConfiguration(RestClientConfiguration.class)
+			.withBean(ObjectMapper.class)
+			.run((context) -> {
+				JsonMapper jsonMapper = context.getBean(JsonMapper.class);
+				Jackson3JsonpMapper jacksonJsonpMapper = context.getBean(Jackson3JsonpMapper.class);
+				assertThat(jacksonJsonpMapper.objectMapper()).isNotSameAs(jsonMapper);
+			});
+	}
+
+	@Test
+	@Deprecated(since = "4.0.0", forRemoval = true)
+	void jackson2JsonpMapperDoesNotUseGlobalObjectMapper() {
+		this.contextRunner.withClassLoader(new FilteredClassLoader(JsonMapper.class))
+			.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
 			.withUserConfiguration(RestClientConfiguration.class)
 			.withBean(ObjectMapper.class)
 			.run((context) -> {