diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java b/core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java index 6326b8a668e..425258ae8c4 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java @@ -54,7 +54,8 @@ private static boolean methodWithoutNullable(MethodTree tree, VisitorState state anyOf( methodReturns(isSubtypeOf("java.util.Collection")), methodReturns(isSubtypeOf("java.util.Map")), - methodReturns(isSubtypeOf("com.google.common.collect.Multimap"))), + methodReturns(isSubtypeOf("com.google.common.collect.Multimap")), + methodReturns(isSubtypeOf("com.google.common.collect.Table"))), 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 index 7a9876823c1..cfbc80133da 100644 --- a/core/src/test/java/com/google/errorprone/bugpatterns/ReturnsNullCollectionTest.java +++ b/core/src/test/java/com/google/errorprone/bugpatterns/ReturnsNullCollectionTest.java @@ -34,6 +34,7 @@ public void positive() { .addSourceLines( "Test.java", "import com.google.common.collect.Multimap;", + "import com.google.common.collect.Table;", "import java.util.Collection;", "import java.util.ArrayList;", "import java.util.List;", @@ -55,6 +56,10 @@ public void positive() { " // BUG: Diagnostic contains: ReturnsNullCollection", " return null;", " }", + " Table methodReturnsNullTable() {", + " // BUG: Diagnostic contains: ReturnsNullCollection", + " return null;", + " }", " List methodReturnsNullListConditionally(boolean foo) {", " if (foo) {", " // BUG: Diagnostic contains: ReturnsNullCollection",