* This class implements the ActionConfigBuilder interface. - *
* 1. Loop over all the namespaces such as /foo and see if it has an action named index * 2. If an action doesn't exists in the parent namespace of the same name, create an action * in the parent namespace of the same name as the namespace that points to the index 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 4241f6ead..d18ca6bcf 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 @@ -19,6 +19,7 @@ package org.apache.struts2.views.velocity; import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStackProvider; import org.apache.velocity.VelocityContext; import java.util.ArrayList; @@ -26,7 +27,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.Function; -public class StrutsVelocityContext extends VelocityContext { +public class StrutsVelocityContext extends VelocityContext implements ValueStackProvider { private final ValueStack stack; private final List chainedContexts; @@ -77,10 +78,10 @@ public class StrutsVelocityContext extends VelocityContext { } protected List> contextGetterList() { - return Arrays.asList(this::superGet, this::chainedContextGet, this::stackGet); + return Arrays.asList(this::superInternalGet, this::chainedContextGet, this::stackGet); } - protected Object superGet(String key) { + protected Object superInternalGet(String key) { return super.internalGet(key); } @@ -96,11 +97,16 @@ public class StrutsVelocityContext extends VelocityContext { return null; } for (VelocityContext chainedContext : chainedContexts) { - Object val = chainedContext.internalGet(key); + Object val = chainedContext.get(key); if (val != null) { return val; } } return null; } + + @Override + public ValueStack getValueStack() { + return stack; + } } diff --git a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java index e05fbe450..3e5996930 100644 --- a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java +++ b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java @@ -28,7 +28,12 @@ import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; import org.apache.struts2.components.Component; +import org.apache.struts2.util.ValueStackProvider; +import org.apache.struts2.views.util.ContextUtil; +import org.apache.velocity.context.AbstractContext; +import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; +import org.apache.velocity.context.InternalWrapperContext; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; @@ -57,8 +62,11 @@ public abstract class AbstractDirective extends Directive { protected abstract Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res); public boolean render(InternalContextAdapter ctx, Writer writer, Node node) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException { - // get the bean - ValueStack stack = (ValueStack) ctx.get("stack"); + ValueStack stack = extractValueStack(ctx); + if (stack == null) { + // Fallback to assuming the ValueStack was put into the Velocity context (as is by default) + stack = (ValueStack) ctx.get(ContextUtil.STACK); + } HttpServletRequest req = (HttpServletRequest) stack.getContext().get(ServletActionContext.HTTP_REQUEST); HttpServletResponse res = (HttpServletResponse) stack.getContext().get(ServletActionContext.HTTP_RESPONSE); Component bean = getBean(stack, req, res); @@ -79,6 +87,27 @@ public abstract class AbstractDirective extends Directive { return true; } + private ValueStack extractValueStack(Context context) { + do { + if (context instanceof ValueStackProvider) { + return ((ValueStackProvider) context).getValueStack(); + } + context = extractContext(context); + } while (context != null); + + return null; + } + + private Context extractContext(Context context) { + if (context instanceof InternalWrapperContext) { + return ((InternalWrapperContext) context).getInternalUserContext(); + } + if (context instanceof AbstractContext) { + return ((AbstractContext) context).getChainedContext(); + } + return null; + } + /** * * Create a Map of properties that the user has passed in. For example: diff --git a/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java b/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java index 6cd38c8aa..60490c6af 100644 --- a/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java +++ b/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java @@ -54,7 +54,7 @@ public class StrutsVelocityContextTest { @Test public void getChainedValue() { - when(chainedContext.internalGet("foo")).thenReturn("bar"); + when(chainedContext.get("foo")).thenReturn("bar"); assertEquals("bar", strutsVelocityContext.internalGet("foo")); } @@ -75,7 +75,7 @@ public class StrutsVelocityContextTest { when(stack.findValue("foo")).thenReturn("qux"); assertEquals("qux", strutsVelocityContext.internalGet("foo")); - when(chainedContext.internalGet("foo")).thenReturn("baz"); + when(chainedContext.get("foo")).thenReturn("baz"); assertEquals("baz", strutsVelocityContext.internalGet("foo")); strutsVelocityContext.put("foo", "bar"); diff --git a/pom.xml b/pom.xml index 3d75c51d4..259242da8 100644 --- a/pom.xml +++ b/pom.xml @@ -980,7 +980,7 @@ org.apache.commons commons-compress - 1.23.0 + 1.24.0
* Create a Map of properties that the user has passed in. For example: diff --git a/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java b/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java index 6cd38c8aa..60490c6af 100644 --- a/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java +++ b/plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java @@ -54,7 +54,7 @@ public class StrutsVelocityContextTest { @Test public void getChainedValue() { - when(chainedContext.internalGet("foo")).thenReturn("bar"); + when(chainedContext.get("foo")).thenReturn("bar"); assertEquals("bar", strutsVelocityContext.internalGet("foo")); } @@ -75,7 +75,7 @@ public class StrutsVelocityContextTest { when(stack.findValue("foo")).thenReturn("qux"); assertEquals("qux", strutsVelocityContext.internalGet("foo")); - when(chainedContext.internalGet("foo")).thenReturn("baz"); + when(chainedContext.get("foo")).thenReturn("baz"); assertEquals("baz", strutsVelocityContext.internalGet("foo")); strutsVelocityContext.put("foo", "bar"); diff --git a/pom.xml b/pom.xml index 3d75c51d4..259242da8 100644 --- a/pom.xml +++ b/pom.xml @@ -980,7 +980,7 @@ org.apache.commons commons-compress - 1.23.0 + 1.24.0