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

LinguisticNaming: fix Boolean false-positive

Browse Source
This commit is contained in:
Andreas Dangel
2018-08-07 19:21:56 +02:00
parent 7d9fd61c50
commit 89f027a64f
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/LinguisticNamingRule.java
View File

@ -104,7 +104,7 @@ public class LinguisticNamingRule extends AbstractJavaRule {
ASTType t = node.getResultType().getFirstChildOfType(ASTType.class);
if (!resultType.isVoid() && t != null) {
for (String prefix : getProperty(BOOLEAN_METHOD_PREFIXES_PROPERTY)) {
if (hasPrefix(nameOfMethod, prefix) && !"boolean".equals(t.getTypeImage())) {
if (hasPrefix(nameOfMethod, prefix) && !"boolean".equalsIgnoreCase(t.getTypeImage())) {
addViolationWithMessage(data, node, "Linguistics Antipattern - The method ''{0}'' indicates linguistically it returns a boolean, but it returns ''{1}''",
new Object[] { nameOfMethod, t.getTypeImage() });
}
@ -114,7 +114,7 @@ public class LinguisticNamingRule extends AbstractJavaRule {
private void checkField(String typeImage, ASTVariableDeclarator node, Object data) {
for (String prefix : getProperty(BOOLEAN_FIELD_PREFIXES_PROPERTY)) {
if (hasPrefix(node.getName(), prefix) && !"boolean".equals(typeImage)) {
if (hasPrefix(node.getName(), prefix) && !"boolean".equalsIgnoreCase(typeImage)) {
addViolationWithMessage(data, node, "Linguistics Antipattern - The field ''{0}'' indicates linguistically it is a boolean, but it is ''{1}''",
new Object[] { node.getName(), typeImage });
}
@ -123,7 +123,7 @@ public class LinguisticNamingRule extends AbstractJavaRule {
private void checkVariable(String typeImage, ASTVariableDeclarator node, Object data) {
for (String prefix : getProperty(BOOLEAN_FIELD_PREFIXES_PROPERTY)) {
if (hasPrefix(node.getName(), prefix) && !"boolean".equals(typeImage)) {
if (hasPrefix(node.getName(), prefix) && !"boolean".equalsIgnoreCase(typeImage)) {
addViolationWithMessage(data, node, "Linguistics Antipattern - The variable ''{0}'' indicates linguistically it is a boolean, but it is ''{1}''",
new Object[] { node.getName(), typeImage });
}

18
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LinguisticNaming.xml
View File

@ -392,6 +392,24 @@ public class MultipleLocalVariables {
void myMethod() {
int canFly, shouldClimb;
}
}
]]></code>
</test-code>
<test-code>
<description>Boolean fields/methods false positive</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
public class BooleanFieldsMethodFP {
Boolean canFly;
public Boolean isFull() {
return true;
}
public void myMethod() {
Boolean hasLegs;
}
}
]]></code>
</test-code>