SONARJAVA-1504 use semantic to match methods from serializable

Author: Wohops

its/ruling/src/test/resources/guava/squid-S1172.json

@@ -11,15 +11,6 @@
 'com.google.guava:guava:src/com/google/common/collect/Cut.java':[
 66,
 ],
-'com.google.guava:guava:src/com/google/common/collect/ImmutableAsList.java':[
-79,
-],
-'com.google.guava:guava:src/com/google/common/collect/ImmutableList.java':[
-601,
-],
-'com.google.guava:guava:src/com/google/common/collect/ImmutableSortedSet.java':[
-779,
-],
 'com.google.guava:guava:src/com/google/common/collect/MapMakerInternalMap.java':[
 2364,
 ],

java-checks/src/main/java/org/sonar/java/checks/unused/UnusedMethodParameterCheck.java

@@ -26,6 +26,8 @@
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.java.checks.SubscriptionBaseVisitor;
+import org.sonar.java.checks.methods.MethodInvocationMatcherCollection;
+import org.sonar.java.checks.methods.MethodMatcher;
 import org.sonar.java.model.ModifiersUtils;
 import org.sonar.java.model.declaration.MethodTreeImpl;
 import org.sonar.java.tag.Tag;
@@ -55,6 +57,9 @@
 public class UnusedMethodParameterCheck extends SubscriptionBaseVisitor {
 
   private static final String AUTHORIZED_ANNOTATION = "javax.enterprise.event.Observes";
+  private static final MethodInvocationMatcherCollection SERIALIZABLE_METHODS = MethodInvocationMatcherCollection.create(
+    MethodMatcher.create().name("writeObject").addParameter("java.io.ObjectOutputStream"),
+    MethodMatcher.create().name("readObject").addParameter("java.io.ObjectInputStream"));
 
   @Override
   public List<Tree.Kind> nodesToVisit() {
@@ -96,13 +101,7 @@ private static boolean isEmptyOrThrowStatement(BlockTree block) {
   }
 
   private static boolean isSerializableMethod(MethodTree methodTree) {
-    boolean result = false;
-    // FIXME detect methods based on type of arg and throws, not arity.
-    if (ModifiersUtils.hasModifier(methodTree.modifiers(), Modifier.PRIVATE) && methodTree.parameters().size() == 1) {
-      result |= "writeObject".equals(methodTree.simpleName().name()) && methodTree.throwsClauses().size() == 1;
-      result |= "readObject".equals(methodTree.simpleName().name()) && methodTree.throwsClauses().size() == 2;
-    }
-    return result;
+    return ModifiersUtils.hasModifier(methodTree.modifiers(), Modifier.PRIVATE) && SERIALIZABLE_METHODS.anyMatch(methodTree);
   }
 
   private static boolean isOverriding(MethodTree tree) {

java-checks/src/test/files/checks/unused/UnusedMethodParameterCheck.java

@@ -1,5 +1,9 @@
 import javax.annotation.Nonnull;
 import javax.enterprise.event.Observes;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 class A extends B{
   void doSomething(int a, int b) { // Noncompliant {{Remove this unused method parameter "b".}} [[sc=31;ec=32]]
@@ -37,7 +41,7 @@ void foo(int a) {
 }
 
 class D extends C {
-  void foo(int b, int a) { // Noncompliant {{Remove this unused method parameter "b".}} [[sc=16;ec=17;secondary=40]]
+  void foo(int b, int a) { // Noncompliant {{Remove this unused method parameter "b".}} [[sc=16;ec=17;secondary=44]]
     System.out.println("");
   }
 }
@@ -66,12 +70,12 @@ class G implements inter {
   void foo(int a) {
     System.out.println("plop");
   }
-  private void writeObject(ObjectOutputStream out)
+  private void writeObject(ObjectOutputStream out) // Compliant
       throws IOException {
     throw new NotSerializableException(getClass().getName());
   }
 
-  private void readObject(ObjectInputStream in)
+  private void readObject(ObjectInputStream in) // Compliant
       throws IOException, ClassNotFoundException {
     throw new NotSerializableException(getClass().getName());
   }
@@ -102,6 +106,18 @@ public Supplier<String> parameterNotUsed(final Object o) {
   }
 }
 
+class MethodFromSerialization {
+  private void writeObject(ObjectOutputStream out) throws MyException { // Compliant
+    throw new MyException();
+  }
+
+  private void readObject(ObjectInputStream in) throws MyException { // Compliant
+    throw new MyException();
+  }
+
+  private static class MyException extends Exception {}
+}
+
 class Annotations {
   public void foo(@Observes Object event, int arg2) { // Compliant
     System.out.println(arg2);