diff --git a/java/com/google/turbine/binder/env/CompoundEnv.java b/java/com/google/turbine/binder/env/CompoundEnv.java index 391a2c3b..c56569ae 100644 --- a/java/com/google/turbine/binder/env/CompoundEnv.java +++ b/java/com/google/turbine/binder/env/CompoundEnv.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.google.turbine.binder.sym.Symbol; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** An {@link Env} that chains two existing envs together. */ public class CompoundEnv implements Env { diff --git a/java/com/google/turbine/binder/env/Env.java b/java/com/google/turbine/binder/env/Env.java index 8da97f08..44f03502 100644 --- a/java/com/google/turbine/binder/env/Env.java +++ b/java/com/google/turbine/binder/env/Env.java @@ -18,7 +18,7 @@ import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.binder.sym.Symbol; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** * An environment that maps {@link Symbol}s {@code S} to bound nodes {@code V}. diff --git a/java/com/google/turbine/binder/env/LazyEnv.java b/java/com/google/turbine/binder/env/LazyEnv.java index b2d85fda..16f7d5d7 100644 --- a/java/com/google/turbine/binder/env/LazyEnv.java +++ b/java/com/google/turbine/binder/env/LazyEnv.java @@ -22,7 +22,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** * An env that permits an analysis pass to access information about symbols from the current pass, diff --git a/java/com/google/turbine/binder/env/SimpleEnv.java b/java/com/google/turbine/binder/env/SimpleEnv.java index 9de5c9fc..d128ad97 100644 --- a/java/com/google/turbine/binder/env/SimpleEnv.java +++ b/java/com/google/turbine/binder/env/SimpleEnv.java @@ -21,7 +21,7 @@ import com.google.turbine.binder.sym.Symbol; import java.util.LinkedHashMap; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A simple {@link ImmutableMap}-backed {@link Env}. */ public class SimpleEnv implements Env { diff --git a/java/com/google/turbine/binder/env/package-info.java b/java/com/google/turbine/binder/env/package-info.java index fa572454..306a1ce9 100644 --- a/java/com/google/turbine/binder/env/package-info.java +++ b/java/com/google/turbine/binder/env/package-info.java @@ -15,5 +15,5 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package com.google.turbine.binder.env; diff --git a/java/com/google/turbine/binder/sym/ClassSymbol.java b/java/com/google/turbine/binder/sym/ClassSymbol.java index 9bb556f3..95871922 100644 --- a/java/com/google/turbine/binder/sym/ClassSymbol.java +++ b/java/com/google/turbine/binder/sym/ClassSymbol.java @@ -17,7 +17,7 @@ package com.google.turbine.binder.sym; import com.google.errorprone.annotations.Immutable; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** * A class symbol. diff --git a/java/com/google/turbine/binder/sym/FieldSymbol.java b/java/com/google/turbine/binder/sym/FieldSymbol.java index 10405002..5f2d6b1e 100644 --- a/java/com/google/turbine/binder/sym/FieldSymbol.java +++ b/java/com/google/turbine/binder/sym/FieldSymbol.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A field symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/MethodSymbol.java b/java/com/google/turbine/binder/sym/MethodSymbol.java index 12c1aa5d..38bfb240 100644 --- a/java/com/google/turbine/binder/sym/MethodSymbol.java +++ b/java/com/google/turbine/binder/sym/MethodSymbol.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A method symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/ModuleSymbol.java b/java/com/google/turbine/binder/sym/ModuleSymbol.java index 4ce5c7af..3afe51a6 100644 --- a/java/com/google/turbine/binder/sym/ModuleSymbol.java +++ b/java/com/google/turbine/binder/sym/ModuleSymbol.java @@ -17,7 +17,7 @@ package com.google.turbine.binder.sym; import com.google.errorprone.annotations.Immutable; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A module symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/PackageSymbol.java b/java/com/google/turbine/binder/sym/PackageSymbol.java index be071e0c..19a5888f 100644 --- a/java/com/google/turbine/binder/sym/PackageSymbol.java +++ b/java/com/google/turbine/binder/sym/PackageSymbol.java @@ -17,7 +17,7 @@ package com.google.turbine.binder.sym; import com.google.errorprone.annotations.Immutable; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A package symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/ParamSymbol.java b/java/com/google/turbine/binder/sym/ParamSymbol.java index e9392231..19bd101c 100644 --- a/java/com/google/turbine/binder/sym/ParamSymbol.java +++ b/java/com/google/turbine/binder/sym/ParamSymbol.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A parameter symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/RecordComponentSymbol.java b/java/com/google/turbine/binder/sym/RecordComponentSymbol.java index c3f44f6e..fd84a926 100644 --- a/java/com/google/turbine/binder/sym/RecordComponentSymbol.java +++ b/java/com/google/turbine/binder/sym/RecordComponentSymbol.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A record component symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/TyVarSymbol.java b/java/com/google/turbine/binder/sym/TyVarSymbol.java index 5ba0788c..143a8f86 100644 --- a/java/com/google/turbine/binder/sym/TyVarSymbol.java +++ b/java/com/google/turbine/binder/sym/TyVarSymbol.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A type variable symbol. */ @Immutable diff --git a/java/com/google/turbine/binder/sym/package-info.java b/java/com/google/turbine/binder/sym/package-info.java index 96f3a87d..17ed6edc 100644 --- a/java/com/google/turbine/binder/sym/package-info.java +++ b/java/com/google/turbine/binder/sym/package-info.java @@ -15,5 +15,5 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package com.google.turbine.binder.sym; diff --git a/java/com/google/turbine/processing/TurbineAnnotationMirror.java b/java/com/google/turbine/processing/TurbineAnnotationMirror.java index f99d2119..16023713 100644 --- a/java/com/google/turbine/processing/TurbineAnnotationMirror.java +++ b/java/com/google/turbine/processing/TurbineAnnotationMirror.java @@ -45,7 +45,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.ErrorType; import javax.lang.model.type.TypeMirror; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link AnnotationMirror} and {@link AnnotationValue} backed by {@link diff --git a/java/com/google/turbine/processing/TurbineElement.java b/java/com/google/turbine/processing/TurbineElement.java index cb6713f9..bef3bfba 100644 --- a/java/com/google/turbine/processing/TurbineElement.java +++ b/java/com/google/turbine/processing/TurbineElement.java @@ -82,7 +82,7 @@ import javax.lang.model.element.TypeParameterElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.TypeMirror; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** An {@link Element} implementation backed by a {@link Symbol}. */ @SuppressWarnings("nullness") // TODO(cushon): Address nullness diagnostics. diff --git a/java/com/google/turbine/processing/TurbineElements.java b/java/com/google/turbine/processing/TurbineElements.java index 9b3ea266..c0ec1fe4 100644 --- a/java/com/google/turbine/processing/TurbineElements.java +++ b/java/com/google/turbine/processing/TurbineElements.java @@ -53,7 +53,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** An implementation of {@link Elements} backed by turbine's {@link Element}. */ @SuppressWarnings("nullness") // TODO(cushon): Address nullness diagnostics. diff --git a/java/com/google/turbine/processing/TurbineMessager.java b/java/com/google/turbine/processing/TurbineMessager.java index 8e78b8bb..5b66c0e7 100644 --- a/java/com/google/turbine/processing/TurbineMessager.java +++ b/java/com/google/turbine/processing/TurbineMessager.java @@ -42,7 +42,7 @@ import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; import javax.tools.Diagnostic; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** Turbine's implementation of {@link Messager}. */ public class TurbineMessager implements Messager { diff --git a/java/com/google/turbine/processing/TurbineName.java b/java/com/google/turbine/processing/TurbineName.java index 5232491b..c68be7da 100644 --- a/java/com/google/turbine/processing/TurbineName.java +++ b/java/com/google/turbine/processing/TurbineName.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import javax.lang.model.element.Name; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** An implementation of {@link Name} backed by a {@link CharSequence}. */ public class TurbineName implements Name { diff --git a/java/com/google/turbine/processing/TurbineProcessingEnvironment.java b/java/com/google/turbine/processing/TurbineProcessingEnvironment.java index 4f320339..492df8cc 100644 --- a/java/com/google/turbine/processing/TurbineProcessingEnvironment.java +++ b/java/com/google/turbine/processing/TurbineProcessingEnvironment.java @@ -24,7 +24,7 @@ import javax.lang.model.SourceVersion; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** Turbine's {@link ProcessingEnvironment}. */ public class TurbineProcessingEnvironment implements ProcessingEnvironment { diff --git a/java/com/google/turbine/processing/TurbineTypeMirror.java b/java/com/google/turbine/processing/TurbineTypeMirror.java index 4cd8ba1a..5bd375b0 100644 --- a/java/com/google/turbine/processing/TurbineTypeMirror.java +++ b/java/com/google/turbine/processing/TurbineTypeMirror.java @@ -58,7 +58,7 @@ import javax.lang.model.type.TypeVariable; import javax.lang.model.type.TypeVisitor; import javax.lang.model.type.WildcardType; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A {@link TypeMirror} implementation backed by a {@link Type}. */ public abstract class TurbineTypeMirror implements TypeMirror { diff --git a/java/com/google/turbine/processing/TurbineTypes.java b/java/com/google/turbine/processing/TurbineTypes.java index c694d42b..d8f0c85c 100644 --- a/java/com/google/turbine/processing/TurbineTypes.java +++ b/java/com/google/turbine/processing/TurbineTypes.java @@ -63,7 +63,7 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.type.WildcardType; import javax.lang.model.util.Types; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** An implementation of {@link Types} backed by turbine's {@link TypeMirror}. */ @SuppressWarnings("nullness") // TODO(cushon): Address nullness diagnostics. diff --git a/java/com/google/turbine/tree/Pretty.java b/java/com/google/turbine/tree/Pretty.java index 858434c5..96643bb5 100644 --- a/java/com/google/turbine/tree/Pretty.java +++ b/java/com/google/turbine/tree/Pretty.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** A pretty-printer for {@link Tree}s. */ public class Pretty implements Tree.Visitor<@Nullable Void, @Nullable Void> { diff --git a/java/com/google/turbine/tree/Tree.java b/java/com/google/turbine/tree/Tree.java index d7ee12f2..da09244b 100644 --- a/java/com/google/turbine/tree/Tree.java +++ b/java/com/google/turbine/tree/Tree.java @@ -29,7 +29,7 @@ import java.util.Deque; import java.util.Optional; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; /** An AST node. */ public abstract class Tree { diff --git a/java/com/google/turbine/tree/package-info.java b/java/com/google/turbine/tree/package-info.java index 2803c675..47cd970b 100644 --- a/java/com/google/turbine/tree/package-info.java +++ b/java/com/google/turbine/tree/package-info.java @@ -15,5 +15,5 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked +@org.jspecify.annotations.NullMarked package com.google.turbine.tree;