Extend ReturnsNullCollection to cover Multimap.

This matters much less now that ReturnMissingNullable is on, but it's also extremely easy to do. PiperOrigin-RevId: 464846273
google · Aug 2, 2022 · e2309dc · e2309dc
1 parent cb1fac8
commit e2309dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java b/core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java
@@ -53,7 +53,8 @@ private static boolean methodWithoutNullable(MethodTree tree, VisitorState state
       allOf(
           anyOf(
               methodReturns(isSubtypeOf("java.util.Collection")),
-              methodReturns(isSubtypeOf("java.util.Map"))),
+              methodReturns(isSubtypeOf("java.util.Map")),
+              methodReturns(isSubtypeOf("com.google.common.collect.Multimap"))),
           ReturnsNullCollection::methodWithoutNullable);
 
   public ReturnsNullCollection() {

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ReturnsNullCollectionTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ReturnsNullCollectionTest.java
@@ -33,6 +33,7 @@ public void positive() {
     compilationHelper
         .addSourceLines(
             "Test.java",
+            "import com.google.common.collect.Multimap;",
             "import java.util.Collection;",
             "import java.util.ArrayList;",
             "import java.util.List;",
@@ -50,6 +51,10 @@ public void positive() {
             "  // BUG: Diagnostic contains: ReturnsNullCollection",
             "    return null;",
             "  }",
+            "  Multimap<String, String> methodReturnsNullMultimap() {",
+            "  // BUG: Diagnostic contains: ReturnsNullCollection",
+            "    return null;",
+            "  }",
             "  List<String> methodReturnsNullListConditionally(boolean foo) {",
             "    if (foo) {",
             "      // BUG: Diagnostic contains: ReturnsNullCollection",