Handle records in targetTypeMatches (#1061)

msridhar · web-flow · commit dc9cf0e1ebe8 · 2024-10-28T12:15:09.000-04:00
Fixes #1059
diff --git a/jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/RecordTests.java b/jdk-recent-unit-tests/src/test/java/com/uber/nullaway/jdk17/RecordTests.java
@@ -252,4 +252,27 @@ public void recordDeconstructionPatternSwitchCase() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void issue1059() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "BarEntity.java",
+            "package com.uber;",
+            "import org.jspecify.annotations.NonNull;",
+            "import org.jspecify.annotations.Nullable;",
+            "public class BarEntity {",
+            "  public interface Identifiable<ID> {",
+            "    @Nullable",
+            "    ID id();",
+            "  }",
+            "  public static class Id {}",
+            "  public record NameChanged(BarEntity.Id id, Class<BarEntity> type) implements Identifiable<@NonNull Id> {",
+            "    public NameChanged(BarEntity.Id id) {",
+            "      this(id, BarEntity.class);",
+            "    }",
+            "  }",
+            "}")
+        .doTest();
+  }
 }
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullabilityUtil.java b/nullaway/src/main/java/com/uber/nullaway/NullabilityUtil.java
@@ -370,7 +370,13 @@ private static boolean targetTypeMatches(Symbol sym, TypeAnnotationPosition posi
         // on other types in the signature (e.g. `class Foo extends Bar<@A Baz> {}`).
         return false;
       default:
-        throw new AssertionError("unsupported element kind " + sym.getKind() + " symbol " + sym);
+        // Compare with toString() to preserve compatibility with JDK 11
+        if (sym.getKind().toString().equals("RECORD")) {
+          // Records are treated like classes
+          return false;
+        } else {
+          throw new AssertionError("unsupported element kind " + sym.getKind() + " symbol " + sym);
+        }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,13 @@ private static boolean targetTypeMatches(Symbol sym, TypeAnnotationPosition posi`
`370`	`370`	// on other types in the signature (e.g. `class Foo extends Bar<@A Baz> {}`).
`371`	`371`	`return false;`
`372`	`372`	`default:`
`373`		`- throw new AssertionError("unsupported element kind " + sym.getKind() + " symbol " + sym);`
	`373`	`+ // Compare with toString() to preserve compatibility with JDK 11`
	`374`	`+ if (sym.getKind().toString().equals("RECORD")) {`
	`375`	`+ // Records are treated like classes`
	`376`	`+ return false;`
	`377`	`+ } else {`
	`378`	`+ throw new AssertionError("unsupported element kind " + sym.getKind() + " symbol " + sym);`
	`379`	`+ }`
`374`	`380`	`}`
`375`	`381`	`}`
`376`	`382`