Bumping versions

spring-cloud · Nov 3, 2023 · 942cc69 · 942cc69
1 parent ed3349b
commit 942cc69
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/.../java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java b/.../java/org/springframework/cloud/openfeign/clientconfig/HttpClient5FeignConfiguration.java
@@ -92,18 +92,17 @@ public CloseableHttpClient httpClient5(HttpClientConnectionManager connectionMan
 			FeignHttpClientProperties httpClientProperties,
 			ObjectProvider<List<HttpClientBuilderCustomizer>> 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());
-
-		customizerProvider.getIfAvailable(List::of)
-			.forEach(c -> c.customize(httpClientBuilder));
+				.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));
 
 		httpClient5 = httpClientBuilder.build();
 		return httpClient5;
@@ -156,7 +155,8 @@ public X509Certificate[] getAcceptedIssuers() {
 	}
 
 	/**
-	 * 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 interface HttpClientBuilderCustomizer {
 		void customize(HttpClientBuilder builder);
 
 	}
+
 }
diff --git a/...src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java b/...src/test/java/org/springframework/cloud/openfeign/FeignHttpClient5ConfigurationTests.java
@@ -82,10 +82,8 @@ void shouldNotInstantiateHttpClient5ByWhenDependenciesPresentButPropertyDisabled
 
 	@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 @@ void shouldInstantiateHttpClient5ByUsingHttpClientBuilderCustomizer() {
 
 	@Configuration
 	static class Config {
+
 		@Bean
 		HttpClientBuilderCustomizer customizer() {
 			return Mockito.mock(HttpClientBuilderCustomizer.class);
 		}
+
 	}
+
 }