Skip to content

Commit e2309dc

Browse files
cpovirkError Prone Team
authored and
Error Prone Team
committed
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
1 parent cb1fac8 commit e2309dc

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

core/src/main/java/com/google/errorprone/bugpatterns/ReturnsNullCollection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ private static boolean methodWithoutNullable(MethodTree tree, VisitorState state
5353
allOf(
5454
anyOf(
5555
methodReturns(isSubtypeOf("java.util.Collection")),
56-
methodReturns(isSubtypeOf("java.util.Map"))),
56+
methodReturns(isSubtypeOf("java.util.Map")),
57+
methodReturns(isSubtypeOf("com.google.common.collect.Multimap"))),
5758
ReturnsNullCollection::methodWithoutNullable);
5859

5960
public ReturnsNullCollection() {

core/src/test/java/com/google/errorprone/bugpatterns/ReturnsNullCollectionTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void positive() {
3333
compilationHelper
3434
.addSourceLines(
3535
"Test.java",
36+
"import com.google.common.collect.Multimap;",
3637
"import java.util.Collection;",
3738
"import java.util.ArrayList;",
3839
"import java.util.List;",
@@ -50,6 +51,10 @@ public void positive() {
5051
" // BUG: Diagnostic contains: ReturnsNullCollection",
5152
" return null;",
5253
" }",
54+
" Multimap<String, String> methodReturnsNullMultimap() {",
55+
" // BUG: Diagnostic contains: ReturnsNullCollection",
56+
" return null;",
57+
" }",
5358
" List<String> methodReturnsNullListConditionally(boolean foo) {",
5459
" if (foo) {",
5560
" // BUG: Diagnostic contains: ReturnsNullCollection",

0 commit comments

Comments
 (0)