From f0013fc06295a81f6273975710e9de9fcf983482 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Fri, 9 Oct 2020 15:38:49 -0400 Subject: [PATCH] Add @Nullable to Delegating*Converter.convert() Issue gh-88, gh-45 --- .../authorization/web/DelegatingAuthenticationConverter.java | 2 ++ .../DelegatingAuthorizationGrantAuthenticationConverter.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java index 44500b9..2e1cae5 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java @@ -15,6 +15,7 @@ */ package org.springframework.security.oauth2.server.authorization.web; +import org.springframework.lang.Nullable; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationConverter; import org.springframework.util.Assert; @@ -50,6 +51,7 @@ public final class DelegatingAuthenticationConverter implements AuthenticationCo this.converters = Collections.unmodifiableList(new LinkedList<>(converters)); } + @Nullable @Override public Authentication convert(HttpServletRequest request) { Assert.notNull(request, "request cannot be null"); diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java index ddd70f3..bdf5d6e 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java @@ -16,6 +16,7 @@ package org.springframework.security.oauth2.server.authorization.web; import org.springframework.core.convert.converter.Converter; +import org.springframework.lang.Nullable; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; @@ -48,6 +49,7 @@ public final class DelegatingAuthorizationGrantAuthenticationConverter implement this.converters = Collections.unmodifiableMap(new HashMap<>(converters)); } + @Nullable @Override public Authentication convert(HttpServletRequest request) { Assert.notNull(request, "request cannot be null");