rename method

msridhar · msridhar · commit 1aa9747fb946 · 2025-02-24T16:27:16.000-08:00
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullabilityUtil.java b/nullaway/src/main/java/com/uber/nullaway/NullabilityUtil.java
@@ -480,7 +480,7 @@ public static boolean mayBeNullFieldFromType(
     return !(symbol.getSimpleName().toString().equals("class")
             || symbol.isEnum()
             || codeAnnotationInfo.isSymbolUnannotated(symbol, config, null))
-        && Nullness.hasNullableFieldAnnotation(symbol, config);
+        && Nullness.hasNullableOrMonotonicNonNullAnnotation(symbol, config);
   }
 
   /**
diff --git a/nullaway/src/main/java/com/uber/nullaway/Nullness.java b/nullaway/src/main/java/com/uber/nullaway/Nullness.java
@@ -64,14 +64,15 @@ public static boolean isMonotonicNonNullAnnotation(String annotName) {
   }
 
   /**
-   * For a field check for either a {@code @Nullable} annotation or a {@code @MonotonicNonNull}
-   * annotation
+   * Check for either a {@code @Nullable} annotation or a {@code @MonotonicNonNull} annotation on
+   * {@code symbol}. Used to reason whether a field may be null.
    */
-  public static boolean hasNullableFieldAnnotation(Symbol symbol, Config config) {
-    return hasNullableFieldAnnotation(NullabilityUtil.getAllAnnotations(symbol, config), config);
+  public static boolean hasNullableOrMonotonicNonNullAnnotation(Symbol symbol, Config config) {
+    return hasNullableOrMonotonicNonNullAnnotation(
+        NullabilityUtil.getAllAnnotations(symbol, config), config);
   }
 
-  private static boolean hasNullableFieldAnnotation(
+  private static boolean hasNullableOrMonotonicNonNullAnnotation(
       Stream<? extends AnnotationMirror> annotations, Config config) {
     return annotations
         .map(anno -> anno.getAnnotationType().toString())

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ public static boolean mayBeNullFieldFromType(`
`480`	`480`	`return !(symbol.getSimpleName().toString().equals("class")`
`481`	`481`	`\|\| symbol.isEnum()`
`482`	`482`	`\|\| codeAnnotationInfo.isSymbolUnannotated(symbol, config, null))`
`483`		`- && Nullness.hasNullableFieldAnnotation(symbol, config);`
	`483`	`+ && Nullness.hasNullableOrMonotonicNonNullAnnotation(symbol, config);`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`/**`