hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Move toCamelCase to StringUtil

Browse Source
This commit is contained in:
Clément Fournier
2018-04-07 17:38:59 +02:00
parent 4496aa7d6a
commit a3c93766df
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
View File

@ -603,4 +603,32 @@ public final class StringUtil {
public static String[] getEmptyStrings() {
return EMPTY_STRINGS;
}
/**
* Converts the given string to Camel case,
* that is, removing all spaces, and capitalising
* the first letter of each word except the first.
*
* <p>If the first word starts with an uppercase
* letter, it's kept as is. This method can thus
* be used for Pascal case too.
*
* @param name The string to convert
*
* @return The string converted to Camel case
*/
public static String toCamelCase(String name) {
StringBuilder sb = new StringBuilder();
boolean isFirst = true;
for (String word : name.trim().split("\\s++")) {
if (isFirst) {
sb.append(word);
isFirst = false;
} else {
sb.append(StringUtils.capitalize(word));
}
}
return sb.toString();
}
}

20
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsRule.java
View File

@ -6,8 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import net.sourceforge.pmd.lang.java.ast.ASTAnnotationTypeDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeBodyDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
@ -19,6 +17,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
import net.sourceforge.pmd.properties.PropertyDescriptor;
import net.sourceforge.pmd.properties.RegexProperty;
import net.sourceforge.pmd.properties.RegexProperty.RegexPBuilder;
import net.sourceforge.pmd.util.StringUtil;
/**
@ -119,23 +118,8 @@ public class ClassNamingConventionsRule extends AbstractJavaRule {
}
private static String toCamelCase(String name) {
StringBuilder sb = new StringBuilder();
boolean isFirst = true;
for (String word : name.trim().split("\\s++")) {
if (isFirst) {
sb.append(word);
isFirst = false;
} else {
sb.append(StringUtils.capitalize(word));
}
}
return sb.toString();
}
private static RegexPBuilder defaultProp(String name) {
return RegexProperty.named(toCamelCase(name) + "Pattern")
return RegexProperty.named(StringUtil.toCamelCase(name) + "Pattern")
.desc("Regex which applies to " + name.trim() + " names")
.defaultValue("[A-Z][a-zA-Z]+");