From 4155263e6323d2fad716624c43e0c7b0f126d1a3 Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Mon, 9 Oct 2023 15:48:07 +1100 Subject: [PATCH 1/2] WW-5349 Remove Struts core dependency on OGNL VarRefs --- .../java/org/apache/struts2/components/UIBean.java | 12 ------------ 1 file changed, 12 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 index 9dc4807f3..59d3713ed 100644 --- 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 abstract class UIBean extends Component { 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 abstract class UIBean extends Component { } } - // 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; From 6995eaf2f93ee2d605f72d2e75d33b44b3bfe3f8 Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Mon, 9 Oct 2023 15:52:58 +1100 Subject: [PATCH 2/2] WW-5349 Remove corresponding unit tests --- .../apache/struts2/components/UIBeanTest.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java index b1f2bcc10..690328942 100644 --- 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.apache.struts2.dispatcher.StaticContentLoader; 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 class UIBeanTest extends StrutsInternalTestCase { assertEquals("foo", txtFld.getTheme()); } - public void testGetThemeFromContext() { - ValueStack stack = ActionContext.getContext().getValueStack(); - MockHttpServletRequest req = new MockHttpServletRequest(); - MockHttpServletResponse res = new MockHttpServletResponse(); - Map 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 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 class UIBeanTest extends StrutsInternalTestCase { 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 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();