diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle index c3ed43972a..590bee6587 100644 --- a/data/spring-security-data.gradle +++ b/data/spring-security-data.gradle @@ -1,3 +1,7 @@ +plugins { + id 'security-nullability' +} + apply plugin: 'io.spring.convention.spring-module' dependencies { diff --git a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java index 4ea5b86950..ff16f9c889 100644 --- a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java +++ b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java @@ -29,6 +29,8 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolderStrategy; import org.springframework.util.Assert; +import org.jspecify.annotations.Nullable; +import org.jspecify.annotations.NullUnmarked; /** *
@@ -93,7 +95,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder .getContextHolderStrategy(); - private Authentication authentication; + private @Nullable Authentication authentication; private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); @@ -146,7 +148,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte this.securityContextHolderStrategy = securityContextHolderStrategy; } - private Authentication getAuthentication() { + private @Nullable Authentication getAuthentication() { if (this.authentication != null) { return this.authentication; }