Browse Source

Revise nullability in AnnotationConfigContextLoaderUtils

pull/36433/head
Sam Brannen 1 week ago
parent
commit
3a266e65d6
  1. 6
      spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java

6
spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java

@ -22,7 +22,6 @@ import java.util.List; @@ -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 { @@ -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));
}

Loading…
Cancel
Save