From 7766ea5a7d846a8f51f410c3c624c52dd3de03bd Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 13 Aug 2025 14:26:20 +0200 Subject: [PATCH] Fix NullAway suppression in DataSourceHealthIndicator See gh-46587 --- .../boot/jdbc/health/DataSourceHealthIndicator.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/health/DataSourceHealthIndicator.java b/module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/health/DataSourceHealthIndicator.java index 2c9eb0c16aa..79e23a93105 100644 --- a/module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/health/DataSourceHealthIndicator.java +++ b/module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/health/DataSourceHealthIndicator.java @@ -175,13 +175,9 @@ public class DataSourceHealthIndicator extends AbstractHealthIndicator implement if (columns != 1) { throw new IncorrectResultSetColumnCountException(1, columns); } - return getResultSetValue(rs); - } - - // RowMapper.mapRow isn't defined as @Nullable return type - @SuppressWarnings("NullAway") - private Object getResultSetValue(ResultSet rs) throws SQLException { - return JdbcUtils.getResultSetValue(rs, 1); + Object result = JdbcUtils.getResultSetValue(rs, 1); + Assert.state(result != null, "'result' must not be null"); + return result; } }