Merge branch '2.3.x'

Closes gh-23144
This commit is contained in:
Stephane Nicoll 2020-08-31 11:19:55 +02:00
commit dee3fad8d0
1 changed files with 2 additions and 2 deletions

View File

@ -4667,9 +4667,9 @@ You can further tune how `RestClient` is configured, as shown in the following e
----
You can also register an arbitrary number of beans that implement `RestClientBuilderCustomizer` for more advanced customizations.
To take full control over the registration, define a `RestClient` bean.
To take full control over the registration, define a `RestClientBuilder` bean.
If you have the `org.elasticsearch.client:elasticsearch-rest-high-level-client` dependency on the classpath, Spring Boot will auto-configure a `RestHighLevelClient`, which wraps any existing `RestClient` bean, reusing its HTTP configuration.
If you have the `org.elasticsearch.client:elasticsearch-rest-high-level-client` dependency on the classpath, Spring Boot will auto-configure a `RestHighLevelClient`, which leverages any existing `RestClientBuilder` bean, reusing its HTTP configuration.
[[boot-features-connecting-to-elasticsearch-reactive-rest]]