Use AvoidCatchingGenericException

as replacement for AvoidCatchingThrowable.
Also enable check for NullPointerExceptions.
We don't check for RuntimeException, Exception as we have
a couple of instances in PMD's codebase.
Also, we don't check for Error, as there is one specific
use case in PMD (error recovery during regression testing).

Author: adangel

src/main/resources/net/sourceforge/pmd/pmd-dogfood-config.xml

@@ -190,7 +190,12 @@
     </rule>
 
     <!--     <rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod" /> -->
-    <!--     <rule ref="category/java/design.xml/AvoidCatchingGenericException" /> -->
+    <rule ref="category/java/errorprone.xml/AvoidCatchingGenericException">
+        <priority>1</priority>
+        <properties>
+            <property name="typesThatShouldNotBeCaught" value="java.lang.NullPointerException,java.lang.Throwable" />
+        </properties>
+    </rule>
     <!--     <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts" /> -->
     <!--     <rule ref="category/java/design.xml/AvoidRethrowingException" /> -->
     <!--     <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException" /> -->
@@ -291,10 +296,6 @@
         <priority>1</priority>
     </rule>
     <!--     <rule ref="category/java/errorprone.xml/AvoidCallingFinalize" /> -->
-    <!--     <rule ref="category/java/errorprone.xml/AvoidCatchingNPE" /> -->
-    <rule ref="category/java/errorprone.xml/AvoidCatchingThrowable">
-        <priority>1</priority>
-    </rule>
     <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor">
         <priority>1</priority>
     </rule>