spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50429 from igormukhin

Browse Source 
* rabbitmq-empty-ssl-bundle:
  Treat empty RabbitMQ SSL bundle as unset

Closes gh-50429
This commit is contained in:
Stéphane Nicoll
2026-05-29 11:29:07 +02:00
parent d33962f37b cfc1e89976
commit 19c7f5aff0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
+1 -1
View File
@@ -474,7 +474,7 @@ public class RabbitProperties {
* @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;
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
+6
View File
@@ -335,6 +335,12 @@ class RabbitPropertiesTests {
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();