cubetiq/spring-authorization-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add @Nullable to Delegating*Converter.convert()

Browse Source 
Issue gh-88, gh-45
This commit is contained in:
Joe Grandja 2020-10-09 15:38:49 -04:00
parent aa5133e170
commit f0013fc062
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java
View File

@ -15,6 +15,7 @@
*/ */
package org.springframework.security.oauth2.server.authorization.web; package org.springframework.security.oauth2.server.authorization.web;
import org.springframework.lang.Nullable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.AuthenticationConverter; import org.springframework.security.web.authentication.AuthenticationConverter;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -50,6 +51,7 @@ public final class DelegatingAuthenticationConverter implements AuthenticationCo
this.converters = Collections.unmodifiableList(new LinkedList<>(converters)); this.converters = Collections.unmodifiableList(new LinkedList<>(converters));
} }
@Nullable
@Override @Override
public Authentication convert(HttpServletRequest request) { public Authentication convert(HttpServletRequest request) {
Assert.notNull(request, "request cannot be null"); Assert.notNull(request, "request cannot be null");

2
oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java
View File

@ -16,6 +16,7 @@
package org.springframework.security.oauth2.server.authorization.web; package org.springframework.security.oauth2.server.authorization.web;
import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.Converter;
import org.springframework.lang.Nullable;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
@ -48,6 +49,7 @@ public final class DelegatingAuthorizationGrantAuthenticationConverter implement
this.converters = Collections.unmodifiableMap(new HashMap<>(converters)); this.converters = Collections.unmodifiableMap(new HashMap<>(converters));
} }
@Nullable
@Override @Override
public Authentication convert(HttpServletRequest request) { public Authentication convert(HttpServletRequest request) {
Assert.notNull(request, "request cannot be null"); Assert.notNull(request, "request cannot be null");