This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5411-delete-deprecated-1
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 31bdbfc27a23811f5b9262df82ba59e66744c4ab
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 17:56:16 2024 +1000
WW-5411 Delete deprecated Velocity injection methods
---
.../OldDecorator2NewStrutsVelocityDecorator.java | 17 +++--------
.../struts2/sitemesh/VelocityPageFilter.java | 14 ++-------
.../views/velocity/result/VelocityResult.java | 33 ++++------------------
.../velocity/template/VelocityTemplateEngine.java | 15 ++--------
4 files changed, 15 insertions(+), 64 deletions(-)
diff --git
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
index 6168b29c0..d51745fa0 100644
---
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
+++
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
@@ -23,16 +23,15 @@ import com.opensymphony.sitemesh.Content;
import com.opensymphony.sitemesh.compatability.Content2HTMLPage;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.inject.Inject;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.apache.struts2.views.velocity.VelocityManager;
import org.apache.struts2.views.velocity.VelocityManagerInterface;
import org.apache.velocity.context.Context;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
@@ -49,14 +48,6 @@ public class OldDecorator2NewStrutsVelocityDecorator extends
OldDecorator2NewStr
velocityManager = mgr;
}
- /**
- * @deprecated since 6.4.0
- */
- @Deprecated
- public static void setVelocityManager(VelocityManager mgr) {
- setVelocityManager((VelocityManagerInterface) mgr);
- }
-
public
OldDecorator2NewStrutsVelocityDecorator(com.opensymphony.module.sitemesh.Decorator
oldDecorator) {
this.oldDecorator = oldDecorator;
}
diff --git
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
index 71e04b329..c2549801b 100644
---
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
+++
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
@@ -24,29 +24,19 @@ import com.opensymphony.sitemesh.DecoratorSelector;
import com.opensymphony.sitemesh.webapp.SiteMeshFilter;
import com.opensymphony.sitemesh.webapp.SiteMeshWebAppContext;
import com.opensymphony.xwork2.inject.Inject;
-import org.apache.struts2.views.velocity.VelocityManager;
+import jakarta.servlet.FilterConfig;
import org.apache.struts2.views.velocity.VelocityManagerInterface;
-import jakarta.servlet.*;
-
/**
* Core Filter for integrating SiteMesh into a Java web application.
*/
public class VelocityPageFilter extends SiteMeshFilter {
- @Inject(required=false)
+ @Inject(required = false)
public static void setVelocityManager(VelocityManagerInterface mgr) {
OldDecorator2NewStrutsVelocityDecorator.setVelocityManager(mgr);
}
- /**
- * @deprecated since 6.4.0
- */
- @Deprecated
- public static void setVelocityManager(VelocityManager mgr) {
- setVelocityManager((VelocityManagerInterface) mgr);
- }
-
private FilterConfig filterConfig;
public void init(FilterConfig filterConfig) {
diff --git
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java
index cb7a1f56d..a89ad6ce3 100644
---
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java
+++
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/result/VelocityResult.java
@@ -22,24 +22,23 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspFactory;
+import jakarta.servlet.jsp.PageContext;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.result.StrutsResultSupport;
import org.apache.struts2.views.JspSupportServlet;
-import org.apache.struts2.views.velocity.VelocityManager;
import org.apache.struts2.views.velocity.VelocityManagerInterface;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
-import jakarta.servlet.Servlet;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.jsp.JspFactory;
-import jakarta.servlet.jsp.PageContext;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -109,14 +108,6 @@ public class VelocityResult extends StrutsResultSupport {
this.velocityManager = mgr;
}
- /**
- * @deprecated since 6.4.0
- */
- @Deprecated
- public void setVelocityManager(VelocityManager mgr) {
- setVelocityManager((VelocityManagerInterface) mgr);
- }
-
/**
* Creates a Velocity context from the action, loads a Velocity template
and executes the
* template. Output is written to the servlet output stream.
@@ -248,16 +239,4 @@ public class VelocityResult extends StrutsResultSupport {
String location) {
return velocityManager.createContext(stack, request, response);
}
-
- /**
- * @deprecated since 6.4.0
- */
- @Deprecated
- protected Context createContext(VelocityManager velocityManager,
- ValueStack stack,
- HttpServletRequest request,
- HttpServletResponse response,
- String location) {
- return createContext((VelocityManagerInterface) velocityManager,
stack, request, response, location);
- }
}
diff --git
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java
index f6e0481f8..bc0bb4268 100644
---
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java
+++
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngine.java
@@ -19,20 +19,19 @@
package org.apache.struts2.views.velocity.template;
import com.opensymphony.xwork2.inject.Inject;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.template.BaseTemplateEngine;
import org.apache.struts2.components.template.Template;
import org.apache.struts2.components.template.TemplateRenderingContext;
-import org.apache.struts2.views.velocity.VelocityManager;
import org.apache.struts2.views.velocity.VelocityManagerInterface;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.Writer;
import java.util.List;
import java.util.Map;
@@ -50,14 +49,6 @@ public class VelocityTemplateEngine extends
BaseTemplateEngine {
this.velocityManager = mgr;
}
- /**
- * @deprecated since 6.4.0
- */
- @Deprecated
- public void setVelocityManager(VelocityManager mgr) {
- setVelocityManager((VelocityManagerInterface) mgr);
- }
-
public void renderTemplate(TemplateRenderingContext templateContext)
throws Exception {
// get the various items required from the stack
Map actionContext = templateContext.getStack().getContext();
