Cleans up method name
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b4d54b6d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b4d54b6d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b4d54b6d Branch: refs/heads/struts-2-3-20-2 Commit: b4d54b6d0caa6aaf453a56b3613aebad8acd3229 Parents: 1bc6832 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Tue Apr 19 08:25:28 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Tue Apr 19 08:25:28 2016 +0200 ---------------------------------------------------------------------- .../struts2/dispatcher/mapper/DefaultActionMapper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b4d54b6d/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java index a7a1a69..024e2d3 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java @@ -136,7 +136,7 @@ public class DefaultActionMapper implements ActionMapper { put(METHOD_PREFIX, new ParameterAction() { public void execute(String key, ActionMapping mapping) { if (allowDynamicMethodCalls) { - mapping.setMethod(key.substring(METHOD_PREFIX.length())); + mapping.setMethod(cleanupActionName(key.substring(METHOD_PREFIX.length()))); } } }); @@ -148,7 +148,7 @@ public class DefaultActionMapper implements ActionMapper { if (allowDynamicMethodCalls) { int bang = name.indexOf('!'); if (bang != -1) { - String method = name.substring(bang + 1); + String method = cleanupActionName(name.substring(bang + 1)); mapping.setMethod(method); name = name.substring(0, bang); } @@ -385,7 +385,7 @@ public class DefaultActionMapper implements ActionMapper { return rawActionName; } else { if (LOG.isWarnEnabled()) { - LOG.warn("Action [#0] does not match allowed action names pattern [#1], cleaning it up!", + LOG.warn("Action/method [#0] does not match allowed action names pattern [#1], cleaning it up!", rawActionName, allowedActionNames); } String cleanActionName = rawActionName; @@ -393,7 +393,7 @@ public class DefaultActionMapper implements ActionMapper { cleanActionName = cleanActionName.replace(chunk, ""); } if (LOG.isDebugEnabled()) { - LOG.debug("Cleaned action name [#0]", cleanActionName); + LOG.debug("Cleaned action/method name [#0]", cleanActionName); } return cleanActionName; }
