Converts comments into logging statements
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b5be431f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b5be431f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b5be431f Branch: refs/heads/master Commit: b5be431f540271685eed803c7e55bf5a4d3138e6 Parents: f522fbc Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Jul 7 11:01:03 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Jul 7 11:01:03 2017 +0200 ---------------------------------------------------------------------- .../convention/DefaultActionNameBuilder.java | 16 +++++++++------- .../struts2/convention/SEOActionNameBuilder.java | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b5be431f/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java ---------------------------------------------------------------------- diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java index 797a519..8a220b8 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java @@ -21,6 +21,8 @@ package org.apache.struts2.convention; import com.opensymphony.xwork2.inject.Inject; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * <p> @@ -33,6 +35,8 @@ import com.opensymphony.xwork2.inject.Inject; */ public class DefaultActionNameBuilder extends AbstractActionNameBuilder { + private static final Logger LOG = LogManager.getLogger(DefaultActionNameBuilder.class); + private boolean lowerCase; @Inject @@ -47,17 +51,15 @@ public class DefaultActionNameBuilder extends AbstractActionNameBuilder { checkActionName(actionName); - // Truncate Action suffix if found + LOG.trace("Truncate Action suffix if found"); actionName = truncateSuffixIfMatches(actionName); - // Force initial letter of action to lowercase, if desired + LOG.trace("Force initial letter of action to lowercase, if desired"); if ((lowerCase) && (actionName.length() > 1)) { int lowerPos = actionName.lastIndexOf('/') + 1; - StringBuilder sb = new StringBuilder(); - sb.append(actionName.substring(0, lowerPos)); - sb.append(Character.toLowerCase(actionName.charAt(lowerPos))); - sb.append(actionName.substring(lowerPos + 1)); - actionName = sb.toString(); + actionName = actionName.substring(0, lowerPos) + + Character.toLowerCase(actionName.charAt(lowerPos)) + + actionName.substring(lowerPos + 1); } return actionName; http://git-wip-us.apache.org/repos/asf/struts/blob/b5be431f/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java ---------------------------------------------------------------------- diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java index 3fea36a..d96fd2d 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java @@ -53,10 +53,10 @@ public class SEOActionNameBuilder extends AbstractActionNameBuilder { checkActionName(actionName); - // Truncate Action suffix if found + LOG.trace("Truncate Action suffix if found"); actionName = truncateSuffixIfMatches(actionName); - // Convert to underscores + LOG.trace("Convert to underscores"); char[] ca = actionName.toCharArray(); StringBuilder build = new StringBuilder("" + ca[0]); boolean lower = true;
