Skip to content

Fix UseSLF4JLoggerRule throws NPEs with Java 10+ var type #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaikreuzer merged 1 commit into from
Apr 25, 2020
Merged

Fix UseSLF4JLoggerRule throws NPEs with Java 10+ var type #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions custom-checks/pmd/src/main/java/org/openhab/tools/analysis/pmd/UseSLF4JLoggerRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@ public Object visit(ASTImportDeclaration node, Object data) {
@Override
public Object visit(ASTVariableDeclarator node, Object data) {
ASTType typeNode = node.getParent().getFirstChildOfType(ASTType.class);
Node reftypeNode = typeNode.getChild(0);
if (reftypeNode instanceof ASTReferenceType) {
ASTClassOrInterfaceType classOrInterfaceType = reftypeNode
.getFirstChildOfType(ASTClassOrInterfaceType.class);
if (classOrInterfaceType != null) {
String className = classOrInterfaceType.getImage();
if (typeNode != null) {
Node reftypeNode = typeNode.getChild(0);
if (reftypeNode instanceof ASTReferenceType) {
ASTClassOrInterfaceType classOrInterfaceType = reftypeNode
.getFirstChildOfType(ASTClassOrInterfaceType.class);
if (classOrInterfaceType != null) {
String className = classOrInterfaceType.getImage();

if (isClassNameForbidden(className)) {
addViolation(data, typeNode);
if (isClassNameForbidden(className)) {
addViolation(data, typeNode);
}
}
}
}
Expand Down
23 changes: 18 additions & 5 deletions ...cks/pmd/src/test/resources/org/openhab/tools/analysis/pmd/test/xml/UseSLF4JLoggerRule.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ class Foo{
]]></code>
</test-code>
<test-code reinitializeRule="true" regressionTest="true">
<description>Real smarthome class</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
<description>Real smarthome class</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
/**
* Copyright (c) 2014,2018 Contributors to the Eclipse Foundation
*
Expand Down Expand Up @@ -189,7 +189,20 @@ public class RawType implements PrimitiveType, State {
}

}

]]></code>
]]></code>
</test-code>
<test-code reinitializeRule="true" regressionTest="true">
<description>Unresolved inferred var types</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
class Foo {
Foo() {
var oh = "openHAB";
var obj1 = new Object();
var obj2 = null;
var i = 1;
}
}
]]></code>
</test-code>
</test-data>