From 8525cbfd19fbebb095c57c7060b0602ecfc96727 Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Thu, 3 Sep 2026 18:13:25 -0600 Subject: [PATCH] Fix Nullability Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com> --- .../task/DelegatingSecurityContextAsyncTaskExecutor.java | 2 +- .../client/oidc/session/InMemoryOidcSessionRegistry.java | 2 +- .../oauth2/client/oidc/session/OidcSessionRegistry.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java index 194cf41044..8d0b395cbf 100644 --- a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java +++ b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java @@ -72,7 +72,7 @@ public class DelegatingSecurityContextAsyncTaskExecutor extends DelegatingSecuri } @Override - public final Future submit(Callable task) { + public final Future submit(Callable task) { return getDelegate().submit(wrap(task)); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistry.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistry.java index 13da5be113..ffcba6a037 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistry.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistry.java @@ -50,7 +50,7 @@ public final class InMemoryOidcSessionRegistry implements OidcSessionRegistry { } @Override - public OidcSessionInformation removeSessionInformation(String clientSessionId) { + public @Nullable OidcSessionInformation removeSessionInformation(String clientSessionId) { OidcSessionInformation information = this.sessions.remove(clientSessionId); if (information != null) { this.logger.trace("Removed client session"); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/OidcSessionRegistry.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/OidcSessionRegistry.java index e984dd5eee..ab0dfee49a 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/OidcSessionRegistry.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/session/OidcSessionRegistry.java @@ -16,6 +16,8 @@ package org.springframework.security.oauth2.client.oidc.session; +import org.jspecify.annotations.Nullable; + import org.springframework.security.oauth2.client.oidc.authentication.logout.OidcLogoutToken; /** @@ -44,7 +46,7 @@ public interface OidcSessionRegistry { * @param clientSessionId the client session * @return any found {@link OidcSessionInformation}, could be {@code null} */ - OidcSessionInformation removeSessionInformation(String clientSessionId); + @Nullable OidcSessionInformation removeSessionInformation(String clientSessionId); /** * Deregister the OIDC Provider sessions referenced by the provided OIDC Logout Token