From 3e66b540140ff33533f0e58c5e68c8788eb28c2a Mon Sep 17 00:00:00 2001 From: mmck328 <20348295+mmck328@users.noreply.github.com> Date: Thu, 20 Mar 2025 23:41:10 +0900 Subject: [PATCH] Fix javadocs on WebFlux CSRF classes Signed-off-by: mmck328 <20348295+mmck328@users.noreply.github.com> --- .../security/web/server/csrf/CsrfException.java | 5 ++--- .../server/csrf/WebSessionServerCsrfTokenRepository.java | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/server/csrf/CsrfException.java b/web/src/main/java/org/springframework/security/web/server/csrf/CsrfException.java index bdb693e95ca..e70bcde4e2e 100644 --- a/web/src/main/java/org/springframework/security/web/server/csrf/CsrfException.java +++ b/web/src/main/java/org/springframework/security/web/server/csrf/CsrfException.java @@ -19,13 +19,12 @@ import java.io.Serial; import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.web.csrf.CsrfToken; /** - * Thrown when an invalid or missing {@link CsrfToken} is found in the HttpServletRequest + * Thrown when an invalid or missing {@link CsrfToken} is found in the ServerWebExchange * * @author Rob Winch - * @since 3.2 + * @since 5.0 */ public class CsrfException extends AccessDeniedException { diff --git a/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java index cae007e2e34..4ccd388d50e 100644 --- a/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java +++ b/web/src/main/java/org/springframework/security/web/server/csrf/WebSessionServerCsrfTokenRepository.java @@ -19,17 +19,16 @@ import java.util.Map; import java.util.UUID; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; import org.springframework.util.Assert; import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebSession; /** * A {@link ServerCsrfTokenRepository} that stores the {@link CsrfToken} in the - * {@link HttpSession}. + * {@link WebSession}. * * @author Rob Winch * @since 5.0 @@ -78,7 +77,7 @@ public Mono loadToken(ServerWebExchange exchange) { } /** - * Sets the {@link HttpServletRequest} parameter name that the {@link CsrfToken} is + * Sets the {@link ServerWebExchange} parameter name that the {@link CsrfToken} is * expected to appear on * @param parameterName the new parameter name to use */ @@ -98,7 +97,7 @@ public void setHeaderName(String headerName) { } /** - * Sets the {@link HttpSession} attribute name that the {@link CsrfToken} is stored in + * Sets the {@link WebSession} attribute name that the {@link CsrfToken} is stored in * @param sessionAttributeName the new attribute name to use */ public void setSessionAttributeName(String sessionAttributeName) {