Fix FP on S5738 when overriding deprecated interface methods

Author: tomasz-tylenda-sonarsource

java-checks-test-sources/default/src/main/files/non-compiling/checks/CallToDeprecatedCodeFlaggedForRemovalCheck_java9.java

@@ -0,0 +1,82 @@
+package checks;
+
+class CallToDeprecatedCodeFlaggedForRemovalCheckSample {
+
+  @Deprecated
+  String a;
+
+  @Deprecated(forRemoval = true)
+  String b;
+
+  @Deprecated(forRemoval = true)
+  void foo() {}
+
+  @Deprecated(forRemoval = false)
+  void bar() {}
+
+  @Deprecated
+  void qix() {}
+
+  void test() {
+    foo(); // Noncompliant {{Remove this call to a deprecated method, it has been marked for removal.}}
+    bar();
+    qix();
+
+    new DeprecatedForRemoval(); // Noncompliant
+    new DeprecatedDefault();
+
+    String s =  a
+      + b; // Noncompliant
+  }
+
+  @Deprecated(forRemoval = true)
+  static class DeprecatedForRemoval { }
+
+  @Deprecated
+  static class DeprecatedDefault { }
+
+  static class Extending extends CallToDeprecatedCodeFlaggedForRemovalCheckSample {
+    @Override
+    void foo() {} // Noncompliant {{Don't override this deprecated method, it has been marked for removal.}}
+
+    @Override
+    void bar() {}
+  }
+
+  interface WithDeprecatedMethod {
+    @Deprecated(forRemoval = true)
+    void interfaceMethod();
+
+    @Deprecated(forRemoval = true)
+    default void interfaceDefault() {}
+  }
+
+  static abstract class WithAbstractMethod {
+    @Deprecated(forRemoval = true)
+    public abstract void forOverriding();
+
+    @Deprecated(forRemoval = true)
+    public void bad() {}
+
+    public void good() {}
+  }
+
+  class Implementing extends WithAbstractMethod implements WithDeprecatedMethod {
+    // Abstract, so overriding is unavoidable.
+    @Override
+    public void interfaceMethod() {} // Compliant
+
+    @Override
+    public void interfaceDefault() {} // Noncompliant
+
+    // Abstract, so overriding is unavoidable.
+    @Override
+    public void forOverriding() {} // Compliant
+
+    @Override
+    public void bad() {} // Noncompliant
+
+    @Override
+    public void good() {}
+  }
+}

java-checks-test-sources/default/src/main/java/checks/CallToDeprecatedCodeFlaggedForRemovalCheckSample.java

@@ -46,7 +46,7 @@ void checkDeprecatedIdentifier(IdentifierTree identifierTree, Symbol deprecatedS
 
   @Override
   void checkOverridingMethod(MethodTree methodTree, List<Symbol.MethodSymbol> deprecatedSymbols) {
-    if (deprecatedSymbols.stream().anyMatch(this::isFlaggedForRemoval)) {
+    if (deprecatedSymbols.stream().anyMatch(methodSymbol -> isFlaggedForRemoval(methodSymbol) && !methodSymbol.isAbstract())) {
       reportIssue(methodTree.simpleName(), "Don't override this deprecated method, it has been marked for removal.");
     }
   }

java-checks/src/main/java/org/sonar/java/checks/CallToDeprecatedCodeMarkedForRemovalCheck.java

@@ -19,14 +19,14 @@
 import org.junit.jupiter.api.Test;
 import org.sonar.java.checks.verifier.CheckVerifier;
 
-import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
 
 class CallToDeprecatedCodeMarkedForRemovalCheckTest {
 
   @Test
   void test() {
     CheckVerifier.newVerifier()
-      .onFile(nonCompilingTestSourcesPath("checks/CallToDeprecatedCodeFlaggedForRemovalCheck_java9.java"))
+      .onFile(mainCodeSourcesPath("checks/CallToDeprecatedCodeFlaggedForRemovalCheckSample.java"))
       // 'forRemoval' introduced in java 9
       .withJavaVersion(9)
       .withCheck(new CallToDeprecatedCodeMarkedForRemovalCheck())