From 3a266e65d674cbef5dce0468edc4ef86aadca80f Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sun, 8 Mar 2026 14:42:17 +0100 Subject: [PATCH] Revise nullability in AnnotationConfigContextLoaderUtils --- .../context/support/AnnotationConfigContextLoaderUtils.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java index 0dec9ce72e2..e72af62e7f8 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jspecify.annotations.Nullable; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.AnnotatedElementUtils; @@ -103,13 +102,12 @@ public abstract class AnnotationConfigContextLoaderUtils { * @param clazz the class to check * @return {@code true} if the supplied class meets the candidate criteria */ - private static boolean isDefaultConfigurationClassCandidate(@Nullable Class clazz) { - return (clazz != null && isStaticNonPrivateAndNonFinal(clazz) && + private static boolean isDefaultConfigurationClassCandidate(Class clazz) { + return (isStaticNonPrivateAndNonFinal(clazz) && AnnotatedElementUtils.hasAnnotation(clazz, Configuration.class)); } private static boolean isStaticNonPrivateAndNonFinal(Class clazz) { - Assert.notNull(clazz, "Class must not be null"); int modifiers = clazz.getModifiers(); return (Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && !Modifier.isFinal(modifiers)); }