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

[java] NonSerializableClass - fix tests

Browse Source
This commit is contained in:
Andreas Dangel committed 2022-11-19 11:53:34 +01:00
1 parent 039c1af4de
commit e3e59bdae7
2 files changed
+21 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassRule.java
+17 -4
View File
@@ -21,12 +21,14 @@ import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTBodyDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTEnumDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTExpression;
import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTFormalParameter;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTRecordDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTStringLiteral;
import net.sourceforge.pmd.lang.java.ast.ASTType;
import net.sourceforge.pmd.lang.java.ast.ASTVariableAccess;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclarator;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
import net.sourceforge.pmd.lang.java.ast.AccessNode;
@@ -89,7 +91,7 @@ public class NonSerializableClassRule extends AbstractJavaRulechainRule {
private void checkSerialPersistentFieldsField(ASTAnyTypeDeclaration anyTypeDeclaration, Object data) {
for (ASTFieldDeclaration field : anyTypeDeclaration.descendants(ASTFieldDeclaration.class)) {
for (ASTVariableDeclaratorId varId : field) {
if (SERIAL_PERSISTENT_FIELDS_NAME.equals(varId.getName()) && varId.getType() != null) {
if (SERIAL_PERSISTENT_FIELDS_NAME.equals(varId.getName())) {
if (!TypeTestUtil.isA(SERIAL_PERSISTENT_FIELDS_TYPE, varId)
|| field.getVisibility() != AccessNode.Visibility.V_PRIVATE
|| !field.hasModifiers(JModifier.STATIC)
@@ -117,7 +119,7 @@ public class NonSerializableClassRule extends AbstractJavaRulechainRule {
}
if (isPersistentField(typeDeclaration, node) && isNotSerializable(node)) {
asCtx(data).addViolation(node, node.getName(), typeDeclaration.getCanonicalName(), node.getTypeMirror());
asCtx(data).addViolation(node, node.getName(), typeDeclaration.getBinaryName(), node.getTypeMirror());
}
return null;
}
@@ -163,7 +165,7 @@ public class NonSerializableClassRule extends AbstractJavaRulechainRule {
if (!getProperty(CHECK_ABSTRACT_TYPES) && classSymbol != null) {
// exclude java.lang.Object, interfaces, abstract classes, and generic types
notSerializable &= !TypeTestUtil.isExactlyA(Object.class, node)
&& !typeMirror.isInterface()
&& !classSymbol.isInterface()
&& !classSymbol.isAbstract()
&& !classSymbol.isGeneric();
}
@@ -192,6 +194,17 @@ public class NonSerializableClassRule extends AbstractJavaRulechainRule {
fields = persistentFieldsDecl.descendants(ASTStringLiteral.class).toStream()
.map(ASTStringLiteral::getConstValue)
.collect(Collectors.toSet());
if (fields.isEmpty()) {
// field initializer might be a reference to a constant
ASTExpression initializer = persistentFieldsDecl.getInitializer();
if (initializer instanceof ASTVariableAccess) {
ASTVariableAccess variableAccess = (ASTVariableAccess) initializer;
ASTVariableDeclaratorId reference = variableAccess.getReferencedSym().tryGetNode();
fields = reference.getParent().descendants(ASTStringLiteral.class).toStream()
.map(ASTStringLiteral::getConstValue)
.collect(Collectors.toSet());
}
}
}
cachedPersistentFieldNames.put(typeDeclaration, fields);
@@ -203,7 +216,7 @@ public class NonSerializableClassRule extends AbstractJavaRulechainRule {
if (node.isField() && (persistentFields == null || persistentFields.contains(node.getName()))) {
ASTFieldDeclaration field = node.ancestors(ASTFieldDeclaration.class).first();
return field != null && !field.hasModifiers(JModifier.STATIC, JModifier.TRANSIENT);
return field != null && !field.hasModifiers(JModifier.STATIC) && !field.hasModifiers(JModifier.TRANSIENT);
}
return false;
}
pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/NonSerializableClass.xml
+4 -4
View File
@@ -206,16 +206,16 @@ public class Foo<T> implements Serializable {
<expected-problems>4</expected-problems>
<expected-linenumbers>5,6,7,8</expected-linenumbers>
<expected-messages>
<message>The field 'names' of serializable class 'Foo' is of non-serializable type 'java.util.List'.</message>
<message>The field 'anotherList' of serializable class 'Foo' is of non-serializable type 'java.util.AbstractList'.</message>
<message>The field 'someData' of serializable class 'Foo' is of non-serializable type 'java.lang.Object'.</message>
<message>The field 'names' of serializable class 'Foo' is of non-serializable type 'java.util.List&lt;java.lang.String&gt;'.</message>
<message>The field 'anotherList' of serializable class 'Foo' is of non-serializable type 'java.util.AbstractList&lt;java.lang.String&gt;'.</message>
<message>The field 'someData' of serializable class 'Foo' is of non-serializable type 'T'.</message>
<message>The field 'canBeAnything' of serializable class 'Foo' is of non-serializable type 'java.lang.Object'.</message>
</expected-messages>
<code><![CDATA[
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.List;
public class Foo<T> implements Serializable {
public class Foo<T> implements java.io.Serializable {
private List<String> names = new ArrayList<>();
private AbstractList<String> anotherList;
private T someData;