mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.7.x'
This commit is contained in:
commit
a3bfc67249
@ -55,7 +55,7 @@ class ElasticsearchRepositoriesAutoConfigurationTests {
|
||||
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,
|
||||
ElasticsearchRepositoriesAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class))
|
||||
.withPropertyValues("spring.elasticsearch.rest.uris=" + elasticsearch.getHttpHostAddress());
|
||||
.withPropertyValues("spring.elasticsearch.uris=" + elasticsearch.getHttpHostAddress());
|
||||
|
||||
@Test
|
||||
void testDefaultRepositoryConfiguration() {
|
||||
|
@ -55,9 +55,8 @@ class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
|
||||
.withConfiguration(AutoConfigurations.of(ReactiveElasticsearchRestClientAutoConfiguration.class,
|
||||
ReactiveElasticsearchRepositoriesAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class))
|
||||
.withPropertyValues(
|
||||
"spring.data.elasticsearch.client.reactive.endpoints=" + elasticsearch.getHost() + ":"
|
||||
+ elasticsearch.getFirstMappedPort(),
|
||||
"spring.data.elasticsearch.client.reactive.socket-timeout=30s");
|
||||
"spring.elasticsearch.uris=" + elasticsearch.getHost() + ":" + elasticsearch.getFirstMappedPort(),
|
||||
"spring.elasticsearch.socket-timeout=30s");
|
||||
|
||||
@Test
|
||||
void testDefaultRepositoryConfiguration() {
|
||||
|
Loading…
Reference in New Issue
Block a user