Provide RestClientSsl as a bean

Closes gh-37400
spring-projects · Sep 15, 2023 · 73c25d7 · 73c25d7
1 parent 827471b
commit 73c25d7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/...n/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java b/...n/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java
@@ -19,10 +19,13 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
+import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.web.client.ClientHttpRequestFactories;
 import org.springframework.boot.web.client.ClientHttpRequestFactorySettings;
 import org.springframework.boot.web.client.RestClientCustomizer;
@@ -44,7 +47,7 @@
  * @author Moritz Halbritter
  * @since 3.2.0
  */
-@AutoConfiguration(after = HttpMessageConvertersAutoConfiguration.class)
+@AutoConfiguration(after = { HttpMessageConvertersAutoConfiguration.class, SslAutoConfiguration.class })
 @ConditionalOnClass(RestClient.class)
 @Conditional(NotReactiveWebApplicationCondition.class)
 public class RestClientAutoConfiguration {
@@ -57,6 +60,13 @@ HttpMessageConvertersRestClientCustomizer httpMessageConvertersRestClientCustomi
 		return new HttpMessageConvertersRestClientCustomizer(messageConverters.getIfUnique());
 	}
 
+	@Bean
+	@ConditionalOnMissingBean(RestClientSsl.class)
+	@ConditionalOnBean(SslBundles.class)
+	AutoConfiguredRestClientSsl restClientSsl(SslBundles sslBundles) {
+		return new AutoConfiguredRestClientSsl(sslBundles);
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	RestClientBuilderConfigurer restClientBuilderConfigurer(ObjectProvider<RestClientCustomizer> customizerProvider) {

diff --git a/...figure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientSsl.java b/...figure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientSsl.java
@@ -32,7 +32,7 @@
  * Typically used as follows: <pre class="code">
  * &#064;Bean
  * public MyBean myBean(RestClient.Builder restClientBuilder, RestClientSsl ssl) {
- *     RestClient restClientrestClient= restClientBuilder.apply(ssl.forBundle("mybundle")).build();
+ *     RestClient restClientrestClient= restClientBuilder.apply(ssl.fromBundle("mybundle")).build();
  *     return new MyBean(webClient);
  * }
  * </pre> NOTE: Apply SSL configuration will replace any previously

diff --git a/...a/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java b/...a/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java
@@ -23,6 +23,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
+import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.web.client.RestClientCustomizer;
 import org.springframework.boot.web.codec.CodecCustomizer;
@@ -59,6 +60,12 @@ void shouldSupplyBeans() {
 		});
 	}
 
+	@Test
+	void shouldSupplyRestClientSslIfSslBundlesIsThere() {
+		this.contextRunner.withBean(SslBundles.class, () -> mock(SslBundles.class))
+			.run((context) -> assertThat(context).hasSingleBean(RestClientSsl.class));
+	}
+
 	@Test
 	void shouldCreateBuilder() {
 		this.contextRunner.run((context) -> {