Browse Source

Bumping versions

fix-okhttp-encoding-condition
buildmaster 2 years ago
parent
commit
ec245b03f7
  1. 2
      docs/src/main/asciidoc/_configprops.adoc
  2. 18
      spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java

2
docs/src/main/asciidoc/_configprops.adoc

@ -20,6 +20,8 @@ @@ -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.

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

@ -78,16 +78,14 @@ class FeignHttpClientPropertiesTests { @@ -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);

Loading…
Cancel
Save