Fixes #1495 [java] UnnecessaryLocalBeforeReturn with assert
This commit is contained in:
@ -6,6 +6,9 @@ package net.sourceforge.pmd.lang.java.rule.design;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import net.sourceforge.pmd.lang.java.ast.ASTAssertStatement;
|
||||||
|
import net.sourceforge.pmd.lang.java.ast.ASTBlock;
|
||||||
|
import net.sourceforge.pmd.lang.java.ast.ASTBlockStatement;
|
||||||
import net.sourceforge.pmd.lang.java.ast.ASTExpression;
|
import net.sourceforge.pmd.lang.java.ast.ASTExpression;
|
||||||
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
|
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
|
||||||
import net.sourceforge.pmd.lang.java.ast.ASTName;
|
import net.sourceforge.pmd.lang.java.ast.ASTName;
|
||||||
@ -44,6 +47,12 @@ public class UnnecessaryLocalBeforeReturnRule extends AbstractJavaRule {
|
|||||||
for (Map.Entry<VariableNameDeclaration, List<NameOccurrence>> entry: vars.entrySet()) {
|
for (Map.Entry<VariableNameDeclaration, List<NameOccurrence>> entry: vars.entrySet()) {
|
||||||
VariableNameDeclaration key = entry.getKey();
|
VariableNameDeclaration key = entry.getKey();
|
||||||
List<NameOccurrence> usages = entry.getValue();
|
List<NameOccurrence> usages = entry.getValue();
|
||||||
|
|
||||||
|
// skip, if there is an assert between declaration and return
|
||||||
|
if (hasAssertStatement(key, rtn)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
for (NameOccurrence occ: usages) {
|
for (NameOccurrence occ: usages) {
|
||||||
if (occ.getLocation().equals(name)) {
|
if (occ.getLocation().equals(name)) {
|
||||||
// only check declarations that occur one line earlier
|
// only check declarations that occur one line earlier
|
||||||
@ -76,4 +85,31 @@ public class UnnecessaryLocalBeforeReturnRule extends AbstractJavaRule {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether there is an assert statement between the variable declaration
|
||||||
|
* and the return statement, that uses the variable.
|
||||||
|
* @param variableDeclaration
|
||||||
|
* @param rtn
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean hasAssertStatement(VariableNameDeclaration variableDeclaration, ASTReturnStatement rtn) {
|
||||||
|
boolean hasAssert = false;
|
||||||
|
ASTBlockStatement blockStatement = variableDeclaration.getAccessNodeParent().getFirstParentOfType(ASTBlockStatement.class);
|
||||||
|
int startIndex = blockStatement.jjtGetChildIndex() + 1;
|
||||||
|
int endIndex = rtn.getFirstParentOfType(ASTBlockStatement.class).jjtGetChildIndex();
|
||||||
|
ASTBlock block = (ASTBlock)blockStatement.jjtGetParent();
|
||||||
|
for (int i = startIndex; i < endIndex; i++) {
|
||||||
|
List<ASTAssertStatement> asserts = block.jjtGetChild(i).findDescendantsOfType(ASTAssertStatement.class);
|
||||||
|
for (ASTAssertStatement assertStatement : asserts) {
|
||||||
|
List<ASTName> names = assertStatement.findDescendantsOfType(ASTName.class);
|
||||||
|
for (ASTName n : names) {
|
||||||
|
if (n.hasImageEqualTo(variableDeclaration.getName())) {
|
||||||
|
hasAssert = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return hasAssert;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,4 +65,17 @@ public class Foo {
|
|||||||
}
|
}
|
||||||
]]></code>
|
]]></code>
|
||||||
</test-code>
|
</test-code>
|
||||||
|
|
||||||
|
<test-code>
|
||||||
|
<description>#1495 [java] UnnecessaryLocalBeforeReturn with assert</description>
|
||||||
|
<expected-problems>0</expected-problems>
|
||||||
|
<code><![CDATA[
|
||||||
|
public class Foo {
|
||||||
|
public int bar() {
|
||||||
|
int res = 2; assert res>=0;
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]]></code>
|
||||||
|
</test-code>
|
||||||
</test-data>
|
</test-data>
|
||||||
|
@ -48,6 +48,7 @@ See also [bugfix #1556](https://sourceforge.net/p/pmd/bugs/1556/).
|
|||||||
* [#213](https://github.com/pmd/pmd/issues/213): \[java] CPD: OutOfMemory when analyzing Lucene
|
* [#213](https://github.com/pmd/pmd/issues/213): \[java] CPD: OutOfMemory when analyzing Lucene
|
||||||
* java-design
|
* java-design
|
||||||
* [#1448](https://sourceforge.net/p/pmd/bugs/1448/): \[java] ImmutableField: Private field in inner class gives false positive with lambdas
|
* [#1448](https://sourceforge.net/p/pmd/bugs/1448/): \[java] ImmutableField: Private field in inner class gives false positive with lambdas
|
||||||
|
* [#1495](https://sourceforge.net/p/pmd/bugs/1495/): \[java] UnnecessaryLocalBeforeReturn with assert
|
||||||
* [#1552](https://sourceforge.net/p/pmd/bugs/1552/): \[java] MissingBreakInSwitch - False positive for continue
|
* [#1552](https://sourceforge.net/p/pmd/bugs/1552/): \[java] MissingBreakInSwitch - False positive for continue
|
||||||
* [#1556](https://sourceforge.net/p/pmd/bugs/1556/): \[java] UseLocaleWithCaseConversions does not works with `ResultSet` (false negative)
|
* [#1556](https://sourceforge.net/p/pmd/bugs/1556/): \[java] UseLocaleWithCaseConversions does not works with `ResultSet` (false negative)
|
||||||
* [#177](https://github.com/pmd/pmd/issues/177): \[java] SingularField with lambdas as final fields
|
* [#177](https://github.com/pmd/pmd/issues/177): \[java] SingularField with lambdas as final fields
|
||||||
|
Reference in New Issue
Block a user