Skip to content

Commit 5662e17

Browse files
committed
Add Nullable Annotations
Added Nullable to methods that may return a null value Closes gh-18046
1 parent 63f28a7 commit 5662e17

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

web/src/main/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class RequestAttributeAuthenticationFilter extends AbstractPreAuthenticat
5858
* missing and {@code exceptionIfVariableMissing} is set to {@code true}.
5959
*/
6060
@Override
61-
protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
61+
protected @Nullable Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
6262
String principal = (String) request.getAttribute(this.principalEnvironmentVariable);
6363
if (principal == null && this.exceptionIfVariableMissing) {
6464
throw new PreAuthenticatedCredentialsNotFoundException(
@@ -73,7 +73,7 @@ protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
7373
* credentials value. Otherwise a dummy value will be used.
7474
*/
7575
@Override
76-
protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
76+
protected @Nullable Object getPreAuthenticatedCredentials(HttpServletRequest request) {
7777
if (this.credentialsEnvironmentVariable != null) {
7878
return request.getAttribute(this.credentialsEnvironmentVariable);
7979
}

web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class RequestHeaderAuthenticationFilter extends AbstractPreAuthenticatedP
5959
* {@code exceptionIfHeaderMissing} is set to {@code true}.
6060
*/
6161
@Override
62-
protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
62+
protected @Nullable Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
6363
String principal = request.getHeader(this.principalRequestHeader);
6464
if (principal == null && this.exceptionIfHeaderMissing) {
6565
throw new PreAuthenticatedCredentialsNotFoundException(
@@ -74,7 +74,7 @@ protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
7474
* will be used.
7575
*/
7676
@Override
77-
protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
77+
protected @Nullable Object getPreAuthenticatedCredentials(HttpServletRequest request) {
7878
if (this.credentialsRequestHeader != null) {
7979
return request.getHeader(this.credentialsRequestHeader);
8080
}

0 commit comments

Comments
 (0)