From 0c2b9758fc9d0c3ee4c58e8e0f341426b8202a41 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 5 Apr 2022 16:02:23 -0500 Subject: [PATCH] Deprecate loadContext(RequestResponseHolder) Fix gh-11032 --- .../security/web/context/HttpRequestResponseHolder.java | 2 ++ .../context/SaveContextOnUpdateOrErrorResponseWrapper.java | 4 ++++ .../web/context/SecurityContextPersistenceFilter.java | 2 ++ .../security/web/context/SecurityContextRepository.java | 2 ++ 4 files changed, 10 insertions(+) diff --git a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java index c5b2f08edc..ee8d6ee70c 100644 --- a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java @@ -27,7 +27,9 @@ import jakarta.servlet.http.HttpServletResponse; * * @author Luke Taylor * @since 3.0 + * @deprecated Use {@link SecurityContextRepository#loadContext(HttpServletRequest)} */ +@Deprecated public final class HttpRequestResponseHolder { private HttpServletRequest request; diff --git a/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java index 81bb453ac2..71ff20291c 100644 --- a/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java +++ b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java @@ -16,6 +16,7 @@ package org.springframework.security.web.context; +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.context.SecurityContext; @@ -39,7 +40,10 @@ import org.springframework.security.web.util.OnCommittedResponseWrapper; * @author Marten Algesten * @author Rob Winch * @since 3.0 + * @deprecated Use {@link SecurityContextRepository#loadContext(HttpServletRequest)} + * instead. */ +@Deprecated public abstract class SaveContextOnUpdateOrErrorResponseWrapper extends OnCommittedResponseWrapper { private boolean contextSaved = false; diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java index 6300a02a26..c60e6bf45a 100644 --- a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java +++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java @@ -57,7 +57,9 @@ import org.springframework.web.filter.GenericFilterBean; * * @author Luke Taylor * @since 3.0 + * @deprecated Use {@link SecurityContextHolderFilter} */ +@Deprecated public class SecurityContextPersistenceFilter extends GenericFilterBean { static final String FILTER_APPLIED = "__spring_security_scpf_applied"; diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java index 95df5213ae..dac004a27c 100644 --- a/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java @@ -60,7 +60,9 @@ public interface SecurityContextRepository { * the context should be loaded. * @return The security context which should be used for the current request, never * null. + * @deprecated Use {@link #loadContext(HttpServletRequest)} instead. */ + @Deprecated SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder); /**