spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 18:29:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48484 from youngledo

Browse Source 
* pr/48484:
  Polish "Use 'unknown' when RabbitMQ version is missing"
  Use 'unknown' when RabbitMQ version is missing

Closes gh-48484
This commit is contained in:
Stéphane Nicoll
2025-12-10 10:19:26 +01:00
parent bf4092bfd2 26fc091c50
commit e9771ff43d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/amqp/RabbitHealthIndicator.java
+4 -2
View File
@@ -45,8 +45,10 @@ public class RabbitHealthIndicator extends AbstractHealthIndicator {
}
private String getVersion() {
return this.rabbitTemplate
.execute((channel) -> channel.getConnection().getServerProperties().get("version").toString());
return this.rabbitTemplate.execute((channel) -> channel.getConnection()
.getServerProperties()
.getOrDefault("version", "unknown")
.toString());
}
}
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/amqp/RabbitHealthIndicatorTests.java
+11
View File
@@ -67,6 +67,17 @@ class RabbitHealthIndicatorTests {
assertThat(health.getDetails()).containsEntry("version", "123");
}
@Test
void healthWhenVersionIsMissingShouldReturnUpWithUnknownVersion() {
givenTemplateExecutionWillInvokeCallback();
Connection connection = mock(Connection.class);
given(this.channel.getConnection()).willReturn(connection);
given(connection.getServerProperties()).willReturn(Collections.emptyMap());
Health health = new RabbitHealthIndicator(this.rabbitTemplate).health();
assertThat(health.getStatus()).isEqualTo(Status.UP);
assertThat(health.getDetails()).containsEntry("version", "unknown");
}
@Test
void healthWhenConnectionFailsShouldReturnDown() {
givenTemplateExecutionWillInvokeCallback();