From 128d33fdc6de62874150a11f6f7f0a5bbc01881c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 22 Aug 2019 15:24:54 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/index.html | 2 +- reference/html/spring-cloud-openfeign.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/html/index.html b/reference/html/index.html index 022a7652..e3f98481 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -297,7 +297,7 @@ public interface StoreClient {

The OkHttpClient and ApacheHttpClient feign clients can be used by setting feign.okhttp.enabled or feign.httpclient.enabled to true, respectively, and having them on the classpath. -You can customize the HTTP client used by providing a bean of either ClosableHttpClient when using Apache or OkHttpClient when using OK HTTP.

+You can customize the HTTP client used by providing a bean of either org.apache.http.impl.client.CloseableHttpClient when using Apache or okhttp3.OkHttpClient when using OK HTTP.

Spring Cloud Netflix does not provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:

diff --git a/reference/html/spring-cloud-openfeign.html b/reference/html/spring-cloud-openfeign.html index 022a7652..e3f98481 100644 --- a/reference/html/spring-cloud-openfeign.html +++ b/reference/html/spring-cloud-openfeign.html @@ -297,7 +297,7 @@ public interface StoreClient {

The OkHttpClient and ApacheHttpClient feign clients can be used by setting feign.okhttp.enabled or feign.httpclient.enabled to true, respectively, and having them on the classpath. -You can customize the HTTP client used by providing a bean of either ClosableHttpClient when using Apache or OkHttpClient when using OK HTTP.

+You can customize the HTTP client used by providing a bean of either org.apache.http.impl.client.CloseableHttpClient when using Apache or okhttp3.OkHttpClient when using OK HTTP.

Spring Cloud Netflix does not provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client: