From ec245b03f75deb39a496a14376463142cd532af8 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 18 Jan 2023 11:00:11 +0000 Subject: [PATCH] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 2 ++ .../FeignHttpClientPropertiesTests.java | 18 ++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 1dcf8563..5ed30d3d 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -20,6 +20,8 @@ |feign.httpclient.disable-ssl-validation | `+++false+++` | |feign.httpclient.enabled | `+++true+++` | Enables the use of the Apache HTTP Client by Feign. |feign.httpclient.follow-redirects | `+++true+++` | +|feign.httpclient.hc5.connection-request-timeout | `+++3+++` | Default value for connection request timeout. +|feign.httpclient.hc5.connection-request-timeout-unit | | Default value for connection request timeout unit. |feign.httpclient.hc5.enabled | `+++false+++` | Enables the use of the Apache HTTP Client 5 by Feign. |feign.httpclient.hc5.pool-concurrency-policy | | Pool concurrency policies. |feign.httpclient.hc5.pool-reuse-policy | | Pool connection re-use policies. diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java index b104254b..41d51d28 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java @@ -78,16 +78,14 @@ class FeignHttpClientPropertiesTests { @Test void testCustomization() { - TestPropertyValues - .of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2", - "feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2", - "feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false", - "feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false", - "feign.httpclient.hc5.poolConcurrencyPolicy=lax", "feign.httpclient.hc5.poolReusePolicy=lifo", - "feign.httpclient.hc5.socketTimeout=200", "feign.httpclient.hc5.socketTimeoutUnit=milliseconds", - "feign.httpclient.hc5.connectionRequestTimeout=200", - "feign.httpclient.hc5.connectionRequestTimeoutUnit=milliseconds") - .applyTo(this.context); + TestPropertyValues.of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2", + "feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2", + "feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false", + "feign.httpclient.disableSslValidation=true", "feign.httpclient.followRedirects=false", + "feign.httpclient.hc5.poolConcurrencyPolicy=lax", "feign.httpclient.hc5.poolReusePolicy=lifo", + "feign.httpclient.hc5.socketTimeout=200", "feign.httpclient.hc5.socketTimeoutUnit=milliseconds", + "feign.httpclient.hc5.connectionRequestTimeout=200", + "feign.httpclient.hc5.connectionRequestTimeoutUnit=milliseconds").applyTo(this.context); setupContext(); assertThat(getProperties().getMaxConnections()).isEqualTo(2); assertThat(getProperties().getConnectionTimeout()).isEqualTo(2);