From ef658c76a308b3408e07087c51868690c2a0d4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Tue, 4 Jan 2022 23:04:48 +0100
Subject: [PATCH 1/2] Update rule AvoidCatchingGenericException

Refs #2701
---
 .ci/files/all-java.xml                            |  2 +-
 .../src/main/resources/category/java/design.xml   |  8 ++++----
 .../design/AvoidCatchingGenericExceptionTest.java |  1 -
 .../design/xml/AvoidCatchingGenericException.xml  | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.ci/files/all-java.xml b/.ci/files/all-java.xml
index 9d5e8335c6..5761de272f 100644
--- a/.ci/files/all-java.xml
+++ b/.ci/files/all-java.xml
@@ -118,7 +118,7 @@
     <!-- design.xml -->
 
     <rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod"/>
-    <!-- <rule ref="category/java/design.xml/AvoidCatchingGenericException"/> -->
+    <rule ref="category/java/design.xml/AvoidCatchingGenericException"/>
     <!-- <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts"/> -->
     <rule ref="category/java/design.xml/AvoidRethrowingException"/>
     <!-- <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/> -->
diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index dddab326b5..b2295fe52d 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -57,10 +57,10 @@ Avoid catching generic exceptions such as NullPointerException, RuntimeException
             <property name="xpath">
                 <value>
 <![CDATA[
-//CatchStatement/FormalParameter/Type/ReferenceType/ClassOrInterfaceType[
-    @Image='NullPointerException' or
-    @Image='Exception' or
-    @Image='RuntimeException']
+//CatchParameter/ClassOrInterfaceType[
+    pmd-java:typeIsExactly('java.lang.NullPointerException') or
+    pmd-java:typeIsExactly('java.lang.Exception') or
+    pmd-java:typeIsExactly('java.lang.RuntimeException')]
 ]]>
                 </value>
             </property>
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java
index 07fa3ff460..f299c962c9 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java
@@ -6,7 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design;
 
 import net.sourceforge.pmd.testframework.PmdRuleTst;
 
-@org.junit.Ignore("Rule has not been updated yet")
 public class AvoidCatchingGenericExceptionTest extends PmdRuleTst {
     // no additional unit tests
 }
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
index a4ac31b9d2..29bfa10a77 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
@@ -31,6 +31,21 @@ public class Foo {
         }
     }
 }
+class FooException extends RuntimeException {}
+        ]]></code>
+    </test-code>
+    <test-code>
+        <description>catching subclass of NPE, ok</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Foo {
+    void bar() {
+        try {
+        } catch (FooException e) {
+        }
+    }
+}
+class FooException extends NullPointerException {}
         ]]></code>
     </test-code>
 

From d2e3780c04f10927d9b8eda081f21d6732e33783 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 13 Jan 2022 19:08:39 +0100
Subject: [PATCH 2/2] [java] AvoidCatchingGenericException - consider
 multi-catch

---
 .../src/main/resources/category/java/design.xml   |  2 +-
 .../design/xml/AvoidCatchingGenericException.xml  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index e161a0104c..ff4d2f590e 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -57,7 +57,7 @@ Avoid catching generic exceptions such as NullPointerException, RuntimeException
             <property name="xpath">
                 <value>
 <![CDATA[
-//CatchParameter/ClassOrInterfaceType[
+//CatchParameter//ClassOrInterfaceType[
     pmd-java:typeIsExactly('java.lang.NullPointerException') or
     pmd-java:typeIsExactly('java.lang.Exception') or
     pmd-java:typeIsExactly('java.lang.RuntimeException')]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
index 29bfa10a77..ba2ed347e9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidCatchingGenericException.xml
@@ -60,4 +60,19 @@ public class Foo {
 }
         ]]></code>
     </test-code>
+
+    <test-code>
+        <description>failure case with multi-catch</description>
+        <expected-problems>2</expected-problems>
+        <code><![CDATA[
+public class Foo {
+    void bar() {
+        try {
+        } catch (NullPointerException | RuntimeException | FooException e) {
+        }
+    }
+}
+class FooException extends Exception {}
+        ]]></code>
+    </test-code>
 </test-data>