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

Disables params evaluation when creating results by convention

Browse Source
This commit is contained in:
Lukasz Lenart
2016-08-17 15:35:43 +02:00
parent 8e67b9144a
commit 030ffa3354
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
+19 -7
View File
@@ -107,14 +107,26 @@ public class ConventionsServiceImpl implements ConventionsService {
public Map<String, ResultTypeConfig> getResultTypesByExtension(PackageConfig packageConfig) {
Map<String, ResultTypeConfig> results = packageConfig.getAllResultTypeConfigs();
ResultTypeConfig dispatcher = disableParse(results.get("dispatcher"));
ResultTypeConfig velocity = disableParse(results.get("velocity"));
ResultTypeConfig freemarker = disableParse(results.get("freemarker"));
Map<String, ResultTypeConfig> resultsByExtension = new HashMap<String, ResultTypeConfig>();
resultsByExtension.put("jsp", results.get("dispatcher"));
resultsByExtension.put("jspf", results.get("dispatcher"));
resultsByExtension.put("jspx", results.get("dispatcher"));
resultsByExtension.put("vm", results.get("velocity"));
resultsByExtension.put("ftl", results.get("freemarker"));
resultsByExtension.put("html", results.get("dispatcher"));
resultsByExtension.put("htm", results.get("dispatcher"));
resultsByExtension.put("jsp", dispatcher);
resultsByExtension.put("jspf", dispatcher);
resultsByExtension.put("jspx", dispatcher);
resultsByExtension.put("vm", velocity);
resultsByExtension.put("ftl", freemarker);
resultsByExtension.put("html", dispatcher);
resultsByExtension.put("htm", dispatcher);
return resultsByExtension;
}
private ResultTypeConfig disableParse(ResultTypeConfig resultConfig) {
if (resultConfig != null) {
return new ResultTypeConfig.Builder(resultConfig).addParam("parse", "false").build();
}
return null;
}
}