Skip to content

Commit d230b08

Browse files
committed
Nullability and Checkstyle
1 parent 6443fba commit d230b08

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222
import java.util.function.Supplier;
2323

24+
import org.jspecify.annotations.Nullable;
2425
import org.junit.jupiter.api.Test;
2526
import org.junit.jupiter.api.extension.ExtendWith;
2627

@@ -934,7 +935,7 @@ public <T> AuthorizationManager<T> hasAuthority(String authority) {
934935
return AuthorizationManagers.allOf(new AuthorizationDecision(false), this::factors, authorized);
935936
}
936937

937-
private <T> AuthorizationResult factors(Supplier<Authentication> authentication, T context) {
938+
private AuthorizationResult factors(Supplier<? extends @Nullable Authentication> authentication, Object context) {
938939
List<String> authorities = authentication.get()
939940
.getAuthorities()
940941
.stream()

core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.apache.commons.logging.Log;
2020
import org.apache.commons.logging.LogFactory;
21+
2122
import org.springframework.beans.factory.InitializingBean;
2223
import org.springframework.context.MessageSource;
2324
import org.springframework.context.MessageSourceAware;

core/src/main/java/org/springframework/security/authorization/method/ExpressionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ private ExpressionUtils() {
3636
}
3737

3838
static @Nullable AuthorizationResult evaluate(Expression expr, EvaluationContext ctx) {
39-
return evaluate(expr, ctx, null, null);
39+
return evaluate(expr, ctx, () -> null, null);
4040
}
4141

4242
static <T> @Nullable AuthorizationResult evaluate(Expression expr, EvaluationContext ctx,
43-
@Nullable Supplier<Authentication> authentication, @Nullable T context) {
43+
Supplier<? extends @Nullable Authentication> authentication, @Nullable T context) {
4444
try {
4545
Object result = expr.getValue(ctx);
4646
if (result instanceof AuthorizationManager<?> manager) {

ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticationProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.apache.commons.logging.Log;
2222
import org.apache.commons.logging.LogFactory;
23+
2324
import org.springframework.context.MessageSource;
2425
import org.springframework.context.MessageSourceAware;
2526
import org.springframework.context.support.MessageSourceAccessor;

webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthentication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public static final class Builder<B extends Builder<B>>
9292

9393
private Builder(WebAuthnAuthentication token) {
9494
super(token);
95+
this.principal = token.principal;
9596
}
9697

9798
@Override

0 commit comments

Comments
 (0)