Add model for Preconditions.checkNotNull(obj, message). (#283)

uber · Feb 27, 2019 · 3a1e2bf · 3a1e2bf
1 parent b3f887e
commit 3a1e2bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java
@@ -195,6 +195,10 @@ private static class DefaultLibraryModels implements LibraryModels {
     private static final ImmutableSetMultimap<MethodRef, Integer> FAIL_IF_NULL_PARAMETERS =
         new ImmutableSetMultimap.Builder<MethodRef, Integer>()
             .put(methodRef("com.google.common.base.Preconditions", "<T>checkNotNull(T)"), 0)
+            .put(
+                methodRef(
+                    "com.google.common.base.Preconditions", "<T>checkNotNull(T,java.lang.Object)"),
+                0)
             .put(methodRef("java.util.Objects", "<T>requireNonNull(T)"), 0)
             .put(methodRef("java.util.Objects", "<T>requireNonNull(T,java.lang.String)"), 0)
             .put(methodRef("org.junit.Assert", "assertNotNull(java.lang.Object)"), 0)

diff --git a/nullaway/src/test/resources/com/uber/nullaway/testdata/NullAwayNegativeCases.java b/nullaway/src/test/resources/com/uber/nullaway/testdata/NullAwayNegativeCases.java
@@ -524,6 +524,11 @@ static void checkNotNull(@Nullable Object o) {
     o.toString();
   }
 
+  static void checkNotNullWithMessage(@Nullable Object o) {
+    Preconditions.checkNotNull(o, "should not be null");
+    o.toString();
+  }
+
   static void requireNonNull(@Nullable Object o, @Nullable Object p) {
     Objects.requireNonNull(o);
     o.toString();