From b8b1a92ad475cc78c3e03b701c11677f7129d58d Mon Sep 17 00:00:00 2001 From: Rob Winch <362503+rwinch@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:35:39 -0500 Subject: [PATCH] Revert "Apply Nullability to spring-security-data" This reverts commit bbcdb236984960416489b4f9d923f83d3a4cba39. --- data/spring-security-data.gradle | 4 ---- .../query/SecurityEvaluationContextExtension.java | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle index 590bee6587..c3ed43972a 100644 --- a/data/spring-security-data.gradle +++ b/data/spring-security-data.gradle @@ -1,7 +1,3 @@ -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 ff16f9c889..4ea5b86950 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,8 +29,6 @@ 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; /** *

@@ -95,7 +93,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder .getContextHolderStrategy(); - private @Nullable Authentication authentication; + private Authentication authentication; private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl(); @@ -148,7 +146,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte this.securityContextHolderStrategy = securityContextHolderStrategy; } - private @Nullable Authentication getAuthentication() { + private Authentication getAuthentication() { if (this.authentication != null) { return this.authentication; }