diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java index 56338aef..22a29836 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java @@ -92,18 +92,17 @@ public class HttpClient5FeignConfiguration { FeignHttpClientProperties httpClientProperties, ObjectProvider> customizerProvider) { HttpClientBuilder httpClientBuilder = HttpClients.custom().disableCookieManagement().useSystemProperties() - .setConnectionManager(connectionManager).evictExpiredConnections() - .setDefaultRequestConfig(RequestConfig.custom() - .setConnectTimeout( - Timeout.of(httpClientProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS)) - .setRedirectsEnabled(httpClientProperties.isFollowRedirects()) - .setConnectionRequestTimeout( - Timeout.of(httpClientProperties.getHc5().getConnectionRequestTimeout(), - httpClientProperties.getHc5().getConnectionRequestTimeoutUnit())) - .build()); + .setConnectionManager(connectionManager).evictExpiredConnections() + .setDefaultRequestConfig(RequestConfig.custom() + .setConnectTimeout( + Timeout.of(httpClientProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS)) + .setRedirectsEnabled(httpClientProperties.isFollowRedirects()) + .setConnectionRequestTimeout( + Timeout.of(httpClientProperties.getHc5().getConnectionRequestTimeout(), + httpClientProperties.getHc5().getConnectionRequestTimeoutUnit())) + .build()); - customizerProvider.getIfAvailable(List::of) - .forEach(c -> c.customize(httpClientBuilder)); + customizerProvider.getIfAvailable(List::of).forEach(c -> c.customize(httpClientBuilder)); httpClient5 = httpClientBuilder.build(); return httpClient5; @@ -156,7 +155,8 @@ public class HttpClient5FeignConfiguration { } /** - * Callback interface that customize {@link HttpClientBuilder} objects before HttpClient created. + * Callback interface that customize {@link HttpClientBuilder} objects before + * HttpClient created. * * @author Kwangyong Kim * @since 4.1.0 @@ -170,4 +170,5 @@ public class HttpClient5FeignConfiguration { void customize(HttpClientBuilder builder); } + } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java index 982a0a21..545cabd4 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java @@ -82,10 +82,8 @@ class FeignHttpClient5ConfigurationTests { @Test void shouldInstantiateHttpClient5ByUsingHttpClientBuilderCustomizer() { - ConfigurableApplicationContext context = new SpringApplicationBuilder() - .web(WebApplicationType.NONE) - .sources(FeignAutoConfiguration.class, Config.class) - .run(); + ConfigurableApplicationContext context = new SpringApplicationBuilder().web(WebApplicationType.NONE) + .sources(FeignAutoConfiguration.class, Config.class).run(); CloseableHttpClient httpClient = context.getBean(CloseableHttpClient.class); assertThat(httpClient).isNotNull(); @@ -99,9 +97,12 @@ class FeignHttpClient5ConfigurationTests { @Configuration static class Config { + @Bean HttpClientBuilderCustomizer customizer() { return Mockito.mock(HttpClientBuilderCustomizer.class); } + } + }