Add @nullable to Delegating*Converter.convert()

Issue spring-projectsgh-88, spring-projectsgh-45
doba16 · Oct 9, 2020 · d9b9c4f · d9b9c4f
1 parent 1657a7e
commit d9b9c4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...framework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java b/...framework/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 DelegatingAuthenticationConverter(List<AuthenticationConverter> converter
 		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/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java b/.../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 DelegatingAuthorizationGrantAuthenticationConverter(
 		this.converters = Collections.unmodifiableMap(new HashMap<>(converters));
 	}
 
+	@Nullable
 	@Override
 	public Authentication convert(HttpServletRequest request) {
 		Assert.notNull(request, "request cannot be null");