From ff3390570478ba6b9cc3eeb8f1c5d4c4a7679fd2 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Sun, 9 Jul 2017 14:21:10 -0400 Subject: [PATCH] Updating property names --- docs/src/main/asciidoc/spring-cloud-netflix.adoc | 2 +- .../src/test/java/OkHttpClientConfigurationTests.java | 2 +- .../cloud/netflix/feign/FeignHttpClientUrlTests.java | 2 +- .../cloud/netflix/feign/valid/FeignOkHttpTests.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 4f7443b3..99a1bc65 100644 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -1536,7 +1536,7 @@ path rendering the `users` path unreachable. The default HTTP client used by zuul is now backed by the Apache HTTP Client instead of the deprecated Ribbon `RestClient`. To use `RestClient` or to use the `okhttp3.OkHttpClient` set -`ribbon.restclient.enabled=true` or `spring.cloud.httpclient.ok.enabled=true` respectively. +`ribbon.restclient.enabled=true` or `ribbon.okhttp.enabled=true` respectively. === Cookies and Sensitive Headers diff --git a/spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java index 24f9f919..503ebf89 100644 --- a/spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java @@ -61,7 +61,7 @@ import static org.mockito.Mockito.mockingDetails; */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = OkHttpClientConfigurationTestApp.class, value = {"feign.okhttp.enabled: true", - "spring.cloud.httpclient.ok.enabled: true", "ribbon.eureka.enabled = false", "ribbon.okhttp.enabled: true"}) + "spring.cloud.httpclientfactories.ok.enabled: true", "ribbon.eureka.enabled = false", "ribbon.okhttp.enabled: true"}) @DirtiesContext public class OkHttpClientConfigurationTests { diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignHttpClientUrlTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignHttpClientUrlTests.java index 08d70848..a685c3a2 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignHttpClientUrlTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignHttpClientUrlTests.java @@ -58,7 +58,7 @@ import lombok.NoArgsConstructor; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = FeignHttpClientUrlTests.TestConfig.class, webEnvironment = WebEnvironment.DEFINED_PORT, value = { "spring.application.name=feignclienturltest", "feign.hystrix.enabled=false", - "spring.cloud.httpclient.ok.enabled=false" }) + "spring.cloud.httpclientfactories.ok.enabled=false" }) @DirtiesContext public class FeignHttpClientUrlTests { diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignOkHttpTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignOkHttpTests.java index ffd7c6ca..04ddb12e 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignOkHttpTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignOkHttpTests.java @@ -63,7 +63,7 @@ import lombok.NoArgsConstructor; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = FeignOkHttpTests.Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { "spring.application.name=feignclienttest", "feign.hystrix.enabled=false", - "feign.okhttp.enabled=true", "spring.cloud.httpclient.ok.enabled=true" }) + "feign.okhttp.enabled=true", "spring.cloud.httpclientfactories.ok.enabled=true" }) @DirtiesContext public class FeignOkHttpTests {