spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source 
Closes gh-48487
This commit is contained in:
Stéphane Nicoll
2025-12-10 10:24:08 +01:00
parent 35d88a7a86 927232dc3a
commit 72afdfd94a
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class RabbitHealthIndicator extends AbstractHealthIndicator {
private @Nullable String getVersion() {
return this.rabbitTemplate.execute((channel) -> {
Object version = channel.getConnection().getServerProperties().get("version");
Object version = channel.getConnection().getServerProperties().getOrDefault("version", "unknown");
Assert.state(version != null, "'version' must not be null");
return version.toString();
});
module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java
+11
View File
@@ -70,6 +70,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();