Use qualifier expression from method reference in JdkObsolete.

Previously we were using the owner of the symbol of the method from the method reference, but this causes false positives when a method in a non-obsolete API overrides one in an obsolete API. RELNOTES: none ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=231460198
google · Jan 31, 2019 · c7a178a · c7a178a
1 parent 98c96ec
commit c7a178a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/JdkObsolete.java b/core/src/main/java/com/google/errorprone/bugpatterns/JdkObsolete.java
@@ -208,9 +208,8 @@ public Description matchClass(ClassTree tree, VisitorState state) {
 
   @Override
   public Description matchMemberReference(MemberReferenceTree tree, VisitorState state) {
-    MethodSymbol symbol = ASTHelpers.getSymbol(tree);
+    Symbol sym = ASTHelpers.getSymbol(tree.getQualifierExpression());
-    return describeIfObsolete(
+    return describeIfObsolete(tree.getQualifierExpression(), ImmutableList.of(sym.asType()), state);
-        tree.getQualifierExpression(), ImmutableList.of(symbol.owner.asType()), state);
   }
 
   private Description describeIfObsolete(

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/JdkObsoleteTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/JdkObsoleteTest.java
@@ -262,4 +262,22 @@ public void obsoleteMocking() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void navigableSetRepro() {
+    testHelper
+        .addSourceLines(
+            "Test.java",
+            "import java.util.NavigableSet;",
+            "import java.util.Optional;",
+            "class Test {",
+            "  Optional<Object> fail1(Optional<NavigableSet<Object>> myOptionalSet) {",
+            "    return myOptionalSet.map(NavigableSet::first);",
+            "  }",
+            "  Optional<Object> fail2(Optional<NavigableSet<Object>> myOptionalSet) {",
+            "    return myOptionalSet.map(NavigableSet::last);",
+            "  }",
+            "}")
+        .doTest();
+  }
 }