Merge pull request #763 from apache/WW-5349-astvarref

WW-5349 Remove Struts core dependency on OGNL VarRefs
apache · Oct 13, 2023 · 913f6bf · 913f6bf
2 parents 23feab6 + 6995eaf
commit 913f6bf
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 50 deletions.
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -601,12 +601,6 @@ public String getTemplateDir() {
             result = findString(this.templateDir);
         }
 
-        // If templateDir is not explicitly given,
-        // try to find attribute which states the dir set to use
-        if (StringUtils.isBlank(result)) {
-            result = stack.findString("#attr.templateDir");
-        }
-
         // Default template set
         if (StringUtils.isBlank(result)) {
             result = defaultTemplateDir;
@@ -634,12 +628,6 @@ public String getTheme() {
             }
         }
 
-        // If theme set is not explicitly given,
-        // try to find attribute which states the theme set to use
-        if (StringUtils.isBlank(result)) {
-            result = stack.findString("#attr.theme");
-        }
-
         // Default theme set
         if (StringUtils.isBlank(result)) {
             result = defaultUITheme;

diff --git a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
@@ -29,7 +29,6 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -144,28 +143,6 @@ public void testGetThemeFromForm() {
         assertEquals("foo", txtFld.getTheme());
     }
 
-    public void testGetThemeFromContext() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        MockHttpServletRequest req = new MockHttpServletRequest();
-        MockHttpServletResponse res = new MockHttpServletResponse();
-        Map<String, Object> context = Collections.singletonMap("theme", "bar");
-        ActionContext.getContext().put("attr", context);
-
-        TextField txtFld = new TextField(stack, req, res);
-        assertEquals("bar", txtFld.getTheme());
-    }
-
-    public void testGetThemeFromContextNonString() {
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        MockHttpServletRequest req = new MockHttpServletRequest();
-        MockHttpServletResponse res = new MockHttpServletResponse();
-        Map<String, Object> context = Collections.singletonMap("theme", 12);
-        ActionContext.getContext().put("attr", context);
-
-        TextField txtFld = new TextField(stack, req, res);
-        assertEquals("12", txtFld.getTheme());
-    }
-
     public void testMergeTemplateNullEngineException() {
         ValueStack stack = ActionContext.getContext().getValueStack();
         MockHttpServletRequest req = new MockHttpServletRequest();
@@ -221,21 +198,6 @@ public void testGetTemplateDirExplicit() {
         assertEquals(explicitTemplateDir, txtFld.getTemplateDir());
     }
 
-    public void testGetTemplateDirAttr() {
-        String attrTemplateDir = "attrTemplateDirectory";
-        String defaultTemplateDir = "defaultTemplateDirectory";
-        ValueStack stack = ActionContext.getContext().getValueStack();
-        MockHttpServletRequest req = new MockHttpServletRequest();
-        MockHttpServletResponse res = new MockHttpServletResponse();
-        Map<String, Object> context = Collections.singletonMap("templateDir", attrTemplateDir);
-        ActionContext.getContext().put("attr", context);
-
-        TextField txtFld = new TextField(stack, req, res);
-        txtFld.setDefaultTemplateDir(defaultTemplateDir);
-
-        assertEquals(attrTemplateDir, txtFld.getTemplateDir());
-    }
-
     public void testGetTemplateDirDefault() {
         String defaultTemplateDir = "defaultTemplateDirectory";
         ValueStack stack = ActionContext.getContext().getValueStack();