Merge branch '4.0.x'

Closes gh-50635

Author: snicoll

module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraProperties.java

@@ -24,6 +24,7 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.io.Resource;
+import org.springframework.util.StringUtils;
 
 /**
  * Configuration properties for Cassandra.
@@ -237,7 +238,7 @@ public static class Ssl {
 		private @Nullable String bundle;
 
 		public boolean isEnabled() {
-			return (this.enabled != null) ? this.enabled : this.bundle != null;
+			return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
 		}
 
 		public void setEnabled(boolean enabled) {

module/spring-boot-cassandra/src/test/java/org/springframework/boot/cassandra/autoconfigure/CassandraPropertiesTests.java

@@ -58,4 +58,11 @@ void defaultValuesInManualMetadataAreConsistent() {
 		assertThat(driverDefaults.get(TypedDriverOption.HEARTBEAT_TIMEOUT)).isEqualTo(Duration.ofSeconds(5));
 	}
 
+	@Test
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		CassandraProperties properties = new CassandraProperties();
+		properties.getSsl().setBundle("");
+		assertThat(properties.getSsl().isEnabled()).isFalse();
+	}
+
 }

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisProperties.java

@@ -22,6 +22,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.StringUtils;
 
 /**
  * Configuration properties for Redis.
@@ -463,7 +464,7 @@ public static class Ssl {
 		private @Nullable String bundle;
 
 		public boolean isEnabled() {
-			return (this.enabled != null) ? this.enabled : this.bundle != null;
+			return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
 		}
 
 		public void setEnabled(boolean enabled) {

…/autoconfigure/RedisPropertiesTests.java …oconfigure/DataRedisPropertiesTests.javamodule/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java renamed to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisPropertiesTests.java module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java renamed to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisPropertiesTests.java

@@ -28,7 +28,7 @@
  *
  * @author Stephane Nicoll
  */
-class RedisPropertiesTests {
+class DataRedisPropertiesTests {
 
 	@Test
 	void lettuceDefaultsAreConsistent() {
@@ -39,4 +39,11 @@ void lettuceDefaultsAreConsistent() {
 			.isEqualTo(defaultClusterTopologyRefreshOptions.useDynamicRefreshSources());
 	}
 
+	@Test
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		DataRedisProperties properties = new DataRedisProperties();
+		properties.getSsl().setBundle("");
+		assertThat(properties.getSsl().isEnabled()).isFalse();
+	}
+
 }

module/spring-boot-mail/src/main/java/org/springframework/boot/mail/autoconfigure/MailSenderPropertiesConfiguration.java

@@ -73,7 +73,7 @@ private void applyProperties(MailProperties properties, JavaMailSenderImpl sende
 		if (ssl.isEnabled()) {
 			javaMailProperties.setProperty("mail." + protocol + ".ssl.enable", "true");
 		}
-		if (ssl.getBundle() != null) {
+		if (StringUtils.hasLength(ssl.getBundle())) {
 			Assert.state(sslBundles != null, "'sslBundles' must not be null");
 			SslBundle sslBundle = sslBundles.getBundle(ssl.getBundle());
 			javaMailProperties.put("mail." + protocol + ".ssl.socketFactory",

module/spring-boot-mail/src/test/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfigurationTests.java

@@ -245,6 +245,21 @@ void connectionOnStartupNotCalled() {
 			});
 	}
 
+	@Test
+	@WithPackageResources("test.jks")
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		this.contextRunner
+			.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.bundle: ",
+					"spring.ssl.bundle.jks.test-bundle.keystore.location:classpath:test.jks",
+					"spring.ssl.bundle.jks.test-bundle.keystore.password:secret",
+					"spring.ssl.bundle.jks.test-bundle.key.password:password")
+			.run((context) -> {
+				assertThat(context).hasSingleBean(JavaMailSenderImpl.class);
+				JavaMailSenderImpl mailSender = context.getBean(JavaMailSenderImpl.class);
+				assertThat(mailSender.getJavaMailProperties().get("mail.smtp.ssl.socketFactory")).isNull();
+			});
+	}
+
 	@Test
 	void smtpSslEnabled() {
 		this.contextRunner.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.enabled:true")

module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoProperties.java

@@ -23,6 +23,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.StringUtils;
 
 /**
  * Configuration properties for Mongo.
@@ -238,7 +239,7 @@ public static class Ssl {
 		private @Nullable String bundle;
 
 		public boolean isEnabled() {
-			return (this.enabled != null) ? this.enabled : this.bundle != null;
+			return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
 		}
 
 		public void setEnabled(boolean enabled) {

module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java

@@ -49,6 +49,13 @@ void canBindCharArrayPassword() {
 			});
 	}
 
+	@Test
+	void sslIsNotEnabledWhenBundleIsEmpty() {
+		MongoProperties properties = new MongoProperties();
+		properties.getSsl().setBundle("");
+		assertThat(properties.getSsl().isEnabled()).isFalse();
+	}
+
 	private UuidRepresentation springDataDefaultUuidRepresentation() {
 		return new MongoConfigurationSupport() {