From fb23b719f222e4c1fcddca694202db9541644c34 Mon Sep 17 00:00:00 2001 From: Stefaan Dutry Date: Wed, 20 Dec 2017 22:08:33 +0100 Subject: [PATCH] used char instead of a single character string --- .../xwork2/config/entities/AllowedMethods.java | 2 +- .../xwork2/util/GlobalLocalizedTextProvider.java | 4 ++-- .../xwork2/util/StrutsLocalizedTextProvider.java | 8 ++++---- .../opensymphony/xwork2/util/finder/ClassFinder.java | 2 +- .../struts2/components/ServletUrlRenderer.java | 12 ++++++------ .../components/template/BaseTemplateEngine.java | 2 +- .../dispatcher/mapper/DefaultActionMapper.java | 10 +++++----- .../multipart/AbstractMultiPartRequest.java | 4 ++-- .../struts2/result/ServletDispatcherResult.java | 4 ++-- .../apache/struts2/result/ServletRedirectResult.java | 2 +- .../java/org/apache/struts2/views/jsp/TagUtils.java | 2 +- .../views/velocity/components/AbstractDirective.java | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java index 1e6c64448..fa645883e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java @@ -56,7 +56,7 @@ public class AllowedMethods { if (isPattern && !method.startsWith("regex:") && !strictMethodInvocation) { allowedMethods.add(new PatternAllowedMethod(methodPattern.toString(), method)); } else if (method.startsWith("regex:")) { - String pattern = method.substring(method.indexOf(":") + 1); + String pattern = method.substring(method.indexOf(':') + 1); allowedMethods.add(new PatternAllowedMethod(pattern, method)); } else if (method.contains("*") && !method.startsWith("regex:") && !strictMethodInvocation) { String pattern = method.replace("*", defaultRegex); diff --git a/core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java index 97ca7dcd0..fce1b995c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java @@ -171,8 +171,8 @@ public class GlobalLocalizedTextProvider extends AbstractLocalizedTextProvider { indexedTextName = aTextName; - while ((i = indexedTextName.indexOf("[", i + 1)) != -1) { - int j = indexedTextName.indexOf("]", i); + while ((i = indexedTextName.indexOf('[', i + 1)) != -1) { + int j = indexedTextName.indexOf(']', i); String a = indexedTextName.substring(0, i); String b = indexedTextName.substring(j); indexedTextName = a + "[*" + b; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java b/core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java index 6366a8691..1dc74b70d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java @@ -232,8 +232,8 @@ public class StrutsLocalizedTextProvider extends AbstractLocalizedTextProvider { indexedTextName = aTextName; - while ((i = indexedTextName.indexOf("[", i + 1)) != -1) { - int j = indexedTextName.indexOf("]", i); + while ((i = indexedTextName.indexOf('[', i + 1)) != -1) { + int j = indexedTextName.indexOf(']', i); String a = indexedTextName.substring(0, i); String b = indexedTextName.substring(j); indexedTextName = a + "[*" + b; @@ -293,14 +293,14 @@ public class StrutsLocalizedTextProvider extends AbstractLocalizedTextProvider { } // see if it's a child property - int idx = aTextName.indexOf("."); + int idx = aTextName.indexOf('.'); if (idx != -1) { String newKey = null; String prop = null; if (aTextName.startsWith(XWorkConverter.CONVERSION_ERROR_PROPERTY_PREFIX)) { - idx = aTextName.indexOf(".", XWorkConverter.CONVERSION_ERROR_PROPERTY_PREFIX.length()); + idx = aTextName.indexOf('.', XWorkConverter.CONVERSION_ERROR_PROPERTY_PREFIX.length()); if (idx != -1) { prop = aTextName.substring(XWorkConverter.CONVERSION_ERROR_PROPERTY_PREFIX.length(), idx); diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java b/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java index 678a2baed..fcbd08e4e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java @@ -189,7 +189,7 @@ public interface ClassFinder { } public String getPackageName(){ - return name.indexOf(".") > 0 ? name.substring(0, name.lastIndexOf(".")) : "" ; + return name.indexOf('.') > 0 ? name.substring(0, name.lastIndexOf('.')) : "" ; } public List getConstructors() { diff --git a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java index 7a0113b87..b41b4d60e 100644 --- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java +++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java @@ -89,8 +89,8 @@ public class ServletUrlRenderer implements UrlRenderer { // We don't include the request parameters cause they would have been // prioritised before this [in start(Writer) method] - if (_value != null && _value.indexOf("?") > 0) { - _value = _value.substring(0, _value.indexOf("?")); + if (_value != null && _value.indexOf('?') > 0) { + _value = _value.substring(0, _value.indexOf('?')); } result = urlHelper.buildUrl(_value, urlComponent.getHttpServletRequest(), urlComponent.getHttpServletResponse(), urlComponent.getParameters(), scheme, urlComponent.isIncludeContext(), urlComponent.isEncode(), urlComponent.isForceAddSchemeHostAndPort(), urlComponent.isEscapeAmp()); } @@ -150,10 +150,10 @@ public class ServletUrlRenderer implements UrlRenderer { } Map actionParams = null; - if (action != null && action.indexOf("?") > 0) { - String queryString = action.substring(action.indexOf("?") + 1); + if (action != null && action.indexOf('?') > 0) { + String queryString = action.substring(action.indexOf('?') + 1); actionParams = urlHelper.parseQueryString(queryString, false); - action = action.substring(0, action.indexOf("?")); + action = action.substring(0, action.indexOf('?')); } ActionMapping nameMapping = actionMapper.getMappingFromActionName(action); @@ -322,7 +322,7 @@ public class ServletUrlRenderer implements UrlRenderer { // where the parameters specified in value attribute takes priority. if (StringUtils.contains(value, "?")) { - String queryString = value.substring(value.indexOf("?") + 1); + String queryString = value.substring(value.indexOf('?') + 1); mergedParams = urlHelper.parseQueryString(queryString, false); for (Map.Entry entry : contextParameters.entrySet()) { diff --git a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java index 7f5deb50c..050ffb195 100644 --- a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java @@ -142,7 +142,7 @@ public abstract class BaseTemplateEngine implements TemplateEngine { protected String getFinalTemplateName(Template template) { String t = template.toString(); - if (t.indexOf(".") <= 0) { + if (t.indexOf('.') <= 0) { return t + "." + getSuffix(); } return t; 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 e4725e792..224e36a7c 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 @@ -163,8 +163,8 @@ public class DefaultActionMapper implements ActionMapper { } } if (!allowSlashesInActionNames && !allowActionCrossNamespaceAccess) { - if (actionName.lastIndexOf("/") != -1) { - actionName = actionName.substring(actionName.lastIndexOf("/") + 1); + if (actionName.lastIndexOf('/') != -1) { + actionName = actionName.substring(actionName.lastIndexOf('/') + 1); } } mapping.setName(actionName); @@ -271,7 +271,7 @@ public class DefaultActionMapper implements ActionMapper { ActionMapping mapping = new ActionMapping(); String uri = RequestUtils.getUri(request); - int indexOfSemicolon = uri.indexOf(";"); + int indexOfSemicolon = uri.indexOf(';'); uri = (indexOfSemicolon > -1) ? uri.substring(0, indexOfSemicolon) : uri; uri = dropExtension(uri, mapping); @@ -291,7 +291,7 @@ public class DefaultActionMapper implements ActionMapper { if (allowDynamicMethodCalls) { // handle "name!method" convention. String name = mapping.getName(); - int exclamation = name.lastIndexOf("!"); + int exclamation = name.lastIndexOf('!'); if (exclamation != -1) { mapping.setName(name.substring(0, exclamation)); @@ -341,7 +341,7 @@ public class DefaultActionMapper implements ActionMapper { */ protected void parseNameAndNamespace(String uri, ActionMapping mapping, ConfigurationManager configManager) { String namespace, name; - int lastSlash = uri.lastIndexOf("/"); + int lastSlash = uri.lastIndexOf('/'); if (lastSlash == -1) { namespace = ""; name = uri; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java index 112621c3e..700364047 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java @@ -131,8 +131,8 @@ public abstract class AbstractMultiPartRequest implements MultiPartRequest { protected String getCanonicalName(final String originalFileName) { String fileName = originalFileName; - int forwardSlash = fileName.lastIndexOf("/"); - int backwardSlash = fileName.lastIndexOf("\\"); + int forwardSlash = fileName.lastIndexOf('/'); + int backwardSlash = fileName.lastIndexOf('\\'); if (forwardSlash != -1 && forwardSlash > backwardSlash) { fileName = fileName.substring(forwardSlash + 1, fileName.length()); } else { diff --git a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java index 136e700cd..f29a771ed 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java @@ -137,8 +137,8 @@ public class ServletDispatcherResult extends StrutsResultSupport { //add parameters passed on the location to #parameters // see WW-2120 - if (StringUtils.isNotEmpty(finalLocation) && finalLocation.indexOf("?") > 0) { - String queryString = finalLocation.substring(finalLocation.indexOf("?") + 1); + if (StringUtils.isNotEmpty(finalLocation) && finalLocation.indexOf('?') > 0) { + String queryString = finalLocation.substring(finalLocation.indexOf('?') + 1); HttpParameters parameters = getParameters(invocation); Map queryParams = urlHelper.parseQueryString(queryString, true); if (queryParams != null && !queryParams.isEmpty()) { diff --git a/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java index 90e94c975..0879ab06d 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java @@ -271,7 +271,7 @@ public class ServletRedirectResult extends StrutsResultSupport implements Reflec try { String rawUrl = url; if (url.contains("?")) { - rawUrl = url.substring(0, url.indexOf("?")); + rawUrl = url.substring(0, url.indexOf('?')); } URI uri = URI.create(rawUrl.replaceAll(" ", "%20")); if (uri.isAbsolute()) { diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java index ea212ac65..1484ccfc0 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java @@ -98,7 +98,7 @@ public class TagUtils { // last part (/foo/bar/baz.xyz -> /foo/bar) String path = RequestUtils.getServletPath(request); - return path.substring(0, path.lastIndexOf("/")); + return path.substring(0, path.lastIndexOf('/')); } } else { return invocation.getProxy().getNamespace(); diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java index 1bed8ef89..99f005940 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java @@ -146,7 +146,7 @@ public abstract class AbstractDirective extends Directive { // node.value uses the StrutsValueStack to evaluate the directive's value parameter String param = node.value(contextAdapter).toString(); - int idx = param.indexOf("="); + int idx = param.indexOf('='); if (idx != -1) { String property = param.substring(0, idx);