root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-34068
This commit is contained in:
Moritz Halbritter 2023-02-06 09:41:16 +01:00
parent 9b6502300f 3af30b0a11
commit a92ed5e2c2
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientConfigurations.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -49,8 +49,8 @@ class ElasticsearchClientConfigurations {
static class JacksonJsonpMapperConfiguration { static class JacksonJsonpMapperConfiguration {
@Bean @Bean
JacksonJsonpMapper jacksonJsonpMapper(ObjectMapper objectMapper) { JacksonJsonpMapper jacksonJsonpMapper() {
return new JacksonJsonpMapper(objectMapper); return new JacksonJsonpMapper();
} }
} }

13
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,6 +23,7 @@ import co.elastic.clients.json.jackson.JacksonJsonpMapper;
import co.elastic.clients.json.jsonb.JsonbJsonpMapper; import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
import co.elastic.clients.transport.ElasticsearchTransport; import co.elastic.clients.transport.ElasticsearchTransport;
import co.elastic.clients.transport.rest_client.RestClientTransport; import co.elastic.clients.transport.rest_client.RestClientTransport;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -108,6 +109,16 @@ class ElasticsearchClientAutoConfigurationTests {
}); });
} }
@Test
void jacksonJsonpMapperDoesNotUseGlobalObjectMapper() {
this.contextRunner.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class))
.withUserConfiguration(RestClientConfiguration.class).run((context) -> {
ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
JacksonJsonpMapper jacksonJsonpMapper = context.getBean(JacksonJsonpMapper.class);
assertThat(jacksonJsonpMapper.objectMapper()).isNotSameAs(objectMapper);
});
}
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class RestClientConfiguration { static class RestClientConfiguration {