Fix JacksonJsonpMapper bean autoconfigure condition bug.

Fix #36107.
spring-projects · Jun 29, 2023 · b94a80d · b94a80d
1 parent 7d019c6
commit b94a80d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/...g/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientConfigurations.java b/...g/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientConfigurations.java
@@ -31,6 +31,7 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -44,7 +45,7 @@
 class ElasticsearchClientConfigurations {
 
 	@ConditionalOnMissingBean(JsonpMapper.class)
-	@ConditionalOnBean(ObjectMapper.class)
+	@ConditionalOnClass(ObjectMapper.class)
 	@Configuration(proxyBeanMethods = false)
 	static class JacksonJsonpMapperConfiguration {
 

diff --git a/...framework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationTests.java b/...framework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationTests.java
@@ -18,9 +18,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.JacksonJsonpMapper;
-import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -62,21 +60,6 @@ void withRestClientAutoConfigurationShouldDefineClientAndSupportingBeans() {
 				.hasSingleBean(ElasticsearchClient.class));
 	}
 
-	@Test
-	void withoutJsonbOrJacksonShouldDefineSimpleMapper() {
-		this.contextRunner.withUserConfiguration(RestClientConfiguration.class)
-			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
-				.hasSingleBean(SimpleJsonpMapper.class));
-	}
-
-	@Test
-	void withJsonbShouldDefineJsonbMapper() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(JsonbAutoConfiguration.class))
-			.withUserConfiguration(RestClientConfiguration.class)
-			.run((context) -> assertThat(context).hasSingleBean(JsonpMapper.class)
-				.hasSingleBean(JsonbJsonpMapper.class));
-	}
-
 	@Test
 	void withJacksonShouldDefineJacksonMapper() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))