From 2ada3f00fa8c5927b8dc750efc6966f23607137d Mon Sep 17 00:00:00 2001 From: Joe Grandja <10884212+jgrandja@users.noreply.github.com> Date: Thu, 2 Apr 2026 04:59:26 -0400 Subject: [PATCH] Polish gh-18888 --- .../ServerOAuth2AuthorizedClientExchangeFilterFunction.java | 4 ++-- ...ServletOAuth2AuthorizedClientExchangeFilterFunction.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java index ddfccbc8b6..3e6bdbe93e 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServerOAuth2AuthorizedClientExchangeFilterFunction.java @@ -119,7 +119,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements "anonymous", "anonymousUser", AuthorityUtils.createAuthorityList("ROLE_USER")); private final Mono currentAuthenticationMono = ReactiveSecurityContextHolder.getContext() - .mapNotNull(SecurityContext::getAuthentication); + .flatMap((ctx) -> Mono.justOrEmpty(ctx.getAuthentication())); // @formatter:off private final Mono clientRegistrationIdMono = this.currentAuthenticationMono @@ -526,7 +526,7 @@ public final class ServerOAuth2AuthorizedClientExchangeFilterFunction implements * request, which is used to obtain an {@link OAuth2AuthorizedClient}. * @param request the intercepted request, containing HTTP method, URI, headers, * and request attributes - * @return the {@link Mono} of the {@link Authentication principal} to be used for + * @return a {@link Mono} of the {@link Authentication principal} to be used for * resolving an {@link OAuth2AuthorizedClient} */ Mono resolve(ClientRequest request); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java index 3a4bc28cdd..129d90dd51 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java @@ -617,12 +617,12 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction implement public interface PrincipalResolver { /** - * Resolve a {@link Authentication principal} from the current request, which is + * Resolve the {@link Authentication principal} from the current request, which is * used to obtain an {@link OAuth2AuthorizedClient}. * @param request the intercepted request, containing HTTP method, URI, headers, * and request attributes - * @return the {@link Mono} of the {@link Authentication principal} to be used for - * resolving an {@link OAuth2AuthorizedClient} + * @return the {@link Authentication principal} to be used for resolving an + * {@link OAuth2AuthorizedClient} */ @Nullable Authentication resolve(ClientRequest request);