Browse Source

Updating property names

pull/6/head
Ryan Baxter 7 years ago
parent
commit
ff33905704
  1. 2
      docs/src/main/asciidoc/spring-cloud-netflix.adoc
  2. 2
      spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java
  3. 2
      spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignHttpClientUrlTests.java
  4. 2
      spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignOkHttpTests.java

2
docs/src/main/asciidoc/spring-cloud-netflix.adoc

@ -1536,7 +1536,7 @@ path rendering the `users` path unreachable. @@ -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

2
spring-cloud-netflix-core/src/test/java/OkHttpClientConfigurationTests.java

@ -61,7 +61,7 @@ import static org.mockito.Mockito.mockingDetails; @@ -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 {

2
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignHttpClientUrlTests.java

@ -58,7 +58,7 @@ import lombok.NoArgsConstructor; @@ -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 {

2
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignOkHttpTests.java

@ -63,7 +63,7 @@ import lombok.NoArgsConstructor; @@ -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 {

Loading…
Cancel
Save