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

Cleanups on BeanMembersShouldSerializeRule #3659

Browse Source
This commit is contained in:
Clément Fournier committed 2021-12-31 16:30:13 +01:00
1 parent 3979ae6a77
commit df15e21640
2 files changed
+14 -12
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/BeanMembersShouldSerializeRule.java
+13 -11
View File
@@ -8,14 +8,14 @@ import static net.sourceforge.pmd.properties.PropertyFactory.stringProperty;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.nullness.qual.NonNull;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.lang.ast.NodeStream;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
@@ -67,23 +67,25 @@ public class BeanMembersShouldSerializeRule extends AbstractIgnoredAnnotationRul
return data;
}
List<String> accessors = node.getDeclarations(ASTMethodDeclaration.class)
Set<String> accessors =
node.getDeclarations(ASTMethodDeclaration.class)
.filter(JavaRuleUtil::isGetterOrSetter)
.collect(Collectors.mapping(m -> m.getName(), CollectionUtil.toMutableList()));
Collections.sort(accessors);
.collect(Collectors.mapping(ASTMethodDeclaration::getName, Collectors.toSet()));
NodeStream<ASTVariableDeclaratorId> fields = node.getDeclarations(ASTFieldDeclaration.class)
NodeStream<ASTVariableDeclaratorId> fields =
node.getDeclarations(ASTFieldDeclaration.class)
.flatMap(ASTFieldDeclaration::getVarIds);
for (ASTVariableDeclaratorId field : fields) {
if (field.getLocalUsages().isEmpty()
|| field.getModifiers().hasAny(JModifier.TRANSIENT, JModifier.STATIC)
|| hasIgnoredAnnotation(field)) {
|| field.getModifiers().hasAny(JModifier.TRANSIENT, JModifier.STATIC)
|| hasIgnoredAnnotation(field)) {
continue;
}
String varName = StringUtils.capitalize(trimIfPrefix(field.getName()));
boolean hasGetMethod = Collections.binarySearch(accessors, "get" + varName) >= 0
|| Collections.binarySearch(accessors, "is" + varName) >= 0;
boolean hasSetMethod = Collections.binarySearch(accessors, "set" + varName) >= 0;
boolean hasGetMethod = accessors.contains("get" + varName)
|| accessors.contains("is" + varName);
boolean hasSetMethod = accessors.contains("set" + varName);
// Note that a Setter method is not applicable to a final
// variable...
if (!hasGetMethod || !field.hasModifiers(JModifier.FINAL) && !hasSetMethod) {
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/JavaRuleUtil.java
+1 -1
View File
@@ -371,7 +371,7 @@ public final class JavaRuleUtil {
if (startsWithCamelCaseWord(node.getName(), "get")) {
return hasField(enclosing, node.getName().substring(3));
} else if (startsWithCamelCaseWord(node.getName(), "is")
&& TypeTestUtil.isA(Boolean.TYPE, node.getResultTypeNode())) {
&& TypeTestUtil.isA(boolean.class, node.getResultTypeNode())) {
return hasField(enclosing, node.getName().substring(2));
}