SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1.x'

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2023-01-17 13:28:53 +01:00
parent 80c80556b4 10b55a0a13
commit 7ad582dbe9
3 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java
View File

@@ -55,6 +55,7 @@ import org.springframework.context.annotation.Configuration;
* Default configuration for {@link CloseableHttpClient}.
*
* @author Nguyen Ky Thanh
* @author changjin wei(魏昌进)
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(CloseableHttpClient.class)
@@ -90,7 +91,11 @@ public class HttpClient5FeignConfiguration {
.setDefaultRequestConfig(RequestConfig.custom()
.setConnectTimeout(
Timeout.of(httpClientProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS))
.setRedirectsEnabled(httpClientProperties.isFollowRedirects()).build())
.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
.setConnectionRequestTimeout(
Timeout.of(httpClientProperties.getHc5().getConnectionRequestTimeout(),
httpClientProperties.getHc5().getConnectionRequestTimeoutUnit()))
.build())
.build();
return httpClient5;
}

37
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FeignHttpClientProperties.java
View File

@@ -27,6 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Ryan Baxter
* @author Nguyen Ky Thanh
* @author Olga Maciaszek-Sharma
* @author changjin wei(魏昌进)
*/
@ConfigurationProperties(prefix = "spring.cloud.openfeign.httpclient")
public class FeignHttpClientProperties {
@@ -199,6 +200,16 @@ public class FeignHttpClientProperties {
*/
public static final TimeUnit DEFAULT_SOCKET_TIMEOUT_UNIT = TimeUnit.SECONDS;
/**
* Default value for connection request timeout.
*/
public static final int DEFAULT_CONNECTION_REQUEST_TIMEOUT = 3;
/**
* Default value for connection request timeout unit.
*/
public static final TimeUnit DEFAULT_CONNECTION_REQUEST_TIMEOUT_UNIT = TimeUnit.MINUTES;
/**
* Pool concurrency policies.
*/
@@ -219,6 +230,16 @@ public class FeignHttpClientProperties {
*/
private TimeUnit socketTimeoutUnit = DEFAULT_SOCKET_TIMEOUT_UNIT;
/**
* Default value for connection request timeout.
*/
private int connectionRequestTimeout = DEFAULT_CONNECTION_REQUEST_TIMEOUT;
/**
* Default value for connection request timeout unit.
*/
private TimeUnit connectionRequestTimeoutUnit = DEFAULT_CONNECTION_REQUEST_TIMEOUT_UNIT;
public PoolConcurrencyPolicy getPoolConcurrencyPolicy() {
return poolConcurrencyPolicy;
}
@@ -251,6 +272,22 @@ public class FeignHttpClientProperties {
this.socketTimeout = socketTimeout;
}
public int getConnectionRequestTimeout() {
return connectionRequestTimeout;
}
public void setConnectionRequestTimeout(int connectionRequestTimeout) {
this.connectionRequestTimeout = connectionRequestTimeout;
}
public TimeUnit getConnectionRequestTimeoutUnit() {
return connectionRequestTimeoutUnit;
}
public void setConnectionRequestTimeoutUnit(TimeUnit connectionRequestTimeoutUnit) {
this.connectionRequestTimeoutUnit = connectionRequestTimeoutUnit;
}
/**
* Enumeration of pool concurrency policies.
*/

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

@@ -32,12 +32,15 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.DEFAULT_CONNECTION_REQUEST_TIMEOUT;
import static org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.DEFAULT_CONNECTION_REQUEST_TIMEOUT_UNIT;
import static org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.DEFAULT_SOCKET_TIMEOUT;
import static org.springframework.cloud.openfeign.support.FeignHttpClientProperties.Hc5Properties.DEFAULT_SOCKET_TIMEOUT_UNIT;
/**
* @author Ryan Baxter
* @author Nguyen Ky Thanh
* @author changjin wei(魏昌进)
*/
@DirtiesContext
class FeignHttpClientPropertiesTests {
@@ -67,22 +70,30 @@ class FeignHttpClientPropertiesTests {
assertThat(getProperties().getHc5().getPoolReusePolicy()).isEqualTo(PoolReusePolicy.FIFO);
assertThat(getProperties().getHc5().getSocketTimeout()).isEqualTo(DEFAULT_SOCKET_TIMEOUT);
assertThat(getProperties().getHc5().getSocketTimeoutUnit()).isEqualTo(DEFAULT_SOCKET_TIMEOUT_UNIT);
assertThat(getProperties().getHc5().getConnectionRequestTimeout())
.isEqualTo(DEFAULT_CONNECTION_REQUEST_TIMEOUT);
assertThat(getProperties().getHc5().getConnectionRequestTimeoutUnit())
.isEqualTo(DEFAULT_CONNECTION_REQUEST_TIMEOUT_UNIT);
}
@Test
void testCustomization() {
TestPropertyValues.of("spring.cloud.openfeign.httpclient.maxConnections=2",
"spring.cloud.openfeign.httpclient.connectionTimeout=2",
"spring.cloud.openfeign.httpclient.maxConnectionsPerRoute=2",
"spring.cloud.openfeign.httpclient.timeToLive=2",
"spring.cloud.openfeign.httpclient.disableSslValidation=true",
"spring.cloud.openfeign.httpclient.followRedirects=false",
"spring.cloud.openfeign.httpclient.disableSslValidation=true",
"spring.cloud.openfeign.httpclient.followRedirects=false",
"spring.cloud.openfeign.httpclient.hc5.poolConcurrencyPolicy=lax",
"spring.cloud.openfeign.httpclient.hc5.poolReusePolicy=lifo",
"spring.cloud.openfeign.httpclient.hc5.socketTimeout=200",
"spring.cloud.openfeign.httpclient.hc5.socketTimeoutUnit=milliseconds").applyTo(this.context);
TestPropertyValues
.of("spring.cloud.openfeign.httpclient.maxConnections=2",
"spring.cloud.openfeign.httpclient.connectionTimeout=2",
"spring.cloud.openfeign.httpclient.maxConnectionsPerRoute=2",
"spring.cloud.openfeign.httpclient.timeToLive=2",
"spring.cloud.openfeign.httpclient.disableSslValidation=true",
"spring.cloud.openfeign.httpclient.followRedirects=false",
"spring.cloud.openfeign.httpclient.disableSslValidation=true",
"spring.cloud.openfeign.httpclient.followRedirects=false",
"spring.cloud.openfeign.httpclient.hc5.poolConcurrencyPolicy=lax",
"spring.cloud.openfeign.httpclient.hc5.poolReusePolicy=lifo",
"spring.cloud.openfeign.httpclient.hc5.socketTimeout=200",
"spring.cloud.openfeign.httpclient.hc5.socketTimeoutUnit=milliseconds",
"spring.cloud.openfeign.httpclient.hc5.connectionRequestTimeout=200",
"spring.cloud.openfeign.httpclient.hc5.connectionRequestTimeoutUnit=milliseconds")
.applyTo(this.context);
setupContext();
assertThat(getProperties().getMaxConnections()).isEqualTo(2);
assertThat(getProperties().getConnectionTimeout()).isEqualTo(2);
@@ -94,6 +105,8 @@ class FeignHttpClientPropertiesTests {
assertThat(getProperties().getHc5().getPoolReusePolicy()).isEqualTo(PoolReusePolicy.LIFO);
assertThat(getProperties().getHc5().getSocketTimeout()).isEqualTo(200);
assertThat(getProperties().getHc5().getSocketTimeoutUnit()).isEqualTo(TimeUnit.MILLISECONDS);
assertThat(getProperties().getHc5().getConnectionRequestTimeout()).isEqualTo(200);
assertThat(getProperties().getHc5().getConnectionRequestTimeoutUnit()).isEqualTo(TimeUnit.MILLISECONDS);
}
private void setupContext() {