Revert "refactor simple onOverrideMayBeNullExpr handlers (uber#747)"

This reverts commit 7714c45.
msridhar · Jul 19, 2023 · 2420b80 · 2420b80
1 parent 382452b
commit 2420b80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/InferredJARModelsHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/InferredJARModelsHandler.java
@@ -196,15 +196,11 @@ public boolean onOverrideMayBeNullExpr(
       @Nullable Symbol exprSymbol,
       VisitorState state,
       boolean exprMayBeNull) {
-    if (exprMayBeNull) {
-      return true;
+    if (expr.getKind().equals(Tree.Kind.METHOD_INVOCATION)
+        && exprSymbol instanceof Symbol.MethodSymbol) {
+      return exprMayBeNull || isReturnAnnotatedNullable((Symbol.MethodSymbol) exprSymbol);
     }
-    if (expr.getKind() == Tree.Kind.METHOD_INVOCATION
-        && exprSymbol instanceof Symbol.MethodSymbol
-        && isReturnAnnotatedNullable((Symbol.MethodSymbol) exprSymbol)) {
-      return true;
-    }
-    return false;
+    return exprMayBeNull;
   }
 
   private boolean isReturnAnnotatedNullable(Symbol.MethodSymbol methodSymbol) {

diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/OptionalEmptinessHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/OptionalEmptinessHandler.java
@@ -87,15 +87,12 @@ public boolean onOverrideMayBeNullExpr(
       @Nullable Symbol exprSymbol,
       VisitorState state,
       boolean exprMayBeNull) {
-    if (exprMayBeNull) {
-      return true;
-    }
-    if (expr.getKind() == Tree.Kind.METHOD_INVOCATION
+    if (expr.getKind().equals(Tree.Kind.METHOD_INVOCATION)
         && exprSymbol instanceof Symbol.MethodSymbol
         && optionalIsGetCall((Symbol.MethodSymbol) exprSymbol, state.getTypes())) {
       return true;
     }
-    return false;
+    return exprMayBeNull;
   }
 
   @Override

diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/RestrictiveAnnotationHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/RestrictiveAnnotationHandler.java
@@ -76,16 +76,13 @@ public boolean onOverrideMayBeNullExpr(
       @Nullable Symbol exprSymbol,
       VisitorState state,
       boolean exprMayBeNull) {
-    if (exprMayBeNull) {
-      return true;
-    }
     Tree.Kind exprKind = expr.getKind();
     if (exprSymbol != null
-        && (exprKind == Tree.Kind.METHOD_INVOCATION || exprKind == Tree.Kind.IDENTIFIER)
-        && isSymbolRestrictivelyNullable(exprSymbol, state.context)) {
-      return true;
+        && (exprKind.equals(Tree.Kind.METHOD_INVOCATION)
+            || exprKind.equals(Tree.Kind.IDENTIFIER))) {
+      return exprMayBeNull || isSymbolRestrictivelyNullable(exprSymbol, state.context);
     }
-    return false;
+    return exprMayBeNull;
   }
 
   @Nullable private CodeAnnotationInfo codeAnnotationInfo;