admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise nullability in AnnotationConfigContextLoaderUtils

Browse Source
This commit is contained in:
Sam Brannen
2026-03-08 14:42:17 +01:00
parent 463138acbc
commit 3a266e65d6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
+2 -4
View File
@@ -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));
}