Fix deprecated attribute usage

hirsute-chauve · Dec 16, 2019 · 50560e0 · 50560e0
1 parent 76d33ea
commit 50560e0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml
@@ -720,7 +720,7 @@ In JUnit 5, one of the following annotations should be used for tests: @Test, @R
                 <value>
 <![CDATA[
 //ClassOrInterfaceDeclaration[
-       matches(@Image, $testClassPattern)
+       matches(@SimpleName, $testClassPattern)
         or ExtendsList/ClassOrInterfaceType[pmd-java:typeIs('junit.framework.TestCase')]]
 
     /ClassOrInterfaceBody/ClassOrInterfaceBodyDeclaration[MethodDeclaration[@Public=true() and starts-with(@Name, 'test')]]

diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -29,12 +29,12 @@ by {% rule java/codestyle/ClassNamingConventions %}.
 <![CDATA[
 //ClassOrInterfaceDeclaration
  [@Abstract='true' and @Interface='false']
- [not (starts-with(@Image,'Abstract'))]
+ [not (starts-with(@SimpleName,'Abstract'))]
 |
 //ClassOrInterfaceDeclaration
  [@Abstract='false']
  [$strict='true']
- [starts-with(@Image, 'Abstract')]
+ [starts-with(@SimpleName, 'Abstract')]
 ]]>
                 </value>
             </property>
@@ -161,7 +161,7 @@ by the more general rule {% rule java/codestyle/FormalParameterNamingConventions
                 <value>
 <![CDATA[
 //MethodDeclaration/MethodDeclarator/FormalParameters/FormalParameter/VariableDeclaratorId[
-        pmd:matches(@Image,'^in[A-Z].*','^out[A-Z].*','^in$','^out$')
+        pmd:matches(@VariableName,'^in[A-Z].*','^out[A-Z].*','^in$','^out$')
 ]
 ]]>
                 </value>
@@ -1092,7 +1092,7 @@ The Local Home interface of a Session EJB should be suffixed by 'LocalHome'.
     and
     not
     (
-        ends-with(@Image,'LocalHome')
+        ends-with(@SimpleName,'LocalHome')
     )
 ]
 ]]>
@@ -1130,7 +1130,7 @@ The Local Interface of a Session EJB should be suffixed by 'Local'.
     and
     not
     (
-        ends-with(@Image,'Local')
+        ends-with(@SimpleName,'Local')
     )
 ]
 ]]>
@@ -1261,7 +1261,7 @@ The EJB Specification states that any MessageDrivenBean or SessionBean should be
     and
     not
     (
-        ends-with(@Image,'Bean')
+        ends-with(@SimpleName,'Bean')
     )
 ]
 ]]>
@@ -1541,11 +1541,11 @@ Remote Interface of a Session EJB should not have a suffix.
     )
     and
     (
-        ends-with(@Image,'Session')
+        ends-with(@SimpleName,'Session')
         or
-        ends-with(@Image,'EJB')
+        ends-with(@SimpleName,'EJB')
         or
-        ends-with(@Image,'Bean')
+        ends-with(@SimpleName,'Bean')
     )
 ]
 ]]>
@@ -1588,7 +1588,7 @@ A Remote Home interface type of a Session EJB should be suffixed by 'Home'.
     and
     not
     (
-        ends-with(@Image,'Home')
+        ends-with(@SimpleName,'Home')
     )
 ]
 ]]>
@@ -1619,7 +1619,7 @@ Short Classnames with fewer than e.g. five characters are not recommended.
             <property name="xpath">
                 <value>
 <![CDATA[
-//ClassOrInterfaceDeclaration[string-length(@Image) < $minimum]
+//ClassOrInterfaceDeclaration[string-length(@SimpleName) < $minimum]
 ]]>
                 </value>
             </property>
@@ -2096,7 +2096,7 @@ public class Foo {
 [PrimarySuffix[@Arguments='false' and @ArrayDereference = 'false']]
 [not(PrimarySuffix/MemberSelector)]
 [ancestor::ClassOrInterfaceBodyDeclaration[1][@AnonymousInnerClass='false']]
-/PrimaryPrefix/Name[@Image = ancestor::ClassOrInterfaceDeclaration[1]/@Image]
+/PrimaryPrefix/Name[@Image = ancestor::ClassOrInterfaceDeclaration[1]/@SimpleName]
 ]]>
                 </value>
             </property>

