Author: musachy
Date: Wed Mar 18 14:41:00 2009
New Revision: 755607
URL: http://svn.apache.org/viewvc?rev=755607&view=rev
Log:
WW-3044 Replace code by similar code in commons lang
Removed:
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/StringToolsTest.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/StringTools.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java?rev=755607&r1=755606&r2=755607&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultActionNameBuilder.java
Wed Mar 18 14:41:00 2009
@@ -21,6 +21,7 @@
package org.apache.struts2.convention;
import com.opensymphony.xwork2.inject.Inject;
+import org.apache.commons.lang.xwork.StringUtils;
/**
* <p>
@@ -46,7 +47,7 @@
*/
@Inject(value = "struts.convention.action.suffix", required = false)
public void setActionSuffix(String actionSuffix) {
- if (!StringTools.isTrimmedEmpty(actionSuffix)) {
+ if (StringUtils.isNotBlank(actionSuffix)) {
this.actionSuffix = actionSuffix;
}
}
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java?rev=755607&r1=755606&r2=755607&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
Wed Mar 18 14:41:00 2009
@@ -32,6 +32,7 @@
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
+import org.apache.commons.lang.xwork.StringUtils;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -440,9 +441,9 @@
public ResultInfo(Result result, PackageConfig packageConfig, String
resultPath,
Class<?> actionClass, Map<String, ResultTypeConfig>
resultsByExtension) {
this.name = result.name();
- if (!StringTools.isTrimmedEmpty(result.type())) {
+ if (StringUtils.isNotBlank(result.type())) {
this.type = result.type();
- } else if (!StringTools.isTrimmedEmpty(result.location())) {
+ } else if (StringUtils.isNotBlank(result.location())) {
this.type = determineType(result.location(), packageConfig,
resultsByExtension);
} else {
throw new ConfigurationException("The action class [" +
actionClass + "] contains a " +
@@ -451,7 +452,7 @@
}
// See if we can handle relative locations or not
- if (!StringTools.isTrimmedEmpty(result.location())) {
+ if (StringUtils.isNotBlank(result.location())) {
if (relativeResultTypes.contains(this.type) &&
!result.location().startsWith("/")) {
location = resultPath + result.location();
} else {
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=755607&r1=755606&r2=755607&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Wed Mar 18 14:41:00 2009
@@ -146,7 +146,7 @@
*/
@Inject("struts.convention.action.fileProtocols")
public void setFileProtocols(String fileProtocols) {
- if (!StringTools.isTrimmedEmpty(fileProtocols)) {
+ if (StringUtils.isNotBlank(fileProtocols)) {
this.fileProtocols =
TextParseUtil.commaDelimitedStringToSet(fileProtocols);
}
}
@@ -182,7 +182,7 @@
*/
@Inject(value = "struts.convention.action.packages", required = false)
public void setActionPackages(String actionPackages) {
- if (!StringTools.isTrimmedEmpty(actionPackages)) {
+ if (StringUtils.isNotBlank(actionPackages)) {
this.actionPackages = actionPackages.split("\\s*[,]\\s*");
}
}
@@ -202,7 +202,7 @@
*/
@Inject(value = "struts.convention.action.suffix", required = false)
public void setActionSuffix(String actionSuffix) {
- if (!StringTools.isTrimmedEmpty(actionSuffix)) {
+ if (StringUtils.isNotBlank(actionSuffix)) {
this.actionSuffix = actionSuffix;
}
}
@@ -213,7 +213,7 @@
*/
@Inject(value = "struts.convention.exclude.packages", required = false)
public void setExcludePackages(String excludePackages) {
- if (!StringTools.isTrimmedEmpty(excludePackages)) {
+ if (StringUtils.isNotBlank(excludePackages)) {
this.excludePackages = excludePackages.split("\\s*[,]\\s*");
}
}
@@ -681,7 +681,7 @@
if (annotation != null) {
actionName = annotation.value() != null &&
annotation.value().equals(Action.DEFAULT_VALUE) ?
actionName : annotation.value();
- actionName = StringTools.lastToken(actionName, "/");
+ actionName = StringUtils.contains(actionName, "/") ?
StringUtils.substringAfterLast(actionName, "/") : actionName;
}
ActionConfig.Builder actionConfig = new
ActionConfig.Builder(pkgCfg.getName(),
@@ -758,7 +758,8 @@
if (LOG.isTraceEnabled()) {
LOG.trace("Using non-default action namespace from the Action
annotation of [#0]", action.value());
}
- actionNamespace = StringTools.upToLastToken(action.value(), "/");
+ String actionName = action.value();
+ actionNamespace = StringUtils.contains(actionName, "/") ?
StringUtils.substringBeforeLast(actionName, "/") : StringUtils.EMPTY;
}
// Next grab the parent annotation from the class
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java?rev=755607&r1=755606&r2=755607&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/SEOActionNameBuilder.java
Wed Mar 18 14:41:00 2009
@@ -23,6 +23,7 @@
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.commons.lang.xwork.StringUtils;
/**
* <p>
@@ -51,7 +52,7 @@
*/
@Inject(value = "struts.convention.action.suffix", required = false)
public void setActionSuffix(String actionSuffix) {
- if (!StringTools.isTrimmedEmpty(actionSuffix)) {
+ if (StringUtils.isNotBlank(actionSuffix)) {
this.actionSuffix = actionSuffix;
}
}
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/StringTools.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/StringTools.java?rev=755607&r1=755606&r2=755607&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/StringTools.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/StringTools.java
Wed Mar 18 14:41:00 2009
@@ -24,6 +24,7 @@
import java.util.Map;
import com.opensymphony.xwork2.config.ConfigurationException;
+import org.apache.commons.lang.xwork.StringUtils;
/**
* <p>
@@ -31,19 +32,6 @@
* </p>
*/
public class StringTools {
- public static boolean isTrimmedEmpty(String s) {
- return s == null || s.trim().length() == 0;
- }
-
- public static String lastToken(String str, String s) {
- int index = str.lastIndexOf(s);
- if (index >= 0) {
- return str.substring(index + 1);
- }
-
- return str;
- }
-
public static boolean contains(String[] strings, String value, boolean
ignoreCase) {
if (strings != null) {
for (String string : strings) {
@@ -55,15 +43,6 @@
return false;
}
- public static String upToLastToken(String str, String s) {
- int index = str.lastIndexOf(s);
- if (index >= 0) {
- return str.substring(0, index);
- }
-
- return "";
- }
-
public static Map<String, String> createParameterMap(String[] parms) {
Map<String, String> map = new HashMap<String, String>();
int subtract = parms.length % 2;
