Browse Source

Add @Nullable to Delegating*Converter.convert()

Issue gh-88, gh-45
pull/130/head
Joe Grandja 5 years ago
parent
commit
f0013fc062
  1. 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthenticationConverter.java
  2. 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/DelegatingAuthorizationGrantAuthenticationConverter.java

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

@ -15,6 +15,7 @@ @@ -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 @@ -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");

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

@ -16,6 +16,7 @@ @@ -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 @@ -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");

Loading…
Cancel
Save