From 02ea89673baffbdcd5056fc9e45033bf3f0a32af Mon Sep 17 00:00:00 2001
From: Kurt Alfred Kluever <kak@google.com>
Date: Sat, 29 Jun 2024 07:19:31 -0700
Subject: [PATCH] Automatic code cleanup.

PiperOrigin-RevId: 647958771
---
 .../nullness/NullArgumentForNonNullParameter.java          | 4 +---
 .../errorprone/bugpatterns/nullness/NullnessUtils.java     | 7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullArgumentForNonNullParameter.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullArgumentForNonNullParameter.java
index 4354141414bf..74fff8e87137 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullArgumentForNonNullParameter.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullArgumentForNonNullParameter.java
@@ -248,9 +248,7 @@ private boolean enclosingAnnotationDefaultsNonTypeVariablesToNonNull(
       if (hasAnnotation(sym, "com.google.protobuf.Internal$ProtoNonnullApi", state)) {
         return true;
       }
-      if ((hasAnnotation(sym, "org.jspecify.annotations.NullMarked", state)
-              // We break this string to avoid having it rewritten by Copybara.
-              || hasAnnotation(sym, "org.jspecify.null" + "ness.NullMarked", state))
+      if (hasAnnotation(sym, "org.jspecify.annotations.NullMarked", state)
           && weTrustNullMarkedOn(sym, state)) {
         return true;
       }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java
index bb52c3fa6c41..8d4e5c6dafc1 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullnessUtils.java
@@ -130,9 +130,7 @@ static boolean nullnessChecksShouldBeConservative(ErrorProneFlags flags) {
 
   static boolean isInNullMarkedScope(Symbol sym, VisitorState state) {
     for (; sym != null; sym = sym.getEnclosingElement()) {
-      if (hasAnnotation(sym, "org.jspecify.annotations.NullMarked", state)
-          // We break this string to avoid having it rewritten by Copybara.
-          || hasAnnotation(sym, "org.jspecify.null" + "ness.NullMarked", state)) {
+      if (hasAnnotation(sym, "org.jspecify.annotations.NullMarked", state)) {
         return true;
       }
     }
@@ -385,9 +383,6 @@ private static boolean isTypeUse(String className) {
       case "org.checkerframework.checker.nullness.qual.Nullable":
       case "org.jspecify.annotations.NonNull":
       case "org.jspecify.annotations.Nullable":
-      // We break these strings to avoid having them rewritten by Copybara.
-      case "org.jspecify.null" + "ness.NonNull":
-      case "org.jspecify.null" + "ness.Nullable":
         return true;
       default:
         // TODO(cpovirk): Detect type-use-ness from the class symbol if it's available?