From 2d2dfef3bf1175651ef73bc779617dbad427f99f Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Tue, 12 Mar 2024 15:35:14 -0500
Subject: [PATCH 1/3] [#1197] fix warning for @VariableName

---
 .../src/main/resources/com/qulice/pmd/ruleset.xml      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
index ebdff1ad1..78eed2f48 100644
--- a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
+++ b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
@@ -153,9 +153,10 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     </description>
     <priority>3</priority>
     <properties>
+      <property name="version" value="2.0"/>
       <property name="xpath">
         <value><![CDATA[
-          //Name[@Image = //FieldDeclaration[@Static='true']/@VariableName]
+          //Name[@Image = //FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name]
         ]]></value>
       </property>
     </properties>
@@ -175,13 +176,14 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     </description>
     <priority>3</priority>
     <properties>
+      <property name="version" value="2.0"/>
       <property name="xpath">
         <value><![CDATA[
           //PrimaryExpression[
-            (./PrimaryPrefix[@ThisModifier='true']) and
+            (./PrimaryPrefix[@ThisModifier=true()]) and
             (./PrimarySuffix[
-              @Image=//FieldDeclaration[@Static='true']/@VariableName
-              or @Image=//MethodDeclaration[@Static='true']/@MethodName
+              @Image=//FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name
+              or @Image=//MethodDeclaration[@Static=true()]/@MethodName
             ])
           ]
         ]]></value>

From 4cf643c39b8462f1c0d02e1f8a0a2479aeb86190 Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Tue, 12 Mar 2024 20:08:06 -0500
Subject: [PATCH 2/3] [#1197] fix static via this rule

---
 .../main/resources/com/qulice/pmd/ruleset.xml   |  4 ++--
 .../qulice/pmd/StaticAccessToStaticFields.java  | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
index 78eed2f48..bfd8e0e3f 100644
--- a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
+++ b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
@@ -182,8 +182,8 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
           //PrimaryExpression[
             (./PrimaryPrefix[@ThisModifier=true()]) and
             (./PrimarySuffix[
-              @Image=//FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name
-              or @Image=//MethodDeclaration[@Static=true()]/@MethodName
+              @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name
+              or @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/MethodDeclaration[@Static=true()]/@MethodName
             ])
           ]
         ]]></value>
diff --git a/qulice-pmd/src/test/resources/com/qulice/pmd/StaticAccessToStaticFields.java b/qulice-pmd/src/test/resources/com/qulice/pmd/StaticAccessToStaticFields.java
index 201a769bb..e29d4796d 100644
--- a/qulice-pmd/src/test/resources/com/qulice/pmd/StaticAccessToStaticFields.java
+++ b/qulice-pmd/src/test/resources/com/qulice/pmd/StaticAccessToStaticFields.java
@@ -12,6 +12,21 @@ public int another() {
     }
 
     public int addToNum(final int another) {
-        return another + StaticAccessToStaticFields.number();
+        return another + StaticAccessToStaticFields.number() + this.another();
+    }
+
+    class InternalClass {
+        final int num;
+
+        InternalClass(final int par) {
+            this.num = par;
+        }
+        static int another() {
+            return 1;
+        }
+
+        public int add(final int a) {
+            return a + this.num;
+        }
     }
 }

From 15e5db1875684fad152eec24bbfed50d361613b2 Mon Sep 17 00:00:00 2001
From: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
Date: Tue, 12 Mar 2024 20:14:27 -0500
Subject: [PATCH 3/3] [#1197] fix 'MethodDeclaration/@MethodName' deprecation
 warning

---
 qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
index bfd8e0e3f..750b1f3e9 100644
--- a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
+++ b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
@@ -183,7 +183,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
             (./PrimaryPrefix[@ThisModifier=true()]) and
             (./PrimarySuffix[
               @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name
-              or @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/MethodDeclaration[@Static=true()]/@MethodName
+              or @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/MethodDeclaration[@Static=true()]/@Name
             ])
           ]
         ]]></value>