|
18 | 18 |
|
19 | 19 | import java.net.URI; |
20 | 20 | import java.nio.charset.StandardCharsets; |
| 21 | +import java.time.Duration; |
21 | 22 | import java.util.Arrays; |
22 | 23 | import java.util.Collections; |
23 | 24 | import java.util.Set; |
|
30 | 31 | import org.mockito.Mock; |
31 | 32 | import org.mockito.junit.jupiter.MockitoExtension; |
32 | 33 |
|
| 34 | +import org.springframework.boot.http.client.ClientHttpRequestFactorySettings; |
33 | 35 | import org.springframework.http.HttpHeaders; |
34 | 36 | import org.springframework.http.HttpMethod; |
35 | 37 | import org.springframework.http.MediaType; |
@@ -272,9 +274,8 @@ void requestFactoryWhenSupplierIsNullShouldThrowException() { |
272 | 274 |
|
273 | 275 | @Test |
274 | 276 | void requestFactoryWhenFunctionIsNullShouldThrowException() { |
275 | | - assertThatIllegalArgumentException() |
276 | | - .isThrownBy(() -> this.builder |
277 | | - .requestFactory((Function<ClientHttpRequestFactorySettings, ClientHttpRequestFactory>) null)) |
| 277 | + assertThatIllegalArgumentException().isThrownBy(() -> this.builder.requestFactory( |
| 278 | + (Function<org.springframework.boot.web.client.ClientHttpRequestFactorySettings, ClientHttpRequestFactory>) null)) |
278 | 279 | .withMessageContaining("RequestFactoryFunction must not be null"); |
279 | 280 | } |
280 | 281 |
|
@@ -343,6 +344,14 @@ void defaultHeaderWhenUsingMockRestServiceServerAddsHeader() { |
343 | 344 | assertThat(request.getHeaders()).contains(entry("spring", Collections.singletonList("boot"))); |
344 | 345 | } |
345 | 346 |
|
| 347 | + @Test |
| 348 | + void requestFactorySettingsAppliesSettings() { |
| 349 | + ClientHttpRequestFactorySettings settings = ClientHttpRequestFactorySettings.defaults() |
| 350 | + .withConnectTimeout(Duration.ofSeconds(1)); |
| 351 | + RestTemplate template = this.builder.requestFactorySettings(settings).build(); |
| 352 | + assertThat(template.getRequestFactory()).extracting("connectTimeout").isEqualTo(1000L); |
| 353 | + } |
| 354 | + |
346 | 355 | @Test |
347 | 356 | void requestCustomizersAddsCustomizers() { |
348 | 357 | RestTemplate template = this.builder |
|
0 commit comments