diff options
Diffstat (limited to 'value')
4 files changed, 9 insertions, 6 deletions
diff --git a/value/src/it/functional/src/test/java/com/google/auto/value/AutoAnnotationTest.java b/value/src/it/functional/src/test/java/com/google/auto/value/AutoAnnotationTest.java index aec89287..a04d41f3 100644 --- a/value/src/it/functional/src/test/java/com/google/auto/value/AutoAnnotationTest.java +++ b/value/src/it/functional/src/test/java/com/google/auto/value/AutoAnnotationTest.java @@ -77,8 +77,9 @@ public class AutoAnnotationTest { .isAtLeast(8.0); Class<? extends Annotation> jspecifyNullable; try { + // We write this using .concat in order to hide it from rewriting rules. jspecifyNullable = - Class.forName("org.jspecify.nullness.Nullable").asSubclass(Annotation.class); + Class.forName("org".concat(".jspecify.nullness.Nullable")).asSubclass(Annotation.class); } catch (ClassNotFoundException e) { throw new AssumptionViolatedException("No JSpecify @Nullable available", e); } diff --git a/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueJava8Test.java b/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueJava8Test.java index 82b65b90..3f4e9bf5 100644 --- a/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueJava8Test.java +++ b/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueJava8Test.java @@ -560,7 +560,7 @@ public class AutoValueJava8Test { } } - // Tests that we generate equals(@org.jspecify.nullness.Nullable x) if that annotation is + // Tests that we generate equals(@Nullable x) using JSpecify @Nullable if that annotation is // available and there is no other @Nullable type annotation mentioned in the @AutoValue class. // If there *are* other @Nullable type annotations, other test methods here will check that they // are used instead. @@ -568,8 +568,9 @@ public class AutoValueJava8Test { public void testDefaultToJSpecifyNullable() throws ReflectiveOperationException { Class<? extends Annotation> jspecifyNullable; try { + // We write this using .concat in order to hide it from rewriting rules. jspecifyNullable = - Class.forName("org.jspecify.nullness.Nullable").asSubclass(Annotation.class); + Class.forName("org".concat(".jspecify.nullness.Nullable")).asSubclass(Annotation.class); } catch (ClassNotFoundException e) { throw new AssumptionViolatedException("No JSpecify @Nullable available", e); } diff --git a/value/src/main/java/com/google/auto/value/processor/Nullables.java b/value/src/main/java/com/google/auto/value/processor/Nullables.java index bcb3ca0a..c07656f1 100644 --- a/value/src/main/java/com/google/auto/value/processor/Nullables.java +++ b/value/src/main/java/com/google/auto/value/processor/Nullables.java @@ -49,7 +49,8 @@ class Nullables { */ static final String NULLABLE_OPTION = "com.google.auto.value.NullableTypeAnnotation"; - private static final String DEFAULT_NULLABLE = "org.jspecify.nullness.Nullable"; + // We write this using .concat in order to hide it from rewriting rules. + private static final String DEFAULT_NULLABLE = "org".concat(".jspecify.nullness.Nullable"); private final Optional<AnnotationMirror> defaultNullable; diff --git a/value/src/test/java/com/google/auto/value/processor/AutoBuilderCompilationTest.java b/value/src/test/java/com/google/auto/value/processor/AutoBuilderCompilationTest.java index 2a5f55a0..50b6b271 100644 --- a/value/src/test/java/com/google/auto/value/processor/AutoBuilderCompilationTest.java +++ b/value/src/test/java/com/google/auto/value/processor/AutoBuilderCompilationTest.java @@ -737,7 +737,7 @@ public final class AutoBuilderCompilationTest { "package foo.bar;", "", "import com.google.auto.value.AutoBuilder;", - "import org.jspecify.nullness.Nullable;", + "import org.checkerframework.checker.nullness.qual.Nullable;", "", "class Baz {", " Baz(String thing) {}", @@ -750,7 +750,7 @@ public final class AutoBuilderCompilationTest { "}"); JavaFileObject nullableFileObject = JavaFileObjects.forSourceLines( - "org.jspecify.nullness.Nullable", + "org.checkerframework.checker.nullness.qual.Nullable", "package org.jspecify.nullness;", "", "import java.lang.annotation.ElementType;", |