Skip to content

Commit ec245b0

Browse files
committed
Bumping versions
1 parent 10b55a0 commit ec245b0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

docs/src/main/asciidoc/_configprops.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
|feign.httpclient.disable-ssl-validation | `+++false+++` |
2121
|feign.httpclient.enabled | `+++true+++` | Enables the use of the Apache HTTP Client by Feign.
2222
|feign.httpclient.follow-redirects | `+++true+++` |
23+
|feign.httpclient.hc5.connection-request-timeout | `+++3+++` | Default value for connection request timeout.
24+
|feign.httpclient.hc5.connection-request-timeout-unit | | Default value for connection request timeout unit.
2325
|feign.httpclient.hc5.enabled | `+++false+++` | Enables the use of the Apache HTTP Client 5 by Feign.
2426
|feign.httpclient.hc5.pool-concurrency-policy | | Pool concurrency policies.
2527
|feign.httpclient.hc5.pool-reuse-policy | | Pool connection re-use policies.

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,14 @@ void testDefaults() {
7878

7979
@Test
8080
void testCustomization() {
81-
TestPropertyValues
82-
.of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2",
83-
"feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2",
84-
"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
85-
"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
86-
"feign.httpclient.hc5.poolConcurrencyPolicy=lax", "feign.httpclient.hc5.poolReusePolicy=lifo",
87-
"feign.httpclient.hc5.socketTimeout=200", "feign.httpclient.hc5.socketTimeoutUnit=milliseconds",
88-
"feign.httpclient.hc5.connectionRequestTimeout=200",
89-
"feign.httpclient.hc5.connectionRequestTimeoutUnit=milliseconds")
90-
.applyTo(this.context);
81+
TestPropertyValues.of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2",
82+
"feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2",
83+
"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
84+
"feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false",
85+
"feign.httpclient.hc5.poolConcurrencyPolicy=lax", "feign.httpclient.hc5.poolReusePolicy=lifo",
86+
"feign.httpclient.hc5.socketTimeout=200", "feign.httpclient.hc5.socketTimeoutUnit=milliseconds",
87+
"feign.httpclient.hc5.connectionRequestTimeout=200",
88+
"feign.httpclient.hc5.connectionRequestTimeoutUnit=milliseconds").applyTo(this.context);
9189
setupContext();
9290
assertThat(getProperties().getMaxConnections()).isEqualTo(2);
9391
assertThat(getProperties().getConnectionTimeout()).isEqualTo(2);

0 commit comments

Comments
 (0)