Skip to content

Add @Nullable to OidcSessionRegistry#removeSessionInformation #19404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ngocnhan-tran1996 wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −2
Open

Add @Nullable to OidcSessionRegistry#removeSessionInformation #19404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e2995f
Add `@Nullable` to `OidcSessionRegistry#removeSessionInformation`
ngocnhan-tran1996 Jun 30, 2026
8792649
Fix checkstyle
ngocnhan-tran1996 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void saveSessionInformation(OidcSessionInformation info) {
}

@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");
Expand Down
4 changes: 3 additions & 1 deletion ...ain/java/org/springframework/security/oauth2/client/oidc/session/OidcSessionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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
Expand Down
Loading