This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5511-removes-addCspHeaders
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ea97930474b1db2915f7ed80a60029802e10fc91
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Aug 22 08:35:26 2025 +0200
WW-5511 Removes deprecated addCspHeaders method
---
.../main/java/org/apache/struts2/interceptor/csp/CspSettings.java | 7 +++----
.../org/apache/struts2/interceptor/csp/DefaultCspSettings.java | 5 -----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java
b/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java
index a8c2a68c2..aa09ffd4b 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/csp/CspSettings.java
@@ -45,11 +45,10 @@ public interface CspSettings {
String CSP_REPORT_TYPE = "application/csp-report";
/**
- * @deprecated use {@link #addCspHeaders(HttpServletRequest,
HttpServletResponse)} instead
+ * Adds CSP related headers to response based on request state (e.g., if
session has been created)
+ *
+ * @since Struts 6.0.3
*/
- @Deprecated
- void addCspHeaders(HttpServletResponse response);
-
void addCspHeaders(HttpServletRequest request, HttpServletResponse
response);
/**
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java
b/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java
index b245ab352..1feb6b208 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/csp/DefaultCspSettings.java
@@ -52,11 +52,6 @@ public class DefaultCspSettings implements CspSettings {
// default to reporting mode
protected String cspHeader = CSP_REPORT_HEADER;
- @Override
- public void addCspHeaders(HttpServletResponse response) {
- throw new UnsupportedOperationException("Unsupported implementation,
use #addCspHeaders(HttpServletRequest request, HttpServletResponse response)");
- }
-
@Override
public void addCspHeaders(HttpServletRequest request, HttpServletResponse
response) {
if (isSessionActive(request)) {
