diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java index e9fdff70acfa..c23d78798293 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java +++ b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java @@ -479,7 +479,7 @@ public class Ssl { * @see #getEnabled() () */ public boolean determineEnabled() { - boolean defaultEnabled = Boolean.TRUE.equals(getEnabled()) || this.bundle != null; + boolean defaultEnabled = Boolean.TRUE.equals(getEnabled()) || StringUtils.hasText(this.bundle); if (CollectionUtils.isEmpty(RabbitProperties.this.parsedAddresses)) { return defaultEnabled; } @@ -1387,7 +1387,7 @@ public static class Ssl { } public boolean determineEnabled() { - return Boolean.TRUE.equals(getEnabled()) || this.bundle != null; + return Boolean.TRUE.equals(getEnabled()) || StringUtils.hasText(this.bundle); } public void setEnabled(@Nullable Boolean enabled) { diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java b/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java index 93548c283a41..81ecdf6f625e 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java +++ b/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java @@ -336,6 +336,12 @@ void determineSslEnabledIsTrueWhenBundleIsSetAndNoAddresses() { assertThat(this.properties.getSsl().determineEnabled()).isTrue(); } + @Test + void determineSslEnabledIsFalseWhenBundleIsEmpty() { + this.properties.getSsl().setBundle(""); + assertThat(this.properties.getSsl().determineEnabled()).isFalse(); + } + @Test void propertiesUseConsistentDefaultValues() { ConnectionFactory connectionFactory = new ConnectionFactory(); @@ -399,6 +405,12 @@ void streamSslIsEnabledWhenBundleIsSet() { assertThat(this.properties.getStream().getSsl().determineEnabled()).isTrue(); } + @Test + void streamSslIsDisabledWhenBundleIsEmpty() { + this.properties.getStream().getSsl().setBundle(""); + assertThat(this.properties.getStream().getSsl().determineEnabled()).isFalse(); + } + @Test void streamSslIsDisabledWhenEnabledIsFalseAndBundleIsNotSet() { this.properties.getStream().getSsl().setEnabled(false);