Merge pull request apache#793 from apache/WW-5363-velocity-order-2

WW-5363 Remove redundant method from VelocityManager
sepe81 · Nov 15, 2023 · 63b0da3 · 63b0da3
2 parents 9f45983 + 0504e70
commit 63b0da3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 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
@@ -77,7 +77,7 @@ public Object internalGet(String key) {
     }
 
     protected List<Function<String, Object>> contextGetterList() {
-        return Arrays.asList(this::superGet, this::chainedContextGet, this::stackGet, this::stackContextGet);
+        return Arrays.asList(this::superGet, this::chainedContextGet, this::stackGet);
     }
 
     protected Object superGet(String key) {
@@ -91,13 +91,6 @@ protected Object stackGet(String key) {
         return stack.findValue(key);
     }
 
-    protected Object stackContextGet(String key) {
-        if (stack == null) {
-            return null;
-        }
-        return stack.getContext().get(key);
-    }
-
     protected Object chainedContextGet(String key) {
         if (chainedContexts == null) {
             return null;

diff --git a/...s/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java b/...s/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityContextTest.java
@@ -27,9 +27,7 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
@@ -49,12 +47,8 @@ public class StrutsVelocityContextTest {
     @Mock
     private ValueStack stack;
 
-    private Map<String, Object> stackContext;
-
     @Before
     public void setUp() throws Exception {
-        stackContext = new HashMap<>();
-        when(stack.getContext()).thenReturn(stackContext);
         strutsVelocityContext = new StrutsVelocityContext(singletonList(chainedContext), stack);
     }
 
@@ -70,12 +64,6 @@ public void getStackValue() {
         assertEquals("bar", strutsVelocityContext.internalGet("foo"));
     }
 
-    @Test
-    public void getStackContextValue() {
-        stackContext.put("foo", "bar");
-        assertEquals("bar", strutsVelocityContext.internalGet("foo"));
-    }
-
     @Test
     public void getSuperValue() {
         strutsVelocityContext.put("foo", "bar");
@@ -84,9 +72,6 @@ public void getSuperValue() {
 
     @Test
     public void getValuePrecedence() {
-        stackContext.put("foo", "quux");
-        assertEquals("quux", strutsVelocityContext.internalGet("foo"));
-
         when(stack.findValue("foo")).thenReturn("qux");
         assertEquals("qux", strutsVelocityContext.internalGet("foo"));