Revert "Apply Nullability to spring-security-data"
This reverts commit bbcdb23698.
This commit is contained in:
@@ -1,7 +1,3 @@
|
|||||||
plugins {
|
|
||||||
id 'security-nullability'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'io.spring.convention.spring-module'
|
apply plugin: 'io.spring.convention.spring-module'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
+2
-4
@@ -29,8 +29,6 @@ import org.springframework.security.core.context.SecurityContext;
|
|||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
import org.springframework.security.core.context.SecurityContextHolderStrategy;
|
import org.springframework.security.core.context.SecurityContextHolderStrategy;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.jspecify.annotations.NullUnmarked;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
@@ -95,7 +93,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte
|
|||||||
private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
|
private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
|
||||||
.getContextHolderStrategy();
|
.getContextHolderStrategy();
|
||||||
|
|
||||||
private @Nullable Authentication authentication;
|
private Authentication authentication;
|
||||||
|
|
||||||
private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
|
private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
|
||||||
|
|
||||||
@@ -148,7 +146,7 @@ public class SecurityEvaluationContextExtension implements EvaluationContextExte
|
|||||||
this.securityContextHolderStrategy = securityContextHolderStrategy;
|
this.securityContextHolderStrategy = securityContextHolderStrategy;
|
||||||
}
|
}
|
||||||
|
|
||||||
private @Nullable Authentication getAuthentication() {
|
private Authentication getAuthentication() {
|
||||||
if (this.authentication != null) {
|
if (this.authentication != null) {
|
||||||
return this.authentication;
|
return this.authentication;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user