spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-10 11:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-50612
This commit is contained in:
Stéphane Nicoll
2026-05-29 11:36:01 +02:00
parent f281ff4dd5 170c52f206
commit 3638852fae
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java
+2 -2
View File
@@ -479,7 +479,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;
}
@@ -1387,7 +1387,7 @@ public class RabbitProperties {
}
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) {
module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java
+12
View File
@@ -336,6 +336,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();
@@ -399,6 +405,12 @@ class RabbitPropertiesTests {
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);