From 3afbe84bbd861626993a398f74c76848429402e2 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 31 Jul 2025 10:48:33 +0200 Subject: [PATCH] Add more nullability annotations to module/spring-boot-amqp See gh-46587 --- .../reactivehealthindicators/MyReactiveHealthIndicator.kt | 6 +++--- .../boot/amqp/health/RabbitHealthIndicator.java | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/health/reactivehealthindicators/MyReactiveHealthIndicator.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/health/reactivehealthindicators/MyReactiveHealthIndicator.kt index b9c18e2b980..2aad716d16d 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/health/reactivehealthindicators/MyReactiveHealthIndicator.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/health/reactivehealthindicators/MyReactiveHealthIndicator.kt @@ -26,15 +26,15 @@ class MyReactiveHealthIndicator : ReactiveHealthIndicator { override fun health(): Mono { // @formatter:off - return doHealthCheck()!!.onErrorResume { exception: Throwable? -> + return doHealthCheck().onErrorResume { exception: Throwable -> Mono.just(Health.Builder().down(exception).build()) } // @formatter:on } - private fun doHealthCheck(): Mono? { + private fun doHealthCheck(): Mono { // perform some specific health check - return /**/ null + return /**/ Mono.empty() } } diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java index f11e80594c4..d0fda92746c 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java +++ b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java @@ -43,7 +43,11 @@ public class RabbitHealthIndicator extends AbstractHealthIndicator { @Override protected void doHealthCheck(Health.Builder builder) throws Exception { - builder.up().withDetail("version", getVersion()); + builder.up(); + String version = getVersion(); + if (version != null) { + builder.withDetail("version", version); + } } private @Nullable String getVersion() {