phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug-177'

Browse Source 
Fixes #177
This commit is contained in:
Andreas Dangel
2017-01-06 10:42:21 +01:00
parent f21ef81998 af9d78c01a
commit 62e33b8e03
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldRule.java
View File

@ -14,6 +14,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTIfStatement;
import net.sourceforge.pmd.lang.java.ast.ASTInitializer;
import net.sourceforge.pmd.lang.java.ast.ASTLambdaExpression;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
import net.sourceforge.pmd.lang.java.ast.ASTStatementExpression;
@ -119,6 +120,12 @@ public class SingularFieldRule extends AbstractLombokAwareRule {
break; // Optimization
}
if (location.getFirstParentOfType(ASTLambdaExpression.class) != null) {
// This usage is inside a lambda expression
violation = false;
break; // Optimization
}
Node method = location.getFirstParentOfType(ASTMethodDeclaration.class);
if (method == null) {
method = location.getFirstParentOfType(ASTConstructorDeclaration.class);

36
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml
View File

@ -569,4 +569,40 @@ public class MyClass {
}
]]></code>
</test-code>
<test-code>
<description>#177 [java] SingularField with lambdas as final fields</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
/** Dummy class. */
public final class Test {
private Timer timer1;
private Timer timer2;
/** Dummy constructor. */
public Timer() {
this.timer1 = new Timer(0, e -> {
// do nothing for now
});
this.timer2 = new Timer(0, e -> {
// do nothing for now
});
}
/** Use a lambda expression to reference timer1 -- triggers SingularField error. */
private final Runnable play1 = () -> {
this.timer1.start();
};
/** Use an anonymous class to reference timer2 -- no error. */
private final Runnable play2 = new Runnable() {
@Override
public void run() {
this.timer2.start();
}
};
}
]]></code>
</test-code>
</test-data>