root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Annotate AuthenticationTrustResolver methods with `@Nullable` 

Since AuthenticationTrustResolver can handle null arguments (this is
also stated in the implementation of this interface), we should mark
these arguments as `@Nullable`.

Closes: gh-17764

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>
This commit is contained in:
Andrey Litvitski 2025-08-19 21:45:39 +03:00 committed by Rob Winch
parent 9310153d16
commit 47be93e694
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
View File

@ -16,6 +16,8 @@
package org.springframework.security.authentication; package org.springframework.security.authentication;
import org.jspecify.annotations.Nullable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
/** /**
@ -37,7 +39,7 @@ public interface AuthenticationTrustResolver {
* @return <code>true</code> the passed authentication token represented an anonymous * @return <code>true</code> the passed authentication token represented an anonymous
* principal, <code>false</code> otherwise * principal, <code>false</code> otherwise
*/ */
boolean isAnonymous(Authentication authentication); boolean isAnonymous(@Nullable Authentication authentication);
/** /**
* Indicates whether the passed <code>Authentication</code> token represents user that * Indicates whether the passed <code>Authentication</code> token represents user that
@ -51,7 +53,7 @@ public interface AuthenticationTrustResolver {
* @return <code>true</code> the passed authentication token represented a principal * @return <code>true</code> the passed authentication token represented a principal
* authenticated using a remember-me token, <code>false</code> otherwise * authenticated using a remember-me token, <code>false</code> otherwise
*/ */
boolean isRememberMe(Authentication authentication); boolean isRememberMe(@Nullable Authentication authentication);
/** /**
* Indicates whether the passed <code>Authentication</code> token represents a fully * Indicates whether the passed <code>Authentication</code> token represents a fully
@ -66,7 +68,7 @@ public interface AuthenticationTrustResolver {
* {@link #isRememberMe(Authentication)}, <code>false</code> otherwise * {@link #isRememberMe(Authentication)}, <code>false</code> otherwise
* @since 6.1 * @since 6.1
*/ */
default boolean isFullyAuthenticated(Authentication authentication) { default boolean isFullyAuthenticated(@Nullable Authentication authentication) {
return isAuthenticated(authentication) && !isRememberMe(authentication); return isAuthenticated(authentication) && !isRememberMe(authentication);
} }
@ -78,7 +80,7 @@ public interface AuthenticationTrustResolver {
* {@link Authentication#isAuthenticated()} is true. * {@link Authentication#isAuthenticated()} is true.
* @since 6.1.7 * @since 6.1.7
*/ */
default boolean isAuthenticated(Authentication authentication) { default boolean isAuthenticated(@Nullable Authentication authentication) {
return authentication != null && authentication.isAuthenticated() && !isAnonymous(authentication); return authentication != null && authentication.isAuthenticated() && !isAnonymous(authentication);
} }

6
core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
View File

@ -16,6 +16,8 @@
package org.springframework.security.authentication; package org.springframework.security.authentication;
import org.jspecify.annotations.Nullable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
/** /**
@ -44,7 +46,7 @@ public class AuthenticationTrustResolverImpl implements AuthenticationTrustResol
} }
@Override @Override
public boolean isAnonymous(Authentication authentication) { public boolean isAnonymous(@Nullable Authentication authentication) {
if ((this.anonymousClass == null) || (authentication == null)) { if ((this.anonymousClass == null) || (authentication == null)) {
return false; return false;
} }
@ -52,7 +54,7 @@ public class AuthenticationTrustResolverImpl implements AuthenticationTrustResol
} }
@Override @Override
public boolean isRememberMe(Authentication authentication) { public boolean isRememberMe(@Nullable Authentication authentication) {
if ((this.rememberMeClass == null) || (authentication == null)) { if ((this.rememberMeClass == null) || (authentication == null)) {
return false; return false;
} }