This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5431-deprecated
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 75ebbf4367aba11f4934a61527c5b6b2e821e0e9
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Jun 21 08:24:54 2024 +0200
WW-5431 Marks unused constants as deprecated
To be removed in Struts 7
---
.../views/freemarker/FreemarkerManager.java | 26 +++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index 62c7cc9ae..987306c5a 100644
---
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -118,9 +118,6 @@ public class FreemarkerManager {
public static final String INITPARAM_DEBUG = "Debug";
public static final String KEY_REQUEST = "Request";
- public static final String KEY_INCLUDE = "include_page";
- public static final String KEY_REQUEST_PRIVATE =
"__FreeMarkerServlet.Request__";
- public static final String KEY_REQUEST_PARAMETERS = "RequestParameters";
public static final String KEY_SESSION = "Session";
public static final String KEY_APPLICATION = "Application";
public static final String KEY_APPLICATION_PRIVATE =
"__FreeMarkerServlet.Application__";
@@ -138,10 +135,29 @@ public class FreemarkerManager {
// for Struts
public static final String KEY_REQUEST_PARAMETERS_STRUTS = "Parameters";
- public static final String KEY_HASHMODEL_PRIVATE =
"__FreeMarkerManager.Request__";
-
public static final String EXPIRATION_DATE;
+ /**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+ @Deprecated
+ public static final String KEY_INCLUDE = "include_page";
+ /**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+ @Deprecated
+ public static final String KEY_REQUEST_PRIVATE =
"__FreeMarkerServlet.Request__";
+ /**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+ @Deprecated
+ public static final String KEY_REQUEST_PARAMETERS = "RequestParameters";
+ /**
+ * @deprecated since Struts 6.5.0, do not use as it will be removed in
Struts 7.0.0
+ */
+ @Deprecated
+ public static final String KEY_HASHMODEL_PRIVATE =
"__FreeMarkerManager.Request__";
+
/**
* Adds individual settings.
*
