bugfix: default中包含return, throw时漏报

p3c-pmd/src/main/java/com/alibaba/p3c/pmd/lang/java/rule/flowcontrol/SwitchStatementRule.java

@@ -60,16 +60,20 @@ public class SwitchStatementRule extends AbstractAliRule {
      */
     private void checkFallThrough(ASTSwitchStatement node, Object data) {
         // refer the rule MissingBreakInSwitch of PMD
-        final String xpath = "../SwitchStatement[(count(.//BreakStatement)" +
-            " + count(BlockStatement//Statement/ReturnStatement)" +
-            " + count(BlockStatement//Statement/ThrowStatement)" +
-            " + count(BlockStatement//Statement/IfStatement[@Else='true' and "
-            + "Statement[2][ReturnStatement|ThrowStatement]]"
-            +
-            "/Statement[1][ReturnStatement|ThrowStatement])" +
-            " + count(SwitchLabel[name(following-sibling::node()) = 'SwitchLabel'])" +
-            " + count(SwitchLabel[count(following-sibling::node()) = 0])" +
-            "  < count (SwitchLabel[@Default != 'true']))]";
+        final String xpath = "../SwitchStatement[(count(.//BreakStatement)"
+            + " + count(BlockStatement//Statement/ReturnStatement)"
+            + " + count(BlockStatement//Statement/ContinueStatement)"
+            + " + count(BlockStatement//Statement/ThrowStatement)"
+            + " + count(BlockStatement//Statement/IfStatement[@Else='true'"
+            + " and Statement[2][ReturnStatement|ContinueStatement|ThrowStatement]]"
+            + "/Statement[1][ReturnStatement|ContinueStatement|ThrowStatement])"
+            + " + count(SwitchLabel[name(following-sibling::node()) = 'SwitchLabel'])"
+            + " + count(SwitchLabel[count(following-sibling::node()) = 0])"
+            + "  < count (SwitchLabel[@Default != 'true'])"
+            + " + count(SwitchLabel[@Default = 'true']/following-sibling::BlockStatement//Statement/ReturnStatement)"
+            + " + count(SwitchLabel[@Default = 'true']/following-sibling::BlockStatement//Statement/ContinueStatement)"
+            + " + count(SwitchLabel[@Default = 'true']/following-sibling::BlockStatement//Statement/ThrowStatement)"
+            + ")]";
 
         if (node.hasDescendantMatchingXPath(xpath)) {
             addViolationWithMessage(data, node, MESSAGE_KEY_PREFIX + ".notermination");

p3c-pmd/src/test/resources/com/alibaba/p3c/pmd/lang/java/rule/flowcontrol/xml/SwitchStatementRule.xml

@@ -79,6 +79,7 @@
                     continue;
                 case 3:        // OK
                 default:
+                    int k = 1;
                     return;
             }
         }