From 04d21c488069c9320e91c635afe9be69e2b8cc9e Mon Sep 17 00:00:00 2001
From: Juan Manuel Leflet Estrada <jleflete@redhat.com>
Date: Mon, 31 Jul 2023 11:20:46 +0200
Subject: [PATCH] [WINDUPRULE-1014] Fix rule message and divide it in two

---
 .../openjdk17/removed-apis.windup.xml         | 23 +++++++++++++------
 .../tests/removed-apis.windup.test.xml        | 16 +++++++++++--
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/rules/rules-reviewed/openjdk21/openjdk17/removed-apis.windup.xml b/rules/rules-reviewed/openjdk21/openjdk17/removed-apis.windup.xml
index 166d4006b..8e3bcb972 100644
--- a/rules/rules-reviewed/openjdk21/openjdk17/removed-apis.windup.xml
+++ b/rules/rules-reviewed/openjdk21/openjdk17/removed-apis.windup.xml
@@ -40,7 +40,7 @@
                 </javaclass>
             </when>
             <perform>
-                <hint title="This method has been removed" effort="3" category-id="mandatory">
+                <hint title="Method java.lang.ThreadGroup.allowThreadSuspension() has been removed" effort="1" category-id="mandatory">
                     <message>
                         The `java.lang.ThreadGroup.allowThreadSuspension` method has been removed and cannot be used anymore.
                     </message>
@@ -49,15 +49,24 @@
         </rule>
         <rule id="removed-apis-00010">
             <when>
-                <or>
-                    <javaclass references="java.lang.Compiler"/>
-                    <javaclass references="javax.management.remote.rmi.RMIIIOPServerImpl"/>
-                </or>
+                <javaclass references="java.lang.Compiler"/>
+            </when>
+            <perform>
+                <hint title="Method java.lang.Compiler has been removed" effort="3" category-id="mandatory">
+                    <message>
+                        The `java.lang.Compiler` method has been removed and cannot be used anymore.
+                    </message>
+                </hint>
+            </perform>
+        </rule>
+        <rule id="removed-apis-00015">
+            <when>
+                <javaclass references="javax.management.remote.rmi.RMIIIOPServerImpl"/>
             </when>
             <perform>
-                <hint title="Finalization has been deprecated for removal in a future release by JDK18." effort="3" category-id="mandatory">
+                <hint title="javax.management.remote.rmi.RMIIIOPServerImpl" effort="3" category-id="mandatory">
                     <message>
-                        This class has been removed and cannot be used anymore.
+                        The `javax.management.remote.rmi.RMIIIOPServerImpl` method has been removed and cannot be used anymore.
                     </message>
                 </hint>
             </perform>
diff --git a/rules/rules-reviewed/openjdk21/openjdk17/tests/removed-apis.windup.test.xml b/rules/rules-reviewed/openjdk21/openjdk17/tests/removed-apis.windup.test.xml
index b128df6d0..8a993dd21 100644
--- a/rules/rules-reviewed/openjdk21/openjdk17/tests/removed-apis.windup.test.xml
+++ b/rules/rules-reviewed/openjdk21/openjdk17/tests/removed-apis.windup.test.xml
@@ -33,8 +33,8 @@
           <rule id="removed-apis-test-00010">
               <when>
                   <not>
-                      <iterable-filter size="2">
-                          <hint-exists message="This class has been removed and cannot be used anymore." />
+                      <iterable-filter size="1">
+                          <hint-exists message="The `java.lang.Compiler` method has been removed and cannot be used anymore." />
                       </iterable-filter>
                   </not>
               </when>
@@ -42,6 +42,18 @@
                   <fail message="removed-apis-test-00010 - the hint was not found"/>
               </perform>
           </rule>
+          <rule id="removed-apis-test-00015">
+              <when>
+                  <not>
+                      <iterable-filter size="1">
+                          <hint-exists message="The `javax.management.remote.rmi.RMIIIOPServerImpl` method has been removed and cannot be used anymore." />
+                      </iterable-filter>
+                  </not>
+              </when>
+              <perform>
+                  <fail message="removed-apis-test-00015 - the hint was not found"/>
+              </perform>
+          </rule>
       </rules>
     </ruleset>
 </ruletest>