Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add duration support for setConnectTimeout and setReadTimeout"

Browse Source 
Closes gh-13355
This commit is contained in:
Stephane Nicoll
2018-06-05 15:54:53 +02:00
parent 36f3c1b883
commit e9c3df4ad2
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
View File

@@ -392,7 +392,7 @@ public class RestTemplateBuilderTests {
}
@Test
public void customizerShouldBeAppliedAtTheEnd() {
public void customizerShouldBeAppliedInTheEnd() {
ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
this.builder.interceptors(this.interceptor)
@@ -437,6 +437,26 @@ public class RestTemplateBuilderTests {
.isInstanceOf(HttpComponentsClientHttpRequestFactory.class);
}
@Test
public void connectTimeoutCanBeNullToUseDefault() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(SimpleClientHttpRequestFactory.class)
.setConnectTimeout(Duration.ofSeconds(5)).setConnectTimeout(null).build()
.getRequestFactory();
assertThat(ReflectionTestUtils.getField(requestFactory, "connectTimeout"))
.isEqualTo(-1);
}
@Test
public void readTimeoutCanBeNullToUseDefault() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(SimpleClientHttpRequestFactory.class)
.setReadTimeout(Duration.ofSeconds(5)).setReadTimeout(null).build()
.getRequestFactory();
assertThat(ReflectionTestUtils.getField(requestFactory, "readTimeout"))
.isEqualTo(-1);
}
@Test
public void connectTimeoutCanBeConfiguredOnHttpComponentsRequestFactory() {
ClientHttpRequestFactory requestFactory = this.builder
@@ -528,17 +548,7 @@ public class RestTemplateBuilderTests {
@Test
@SuppressWarnings("deprecation")
public void deprecatedReadTimeout() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(SimpleClientHttpRequestFactory.class).setReadTimeout(1234)
.build().getRequestFactory();
assertThat(ReflectionTestUtils.getField(requestFactory, "readTimeout"))
.isEqualTo(1234);
}
@Test
@SuppressWarnings("deprecation")
public void deprecatedConnectTimeout() {
public void connectTimeoutCanBeSetWithInteger() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(SimpleClientHttpRequestFactory.class)
.setConnectTimeout(1234).build().getRequestFactory();
@@ -547,23 +557,13 @@ public class RestTemplateBuilderTests {
}
@Test
public void readTimeoutShouldBeIgnored() {
@SuppressWarnings("deprecation")
public void readTimeoutCanBeSetWithInteger() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(SimpleClientHttpRequestFactory.class)
.setReadTimeout(Duration.ofSeconds(5)).setReadTimeout(null).build()
.getRequestFactory();
.requestFactory(SimpleClientHttpRequestFactory.class).setReadTimeout(1234)
.build().getRequestFactory();
assertThat(ReflectionTestUtils.getField(requestFactory, "readTimeout"))
.isEqualTo(-1);
}
@Test
public void connectionTimeoutShouldBeIgnored() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(SimpleClientHttpRequestFactory.class)
.setConnectTimeout(Duration.ofSeconds(5)).setConnectTimeout(null).build()
.getRequestFactory();
assertThat(ReflectionTestUtils.getField(requestFactory, "connectTimeout"))
.isEqualTo(-1);
.isEqualTo(1234);
}
public static class RestTemplateSubclass extends RestTemplate {