diff --git a/pmd-java/src/main/resources/category/java/errorprone.xml b/pmd-java/src/main/resources/category/java/errorprone.xml
@@ -705,7 +705,7 @@ public String bar(String string) {
   @Name='onStart'
   ]
     /Block[not(
-      (BlockStatement[1]/Statement/StatementExpression/PrimaryExpression[./PrimaryPrefix[@SuperModifier='true']]/PrimarySuffix[@Image= ancestor::MethodDeclaration/MethodDeclarator/@Image]))]
+      (BlockStatement[1]/Statement/StatementExpression/PrimaryExpression[./PrimaryPrefix[@SuperModifier='true']]/PrimarySuffix[@Image= ancestor::MethodDeclaration/@Name]))]
 [ancestor::ClassOrInterfaceDeclaration[ExtendsList/ClassOrInterfaceType[
   pmd-java:typeIs('android.app.Activity') or
   pmd-java:typeIs('android.app.Application') or
@@ -750,7 +750,7 @@ Super should be called at the end of the method
   @Name='onTerminate'
   ]
    /Block/BlockStatement[last()]
-    [not(Statement/StatementExpression/PrimaryExpression[./PrimaryPrefix[@SuperModifier='true']]/PrimarySuffix[@Image= ancestor::MethodDeclaration/MethodDeclarator/@Image])]
+    [not(Statement/StatementExpression/PrimaryExpression[./PrimaryPrefix[@SuperModifier='true']]/PrimarySuffix[@Image= ancestor::MethodDeclaration/@Name])]
 [ancestor::ClassOrInterfaceDeclaration[ExtendsList/ClassOrInterfaceType[
   pmd-java:typeIs('android.app.Activity') or
   pmd-java:typeIs('android.app.Application') or
@@ -939,7 +939,7 @@ Note: This is only possible with Java 1.5 or higher.
 [
 @Name = 'clone'
 and @Arity = 0
-and not (ResultType//ClassOrInterfaceType/@Image = ancestor::ClassOrInterfaceDeclaration[1]/@Image)
+and not (ResultType//ClassOrInterfaceType/@Image = ancestor::ClassOrInterfaceDeclaration[1]/@SimpleName)
 ]
 ]]>
                 </value>
@@ -2452,10 +2452,10 @@ See the property `annotations`.
            [(./ClassOrInterfaceBody/ClassOrInterfaceBodyDeclaration/MethodDeclaration
                 [@Public=true()]
                 [./ResultType/Type/ReferenceType/ClassOrInterfaceType
-                    [@Image = //ClassOrInterfaceDeclaration[@Nested=false()]/@Image]
+                    [@Image = //ClassOrInterfaceDeclaration[@Nested=false()]/@SimpleName]
                 ]
             ) or (
-                ./ExtendsList/ClassOrInterfaceType[@Image = //ClassOrInterfaceDeclaration[@Nested=false()]/@Image]
+                ./ExtendsList/ClassOrInterfaceType[@Image = //ClassOrInterfaceDeclaration[@Nested=false()]/@SimpleName]
             )]
         )
 ]
@@ -2650,7 +2650,7 @@ Object clone() should be implemented with super.clone().
 [count(./Block//*[
     (self::AllocationExpression) and
     (./ClassOrInterfaceType/@Image = ancestor::
-ClassOrInterfaceDeclaration[1]/@Image)
+ClassOrInterfaceDeclaration[1]/@SimpleName)
   ])> 0
 ]
 ]]>
@@ -2696,8 +2696,8 @@ with the restriction that the logger needs to be passed into the constructor.
     or (@Static = false() and .//VariableDeclaratorId[@Image != $loggerName])
 
     (: check logger argument type matches class or enum name :)
-    or .//ArgumentList//ClassOrInterfaceType[@Image != ancestor::ClassOrInterfaceDeclaration/@Image]
-    or .//ArgumentList//ClassOrInterfaceType[@Image != ancestor::EnumDeclaration/@Image]
+    or .//ArgumentList//ClassOrInterfaceType[@Image != ancestor::ClassOrInterfaceDeclaration/@SimpleName]
+    or .//ArgumentList//ClassOrInterfaceType[@Image != ancestor::EnumDeclaration/@SimpleName]
 ]
 [not(
      (: special case - final logger initialized inside constructor :)

diff --git a/pmd-java/src/main/resources/category/java/performance.xml b/pmd-java/src/main/resources/category/java/performance.xml
@@ -808,7 +808,7 @@ ArrayList is a much better Collection implementation than Vector if thread-safe
             <property name="xpath">
                 <value>
 <![CDATA[
-//CompilationUnit[count(ImportDeclaration) = 0 or count(ImportDeclaration/Name[@Image='java.util.Vector']) > 0]
+//CompilationUnit[count(ImportDeclaration) = 0 or count(ImportDeclaration[@ImportedName='java.util.Vector']) > 0]
   //AllocationExpression/ClassOrInterfaceType
     [@Image='Vector' or @Image='java.util.Vector']
 ]]>