SONARJAVA-4913 Properly reset visitor's state in S1181

johann-beleites-sonarsource · johann-beleites-sonarsource · commit 9cc9a8aca61f · 2024-03-21T16:20:10.000+01:00
diff --git a/its/autoscan/src/test/resources/autoscan/diffs/diff_S1181.json b/its/autoscan/src/test/resources/autoscan/diffs/diff_S1181.json
@@ -1,6 +1,6 @@
 {
   "ruleKey": "S1181",
   "hasTruePositives": true,
-  "falseNegatives": 2,
+  "falseNegatives": 3,
   "falsePositives": 0
-}
+}
diff --git a/its/ruling/src/test/resources/commons-beanutils/java-S1181.json b/its/ruling/src/test/resources/commons-beanutils/java-S1181.json
@@ -1,4 +1,8 @@
 {
+"commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java": [
+1057,
+1116
+],
 "commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConvertingWrapDynaBean.java": [
 72
 ],
@@ -9,5 +13,5 @@
 286,
 323,
 356
-],
+]
 }
diff --git a/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1181.json b/its/ruling/src/test/resources/eclipse-jetty-similar-to-main/java-S1181.json
@@ -93,15 +93,66 @@
 154,
 188
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
+674,
+735
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java": [
+86
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
 216
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java": [
+414,
+427,
+516,
+551,
+569,
+649,
+787,
+820,
+878,
+999,
+1016,
+1032
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java": [
+562,
+672,
+819,
+1006
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
+596,
+705,
+859,
+934,
+1002,
+1279,
+1296,
+1456,
+1466,
+1552
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
 627
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
+200,
+229,
+542
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Request.java": [
+1436,
+2344
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceContentFactory.java": [
 63
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java": [
+152
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Server.java": [
 405,
 431,
@@ -123,7 +174,10 @@
 1380,
 1401
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java": [
+91
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java": [
 107
-],
+]
 }
diff --git a/its/ruling/src/test/resources/eclipse-jetty/java-S1181.json b/its/ruling/src/test/resources/eclipse-jetty/java-S1181.json
@@ -93,15 +93,66 @@
 154,
 188
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java": [
+674,
+735
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/AsyncRequestLogWriter.java": [
+86
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/DetectorConnectionFactory.java": [
 216
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java": [
+414,
+427,
+516,
+551,
+569,
+649,
+787,
+820,
+878,
+999,
+1016,
+1032
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java": [
+562,
+672,
+819,
+1006
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java": [
+596,
+705,
+859,
+934,
+1002,
+1279,
+1296,
+1456,
+1466,
+1552
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartFormInputStream.java": [
 627
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java": [
+200,
+229,
+542
+],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Request.java": [
+1436,
+2344
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/ResourceContentFactory.java": [
 63
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/ResponseWriter.java": [
+152
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/Server.java": [
 405,
 431,
@@ -123,6 +174,9 @@
 1380,
 1401
 ],
+"org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/handler/DebugHandler.java": [
+91
+],
 "org.eclipse.jetty:jetty-project:jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionData.java": [
 107
 ],
@@ -135,11 +189,47 @@
 "org.eclipse.jetty:jetty-project:jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java": [
 94
 ],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java": [
+1179
+],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java": [
 197,
 210,
 380
 ],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/DeprecationWarning.java": [
+46,
+76
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java": [
+49
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/ManifestUtils.java": [
+54,
+82
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java": [
+938,
+1030,
+1327,
+1350
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/Pool.java": [
+250
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java": [
+414
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java": [
+680,
+825,
+846,
+867,
+888
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/ServiceLoaderSpliterator.java": [
+46
+],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java": [
 77,
 189
@@ -148,12 +238,28 @@
 110,
 140
 ],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java": [
+138,
+154,
+210,
+237,
+412,
+444,
+685
+],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/component/Dumpable.java": [
 126
 ],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java": [
 176
 ],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java": [
+718,
+744
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java": [
+140
+],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SniX509ExtendedKeyManager.java": [
 166
 ],
@@ -165,10 +271,30 @@
 1748,
 1771
 ],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java": [
+268,
+922
+],
 "org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/thread/ReservedThreadExecutor.java": [
 281,
 377
 ],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java": [
+69
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/thread/Sweeper.java": [
+144
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/thread/TimerScheduler.java": [
+113
+],
+"org.eclipse.jetty:jetty-project:jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/EatWhatYouKill.java": [
+177,
+340,
+352,
+364,
+390
+],
 "org.eclipse.jetty:jetty-project:jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java": [
 1838
 ]
diff --git a/java-checks-test-sources/default/src/main/files/non-compiling/checks/CatchOfThrowableOrErrorCheck.java b/java-checks-test-sources/default/src/main/files/non-compiling/checks/CatchOfThrowableOrErrorCheck.java
@@ -85,6 +85,10 @@ private void doNotReportWhenUnknownMethodInTryBlock() {
         return unknown();
       } catch (java.lang.Throwable e) { // Compliant with incomplete semantics, we cannot asess whether unknown will throw something.
       }
+
+      // Ensure that we still raise an issue after encountering unrelated blocks containing incomplete semantics:
+      try {} catch (Throwable e) {           // Noncompliant
+      }
     }
 
     class ThrowingThrowable {
diff --git a/java-checks/src/main/java/org/sonar/java/checks/CatchOfThrowableOrErrorCheck.java b/java-checks/src/main/java/org/sonar/java/checks/CatchOfThrowableOrErrorCheck.java
@@ -52,6 +52,7 @@ public List<Tree.Kind> nodesToVisit() {
   @Override
   public void visitNode(Tree tree) {
     TryStatementTree tryStatement = (TryStatementTree) tree;
+    tryBlockVisitor.reset();
     tryStatement.block().accept(tryBlockVisitor);
     if (tryBlockVisitor.containsExplicitThrowable || tryBlockVisitor.containsUnresolvableCall) {
       return;
@@ -128,6 +129,11 @@ private static class TryBlockVisitor extends BaseTreeVisitor {
     private boolean containsExplicitThrowable;
     private boolean containsUnresolvableCall;
 
+    public void reset() {
+      containsUnresolvableCall = false;
+      containsExplicitThrowable = false;
+    }
+
     @Override
     public void visitMethodInvocation(MethodInvocationTree tree) {
       checkIfThrowThrowable(tree.methodSymbol());

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"ruleKey": "S1181",`
`3`	`3`	`"hasTruePositives": true,`
`4`		`- "falseNegatives": 2,`
	`4`	`+ "falseNegatives": 3,`
`5`	`5`	`"falsePositives": 0`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`{`
	`2`	`+"commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java": [`
	`3`	`+1057,`
	`4`	`+1116`
	`5`	`+],`
`2`	`6`	`"commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/ConvertingWrapDynaBean.java": [`
`3`	`7`	`72`
`4`	`8`	`],`
`@@ -9,5 +13,5 @@`
`9`	`13`	`286,`
`10`	`14`	`323,`
`11`	`15`	`356`
`12`		`-],`
	`16`	`+]`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,10 @@ private void doNotReportWhenUnknownMethodInTryBlock() {`
`85`	`85`	`return unknown();`
`86`	`86`	`} catch (java.lang.Throwable e) { // Compliant with incomplete semantics, we cannot asess whether unknown will throw something.`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ // Ensure that we still raise an issue after encountering unrelated blocks containing incomplete semantics:`
	`90`	`+ try {} catch (Throwable e) { // Noncompliant`
	`91`	`+ }`
`88`	`92`	`}`
`89`	`93`
`90`	`94`	`class ThrowingThrowable {`