From 3622daf6f28a754c9e11432bb8053e3e18a5b913 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 9 Dec 2024 06:45:22 -0800 Subject: [PATCH] Migrate from Checker Framework annotations to JSpecify. RELNOTES=n/a PiperOrigin-RevId: 704266700 --- jimfs/pom.xml | 4 ++-- .../java/com/google/common/jimfs/AbstractWatchService.java | 2 +- .../java/com/google/common/jimfs/AclAttributeProvider.java | 2 +- .../java/com/google/common/jimfs/AttributeProvider.java | 2 +- .../main/java/com/google/common/jimfs/AttributeService.java | 2 +- .../com/google/common/jimfs/BasicAttributeProvider.java | 2 +- .../main/java/com/google/common/jimfs/Configuration.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/Directory.java | 2 +- .../main/java/com/google/common/jimfs/DirectoryEntry.java | 2 +- .../java/com/google/common/jimfs/DosAttributeProvider.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/File.java | 2 +- .../main/java/com/google/common/jimfs/FileSystemView.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/FileTree.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/Handler.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/Jimfs.java | 2 +- .../google/common/jimfs/JimfsAsynchronousFileChannel.java | 2 +- .../main/java/com/google/common/jimfs/JimfsFileStore.java | 2 +- .../main/java/com/google/common/jimfs/JimfsFileSystem.java | 2 +- .../com/google/common/jimfs/JimfsFileSystemProvider.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java | 2 +- .../com/google/common/jimfs/JimfsSecureDirectoryStream.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/Name.java | 2 +- .../com/google/common/jimfs/OwnerAttributeProvider.java | 2 +- .../src/main/java/com/google/common/jimfs/PathService.java | 2 +- jimfs/src/main/java/com/google/common/jimfs/PathType.java | 2 +- .../java/com/google/common/jimfs/PathURLConnection.java | 2 +- .../com/google/common/jimfs/PosixAttributeProvider.java | 2 +- .../com/google/common/jimfs/StandardAttributeProviders.java | 2 +- .../java/com/google/common/jimfs/UnixAttributeProvider.java | 2 +- .../src/main/java/com/google/common/jimfs/UnixPathType.java | 2 +- .../google/common/jimfs/UserDefinedAttributeProvider.java | 2 +- .../main/java/com/google/common/jimfs/WindowsPathType.java | 2 +- .../com/google/common/jimfs/AbstractPathMatcherTest.java | 2 +- .../test/java/com/google/common/jimfs/DirectoryTest.java | 2 +- .../src/test/java/com/google/common/jimfs/FileTreeTest.java | 2 +- .../src/test/java/com/google/common/jimfs/PathSubject.java | 2 +- .../src/test/java/com/google/common/jimfs/PathTypeTest.java | 2 +- .../java/com/google/common/jimfs/TestAttributeProvider.java | 2 +- pom.xml | 6 +++--- 39 files changed, 42 insertions(+), 42 deletions(-) diff --git a/jimfs/pom.xml b/jimfs/pom.xml index 017387be6..cdf544f4e 100644 --- a/jimfs/pom.xml +++ b/jimfs/pom.xml @@ -61,8 +61,8 @@ true - org.checkerframework - checker-qual + org.jspecify + jspecify true diff --git a/jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java b/jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java index 2ccaa1b28..ce7d25bf5 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java +++ b/jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract implementation of {@link WatchService}. Provides the means for registering and managing diff --git a/jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java index 9b543d314..5e85c730e 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java @@ -29,7 +29,7 @@ import java.nio.file.attribute.UserPrincipal; import java.util.List; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides the {@link AclFileAttributeView} ("acl"). diff --git a/jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java index b975c9850..7f2aa6d67 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java @@ -24,7 +24,7 @@ import java.nio.file.attribute.FileAttributeView; import java.util.Arrays; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract provider for handling a specific file attribute view. diff --git a/jimfs/src/main/java/com/google/common/jimfs/AttributeService.java b/jimfs/src/main/java/com/google/common/jimfs/AttributeService.java index 3bae38d73..efc407ace 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/AttributeService.java +++ b/jimfs/src/main/java/com/google/common/jimfs/AttributeService.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Service providing all attribute related operations for a file store. One piece of the file store diff --git a/jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java index 43272ee34..2a43fb99b 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java @@ -23,7 +23,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.FileAttributeView; import java.nio.file.attribute.FileTime; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides attributes common to all file systems, the {@link diff --git a/jimfs/src/main/java/com/google/common/jimfs/Configuration.java b/jimfs/src/main/java/com/google/common/jimfs/Configuration.java index 7801ea7e4..93af863b9 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/Configuration.java +++ b/jimfs/src/main/java/com/google/common/jimfs/Configuration.java @@ -45,7 +45,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Immutable configuration for an in-memory file system. A {@code Configuration} is passed to a diff --git a/jimfs/src/main/java/com/google/common/jimfs/Directory.java b/jimfs/src/main/java/com/google/common/jimfs/Directory.java index e65eb3481..166a3f305 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/Directory.java +++ b/jimfs/src/main/java/com/google/common/jimfs/Directory.java @@ -22,7 +22,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.nio.file.attribute.FileTime; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A table of {@linkplain DirectoryEntry directory entries}. diff --git a/jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java b/jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java index 6492a59b4..b20759d74 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java +++ b/jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java @@ -27,7 +27,7 @@ import java.nio.file.NotLinkException; import java.nio.file.Path; import java.util.Objects; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Entry in a directory, containing references to the directory itself, the file the entry links to diff --git a/jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java index 9a8ed189b..91244d81d 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java @@ -27,7 +27,7 @@ import java.nio.file.attribute.FileAttributeView; import java.nio.file.attribute.FileTime; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides the {@link DosFileAttributeView} ("dos") and allows the reading diff --git a/jimfs/src/main/java/com/google/common/jimfs/File.java b/jimfs/src/main/java/com/google/common/jimfs/File.java index 71b250161..9a9deeba3 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/File.java +++ b/jimfs/src/main/java/com/google/common/jimfs/File.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.nio.file.attribute.FileTime; import java.util.concurrent.locks.ReadWriteLock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A file object, containing both the file's metadata and content. diff --git a/jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java b/jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java index 702326ff3..3f75519e0 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java +++ b/jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java @@ -50,7 +50,7 @@ import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * View of a file system with a specific working directory. As all file system operations need to diff --git a/jimfs/src/main/java/com/google/common/jimfs/FileTree.java b/jimfs/src/main/java/com/google/common/jimfs/FileTree.java index cacb16ac8..5ebdf683c 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/FileTree.java +++ b/jimfs/src/main/java/com/google/common/jimfs/FileTree.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The tree of directories and files for the file system. Contains the file system root directories diff --git a/jimfs/src/main/java/com/google/common/jimfs/Handler.java b/jimfs/src/main/java/com/google/common/jimfs/Handler.java index 18c305b66..766446cb9 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/Handler.java +++ b/jimfs/src/main/java/com/google/common/jimfs/Handler.java @@ -23,7 +23,7 @@ import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link URLStreamHandler} implementation for jimfs. Named {@code Handler} so that the class can be diff --git a/jimfs/src/main/java/com/google/common/jimfs/Jimfs.java b/jimfs/src/main/java/com/google/common/jimfs/Jimfs.java index 6719913da..121b1ec79 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/Jimfs.java +++ b/jimfs/src/main/java/com/google/common/jimfs/Jimfs.java @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static factory methods for creating new Jimfs file systems. File systems may either be created diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java index 36c0af32f..6a295768e 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java @@ -34,7 +34,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link AsynchronousFileChannel} implementation that delegates to a {@link JimfsFileChannel}. diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java index 08ae3e367..021cf0ab4 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java @@ -34,7 +34,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link FileStore} implementation which provides methods for file creation, lookup and attribute diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystem.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystem.java index 4cc0d20b5..6eaa4ec7b 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystem.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystem.java @@ -33,7 +33,7 @@ import java.nio.file.attribute.UserPrincipalLookupService; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link FileSystem} implementation for Jimfs. Most behavior for the file system is implemented by diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystemProvider.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystemProvider.java index 915bc3443..6c176c2e8 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystemProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystemProvider.java @@ -48,7 +48,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link FileSystemProvider} implementation for Jimfs. This provider implements the actual file diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java index 0ff00f62c..29f15971d 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java @@ -41,7 +41,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Jimfs implementation of {@link Path}. Creation of new {@code Path} objects is delegated to the diff --git a/jimfs/src/main/java/com/google/common/jimfs/JimfsSecureDirectoryStream.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsSecureDirectoryStream.java index db72f0468..427355ebd 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/JimfsSecureDirectoryStream.java +++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsSecureDirectoryStream.java @@ -35,7 +35,7 @@ import java.nio.file.attribute.FileAttributeView; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Secure directory stream implementation that uses a {@link FileSystemView} with the stream's diff --git a/jimfs/src/main/java/com/google/common/jimfs/Name.java b/jimfs/src/main/java/com/google/common/jimfs/Name.java index 0f5a83a2e..f283ea1c4 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/Name.java +++ b/jimfs/src/main/java/com/google/common/jimfs/Name.java @@ -20,7 +20,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Immutable representation of a file name. Used both for the name components of paths and as the diff --git a/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java index 156be1b34..394a75db4 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java @@ -26,7 +26,7 @@ import java.nio.file.attribute.FileOwnerAttributeView; import java.nio.file.attribute.UserPrincipal; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides the {@link FileOwnerAttributeView} ("owner"). diff --git a/jimfs/src/main/java/com/google/common/jimfs/PathService.java b/jimfs/src/main/java/com/google/common/jimfs/PathService.java index 2dbf6785b..d2496df38 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/PathService.java +++ b/jimfs/src/main/java/com/google/common/jimfs/PathService.java @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Service for creating {@link JimfsPath} instances and handling other path-related operations. diff --git a/jimfs/src/main/java/com/google/common/jimfs/PathType.java b/jimfs/src/main/java/com/google/common/jimfs/PathType.java index 1ac75336f..3d63fffde 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/PathType.java +++ b/jimfs/src/main/java/com/google/common/jimfs/PathType.java @@ -26,7 +26,7 @@ import java.net.URISyntaxException; import java.nio.file.InvalidPathException; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object defining a specific type of path. Knows how to parse strings to a path and how to diff --git a/jimfs/src/main/java/com/google/common/jimfs/PathURLConnection.java b/jimfs/src/main/java/com/google/common/jimfs/PathURLConnection.java index 6626657b2..9f66579c0 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/PathURLConnection.java +++ b/jimfs/src/main/java/com/google/common/jimfs/PathURLConnection.java @@ -43,7 +43,7 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@code URLConnection} implementation. diff --git a/jimfs/src/main/java/com/google/common/jimfs/PosixAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/PosixAttributeProvider.java index 490ef82b3..4f0928368 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/PosixAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/PosixAttributeProvider.java @@ -35,7 +35,7 @@ import java.nio.file.attribute.UserPrincipal; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides the {@link PosixFileAttributeView} ("posix") and allows reading diff --git a/jimfs/src/main/java/com/google/common/jimfs/StandardAttributeProviders.java b/jimfs/src/main/java/com/google/common/jimfs/StandardAttributeProviders.java index 264a8990e..fc7035e56 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/StandardAttributeProviders.java +++ b/jimfs/src/main/java/com/google/common/jimfs/StandardAttributeProviders.java @@ -17,7 +17,7 @@ package com.google.common.jimfs; import com.google.common.collect.ImmutableMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static registry of {@link AttributeProvider} implementations for the standard set of file diff --git a/jimfs/src/main/java/com/google/common/jimfs/UnixAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/UnixAttributeProvider.java index 6f793d7be..186608462 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/UnixAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/UnixAttributeProvider.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides the "unix" attribute view. diff --git a/jimfs/src/main/java/com/google/common/jimfs/UnixPathType.java b/jimfs/src/main/java/com/google/common/jimfs/UnixPathType.java index 35b7bcf7e..2e2804606 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/UnixPathType.java +++ b/jimfs/src/main/java/com/google/common/jimfs/UnixPathType.java @@ -19,7 +19,7 @@ import static com.google.common.base.Preconditions.checkArgument; import java.nio.file.InvalidPathException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unix-style path type. diff --git a/jimfs/src/main/java/com/google/common/jimfs/UserDefinedAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/UserDefinedAttributeProvider.java index 1da028a1e..234caa03b 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/UserDefinedAttributeProvider.java +++ b/jimfs/src/main/java/com/google/common/jimfs/UserDefinedAttributeProvider.java @@ -25,7 +25,7 @@ import java.nio.file.attribute.FileAttributeView; import java.nio.file.attribute.UserDefinedFileAttributeView; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Attribute provider that provides the {@link UserDefinedFileAttributeView} ("user"). Unlike most diff --git a/jimfs/src/main/java/com/google/common/jimfs/WindowsPathType.java b/jimfs/src/main/java/com/google/common/jimfs/WindowsPathType.java index bfd92eacd..e4e68b5ec 100644 --- a/jimfs/src/main/java/com/google/common/jimfs/WindowsPathType.java +++ b/jimfs/src/main/java/com/google/common/jimfs/WindowsPathType.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Windows-style path type. diff --git a/jimfs/src/test/java/com/google/common/jimfs/AbstractPathMatcherTest.java b/jimfs/src/test/java/com/google/common/jimfs/AbstractPathMatcherTest.java index 141cc133c..fbe916b00 100644 --- a/jimfs/src/test/java/com/google/common/jimfs/AbstractPathMatcherTest.java +++ b/jimfs/src/test/java/com/google/common/jimfs/AbstractPathMatcherTest.java @@ -34,7 +34,7 @@ import java.nio.file.WatchService; import java.util.Iterator; import java.util.regex.PatternSyntaxException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract base class for tests of {@link PathMatcher} implementations. diff --git a/jimfs/src/test/java/com/google/common/jimfs/DirectoryTest.java b/jimfs/src/test/java/com/google/common/jimfs/DirectoryTest.java index ed097d8e4..da3163e97 100644 --- a/jimfs/src/test/java/com/google/common/jimfs/DirectoryTest.java +++ b/jimfs/src/test/java/com/google/common/jimfs/DirectoryTest.java @@ -28,7 +28,7 @@ import com.google.common.collect.Iterables; import java.util.HashSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jimfs/src/test/java/com/google/common/jimfs/FileTreeTest.java b/jimfs/src/test/java/com/google/common/jimfs/FileTreeTest.java index 55032d93d..516750168 100644 --- a/jimfs/src/test/java/com/google/common/jimfs/FileTreeTest.java +++ b/jimfs/src/test/java/com/google/common/jimfs/FileTreeTest.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jimfs/src/test/java/com/google/common/jimfs/PathSubject.java b/jimfs/src/test/java/com/google/common/jimfs/PathSubject.java index 991b12867..0a812d32e 100644 --- a/jimfs/src/test/java/com/google/common/jimfs/PathSubject.java +++ b/jimfs/src/test/java/com/google/common/jimfs/PathSubject.java @@ -37,7 +37,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Subject for doing assertions on file system paths. diff --git a/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java index 53e08fe74..b8cb30a85 100644 --- a/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java +++ b/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.jimfs.PathType.ParseResult; import java.net.URI; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/jimfs/src/test/java/com/google/common/jimfs/TestAttributeProvider.java b/jimfs/src/test/java/com/google/common/jimfs/TestAttributeProvider.java index b53604779..9921f276e 100644 --- a/jimfs/src/test/java/com/google/common/jimfs/TestAttributeProvider.java +++ b/jimfs/src/test/java/com/google/common/jimfs/TestAttributeProvider.java @@ -26,7 +26,7 @@ import java.nio.file.attribute.FileTime; import java.util.HashMap; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** @author Colin Decker */ public final class TestAttributeProvider extends AttributeProvider { diff --git a/pom.xml b/pom.xml index d8309172f..972d634f3 100644 --- a/pom.xml +++ b/pom.xml @@ -129,9 +129,9 @@ 3.0.2 - org.checkerframework - checker-qual - 3.48.2 + org.jspecify + jspecify + 1.0.0