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 74fff8e8713..4354141414b 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,7 +248,9 @@ private boolean enclosingAnnotationDefaultsNonTypeVariablesToNonNull( if (hasAnnotation(sym, "com.google.protobuf.Internal$ProtoNonnullApi", state)) { return true; } - if (hasAnnotation(sym, "org.jspecify.annotations.NullMarked", state) + 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)) && 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 3782c145541..e1dbc7e815f 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 @@ -129,7 +129,9 @@ 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)) { + 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)) { return true; } } @@ -381,8 +383,9 @@ private static boolean isTypeUse(String className) { case "org.checkerframework.checker.nullness.qual.Nullable": case "org.jspecify.annotations.NonNull": case "org.jspecify.annotations.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? diff --git a/pom.xml b/pom.xml index 248c8b26c22..c6501498e51 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.6.13 3.19.6 1.43.3 - 0.2.0 + 0.3.0 5.1.0