You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/08/17 14:17:43 UTC
[2/3] struts git commit: Disables params evaluation when creating
results by convention
Disables params evaluation when creating results by convention
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/17d5e393
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/17d5e393
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/17d5e393
Branch: refs/heads/master
Commit: 17d5e3934407a0197f877bd6539a1505fc56233d
Parents: ea2564d
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Aug 17 15:35:43 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Aug 17 16:01:17 2016 +0200
----------------------------------------------------------------------
.../convention/ConventionsServiceImpl.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/17d5e393/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
index 1a8af90..8e68538 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
@@ -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<>();
- 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;
+ }
+
}