diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/Attribute.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/Attribute.java index 3b032e558f..54edbcb3d9 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/Attribute.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/Attribute.java @@ -106,16 +106,11 @@ public final class Attribute { return null; } else { DeprecatedAttribute annot = method.getAnnotation(DeprecatedAttribute.class); - String result = annot != null + return annot != null ? annot.replaceWith() : method.isAnnotationPresent(Deprecated.class) ? DeprecatedAttribute.NO_REPLACEMENT : null; - if (result == null && List.class.isAssignableFrom(method.getReturnType())) { - // Lists are generally deprecated, see #2451 - result = DeprecatedAttribute.NO_REPLACEMENT; - } - return result; } }