[struts] 01/02: WW-5047 Marks previous constructors as deprecated

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5047-new-velocity
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 35aae077c8254fa7cc7a9e366564968b147df827
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sun Feb 23 10:55:42 2020 +0100

    WW-5047 Marks previous constructors as deprecated
---
 .../views/velocity/StrutsVelocityContext.java      | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git 
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
 
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
index 62ac6c7..0b4bc73 100644
--- 
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
+++ 
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
@@ -22,6 +22,8 @@ import org.apache.velocity.VelocityContext;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class StrutsVelocityContext extends VelocityContext {
@@ -29,15 +31,35 @@ public class StrutsVelocityContext extends VelocityContext {
     private ValueStack stack;
     private List<VelocityContext> chainedContexts;
 
-    public StrutsVelocityContext(ValueStack stack) {
-        this(null, stack);
-    }
-
+    /**
+     * Creates a content with link to the ValueStack and any other Velocity 
contexts
+     *
+     * @param chainedContexts Existing Velocity contexts to chain to
+     * @param stack Struts ValueStack
+     * @since 2.6
+     */
     public StrutsVelocityContext(List<VelocityContext> chainedContexts, 
ValueStack stack) {
         this.chainedContexts = chainedContexts;
         this.stack = stack;
     }
 
+    /**
+     * @deprecated please use newly added {@link 
StrutsVelocityContext(List<VelocityContext)} constructor instead
+     * and pass {null} or empty list if no chained contexts were defined
+     */
+    @Deprecated
+    public StrutsVelocityContext(ValueStack stack) {
+        this((List<VelocityContext>) null, stack);
+    }
+
+    /**
+     * @deprecated please use newly added {@link 
StrutsVelocityContext(List<VelocityContext)} constructor instead
+     */
+    @Deprecated()
+    public StrutsVelocityContext(VelocityContext[] chainedContexts, ValueStack 
stack) {
+        this(new ArrayList<>(Arrays.asList(chainedContexts)), stack);
+    }
+
     public boolean internalContainsKey(String key) {
         boolean contains = super.internalContainsKey(key);