Handle records in targetTypeMatches (#1061)

Fixes #1059
uber · Oct 28, 2024 · dc9cf0e · dc9cf0e
1 parent 8f4b928
commit dc9cf0e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
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);
+        }
     }
   }