Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
WW-5349 Remove Struts core dependency on OGNL VarRefs
This commit is contained in:
Kusal Kithul-Godage
2023-10-13 11:39:54 +11:00
committed by GitHub
parent 23feab685c 6995eaf2f9
commit 913f6bf3a1
2 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/UIBean.java
-12
View File
@@ -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;
core/src/test/java/org/apache/struts2/components/UIBeanTest.java
-38
View File
@@ -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<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 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<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();