Description: Replace jspecify with Checker Framkework Checker Framework is already in Debian and performs a similar function, whereas jspecify would need to be added. If jspecify is ever added to Debian, this patch can be removed. Author: Olek Wojnar Forwarded: not-needed Last-Update: 2025-03-23 --- a/java/com/google/turbine/binder/Binder.java +++ b/java/com/google/turbine/binder/Binder.java @@ -69,7 +69,7 @@ import java.time.Duration; import java.util.Optional; import javax.annotation.processing.Processor; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** The entry point for analysis. */ public final class Binder { --- a/java/com/google/turbine/binder/ClassPath.java +++ b/java/com/google/turbine/binder/ClassPath.java @@ -23,7 +23,7 @@ import com.google.turbine.binder.lookup.TopLevelIndex; import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.binder.sym.ModuleSymbol; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A compilation classpath, e.g. the user or platform class path. May be backed by a search path of --- a/java/com/google/turbine/binder/ClassPathBinder.java +++ b/java/com/google/turbine/binder/ClassPathBinder.java @@ -36,7 +36,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Sets up an environment for symbols on the classpath. */ public final class ClassPathBinder { --- a/java/com/google/turbine/binder/ConstBinder.java +++ b/java/com/google/turbine/binder/ConstBinder.java @@ -58,7 +58,7 @@ import com.google.turbine.type.Type.WildUpperBoundedTy; import java.lang.annotation.RetentionPolicy; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Binding pass to evaluate constant expressions. */ public class ConstBinder { --- a/java/com/google/turbine/binder/ConstEvaluator.java +++ b/java/com/google/turbine/binder/ConstEvaluator.java @@ -74,7 +74,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Constant expression evaluation. --- a/java/com/google/turbine/binder/CtSymClassBinder.java +++ b/java/com/google/turbine/binder/CtSymClassBinder.java @@ -40,7 +40,7 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Constructs a platform {@link ClassPath} from the current JDK's ct.sym file. */ public final class CtSymClassBinder { --- a/java/com/google/turbine/binder/FileManagerClassBinder.java +++ b/java/com/google/turbine/binder/FileManagerClassBinder.java @@ -39,7 +39,7 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Binds a {@link StandardJavaFileManager} to an {@link ClassPath}. This can be used to share a --- a/java/com/google/turbine/binder/HierarchyBinder.java +++ b/java/com/google/turbine/binder/HierarchyBinder.java @@ -35,7 +35,7 @@ import com.google.turbine.tree.Tree.ClassTy; import java.util.ArrayDeque; import java.util.LinkedHashMap; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Type hierarchy binding. */ public class HierarchyBinder { --- a/java/com/google/turbine/binder/JimageClassBinder.java +++ b/java/com/google/turbine/binder/JimageClassBinder.java @@ -53,7 +53,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Constructs a platform {@link ClassPath} from the current JDK's jimage file using jrtfs. */ public class JimageClassBinder { --- a/java/com/google/turbine/binder/Processing.java +++ b/java/com/google/turbine/binder/Processing.java @@ -71,7 +71,7 @@ import javax.lang.model.SourceVersion; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Top level annotation processing logic, see also {@link Binder}. */ public class Processing { --- a/java/com/google/turbine/binder/Resolve.java +++ b/java/com/google/turbine/binder/Resolve.java @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Qualified name resolution. */ public final class Resolve { --- a/java/com/google/turbine/binder/TypeBinder.java +++ b/java/com/google/turbine/binder/TypeBinder.java @@ -68,7 +68,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Type binding. */ public class TypeBinder { --- a/java/com/google/turbine/binder/bound/AnnotationMetadata.java +++ b/java/com/google/turbine/binder/bound/AnnotationMetadata.java @@ -23,7 +23,7 @@ import com.google.turbine.model.TurbineElementType; import java.lang.annotation.RetentionPolicy; import java.util.EnumSet; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Annotation metadata, e.g. from {@link java.lang.annotation.Target}, {@link --- a/java/com/google/turbine/binder/bound/BoundClass.java +++ b/java/com/google/turbine/binder/bound/BoundClass.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap; import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.model.TurbineTyKind; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * The initial bound tree representation. --- a/java/com/google/turbine/binder/bound/EnumConstantValue.java +++ b/java/com/google/turbine/binder/bound/EnumConstantValue.java @@ -18,7 +18,7 @@ import com.google.turbine.binder.sym.FieldSymbol; import com.google.turbine.model.Const; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** An enum constant. */ public class EnumConstantValue extends Const { --- a/java/com/google/turbine/binder/bound/HeaderBoundClass.java +++ b/java/com/google/turbine/binder/bound/HeaderBoundClass.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableMap; import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.binder.sym.TyVarSymbol; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A bound node that augments {@link BoundClass} with superclasses and interfaces. */ public interface HeaderBoundClass extends BoundClass { --- a/java/com/google/turbine/binder/bound/ModuleInfo.java +++ b/java/com/google/turbine/binder/bound/ModuleInfo.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.type.AnnoInfo; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A bound module declaration (see JLS §7.7). */ public class ModuleInfo { --- a/java/com/google/turbine/binder/bound/PackageSourceBoundClass.java +++ b/java/com/google/turbine/binder/bound/PackageSourceBoundClass.java @@ -23,7 +23,7 @@ import com.google.turbine.diag.SourceFile; import com.google.turbine.model.TurbineTyKind; import com.google.turbine.tree.Tree; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link BoundClass} with shared lookup scopes for the current compilation unit and package. */ public class PackageSourceBoundClass implements BoundClass { --- a/java/com/google/turbine/binder/bound/SourceBoundClass.java +++ b/java/com/google/turbine/binder/bound/SourceBoundClass.java @@ -20,7 +20,7 @@ import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.model.TurbineTyKind; import com.google.turbine.tree.Tree; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link BoundClass} that corresponds to a source file being compiled. */ public class SourceBoundClass implements BoundClass { --- a/java/com/google/turbine/binder/bound/SourceHeaderBoundClass.java +++ b/java/com/google/turbine/binder/bound/SourceHeaderBoundClass.java @@ -25,7 +25,7 @@ import com.google.turbine.diag.SourceFile; import com.google.turbine.model.TurbineTyKind; import com.google.turbine.tree.Tree; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link HeaderBoundClass} that corresponds to a source file being compiled. */ public class SourceHeaderBoundClass implements HeaderBoundClass { --- a/java/com/google/turbine/binder/bound/SourceModuleInfo.java +++ b/java/com/google/turbine/binder/bound/SourceModuleInfo.java @@ -24,7 +24,7 @@ import com.google.turbine.binder.bound.ModuleInfo.UseInfo; import com.google.turbine.diag.SourceFile; import com.google.turbine.type.AnnoInfo; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link ModuleInfo} that corresponds to a source file being compiled. */ public class SourceModuleInfo extends ModuleInfo { --- a/java/com/google/turbine/binder/bound/SourceTypeBoundClass.java +++ b/java/com/google/turbine/binder/bound/SourceTypeBoundClass.java @@ -29,7 +29,7 @@ import com.google.turbine.type.Type; import com.google.turbine.type.Type.ClassTy; import com.google.turbine.type.Type.TyKind; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A HeaderBoundClass for classes compiled from source. */ public class SourceTypeBoundClass implements TypeBoundClass { --- a/java/com/google/turbine/binder/bound/TurbineAnnotationValue.java +++ b/java/com/google/turbine/binder/bound/TurbineAnnotationValue.java @@ -20,7 +20,7 @@ import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.model.Const; import com.google.turbine.type.AnnoInfo; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** An annotation literal constant. */ public class TurbineAnnotationValue extends Const { --- a/java/com/google/turbine/binder/bound/TurbineClassValue.java +++ b/java/com/google/turbine/binder/bound/TurbineClassValue.java @@ -19,7 +19,7 @@ import com.google.turbine.model.Const; import com.google.turbine.type.Type; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A class literal constant. */ public class TurbineClassValue extends Const { --- a/java/com/google/turbine/binder/bound/TypeBoundClass.java +++ b/java/com/google/turbine/binder/bound/TypeBoundClass.java @@ -32,7 +32,7 @@ import com.google.turbine.type.Type; import com.google.turbine.type.Type.IntersectionTy; import com.google.turbine.type.Type.MethodTy; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A bound node that augments {@link HeaderBoundClass} with type information. */ public interface TypeBoundClass extends HeaderBoundClass { --- a/java/com/google/turbine/binder/bytecode/BytecodeBoundClass.java +++ b/java/com/google/turbine/binder/bytecode/BytecodeBoundClass.java @@ -58,7 +58,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.Map; import java.util.function.Function; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A bound class backed by a class file. --- 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.checkerframework.checker.nullness.qual.Nullable; /** An {@link Env} that chains two existing envs together. */ public class CompoundEnv implements Env { --- 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.checkerframework.checker.nullness.qual.Nullable; /** * An environment that maps {@link Symbol}s {@code S} to bound nodes {@code V}. --- 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.checkerframework.checker.nullness.qual.Nullable; /** * An env that permits an analysis pass to access information about symbols from the current pass, --- 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.checkerframework.checker.nullness.qual.Nullable; /** A simple {@link ImmutableMap}-backed {@link Env}. */ public class SimpleEnv implements Env { --- a/java/com/google/turbine/binder/lookup/CanonicalSymbolResolver.java +++ b/java/com/google/turbine/binder/lookup/CanonicalSymbolResolver.java @@ -18,7 +18,7 @@ import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.tree.Tree; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Canonical type resolution. Breaks a circular dependency between binding and import handling. */ public interface CanonicalSymbolResolver extends ImportScope.ResolveFunction { --- a/java/com/google/turbine/binder/lookup/CompoundScope.java +++ b/java/com/google/turbine/binder/lookup/CompoundScope.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link Scope} that chains other scopes together. */ public class CompoundScope implements Scope { --- a/java/com/google/turbine/binder/lookup/CompoundTopLevelIndex.java +++ b/java/com/google/turbine/binder/lookup/CompoundTopLevelIndex.java @@ -19,7 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.ImmutableList; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link TopLevelIndex} that aggregates multiple indices into one. */ // Note: this implementation doesn't detect if the indices contain incompatible information, --- a/java/com/google/turbine/binder/lookup/ImportIndex.java +++ b/java/com/google/turbine/binder/lookup/ImportIndex.java @@ -31,7 +31,7 @@ import com.google.turbine.tree.Tree.ImportDecl; import java.util.HashMap; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A scope that provides entries for the single-type imports in a compilation unit. --- a/java/com/google/turbine/binder/lookup/ImportScope.java +++ b/java/com/google/turbine/binder/lookup/ImportScope.java @@ -18,7 +18,7 @@ import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.tree.Tree; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A scope for imports. Non-canonical imports depend on hierarchy analysis, so to break the cycle we --- a/java/com/google/turbine/binder/lookup/MemberImportIndex.java +++ b/java/com/google/turbine/binder/lookup/MemberImportIndex.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** An index for statically imported members, in particular constant variables. */ public class MemberImportIndex { --- a/java/com/google/turbine/binder/lookup/PackageScope.java +++ b/java/com/google/turbine/binder/lookup/PackageScope.java @@ -18,7 +18,7 @@ import com.google.common.collect.Iterables; import com.google.turbine.binder.sym.ClassSymbol; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A scope that corresponds to a particular package, which supports iteration over its enclosed --- a/java/com/google/turbine/binder/lookup/Scope.java +++ b/java/com/google/turbine/binder/lookup/Scope.java @@ -16,7 +16,7 @@ package com.google.turbine.binder.lookup; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A scope that defines types, and supports qualified name resolution. */ public interface Scope { --- a/java/com/google/turbine/binder/lookup/SimpleTopLevelIndex.java +++ b/java/com/google/turbine/binder/lookup/SimpleTopLevelIndex.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An index of canonical type names where all members are known statically. --- a/java/com/google/turbine/binder/lookup/TopLevelIndex.java +++ b/java/com/google/turbine/binder/lookup/TopLevelIndex.java @@ -16,7 +16,7 @@ package com.google.turbine.binder.lookup; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * An index of canonical type names. --- a/java/com/google/turbine/binder/lookup/WildImportIndex.java +++ b/java/com/google/turbine/binder/lookup/WildImportIndex.java @@ -22,7 +22,7 @@ import com.google.turbine.binder.sym.ClassSymbol; import com.google.turbine.tree.Tree; import com.google.turbine.tree.Tree.ImportDecl; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A scope that provides best-effort lookup for on-demand imported types in a compilation unit. --- 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.checkerframework.checker.nullness.qual.Nullable; /** * A class symbol. --- 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.checkerframework.checker.nullness.qual.Nullable; /** A field symbol. */ @Immutable --- 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.checkerframework.checker.nullness.qual.Nullable; /** A method symbol. */ @Immutable --- 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.checkerframework.checker.nullness.qual.Nullable; /** A module symbol. */ @Immutable --- 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.checkerframework.checker.nullness.qual.Nullable; /** A package symbol. */ @Immutable --- 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.checkerframework.checker.nullness.qual.Nullable; /** A parameter symbol. */ @Immutable --- 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.checkerframework.checker.nullness.qual.Nullable; /** A record component symbol. */ @Immutable --- 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.checkerframework.checker.nullness.qual.Nullable; /** A type variable symbol. */ @Immutable --- a/java/com/google/turbine/bytecode/ClassFile.java +++ b/java/com/google/turbine/bytecode/ClassFile.java @@ -26,7 +26,7 @@ import java.util.Deque; import java.util.List; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A JVMS §4.1 ClassFile. */ public class ClassFile { --- a/java/com/google/turbine/bytecode/ClassReader.java +++ b/java/com/google/turbine/bytecode/ClassReader.java @@ -39,7 +39,7 @@ import com.google.turbine.model.TurbineFlag; import java.util.ArrayList; import java.util.List; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A JVMS §4 class file reader. */ public class ClassReader { --- a/java/com/google/turbine/bytecode/sig/Sig.java +++ b/java/com/google/turbine/bytecode/sig/Sig.java @@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableList; import com.google.turbine.model.TurbineConstantTypeKind; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** JVMS 4.7.9.1 signatures. */ public final class Sig { --- a/java/com/google/turbine/deps/Transitive.java +++ b/java/com/google/turbine/deps/Transitive.java @@ -33,7 +33,7 @@ import com.google.turbine.model.TurbineFlag; import java.util.LinkedHashSet; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Collects the minimal compile-time API for symbols in the supertype closure of compiled classes. --- a/java/com/google/turbine/diag/SourceFile.java +++ b/java/com/google/turbine/diag/SourceFile.java @@ -19,7 +19,7 @@ import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A source file. */ public class SourceFile { --- a/java/com/google/turbine/diag/TurbineDiagnostic.java +++ b/java/com/google/turbine/diag/TurbineDiagnostic.java @@ -27,7 +27,7 @@ import com.google.turbine.diag.TurbineError.ErrorKind; import java.util.Objects; import javax.tools.Diagnostic; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A compilation error. */ public class TurbineDiagnostic { --- a/java/com/google/turbine/lower/Lower.java +++ b/java/com/google/turbine/lower/Lower.java @@ -88,7 +88,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Lowering from bound classes to bytecode. */ public class Lower { --- a/java/com/google/turbine/lower/LowerSignature.java +++ b/java/com/google/turbine/lower/LowerSignature.java @@ -46,7 +46,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** Translator from {@link Type}s to {@link Sig}natures. */ public class LowerSignature { --- a/java/com/google/turbine/model/Const.java +++ b/java/com/google/turbine/model/Const.java @@ -21,7 +21,7 @@ import com.google.common.escape.SourceCodeEscapers; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.AnnotationValueVisitor; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Compile-time constant expressions, including literals of primitive or String type, class --- a/java/com/google/turbine/parse/ConstExpressionParser.java +++ b/java/com/google/turbine/parse/ConstExpressionParser.java @@ -32,7 +32,7 @@ import com.google.turbine.tree.Tree.Ident; import com.google.turbine.tree.TurbineOperatorKind; import java.util.Optional; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A parser for compile-time constant expressions. */ public class ConstExpressionParser { --- a/java/com/google/turbine/parse/Parser.java +++ b/java/com/google/turbine/parse/Parser.java @@ -65,7 +65,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Optional; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * A parser for the subset of Java required for header compilation. --- a/java/com/google/turbine/parse/StreamLexer.java +++ b/java/com/google/turbine/parse/StreamLexer.java @@ -25,7 +25,7 @@ import com.google.turbine.diag.SourceFile; import com.google.turbine.diag.TurbineError; import com.google.turbine.diag.TurbineError.ErrorKind; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** A {@link Lexer} that streams input from a {@link UnicodeEscapePreprocessor}. */ public class StreamLexer implements Lexer { --- 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.checkerframework.checker.nullness.qual.Nullable; /** * An implementation of {@link AnnotationMirror} and {@link AnnotationValue} backed by {@link --- 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.checkerframework.checker.nullness.qual.Nullable; /** An {@link Element} implementation backed by a {@link Symbol}. */ @SuppressWarnings("nullness") // TODO(cushon): Address nullness diagnostics. --- 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.checkerframework.checker.nullness.qual.Nullable; /** An implementation of {@link Elements} backed by turbine's {@link Element}. */ @SuppressWarnings("nullness") // TODO(cushon): Address nullness diagnostics. --- 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.checkerframework.checker.nullness.qual.Nullable; /** Turbine's implementation of {@link Messager}. */ public class TurbineMessager implements Messager { --- 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.checkerframework.checker.nullness.qual.Nullable; /** An implementation of {@link Name} backed by a {@link CharSequence}. */ public class TurbineName implements Name { --- 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.checkerframework.checker.nullness.qual.Nullable; /** Turbine's {@link ProcessingEnvironment}. */ public class TurbineProcessingEnvironment implements ProcessingEnvironment { --- 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.checkerframework.checker.nullness.qual.Nullable; /** A {@link TypeMirror} implementation backed by a {@link Type}. */ public abstract class TurbineTypeMirror implements TypeMirror { --- a/java/com/google/turbine/processing/TurbineTypes.java +++ b/java/com/google/turbine/processing/TurbineTypes.java @@ -62,7 +62,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.checkerframework.checker.nullness.qual.Nullable; /** An implementation of {@link Types} backed by turbine's {@link TypeMirror}. */ @SuppressWarnings("nullness") // TODO(cushon): Address nullness diagnostics. --- 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.checkerframework.checker.nullness.qual.Nullable; /** A pretty-printer for {@link Tree}s. */ public class Pretty implements Tree.Visitor<@Nullable Void, @Nullable Void> { --- 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.checkerframework.checker.nullness.qual.Nullable; /** An AST node. */ public abstract class Tree { --- a/java/com/google/turbine/type/AnnoInfo.java +++ b/java/com/google/turbine/type/AnnoInfo.java @@ -29,7 +29,7 @@ import com.google.turbine.tree.Tree.Expression; import java.util.Map; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** An annotation use. */ public class AnnoInfo { --- a/java/com/google/turbine/type/Type.java +++ b/java/com/google/turbine/type/Type.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** JLS 4 types. */ public interface Type { --- a/java/com/google/turbine/types/Canonicalize.java +++ b/java/com/google/turbine/types/Canonicalize.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; /** * Canonicalizes qualified type names so qualifiers are always the declaring class of the qualified --- a/javatests/com/google/turbine/binder/bytecode/BytecodeBoundClassTest.java +++ b/javatests/com/google/turbine/binder/bytecode/BytecodeBoundClassTest.java @@ -41,7 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; --- a/javatests/com/google/turbine/lower/MissingJavaBaseModule.java +++ b/javatests/com/google/turbine/lower/MissingJavaBaseModule.java @@ -34,7 +34,7 @@ import com.google.turbine.binder.sym.ModuleSymbol; import java.util.Map; import java.util.Optional; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; --- a/javatests/com/google/turbine/processing/TurbineFilerTest.java +++ b/javatests/com/google/turbine/processing/TurbineFilerTest.java @@ -39,7 +39,7 @@ import javax.tools.FileObject; import javax.tools.JavaFileObject; import javax.tools.StandardLocation; -import org.jspecify.nullness.Nullable; +import org.checkerframework.checker.nullness.qual.Nullable; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; --- a/pom.xml +++ b/pom.xml @@ -77,10 +77,9 @@ ${errorprone.version} - org.jspecify - jspecify - 0.2.0 - true + org.checkerframework + checker-qual + debian com.google.protobuf --- a/java/com/google/common/escape/package-info.java +++ b/java/com/google/common/escape/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.common.escape; --- a/java/com/google/turbine/binder/bound/package-info.java +++ b/java/com/google/turbine/binder/bound/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.binder.bound; --- a/java/com/google/turbine/binder/bytecode/package-info.java +++ b/java/com/google/turbine/binder/bytecode/package-info.java @@ -14,5 +14,4 @@ * limitations under the License. */ -@org.jspecify.nullness.NullMarked package com.google.turbine.binder.bytecode; --- a/java/com/google/turbine/binder/env/package-info.java +++ b/java/com/google/turbine/binder/env/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.binder.env; --- a/java/com/google/turbine/binder/lookup/package-info.java +++ b/java/com/google/turbine/binder/lookup/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.binder.lookup; --- a/java/com/google/turbine/binder/package-info.java +++ b/java/com/google/turbine/binder/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.binder; --- a/java/com/google/turbine/binder/sym/package-info.java +++ b/java/com/google/turbine/binder/sym/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.binder.sym; --- a/java/com/google/turbine/bytecode/package-info.java +++ b/java/com/google/turbine/bytecode/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.bytecode; --- a/java/com/google/turbine/bytecode/sig/package-info.java +++ b/java/com/google/turbine/bytecode/sig/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.bytecode.sig; --- a/java/com/google/turbine/options/package-info.java +++ b/java/com/google/turbine/options/package-info.java @@ -14,5 +14,4 @@ * limitations under the License. */ -@org.jspecify.nullness.NullMarked package com.google.turbine.options; --- a/java/com/google/turbine/tree/package-info.java +++ b/java/com/google/turbine/tree/package-info.java @@ -15,5 +15,4 @@ */ @com.google.errorprone.annotations.CheckReturnValue -@org.jspecify.nullness.NullMarked package com.google.turbine.tree;