Properly check generic method overriding in explicitly-typed anonymous classes

nullaway/build.gradle

@@ -125,6 +125,9 @@ def jdk8Test = tasks.register("testJdk8", Test) {
     filter {
         // JDK 8 does not support diamonds on anonymous classes
         excludeTestsMatching "com.uber.nullaway.NullAwayJSpecifyGenericsTests.overrideDiamondAnonymousClass"
+        // tests cannot run on JDK 8 since Mockito version no longer supports it
+        excludeTestsMatching "com.uber.nullaway.NullAwaySerializationTest.initializationError"
+        excludeTestsMatching "com.uber.nullaway.handlers.contract.ContractUtilsTest.getEmptyAntecedent"
     }
 }
 

nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java

@@ -4,6 +4,7 @@
 import static java.util.stream.Collectors.joining;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.suppliers.Supplier;
 import com.google.errorprone.suppliers.Suppliers;
@@ -21,6 +22,7 @@
 import com.sun.source.tree.ParameterizedTypeTree;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.VariableTree;
+import com.sun.source.util.SimpleTreeVisitor;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Attribute;
 import com.sun.tools.javac.code.BoundKind;
@@ -719,10 +721,14 @@
       TreePath path = state.getPath();
       NewClassTree newClassTree = ASTHelpers.findEnclosingNode(path, NewClassTree.class);
       if (newClassTree == null) {
         throw new RuntimeException(
             "method should be inside a NewClassTree " + state.getSourceForNode(path.getLeaf()));
       }
-      return getTreeType(newClassTree, state);
+      Type typeFromTree = getTreeType(newClassTree, state);
+      if (typeFromTree != null) {
+        Verify.verify(state.getTypes().isAssignable(symbol.type, typeFromTree));
+      }
+      return typeFromTree;
     } else {
       return symbol.type;
     }

nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java

@@ -2,6 +2,7 @@
 
 import com.google.errorprone.CompilationTestHelper;
 import java.util.Arrays;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class NullAwayJSpecifyGenericsTests extends NullAwayTestsBase {
@@ -993,16 +994,56 @@ public void overrideExplicitlyTypedAnonymousClass() {
             "      // BUG: Diagnostic contains: parameter s is @NonNull, but parameter in superclass method",
             "      public String apply(String s) { return s; }",
             "    };",
-            "    FnClass<@Nullable String, String> fn2 = new FnClass<@Nullable String, String>() {",
+            "    FnClass<String, String> fn2 = new FnClass<String, String>() {",
+            "      // BUG: Diagnostic contains: method returns @Nullable, but superclass method",
+            "      public @Nullable String apply(String s) { return null; }",
+            "    };",
+            "    Fn<String, @Nullable String> fn3 = new Fn<String, @Nullable String>() {",
+            "      public @Nullable String apply(String s) { return null; }",
+            "    };",
+            "    FnClass<@Nullable String, String> fn4 = new FnClass<@Nullable String, String>() {",
+            "      public String apply(@Nullable String s) { return \"hello\"; }",
+            "    };",
+            "  }",
+            "  static void anonymousClassesFullName() {",
+            "    Test.Fn<@Nullable String, String> fn1 = new Test.Fn<@Nullable String, String>() {",
             "      // BUG: Diagnostic contains: parameter s is @NonNull, but parameter in superclass method",
             "      public String apply(String s) { return s; }",
             "    };",
-            "    Fn<String, @Nullable String> fn3 = new Fn<String, @Nullable String>() {",
+            "    Test.FnClass<String, String> fn2 = new Test.FnClass<String, String>() {",
+            "      // BUG: Diagnostic contains: method returns @Nullable, but superclass method",
             "      public @Nullable String apply(String s) { return null; }",
             "    };",
-            "    FnClass<String, @Nullable String> fn4 = new FnClass<String, @Nullable String>() {",
+            "    Test.Fn<String, @Nullable String> fn3 = new Test.Fn<String, @Nullable String>() {",
             "      public @Nullable String apply(String s) { return null; }",
             "    };",
+            "    Test.FnClass<@Nullable String, String> fn4 = new Test.FnClass<@Nullable String, String>() {",
+            "      public String apply(@Nullable String s) { return \"hello\"; }",
+            "    };",
+            "  }",
+            "}")
+        .doTest();
+  }
+
+  @Ignore("Need to add support for this case")
+  @Test
+  public void overrideAnonymousNestedClass() {
+    makeHelper()
+        .addSourceLines(
+            "Test.java",
+            "package com.uber;",
+            "import org.jspecify.annotations.Nullable;",
+            "class Test {",
+            "  class Wrapper<P extends @Nullable Object> {",
+            "    abstract class Fn<R extends @Nullable Object> {",
+            "      abstract R apply(P p);",
+            "    }",
+            "  }",
+            "  void anonymousNestedClasses() {",
+            "    Wrapper<@Nullable String>.Fn<String> fn1 = (this.new Wrapper<@Nullable String>()).new Fn<String>() {",
+            "      // BUG: Diagnostic contains: parameter s is @NonNull, but parameter in superclass method",
+            "      public String apply(String s) { return s; }",
+            "    };",
             "  }",
             "}")
         .doTest();