From 978eb4396a4988dfd721aa433b2f25dd324e6aea Mon Sep 17 00:00:00 2001 From: Joe Grandja <10884212+jgrandja@users.noreply.github.com> Date: Mon, 31 Aug 2026 11:09:18 -0400 Subject: [PATCH] Polish gh-19585 --- ...hOidcUserReactiveOAuth2AuthorizationSuccessHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshOidcUserReactiveOAuth2AuthorizationSuccessHandler.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshOidcUserReactiveOAuth2AuthorizationSuccessHandler.java index 92dbd57fdc..e252a7ee95 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshOidcUserReactiveOAuth2AuthorizationSuccessHandler.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/RefreshOidcUserReactiveOAuth2AuthorizationSuccessHandler.java @@ -144,8 +144,7 @@ public final class RefreshOidcUserReactiveOAuth2AuthorizationSuccessHandler /** * Sets a {@link ServerSecurityContextRepository} to use for refreshing a - * {@link SecurityContext}, defaults to - * {@link WebSessionServerSecurityContextRepository}. + * {@link SecurityContext}. * @param serverSecurityContextRepository the {@link ServerSecurityContextRepository} * to use */ @@ -329,9 +328,9 @@ public final class RefreshOidcUserReactiveOAuth2AuthorizationSuccessHandler return Mono.empty(); } - @SuppressWarnings("NullAway") @Override - public Mono save(ServerWebExchange exchange, SecurityContext context) { + public Mono save(ServerWebExchange exchange, @Nullable SecurityContext context) { + Assert.notNull(context, "context cannot be null"); // Save SecurityContext in WebSession without rotating session id. return exchange.getSession().doOnNext((session) -> { session.getAttributes()