From bccfbfd63082ffb693c34d920bebad914835ba3c Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 21 Oct 2025 15:37:35 +0200 Subject: [PATCH] Fix previous commit for 6.2.x compatibility See gh-35674 --- .../springframework/jdbc/support/JdbcUtilsRuntimeHints.java | 6 +++--- .../jdbc/support/JdbcUtilsRuntimeHintsTests.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHints.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHints.java index b403e15039f..11bdde45c80 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHints.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHints.java @@ -18,15 +18,15 @@ package org.springframework.jdbc.support; import java.sql.Types; -import org.jspecify.annotations.Nullable; - import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.lang.Nullable; /** * {@link RuntimeHintsRegistrar} implementation that registers runtime hints for * {@link JdbcUtils}. + * * @author Brian Clozel * @since 6.2.13 */ @@ -34,7 +34,7 @@ class JdbcUtilsRuntimeHints implements RuntimeHintsRegistrar { @Override public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { - hints.reflection().registerType(Types.class, MemberCategory.ACCESS_PUBLIC_FIELDS); + hints.reflection().registerType(Types.class, MemberCategory.PUBLIC_FIELDS); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHintsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHintsTests.java index 3cce33393a2..64c0a6bdcfd 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHintsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsRuntimeHintsTests.java @@ -48,7 +48,7 @@ class JdbcUtilsRuntimeHintsTests { void sqlTypesShouldHaveFieldAccess() { for (Field field : Types.class.getFields()) { assertThat(RuntimeHintsPredicates.reflection() - .onFieldAccess(field)).accepts(this.hints); + .onField(field)).accepts(this.hints); } }