From 2cc8c5eddb587db3ac12dacdd5563e79a4681ec4 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Sat, 21 Dec 2024 19:35:44 -0800 Subject: [PATCH] Migrate from Checker Framework annotations to JSpecify annotations. This is the next step toward [using JSpecify in Guava](https://github.com/jspecify/jspecify/issues/239#issuecomment-2204318808). RELNOTES=Migrated from Checker Framework annotations to JSpecify annotations. PiperOrigin-RevId: 708707163 --- .../common/collect/testing/AbstractCollectionTester.java | 2 +- .../common/collect/testing/AbstractContainerTester.java | 2 +- .../google/common/collect/testing/AbstractIteratorTester.java | 2 +- .../com/google/common/collect/testing/AbstractMapTester.java | 2 +- .../src/com/google/common/collect/testing/AbstractTester.java | 2 +- .../src/com/google/common/collect/testing/BaseComparable.java | 2 +- .../common/collect/testing/DerivedCollectionGenerators.java | 2 +- .../collect/testing/FeatureSpecificTestSuiteBuilder.java | 2 +- .../src/com/google/common/collect/testing/Helpers.java | 2 +- .../src/com/google/common/collect/testing/IteratorTester.java | 2 +- .../com/google/common/collect/testing/ListIteratorTester.java | 2 +- .../com/google/common/collect/testing/MapInterfaceTest.java | 2 +- .../com/google/common/collect/testing/MinimalCollection.java | 4 ++-- .../com/google/common/collect/testing/MinimalIterable.java | 2 +- .../src/com/google/common/collect/testing/MinimalSet.java | 4 ++-- .../com/google/common/collect/testing/OneSizeGenerator.java | 2 +- .../common/collect/testing/OneSizeTestContainerGenerator.java | 2 +- .../common/collect/testing/ReflectionFreeAssertThrows.java | 2 +- .../src/com/google/common/collect/testing/SafeTreeMap.java | 2 +- .../src/com/google/common/collect/testing/SafeTreeSet.java | 2 +- .../src/com/google/common/collect/testing/SampleElements.java | 2 +- .../common/collect/testing/SortedMapTestSuiteBuilder.java | 2 +- .../com/google/common/collect/testing/SpliteratorTester.java | 2 +- .../common/collect/testing/TestCollectionGenerator.java | 2 +- .../google/common/collect/testing/TestContainerGenerator.java | 2 +- .../com/google/common/collect/testing/TestListGenerator.java | 2 +- .../common/collect/testing/TestMapEntrySetGenerator.java | 2 +- .../com/google/common/collect/testing/TestMapGenerator.java | 2 +- .../com/google/common/collect/testing/TestQueueGenerator.java | 2 +- .../com/google/common/collect/testing/TestSetGenerator.java | 2 +- .../google/common/collect/testing/TestSortedMapGenerator.java | 2 +- .../google/common/collect/testing/TestSortedSetGenerator.java | 2 +- .../google/common/collect/testing/TestSubjectGenerator.java | 2 +- .../com/google/common/collect/testing/UnhashableObject.java | 2 +- .../common/collect/testing/features/CollectionSize.java | 2 +- .../common/collect/testing/features/TesterRequirements.java | 2 +- .../common/collect/testing/google/AbstractBiMapTester.java | 2 +- .../collect/testing/google/AbstractListMultimapTester.java | 2 +- .../common/collect/testing/google/AbstractMultimapTester.java | 2 +- .../testing/google/DerivedGoogleCollectionGenerators.java | 2 +- .../collect/testing/google/ListMultimapAsMapTester.java | 2 +- .../common/collect/testing/google/MultimapEqualsTester.java | 2 +- .../common/collect/testing/google/MultimapPutTester.java | 2 +- .../common/collect/testing/google/MultimapSizeTester.java | 2 +- .../common/collect/testing/google/MultisetIteratorTester.java | 2 +- .../collect/testing/google/ReflectionFreeAssertThrows.java | 2 +- .../common/collect/testing/google/SetMultimapAsMapTester.java | 2 +- .../common/collect/testing/google/TestBiMapGenerator.java | 2 +- .../collect/testing/google/TestListMultimapGenerator.java | 2 +- .../common/collect/testing/google/TestMultimapGenerator.java | 2 +- .../common/collect/testing/google/TestMultisetGenerator.java | 2 +- .../collect/testing/google/UnmodifiableCollectionTests.java | 2 +- .../collect/testing/testers/AbstractListIndexOfTester.java | 2 +- .../common/collect/testing/testers/AbstractListTester.java | 2 +- .../collect/testing/testers/CollectionAddAllTester.java | 2 +- .../collect/testing/testers/CollectionIteratorTester.java | 2 +- .../collect/testing/testers/ListListIteratorTester.java | 2 +- .../common/collect/testing/testers/MapPutAllTester.java | 2 +- .../collect/testing/testers/ReflectionFreeAssertThrows.java | 2 +- .../collect/testing/testers/SortedSetNavigationTester.java | 2 +- .../src/com/google/common/testing/ArbitraryInstances.java | 2 +- .../src/com/google/common/testing/ClassSanityTester.java | 2 +- .../src/com/google/common/testing/DummyProxy.java | 2 +- .../src/com/google/common/testing/EqualsTester.java | 2 +- .../com/google/common/testing/ForwardingWrapperTester.java | 2 +- .../src/com/google/common/testing/FreshValueGenerator.java | 2 +- .../src/com/google/common/testing/NullPointerTester.java | 2 +- .../src/com/google/common/testing/TestLogHandler.java | 2 +- .../util/concurrent/testing/AbstractListenableFutureTest.java | 2 +- .../common/collect/testing/MapTestSuiteBuilderTests.java | 2 +- .../test/com/google/common/collect/testing/MyTester.java | 2 +- .../com/google/common/testing/ArbitraryInstancesTest.java | 2 +- .../test/com/google/common/testing/EqualsTesterTest.java | 2 +- .../test/com/google/common/testing/FakeTickerTest.java | 2 +- .../test/com/google/common/testing/GcFinalizationTest.java | 2 +- .../com/google/common/testing/ReflectionFreeAssertThrows.java | 2 +- .../com/google/common/testing/SerializableTesterTest.java | 2 +- .../test/com/google/common/testing/TearDownStackTest.java | 2 +- .../testing/anotherpackage/ForwardingWrapperTesterTest.java | 2 +- .../benchmark/com/google/common/cache/ChainBenchmark.java | 2 +- .../common/collect/ConcurrentHashMultisetBenchmark.java | 2 +- .../google/common/collect/MinMaxPriorityQueueBenchmark.java | 2 +- .../google/common/util/concurrent/ExecutionListBenchmark.java | 2 +- .../util/concurrent/MonitorBasedArrayBlockingQueue.java | 2 +- .../util/concurrent/MonitorBasedPriorityBlockingQueue.java | 2 +- .../test/com/google/common/base/AbstractIteratorTest.java | 2 +- .../test/com/google/common/base/EquivalenceTest.java | 2 +- .../com/google/common/base/FinalizableReferenceQueueTest.java | 2 +- .../test/com/google/common/base/FunctionsTest.java | 2 +- .../guava-tests/test/com/google/common/base/JoinerTest.java | 2 +- .../guava-tests/test/com/google/common/base/OptionalTest.java | 2 +- .../test/com/google/common/base/PreconditionsTest.java | 2 +- .../test/com/google/common/base/PredicatesTest.java | 2 +- .../com/google/common/base/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/base/SuppliersTest.java | 2 +- .../test/com/google/common/base/ToStringHelperTest.java | 2 +- .../test/com/google/common/cache/AbstractCacheTest.java | 2 +- .../com/google/common/cache/AbstractLoadingCacheTest.java | 2 +- .../test/com/google/common/cache/CacheBuilderFactory.java | 2 +- .../test/com/google/common/cache/CacheTesting.java | 2 +- .../test/com/google/common/cache/LocalCacheTest.java | 2 +- .../com/google/common/cache/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/cache/TestingCacheLoaders.java | 2 +- .../com/google/common/collect/AbstractFilteredMapTest.java | 2 +- .../com/google/common/collect/AbstractImmutableSetTest.java | 2 +- .../test/com/google/common/collect/AbstractIteratorTest.java | 2 +- .../test/com/google/common/collect/AbstractMapEntryTest.java | 2 +- .../common/collect/AbstractMapsTransformValuesTest.java | 2 +- .../google/common/collect/AbstractSequentialIteratorTest.java | 2 +- .../test/com/google/common/collect/AbstractTableReadTest.java | 2 +- .../test/com/google/common/collect/AbstractTableTest.java | 4 ++-- .../test/com/google/common/collect/ArrayTableTest.java | 2 +- android/guava-tests/test/com/google/common/collect/Base.java | 2 +- .../google/common/collect/CollectionBenchmarkSampleData.java | 2 +- .../test/com/google/common/collect/Collections2Test.java | 2 +- .../test/com/google/common/collect/ComparatorsTest.java | 2 +- .../test/com/google/common/collect/FauxveridesTest.java | 2 +- .../test/com/google/common/collect/FluentIterableTest.java | 2 +- .../test/com/google/common/collect/ForwardingListTest.java | 2 +- .../test/com/google/common/collect/ForwardingMapTest.java | 2 +- .../com/google/common/collect/ForwardingMultisetTest.java | 2 +- .../com/google/common/collect/ForwardingNavigableMapTest.java | 2 +- .../com/google/common/collect/ForwardingNavigableSetTest.java | 2 +- .../test/com/google/common/collect/ForwardingQueueTest.java | 2 +- .../test/com/google/common/collect/ForwardingSetTest.java | 2 +- .../com/google/common/collect/ForwardingSortedMapTest.java | 2 +- .../google/common/collect/ForwardingSortedMultisetTest.java | 2 +- .../com/google/common/collect/ForwardingSortedSetTest.java | 2 +- .../test/com/google/common/collect/GeneralRangeTest.java | 2 +- .../test/com/google/common/collect/HashBasedTableTest.java | 2 +- .../test/com/google/common/collect/ImmutableBiMapTest.java | 2 +- .../common/collect/ImmutableClassToInstanceMapTest.java | 2 +- .../com/google/common/collect/ImmutableListMultimapTest.java | 2 +- .../test/com/google/common/collect/ImmutableListTest.java | 2 +- .../test/com/google/common/collect/ImmutableMapTest.java | 2 +- .../test/com/google/common/collect/ImmutableMultimapTest.java | 2 +- .../test/com/google/common/collect/ImmutableMultisetTest.java | 2 +- .../com/google/common/collect/ImmutableSetMultimapTest.java | 2 +- .../com/google/common/collect/ImmutableSortedMapTest.java | 2 +- .../test/com/google/common/collect/ImmutableTableTest.java | 2 +- .../test/com/google/common/collect/IterablesTest.java | 2 +- .../test/com/google/common/collect/IteratorsTest.java | 2 +- .../test/com/google/common/collect/LegacyComparable.java | 2 +- .../com/google/common/collect/LinkedHashMultimapTest.java | 2 +- .../com/google/common/collect/LinkedListMultimapTest.java | 2 +- .../test/com/google/common/collect/ListsImplTest.java | 2 +- .../test/com/google/common/collect/MapsCollectionTest.java | 2 +- .../guava-tests/test/com/google/common/collect/MapsTest.java | 2 +- .../collect/MapsTransformValuesUnmodifiableIteratorTest.java | 2 +- .../com/google/common/collect/MinMaxPriorityQueueTest.java | 2 +- .../test/com/google/common/collect/MultimapBuilderTest.java | 2 +- .../test/com/google/common/collect/MultimapsTest.java | 2 +- .../google/common/collect/MultisetsImmutableEntryTest.java | 2 +- .../test/com/google/common/collect/NewCustomTableTest.java | 2 +- .../test/com/google/common/collect/ObjectArraysTest.java | 2 +- .../test/com/google/common/collect/OrderingTest.java | 4 ++-- .../test/com/google/common/collect/PeekingIteratorTest.java | 2 +- .../test/com/google/common/collect/QueuesTest.java | 2 +- .../guava-tests/test/com/google/common/collect/RangeTest.java | 2 +- .../com/google/common/collect/ReflectionFreeAssertThrows.java | 2 +- .../com/google/common/collect/RegularImmutableAsListTest.java | 2 +- .../guava-tests/test/com/google/common/collect/SetsTest.java | 2 +- .../com/google/common/collect/SimpleAbstractMultisetTest.java | 2 +- .../test/com/google/common/collect/SynchronizedBiMapTest.java | 2 +- .../test/com/google/common/collect/SynchronizedDequeTest.java | 2 +- .../test/com/google/common/collect/SynchronizedMapTest.java | 2 +- .../com/google/common/collect/SynchronizedMultimapTest.java | 2 +- .../google/common/collect/SynchronizedNavigableMapTest.java | 2 +- .../google/common/collect/SynchronizedNavigableSetTest.java | 2 +- .../test/com/google/common/collect/SynchronizedQueueTest.java | 2 +- .../test/com/google/common/collect/SynchronizedSetTest.java | 2 +- .../test/com/google/common/collect/SynchronizedTableTest.java | 2 +- .../test/com/google/common/collect/TableCollectionTest.java | 2 +- .../test/com/google/common/collect/TablesTest.java | 2 +- .../com/google/common/collect/TablesTransformValuesTest.java | 2 +- .../test/com/google/common/collect/TransposedTableTest.java | 2 +- .../test/com/google/common/collect/TreeBasedTableTest.java | 2 +- .../com/google/common/collect/TreeMultimapExplicitTest.java | 2 +- .../test/com/google/common/collect/TreeMultisetTest.java | 2 +- .../com/google/common/escape/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/escape/UnicodeEscaperTest.java | 2 +- .../test/com/google/common/eventbus/PackageSanityTests.java | 2 +- .../test/com/google/common/eventbus/StringCatcher.java | 2 +- .../test/com/google/common/eventbus/SubscriberTest.java | 2 +- .../google/common/eventbus/outside/AbstractEventBusTest.java | 2 +- .../test/com/google/common/graph/AbstractNetworkTest.java | 2 +- .../test/com/google/common/graph/ValueGraphTest.java | 2 +- .../test/com/google/common/hash/BloomFilterTest.java | 2 +- .../guava-tests/test/com/google/common/hash/HashCodeTest.java | 2 +- .../test/com/google/common/hash/MacHashFunctionTest.java | 2 +- .../test/com/google/common/io/BaseEncodingTest.java | 2 +- .../guava-tests/test/com/google/common/io/ByteSourceTest.java | 2 +- android/guava-tests/test/com/google/common/io/CloserTest.java | 2 +- android/guava-tests/test/com/google/common/io/IoTestCase.java | 2 +- .../test/com/google/common/io/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/io/SourceSinkFactories.java | 2 +- .../test/com/google/common/math/QuantilesTest.java | 2 +- .../com/google/common/math/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/net/HostAndPortTest.java | 2 +- .../com/google/common/net/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/primitives/BooleansTest.java | 2 +- .../test/com/google/common/primitives/BytesTest.java | 2 +- .../test/com/google/common/primitives/CharsTest.java | 2 +- .../test/com/google/common/primitives/DoublesTest.java | 2 +- .../test/com/google/common/primitives/FloatsTest.java | 2 +- .../test/com/google/common/primitives/IntsTest.java | 2 +- .../test/com/google/common/primitives/LongsTest.java | 2 +- .../google/common/primitives/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/primitives/ShortsTest.java | 2 +- .../google/common/reflect/AbstractInvocationHandlerTest.java | 2 +- .../test/com/google/common/reflect/InvokableTest.java | 2 +- .../test/com/google/common/reflect/SubtypeTester.java | 2 +- .../common/util/concurrent/AbstractAbstractFutureTest.java | 2 +- .../common/util/concurrent/AbstractFutureBenchmarks.java | 2 +- .../com/google/common/util/concurrent/AbstractFutureTest.java | 2 +- .../common/util/concurrent/AbstractScheduledServiceTest.java | 2 +- .../test/com/google/common/util/concurrent/CallablesTest.java | 2 +- .../google/common/util/concurrent/ExecutionSequencerTest.java | 2 +- .../com/google/common/util/concurrent/FutureCallbackTest.java | 2 +- .../common/util/concurrent/FuturesGetCheckedInputs.java | 2 +- .../com/google/common/util/concurrent/FuturesGetDoneTest.java | 2 +- .../test/com/google/common/util/concurrent/FuturesTest.java | 2 +- .../google/common/util/concurrent/GeneratedMonitorTest.java | 2 +- .../google/common/util/concurrent/InterruptibleTaskTest.java | 2 +- .../google/common/util/concurrent/ListenableFutureTester.java | 2 +- .../com/google/common/util/concurrent/MoreExecutorsTest.java | 2 +- .../common/util/concurrent/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/util/concurrent/TestPlatform.java | 2 +- .../test/com/google/common/util/concurrent/TestThread.java | 2 +- .../util/concurrent/TrustedListenableFutureTaskTest.java | 2 +- android/guava/src/com/google/common/base/Absent.java | 2 +- .../guava/src/com/google/common/base/AbstractIterator.java | 2 +- android/guava/src/com/google/common/base/CaseFormat.java | 2 +- android/guava/src/com/google/common/base/Converter.java | 2 +- android/guava/src/com/google/common/base/Defaults.java | 2 +- android/guava/src/com/google/common/base/Enums.java | 2 +- android/guava/src/com/google/common/base/Equivalence.java | 4 ++-- .../com/google/common/base/FinalizablePhantomReference.java | 2 +- .../src/com/google/common/base/FinalizableReferenceQueue.java | 2 +- .../src/com/google/common/base/FinalizableSoftReference.java | 2 +- .../src/com/google/common/base/FinalizableWeakReference.java | 2 +- android/guava/src/com/google/common/base/Function.java | 2 +- .../src/com/google/common/base/FunctionalEquivalence.java | 2 +- android/guava/src/com/google/common/base/Functions.java | 2 +- android/guava/src/com/google/common/base/Joiner.java | 2 +- android/guava/src/com/google/common/base/MoreObjects.java | 2 +- android/guava/src/com/google/common/base/NullnessCasts.java | 2 +- android/guava/src/com/google/common/base/Objects.java | 2 +- android/guava/src/com/google/common/base/Optional.java | 2 +- .../guava/src/com/google/common/base/PairwiseEquivalence.java | 2 +- android/guava/src/com/google/common/base/Platform.java | 2 +- android/guava/src/com/google/common/base/Preconditions.java | 2 +- android/guava/src/com/google/common/base/Predicate.java | 2 +- android/guava/src/com/google/common/base/Predicates.java | 2 +- android/guava/src/com/google/common/base/Present.java | 2 +- android/guava/src/com/google/common/base/Splitter.java | 2 +- .../src/com/google/common/base/StandardSystemProperty.java | 2 +- android/guava/src/com/google/common/base/Strings.java | 2 +- android/guava/src/com/google/common/base/Supplier.java | 2 +- android/guava/src/com/google/common/base/Suppliers.java | 2 +- android/guava/src/com/google/common/base/Throwables.java | 2 +- android/guava/src/com/google/common/base/Verify.java | 2 +- android/guava/src/com/google/common/base/VerifyException.java | 2 +- .../guava/src/com/google/common/base/internal/Finalizer.java | 2 +- android/guava/src/com/google/common/cache/Cache.java | 2 +- android/guava/src/com/google/common/cache/CacheBuilder.java | 2 +- .../guava/src/com/google/common/cache/CacheBuilderSpec.java | 2 +- android/guava/src/com/google/common/cache/CacheStats.java | 2 +- .../guava/src/com/google/common/cache/ForwardingCache.java | 2 +- android/guava/src/com/google/common/cache/LocalCache.java | 2 +- android/guava/src/com/google/common/cache/ReferenceEntry.java | 2 +- .../src/com/google/common/cache/RemovalNotification.java | 2 +- android/guava/src/com/google/common/cache/Striped64.java | 2 +- .../guava/src/com/google/common/collect/AbstractBiMap.java | 2 +- .../google/common/collect/AbstractIndexedListIterator.java | 2 +- .../guava/src/com/google/common/collect/AbstractIterator.java | 2 +- .../src/com/google/common/collect/AbstractListMultimap.java | 2 +- .../com/google/common/collect/AbstractMapBasedMultimap.java | 2 +- .../com/google/common/collect/AbstractMapBasedMultiset.java | 2 +- .../guava/src/com/google/common/collect/AbstractMapEntry.java | 2 +- .../guava/src/com/google/common/collect/AbstractMultimap.java | 2 +- .../guava/src/com/google/common/collect/AbstractMultiset.java | 2 +- .../src/com/google/common/collect/AbstractNavigableMap.java | 2 +- .../guava/src/com/google/common/collect/AbstractRangeSet.java | 2 +- .../com/google/common/collect/AbstractSequentialIterator.java | 2 +- .../src/com/google/common/collect/AbstractSetMultimap.java | 2 +- .../common/collect/AbstractSortedKeySortedSetMultimap.java | 2 +- .../src/com/google/common/collect/AbstractSortedMultiset.java | 2 +- .../com/google/common/collect/AbstractSortedSetMultimap.java | 2 +- .../guava/src/com/google/common/collect/AbstractTable.java | 2 +- .../guava/src/com/google/common/collect/AllEqualOrdering.java | 2 +- .../src/com/google/common/collect/ArrayListMultimap.java | 2 +- .../ArrayListMultimapGwtSerializationDependencies.java | 2 +- android/guava/src/com/google/common/collect/ArrayTable.java | 2 +- android/guava/src/com/google/common/collect/BiMap.java | 2 +- .../src/com/google/common/collect/ByFunctionOrdering.java | 2 +- .../guava/src/com/google/common/collect/CartesianList.java | 2 +- .../src/com/google/common/collect/ClassToInstanceMap.java | 4 ++-- .../src/com/google/common/collect/CollectCollectors.java | 2 +- .../src/com/google/common/collect/CollectSpliterators.java | 2 +- android/guava/src/com/google/common/collect/Collections2.java | 2 +- .../guava/src/com/google/common/collect/CompactHashMap.java | 2 +- .../guava/src/com/google/common/collect/CompactHashSet.java | 2 +- .../guava/src/com/google/common/collect/CompactHashing.java | 2 +- .../src/com/google/common/collect/CompactLinkedHashMap.java | 2 +- .../src/com/google/common/collect/CompactLinkedHashSet.java | 2 +- .../src/com/google/common/collect/ComparatorOrdering.java | 2 +- android/guava/src/com/google/common/collect/Comparators.java | 2 +- .../guava/src/com/google/common/collect/ComparisonChain.java | 2 +- .../guava/src/com/google/common/collect/CompoundOrdering.java | 2 +- .../src/com/google/common/collect/ComputationException.java | 2 +- .../src/com/google/common/collect/ConcurrentHashMultiset.java | 2 +- .../src/com/google/common/collect/ConsumingQueueIterator.java | 2 +- android/guava/src/com/google/common/collect/Count.java | 2 +- android/guava/src/com/google/common/collect/Cut.java | 2 +- .../src/com/google/common/collect/DenseImmutableTable.java | 2 +- .../common/collect/DescendingImmutableSortedMultiset.java | 2 +- .../google/common/collect/DescendingImmutableSortedSet.java | 2 +- .../src/com/google/common/collect/DescendingMultiset.java | 2 +- .../guava/src/com/google/common/collect/DiscreteDomain.java | 2 +- .../src/com/google/common/collect/EmptyContiguousSet.java | 2 +- .../guava/src/com/google/common/collect/EnumHashBiMap.java | 2 +- android/guava/src/com/google/common/collect/EnumMultiset.java | 2 +- .../guava/src/com/google/common/collect/ExplicitOrdering.java | 2 +- .../src/com/google/common/collect/FilteredEntryMultimap.java | 2 +- .../com/google/common/collect/FilteredEntrySetMultimap.java | 2 +- .../com/google/common/collect/FilteredKeyListMultimap.java | 2 +- .../src/com/google/common/collect/FilteredKeyMultimap.java | 2 +- .../src/com/google/common/collect/FilteredKeySetMultimap.java | 2 +- .../guava/src/com/google/common/collect/FilteredMultimap.java | 2 +- .../src/com/google/common/collect/FilteredMultimapValues.java | 2 +- .../src/com/google/common/collect/FilteredSetMultimap.java | 2 +- .../guava/src/com/google/common/collect/FluentIterable.java | 4 ++-- .../com/google/common/collect/ForwardingBlockingDeque.java | 2 +- .../src/com/google/common/collect/ForwardingCollection.java | 2 +- .../com/google/common/collect/ForwardingConcurrentMap.java | 2 +- .../guava/src/com/google/common/collect/ForwardingDeque.java | 2 +- .../src/com/google/common/collect/ForwardingIterator.java | 2 +- .../guava/src/com/google/common/collect/ForwardingList.java | 2 +- .../src/com/google/common/collect/ForwardingListIterator.java | 2 +- .../src/com/google/common/collect/ForwardingListMultimap.java | 2 +- .../guava/src/com/google/common/collect/ForwardingMap.java | 2 +- .../src/com/google/common/collect/ForwardingMapEntry.java | 2 +- .../src/com/google/common/collect/ForwardingMultimap.java | 2 +- .../src/com/google/common/collect/ForwardingMultiset.java | 2 +- .../src/com/google/common/collect/ForwardingNavigableMap.java | 2 +- .../src/com/google/common/collect/ForwardingNavigableSet.java | 2 +- .../guava/src/com/google/common/collect/ForwardingQueue.java | 2 +- .../guava/src/com/google/common/collect/ForwardingSet.java | 2 +- .../src/com/google/common/collect/ForwardingSetMultimap.java | 2 +- .../src/com/google/common/collect/ForwardingSortedMap.java | 2 +- .../com/google/common/collect/ForwardingSortedMultiset.java | 2 +- .../src/com/google/common/collect/ForwardingSortedSet.java | 2 +- .../google/common/collect/ForwardingSortedSetMultimap.java | 2 +- .../guava/src/com/google/common/collect/ForwardingTable.java | 2 +- android/guava/src/com/google/common/collect/GeneralRange.java | 2 +- android/guava/src/com/google/common/collect/HashBiMap.java | 2 +- android/guava/src/com/google/common/collect/HashMultimap.java | 2 +- .../collect/HashMultimapGwtSerializationDependencies.java | 2 +- android/guava/src/com/google/common/collect/HashMultiset.java | 2 +- android/guava/src/com/google/common/collect/Hashing.java | 2 +- .../guava/src/com/google/common/collect/ImmutableAsList.java | 2 +- .../guava/src/com/google/common/collect/ImmutableBiMap.java | 2 +- .../google/common/collect/ImmutableClassToInstanceMap.java | 4 ++-- .../src/com/google/common/collect/ImmutableCollection.java | 2 +- .../guava/src/com/google/common/collect/ImmutableEntry.java | 2 +- .../guava/src/com/google/common/collect/ImmutableEnumMap.java | 2 +- .../guava/src/com/google/common/collect/ImmutableEnumSet.java | 2 +- .../guava/src/com/google/common/collect/ImmutableList.java | 2 +- .../src/com/google/common/collect/ImmutableListMultimap.java | 2 +- android/guava/src/com/google/common/collect/ImmutableMap.java | 2 +- .../src/com/google/common/collect/ImmutableMapEntrySet.java | 2 +- .../src/com/google/common/collect/ImmutableMapKeySet.java | 2 +- .../src/com/google/common/collect/ImmutableMapValues.java | 2 +- .../src/com/google/common/collect/ImmutableMultimap.java | 2 +- .../src/com/google/common/collect/ImmutableMultiset.java | 2 +- .../src/com/google/common/collect/ImmutableRangeMap.java | 2 +- .../src/com/google/common/collect/ImmutableRangeSet.java | 2 +- android/guava/src/com/google/common/collect/ImmutableSet.java | 2 +- .../src/com/google/common/collect/ImmutableSetMultimap.java | 2 +- .../src/com/google/common/collect/ImmutableSortedMap.java | 2 +- .../com/google/common/collect/ImmutableSortedMultiset.java | 2 +- .../src/com/google/common/collect/ImmutableSortedSet.java | 2 +- .../guava/src/com/google/common/collect/ImmutableTable.java | 2 +- .../src/com/google/common/collect/IndexedImmutableSet.java | 2 +- android/guava/src/com/google/common/collect/Interners.java | 2 +- android/guava/src/com/google/common/collect/Iterables.java | 4 ++-- android/guava/src/com/google/common/collect/Iterators.java | 4 ++-- .../com/google/common/collect/LexicographicalOrdering.java | 2 +- .../src/com/google/common/collect/LinkedHashMultimap.java | 2 +- .../LinkedHashMultimapGwtSerializationDependencies.java | 2 +- .../src/com/google/common/collect/LinkedHashMultiset.java | 2 +- .../src/com/google/common/collect/LinkedListMultimap.java | 2 +- android/guava/src/com/google/common/collect/ListMultimap.java | 2 +- android/guava/src/com/google/common/collect/Lists.java | 2 +- .../guava/src/com/google/common/collect/MapDifference.java | 2 +- android/guava/src/com/google/common/collect/MapMaker.java | 2 +- .../src/com/google/common/collect/MapMakerInternalMap.java | 2 +- android/guava/src/com/google/common/collect/Maps.java | 4 ++-- .../src/com/google/common/collect/MinMaxPriorityQueue.java | 2 +- .../guava/src/com/google/common/collect/MoreCollectors.java | 2 +- android/guava/src/com/google/common/collect/Multimap.java | 2 +- .../guava/src/com/google/common/collect/MultimapBuilder.java | 2 +- android/guava/src/com/google/common/collect/Multimaps.java | 2 +- android/guava/src/com/google/common/collect/Multiset.java | 2 +- android/guava/src/com/google/common/collect/Multisets.java | 2 +- .../com/google/common/collect/MutableClassToInstanceMap.java | 4 ++-- .../guava/src/com/google/common/collect/NaturalOrdering.java | 2 +- .../guava/src/com/google/common/collect/NullnessCasts.java | 2 +- .../src/com/google/common/collect/NullsFirstOrdering.java | 4 ++-- .../src/com/google/common/collect/NullsLastOrdering.java | 4 ++-- android/guava/src/com/google/common/collect/ObjectArrays.java | 4 ++-- .../src/com/google/common/collect/ObjectCountHashMap.java | 2 +- .../com/google/common/collect/ObjectCountLinkedHashMap.java | 2 +- android/guava/src/com/google/common/collect/Ordering.java | 4 ++-- .../guava/src/com/google/common/collect/PeekingIterator.java | 2 +- android/guava/src/com/google/common/collect/Platform.java | 2 +- android/guava/src/com/google/common/collect/Queues.java | 2 +- android/guava/src/com/google/common/collect/Range.java | 2 +- android/guava/src/com/google/common/collect/RangeMap.java | 2 +- android/guava/src/com/google/common/collect/RangeSet.java | 2 +- .../src/com/google/common/collect/RegularContiguousSet.java | 2 +- .../src/com/google/common/collect/RegularImmutableAsList.java | 2 +- .../src/com/google/common/collect/RegularImmutableBiMap.java | 2 +- .../src/com/google/common/collect/RegularImmutableList.java | 2 +- .../src/com/google/common/collect/RegularImmutableMap.java | 2 +- .../com/google/common/collect/RegularImmutableMultiset.java | 2 +- .../src/com/google/common/collect/RegularImmutableSet.java | 2 +- .../google/common/collect/RegularImmutableSortedMultiset.java | 2 +- .../com/google/common/collect/RegularImmutableSortedSet.java | 2 +- .../src/com/google/common/collect/RegularImmutableTable.java | 2 +- .../guava/src/com/google/common/collect/ReverseOrdering.java | 2 +- .../guava/src/com/google/common/collect/RowSortedTable.java | 2 +- .../guava/src/com/google/common/collect/Serialization.java | 2 +- android/guava/src/com/google/common/collect/SetMultimap.java | 2 +- android/guava/src/com/google/common/collect/Sets.java | 4 ++-- .../src/com/google/common/collect/SingletonImmutableSet.java | 2 +- .../guava/src/com/google/common/collect/SortedIterable.java | 2 +- .../guava/src/com/google/common/collect/SortedIterables.java | 2 +- android/guava/src/com/google/common/collect/SortedLists.java | 2 +- .../src/com/google/common/collect/SortedMapDifference.java | 2 +- .../guava/src/com/google/common/collect/SortedMultiset.java | 2 +- .../src/com/google/common/collect/SortedMultisetBridge.java | 2 +- .../guava/src/com/google/common/collect/SortedMultisets.java | 2 +- .../src/com/google/common/collect/SortedSetMultimap.java | 2 +- .../src/com/google/common/collect/StandardRowSortedTable.java | 2 +- .../guava/src/com/google/common/collect/StandardTable.java | 2 +- android/guava/src/com/google/common/collect/Streams.java | 2 +- android/guava/src/com/google/common/collect/Synchronized.java | 2 +- android/guava/src/com/google/common/collect/Table.java | 2 +- .../guava/src/com/google/common/collect/TableCollectors.java | 2 +- android/guava/src/com/google/common/collect/Tables.java | 2 +- android/guava/src/com/google/common/collect/TopKSelector.java | 2 +- .../src/com/google/common/collect/TransformedIterator.java | 2 +- .../com/google/common/collect/TransformedListIterator.java | 2 +- .../guava/src/com/google/common/collect/TreeBasedTable.java | 2 +- android/guava/src/com/google/common/collect/TreeMultimap.java | 2 +- android/guava/src/com/google/common/collect/TreeMultiset.java | 2 +- android/guava/src/com/google/common/collect/TreeRangeMap.java | 2 +- android/guava/src/com/google/common/collect/TreeRangeSet.java | 2 +- .../guava/src/com/google/common/collect/TreeTraverser.java | 2 +- .../src/com/google/common/collect/UnmodifiableIterator.java | 2 +- .../com/google/common/collect/UnmodifiableListIterator.java | 2 +- .../com/google/common/collect/UnmodifiableSortedMultiset.java | 2 +- .../src/com/google/common/escape/ArrayBasedCharEscaper.java | 2 +- .../com/google/common/escape/ArrayBasedUnicodeEscaper.java | 2 +- android/guava/src/com/google/common/escape/CharEscaper.java | 2 +- .../src/com/google/common/escape/CharEscaperBuilder.java | 2 +- android/guava/src/com/google/common/escape/Escapers.java | 2 +- .../guava/src/com/google/common/escape/UnicodeEscaper.java | 2 +- android/guava/src/com/google/common/eventbus/Subscriber.java | 2 +- .../src/com/google/common/eventbus/SubscriberRegistry.java | 2 +- .../guava/src/com/google/common/graph/AbstractBaseGraph.java | 2 +- .../common/graph/AbstractDirectedNetworkConnections.java | 2 +- android/guava/src/com/google/common/graph/AbstractGraph.java | 2 +- .../guava/src/com/google/common/graph/AbstractNetwork.java | 2 +- .../common/graph/AbstractUndirectedNetworkConnections.java | 2 +- .../guava/src/com/google/common/graph/AbstractValueGraph.java | 2 +- .../src/com/google/common/graph/DirectedGraphConnections.java | 2 +- .../google/common/graph/DirectedMultiNetworkConnections.java | 2 +- .../guava/src/com/google/common/graph/EdgesConnecting.java | 2 +- android/guava/src/com/google/common/graph/ElementOrder.java | 2 +- android/guava/src/com/google/common/graph/EndpointPair.java | 2 +- .../src/com/google/common/graph/EndpointPairIterator.java | 2 +- .../guava/src/com/google/common/graph/ForwardingNetwork.java | 2 +- .../src/com/google/common/graph/ForwardingValueGraph.java | 2 +- android/guava/src/com/google/common/graph/Graph.java | 2 +- .../guava/src/com/google/common/graph/GraphConnections.java | 2 +- android/guava/src/com/google/common/graph/Graphs.java | 2 +- .../guava/src/com/google/common/graph/IncidentEdgeSet.java | 2 +- .../guava/src/com/google/common/graph/MapIteratorCache.java | 2 +- .../guava/src/com/google/common/graph/MapRetrievalCache.java | 2 +- .../src/com/google/common/graph/MultiEdgesConnecting.java | 2 +- .../guava/src/com/google/common/graph/MutableValueGraph.java | 2 +- android/guava/src/com/google/common/graph/Network.java | 2 +- .../guava/src/com/google/common/graph/NetworkConnections.java | 2 +- .../com/google/common/graph/StandardMutableValueGraph.java | 2 +- .../guava/src/com/google/common/graph/StandardValueGraph.java | 2 +- android/guava/src/com/google/common/graph/Traverser.java | 2 +- .../com/google/common/graph/UndirectedGraphConnections.java | 2 +- .../common/graph/UndirectedMultiNetworkConnections.java | 2 +- android/guava/src/com/google/common/graph/ValueGraph.java | 2 +- .../com/google/common/hash/AbstractCompositeHashFunction.java | 2 +- .../src/com/google/common/hash/AbstractHashFunction.java | 2 +- android/guava/src/com/google/common/hash/AbstractHasher.java | 2 +- android/guava/src/com/google/common/hash/BloomFilter.java | 2 +- .../src/com/google/common/hash/BloomFilterStrategies.java | 2 +- android/guava/src/com/google/common/hash/Funnel.java | 2 +- android/guava/src/com/google/common/hash/Funnels.java | 2 +- android/guava/src/com/google/common/hash/HashCode.java | 2 +- android/guava/src/com/google/common/hash/HashFunction.java | 2 +- android/guava/src/com/google/common/hash/Hasher.java | 2 +- android/guava/src/com/google/common/hash/Hashing.java | 2 +- .../src/com/google/common/hash/Murmur3_128HashFunction.java | 2 +- .../src/com/google/common/hash/Murmur3_32HashFunction.java | 2 +- android/guava/src/com/google/common/hash/SipHashFunction.java | 2 +- android/guava/src/com/google/common/hash/Striped64.java | 2 +- android/guava/src/com/google/common/io/AppendableWriter.java | 2 +- android/guava/src/com/google/common/io/BaseEncoding.java | 2 +- .../guava/src/com/google/common/io/ByteArrayDataInput.java | 2 +- android/guava/src/com/google/common/io/ByteProcessor.java | 2 +- android/guava/src/com/google/common/io/ByteSource.java | 2 +- android/guava/src/com/google/common/io/ByteStreams.java | 2 +- .../guava/src/com/google/common/io/CharSequenceReader.java | 2 +- android/guava/src/com/google/common/io/CharSource.java | 2 +- android/guava/src/com/google/common/io/CharStreams.java | 2 +- android/guava/src/com/google/common/io/Closeables.java | 2 +- android/guava/src/com/google/common/io/Closer.java | 2 +- .../src/com/google/common/io/FileBackedOutputStream.java | 2 +- android/guava/src/com/google/common/io/Files.java | 2 +- .../google/common/io/InsecureRecursiveDeleteException.java | 2 +- android/guava/src/com/google/common/io/LineProcessor.java | 2 +- android/guava/src/com/google/common/io/LineReader.java | 2 +- android/guava/src/com/google/common/io/MoreFiles.java | 2 +- android/guava/src/com/google/common/io/MultiInputStream.java | 2 +- android/guava/src/com/google/common/io/MultiReader.java | 2 +- android/guava/src/com/google/common/io/Resources.java | 2 +- .../src/com/google/common/math/LinearTransformation.java | 2 +- android/guava/src/com/google/common/math/PairedStats.java | 2 +- android/guava/src/com/google/common/math/Stats.java | 2 +- android/guava/src/com/google/common/net/HostAndPort.java | 2 +- android/guava/src/com/google/common/net/HostSpecifier.java | 2 +- android/guava/src/com/google/common/net/InetAddresses.java | 2 +- .../guava/src/com/google/common/net/InternetDomainName.java | 2 +- android/guava/src/com/google/common/net/MediaType.java | 2 +- android/guava/src/com/google/common/net/PercentEscaper.java | 2 +- android/guava/src/com/google/common/primitives/Booleans.java | 2 +- android/guava/src/com/google/common/primitives/Bytes.java | 2 +- android/guava/src/com/google/common/primitives/Chars.java | 2 +- android/guava/src/com/google/common/primitives/Doubles.java | 2 +- android/guava/src/com/google/common/primitives/Floats.java | 2 +- .../com/google/common/primitives/ImmutableDoubleArray.java | 2 +- .../src/com/google/common/primitives/ImmutableIntArray.java | 2 +- .../src/com/google/common/primitives/ImmutableLongArray.java | 2 +- android/guava/src/com/google/common/primitives/Ints.java | 2 +- android/guava/src/com/google/common/primitives/Longs.java | 2 +- android/guava/src/com/google/common/primitives/Shorts.java | 2 +- .../src/com/google/common/primitives/UnsignedInteger.java | 2 +- .../guava/src/com/google/common/primitives/UnsignedLong.java | 2 +- .../com/google/common/reflect/AbstractInvocationHandler.java | 2 +- android/guava/src/com/google/common/reflect/ClassPath.java | 2 +- .../com/google/common/reflect/ImmutableTypeToInstanceMap.java | 2 +- android/guava/src/com/google/common/reflect/Invokable.java | 2 +- .../com/google/common/reflect/MutableTypeToInstanceMap.java | 4 ++-- android/guava/src/com/google/common/reflect/Parameter.java | 2 +- .../guava/src/com/google/common/reflect/TypeParameter.java | 2 +- android/guava/src/com/google/common/reflect/TypeResolver.java | 2 +- .../src/com/google/common/reflect/TypeToInstanceMap.java | 4 ++-- android/guava/src/com/google/common/reflect/TypeToken.java | 2 +- android/guava/src/com/google/common/reflect/TypeVisitor.java | 2 +- android/guava/src/com/google/common/reflect/Types.java | 2 +- .../google/common/util/concurrent/AbstractCatchingFuture.java | 2 +- .../src/com/google/common/util/concurrent/AbstractFuture.java | 2 +- .../util/concurrent/AbstractListeningExecutorService.java | 2 +- .../common/util/concurrent/AbstractScheduledService.java | 2 +- .../com/google/common/util/concurrent/AbstractService.java | 2 +- .../common/util/concurrent/AbstractTransformFuture.java | 2 +- .../com/google/common/util/concurrent/AggregateFuture.java | 2 +- .../google/common/util/concurrent/AggregateFutureState.java | 2 +- .../src/com/google/common/util/concurrent/AsyncCallable.java | 2 +- .../src/com/google/common/util/concurrent/AsyncFunction.java | 2 +- .../src/com/google/common/util/concurrent/AtomicLongMap.java | 2 +- .../guava/src/com/google/common/util/concurrent/Atomics.java | 2 +- .../src/com/google/common/util/concurrent/Callables.java | 2 +- .../src/com/google/common/util/concurrent/ClosingFuture.java | 2 +- .../com/google/common/util/concurrent/CollectionFuture.java | 2 +- .../src/com/google/common/util/concurrent/CombinedFuture.java | 2 +- .../common/util/concurrent/CycleDetectingLockFactory.java | 2 +- .../src/com/google/common/util/concurrent/ExecutionError.java | 2 +- .../src/com/google/common/util/concurrent/ExecutionList.java | 2 +- .../com/google/common/util/concurrent/ExecutionSequencer.java | 2 +- .../com/google/common/util/concurrent/FakeTimeLimiter.java | 2 +- .../src/com/google/common/util/concurrent/FluentFuture.java | 2 +- .../common/util/concurrent/ForwardingBlockingDeque.java | 2 +- .../common/util/concurrent/ForwardingBlockingQueue.java | 2 +- .../common/util/concurrent/ForwardingExecutorService.java | 2 +- .../google/common/util/concurrent/ForwardingFluentFuture.java | 2 +- .../com/google/common/util/concurrent/ForwardingFuture.java | 2 +- .../common/util/concurrent/ForwardingListenableFuture.java | 2 +- .../util/concurrent/ForwardingListeningExecutorService.java | 2 +- .../src/com/google/common/util/concurrent/FutureCallback.java | 2 +- .../guava/src/com/google/common/util/concurrent/Futures.java | 2 +- .../com/google/common/util/concurrent/FuturesGetChecked.java | 2 +- .../concurrent/GwtFluentFutureCatchingSpecialization.java | 2 +- .../com/google/common/util/concurrent/ImmediateFuture.java | 2 +- .../com/google/common/util/concurrent/InterruptibleTask.java | 2 +- .../com/google/common/util/concurrent/JdkFutureAdapters.java | 2 +- .../src/com/google/common/util/concurrent/LazyLogger.java | 2 +- .../com/google/common/util/concurrent/ListenableFuture.java | 2 +- .../google/common/util/concurrent/ListenableFutureTask.java | 2 +- .../common/util/concurrent/ListenableScheduledFuture.java | 2 +- .../common/util/concurrent/ListeningExecutorService.java | 2 +- .../util/concurrent/ListeningScheduledExecutorService.java | 2 +- .../guava/src/com/google/common/util/concurrent/Monitor.java | 2 +- .../src/com/google/common/util/concurrent/MoreExecutors.java | 2 +- .../src/com/google/common/util/concurrent/NullnessCasts.java | 2 +- .../common/util/concurrent/OverflowAvoidingLockSupport.java | 2 +- .../guava/src/com/google/common/util/concurrent/Platform.java | 2 +- .../src/com/google/common/util/concurrent/RateLimiter.java | 2 +- .../com/google/common/util/concurrent/SequentialExecutor.java | 2 +- .../src/com/google/common/util/concurrent/SettableFuture.java | 2 +- .../com/google/common/util/concurrent/SimpleTimeLimiter.java | 2 +- .../guava/src/com/google/common/util/concurrent/Striped.java | 2 +- .../google/common/util/concurrent/ThreadFactoryBuilder.java | 2 +- .../src/com/google/common/util/concurrent/TimeLimiter.java | 2 +- .../src/com/google/common/util/concurrent/TimeoutFuture.java | 2 +- .../common/util/concurrent/TrustedListenableFutureTask.java | 2 +- .../common/util/concurrent/UncheckedExecutionException.java | 2 +- .../common/util/concurrent/UncheckedTimeoutException.java | 2 +- .../com/google/common/util/concurrent/Uninterruptibles.java | 2 +- .../common/util/concurrent/WrappingExecutorService.java | 2 +- .../util/concurrent/WrappingScheduledExecutorService.java | 2 +- .../com/google/common/util/concurrent/ListenableFuture.java | 2 +- .../com/google/common/base/ExtraObjectsMethodsForWeb.java | 2 +- .../common/base/super/com/google/common/base/Platform.java | 2 +- .../cache/super/com/google/common/cache/LocalCache.java | 2 +- .../com/google/common/collect/AbstractSortedMultiset.java | 2 +- .../ArrayListMultimapGwtSerializationDependencies.java | 2 +- .../super/com/google/common/collect/DescendingMultiset.java | 2 +- .../google/common/collect/ForwardingImmutableCollection.java | 2 +- .../com/google/common/collect/ForwardingImmutableList.java | 2 +- .../com/google/common/collect/ForwardingImmutableMap.java | 2 +- .../com/google/common/collect/ForwardingImmutableSet.java | 2 +- .../com/google/common/collect/ForwardingSortedMultiset.java | 2 +- .../collect/HashMultimapGwtSerializationDependencies.java | 2 +- .../super/com/google/common/collect/ImmutableBiMap.java | 2 +- .../super/com/google/common/collect/ImmutableCollection.java | 2 +- .../super/com/google/common/collect/ImmutableList.java | 2 +- .../collect/super/com/google/common/collect/ImmutableMap.java | 2 +- .../collect/super/com/google/common/collect/ImmutableSet.java | 2 +- .../super/com/google/common/collect/ImmutableSortedMap.java | 2 +- .../super/com/google/common/collect/ImmutableSortedSet.java | 2 +- .../LinkedHashMultimapGwtSerializationDependencies.java | 2 +- .../collect/super/com/google/common/collect/Platform.java | 2 +- .../super/com/google/common/collect/RegularImmutableList.java | 2 +- .../com/google/common/collect/RegularImmutableMultiset.java | 2 +- .../com/google/common/collect/RegularImmutableSortedSet.java | 2 +- .../com/google/common/collect/SingletonImmutableBiMap.java | 2 +- .../com/google/common/collect/SingletonImmutableSet.java | 2 +- .../super/com/google/common/collect/SortedMultiset.java | 2 +- .../com/google/common/collect/UnmodifiableSortedMultiset.java | 2 +- .../com/google/common/util/concurrent/AbstractFuture.java | 2 +- .../google/common/util/concurrent/AggregateFutureState.java | 2 +- .../concurrent/GwtFluentFutureCatchingSpecialization.java | 2 +- .../util/concurrent/GwtFuturesCatchingSpecialization.java | 2 +- .../com/google/common/util/concurrent/InterruptibleTask.java | 2 +- .../com/google/common/util/concurrent/ListenableFuture.java | 2 +- .../com/google/common/util/concurrent/Uninterruptibles.java | 2 +- .../super/com/google/common/util/concurrent/TestPlatform.java | 2 +- .../common/collect/testing/AbstractCollectionTester.java | 2 +- .../common/collect/testing/AbstractContainerTester.java | 2 +- .../google/common/collect/testing/AbstractIteratorTester.java | 2 +- .../com/google/common/collect/testing/AbstractMapTester.java | 2 +- .../src/com/google/common/collect/testing/AbstractTester.java | 2 +- .../src/com/google/common/collect/testing/BaseComparable.java | 2 +- .../common/collect/testing/DerivedCollectionGenerators.java | 2 +- .../collect/testing/FeatureSpecificTestSuiteBuilder.java | 2 +- .../src/com/google/common/collect/testing/Helpers.java | 2 +- .../src/com/google/common/collect/testing/IteratorTester.java | 2 +- .../com/google/common/collect/testing/ListIteratorTester.java | 2 +- .../com/google/common/collect/testing/MapInterfaceTest.java | 2 +- .../com/google/common/collect/testing/MinimalCollection.java | 4 ++-- .../com/google/common/collect/testing/MinimalIterable.java | 2 +- .../src/com/google/common/collect/testing/MinimalSet.java | 4 ++-- .../com/google/common/collect/testing/OneSizeGenerator.java | 2 +- .../common/collect/testing/OneSizeTestContainerGenerator.java | 2 +- .../common/collect/testing/ReflectionFreeAssertThrows.java | 2 +- .../src/com/google/common/collect/testing/SafeTreeMap.java | 2 +- .../src/com/google/common/collect/testing/SafeTreeSet.java | 2 +- .../src/com/google/common/collect/testing/SampleElements.java | 2 +- .../common/collect/testing/SortedMapTestSuiteBuilder.java | 2 +- .../com/google/common/collect/testing/SpliteratorTester.java | 2 +- .../common/collect/testing/TestCollectionGenerator.java | 2 +- .../google/common/collect/testing/TestContainerGenerator.java | 2 +- .../com/google/common/collect/testing/TestListGenerator.java | 2 +- .../common/collect/testing/TestMapEntrySetGenerator.java | 2 +- .../com/google/common/collect/testing/TestMapGenerator.java | 2 +- .../com/google/common/collect/testing/TestQueueGenerator.java | 2 +- .../com/google/common/collect/testing/TestSetGenerator.java | 2 +- .../google/common/collect/testing/TestSortedMapGenerator.java | 2 +- .../google/common/collect/testing/TestSortedSetGenerator.java | 2 +- .../google/common/collect/testing/TestSubjectGenerator.java | 2 +- .../com/google/common/collect/testing/UnhashableObject.java | 2 +- .../common/collect/testing/features/CollectionSize.java | 2 +- .../common/collect/testing/features/TesterRequirements.java | 2 +- .../common/collect/testing/google/AbstractBiMapTester.java | 2 +- .../collect/testing/google/AbstractListMultimapTester.java | 2 +- .../common/collect/testing/google/AbstractMultimapTester.java | 2 +- .../testing/google/DerivedGoogleCollectionGenerators.java | 2 +- .../collect/testing/google/ListMultimapAsMapTester.java | 2 +- .../common/collect/testing/google/MultimapEqualsTester.java | 2 +- .../common/collect/testing/google/MultimapPutTester.java | 2 +- .../common/collect/testing/google/MultimapSizeTester.java | 2 +- .../common/collect/testing/google/MultisetIteratorTester.java | 2 +- .../collect/testing/google/ReflectionFreeAssertThrows.java | 2 +- .../common/collect/testing/google/SetMultimapAsMapTester.java | 2 +- .../common/collect/testing/google/TestBiMapGenerator.java | 2 +- .../collect/testing/google/TestListMultimapGenerator.java | 2 +- .../common/collect/testing/google/TestMultimapGenerator.java | 2 +- .../common/collect/testing/google/TestMultisetGenerator.java | 2 +- .../collect/testing/google/UnmodifiableCollectionTests.java | 2 +- .../collect/testing/testers/AbstractListIndexOfTester.java | 2 +- .../common/collect/testing/testers/AbstractListTester.java | 2 +- .../collect/testing/testers/CollectionAddAllTester.java | 2 +- .../collect/testing/testers/CollectionIteratorTester.java | 2 +- .../collect/testing/testers/ListListIteratorTester.java | 2 +- .../common/collect/testing/testers/MapPutAllTester.java | 2 +- .../collect/testing/testers/ReflectionFreeAssertThrows.java | 2 +- .../collect/testing/testers/SortedSetNavigationTester.java | 2 +- .../src/com/google/common/testing/ArbitraryInstances.java | 2 +- .../src/com/google/common/testing/ClassSanityTester.java | 2 +- .../src/com/google/common/testing/CollectorTester.java | 2 +- guava-testlib/src/com/google/common/testing/DummyProxy.java | 2 +- guava-testlib/src/com/google/common/testing/EqualsTester.java | 2 +- .../com/google/common/testing/ForwardingWrapperTester.java | 2 +- .../src/com/google/common/testing/FreshValueGenerator.java | 2 +- .../src/com/google/common/testing/NullPointerTester.java | 2 +- .../src/com/google/common/testing/TestLogHandler.java | 2 +- .../util/concurrent/testing/AbstractListenableFutureTest.java | 2 +- .../common/collect/testing/MapTestSuiteBuilderTests.java | 2 +- .../test/com/google/common/collect/testing/MyTester.java | 2 +- .../com/google/common/testing/ArbitraryInstancesTest.java | 2 +- .../test/com/google/common/testing/ClassSanityTesterTest.java | 2 +- .../test/com/google/common/testing/EqualsTesterTest.java | 2 +- .../test/com/google/common/testing/FakeTickerTest.java | 2 +- .../test/com/google/common/testing/GcFinalizationTest.java | 2 +- .../test/com/google/common/testing/NullPointerTesterTest.java | 2 +- .../com/google/common/testing/ReflectionFreeAssertThrows.java | 2 +- .../com/google/common/testing/SerializableTesterTest.java | 2 +- .../test/com/google/common/testing/TearDownStackTest.java | 2 +- .../testing/anotherpackage/ForwardingWrapperTesterTest.java | 2 +- .../benchmark/com/google/common/cache/ChainBenchmark.java | 2 +- .../common/collect/ConcurrentHashMultisetBenchmark.java | 2 +- .../google/common/collect/MinMaxPriorityQueueBenchmark.java | 2 +- .../google/common/util/concurrent/ExecutionListBenchmark.java | 2 +- .../util/concurrent/MonitorBasedArrayBlockingQueue.java | 2 +- .../util/concurrent/MonitorBasedPriorityBlockingQueue.java | 2 +- .../test/com/google/common/base/AbstractIteratorTest.java | 2 +- guava-tests/test/com/google/common/base/EquivalenceTest.java | 2 +- .../com/google/common/base/FinalizableReferenceQueueTest.java | 2 +- guava-tests/test/com/google/common/base/FunctionsTest.java | 2 +- guava-tests/test/com/google/common/base/JoinerTest.java | 2 +- guava-tests/test/com/google/common/base/OptionalTest.java | 2 +- .../test/com/google/common/base/PreconditionsTest.java | 2 +- guava-tests/test/com/google/common/base/PredicatesTest.java | 2 +- .../com/google/common/base/ReflectionFreeAssertThrows.java | 2 +- guava-tests/test/com/google/common/base/SuppliersTest.java | 2 +- .../test/com/google/common/base/ToStringHelperTest.java | 2 +- .../test/com/google/common/cache/AbstractCacheTest.java | 2 +- .../com/google/common/cache/AbstractLoadingCacheTest.java | 2 +- .../test/com/google/common/cache/CacheBuilderFactory.java | 2 +- guava-tests/test/com/google/common/cache/CacheTesting.java | 2 +- guava-tests/test/com/google/common/cache/LocalCacheTest.java | 2 +- .../com/google/common/cache/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/cache/TestingCacheLoaders.java | 2 +- .../com/google/common/collect/AbstractFilteredMapTest.java | 2 +- .../com/google/common/collect/AbstractHashFloodingTest.java | 2 +- .../com/google/common/collect/AbstractImmutableSetTest.java | 2 +- .../test/com/google/common/collect/AbstractIteratorTest.java | 2 +- .../test/com/google/common/collect/AbstractMapEntryTest.java | 2 +- .../common/collect/AbstractMapsTransformValuesTest.java | 2 +- .../google/common/collect/AbstractSequentialIteratorTest.java | 2 +- .../test/com/google/common/collect/AbstractTableReadTest.java | 2 +- .../test/com/google/common/collect/AbstractTableTest.java | 4 ++-- .../test/com/google/common/collect/ArrayTableTest.java | 2 +- guava-tests/test/com/google/common/collect/Base.java | 2 +- .../google/common/collect/CollectionBenchmarkSampleData.java | 2 +- .../test/com/google/common/collect/Collections2Test.java | 2 +- .../test/com/google/common/collect/ComparatorsTest.java | 2 +- .../test/com/google/common/collect/ComparisonChainTest.java | 2 +- .../test/com/google/common/collect/FauxveridesTest.java | 2 +- .../test/com/google/common/collect/FluentIterableTest.java | 2 +- .../test/com/google/common/collect/ForwardingListTest.java | 2 +- .../test/com/google/common/collect/ForwardingMapTest.java | 2 +- .../com/google/common/collect/ForwardingMultisetTest.java | 2 +- .../com/google/common/collect/ForwardingNavigableMapTest.java | 2 +- .../com/google/common/collect/ForwardingNavigableSetTest.java | 2 +- .../test/com/google/common/collect/ForwardingQueueTest.java | 2 +- .../test/com/google/common/collect/ForwardingSetTest.java | 2 +- .../com/google/common/collect/ForwardingSortedMapTest.java | 2 +- .../google/common/collect/ForwardingSortedMultisetTest.java | 2 +- .../com/google/common/collect/ForwardingSortedSetTest.java | 2 +- .../test/com/google/common/collect/GeneralRangeTest.java | 2 +- .../test/com/google/common/collect/HashBasedTableTest.java | 2 +- .../test/com/google/common/collect/ImmutableBiMapTest.java | 2 +- .../common/collect/ImmutableClassToInstanceMapTest.java | 2 +- .../com/google/common/collect/ImmutableListMultimapTest.java | 2 +- .../test/com/google/common/collect/ImmutableListTest.java | 2 +- .../test/com/google/common/collect/ImmutableMapTest.java | 2 +- .../test/com/google/common/collect/ImmutableMultimapTest.java | 2 +- .../test/com/google/common/collect/ImmutableMultisetTest.java | 2 +- .../com/google/common/collect/ImmutableSetMultimapTest.java | 2 +- .../test/com/google/common/collect/ImmutableSetTest.java | 2 +- .../com/google/common/collect/ImmutableSortedMapTest.java | 2 +- .../com/google/common/collect/ImmutableSortedSetTest.java | 2 +- .../test/com/google/common/collect/ImmutableTableTest.java | 2 +- guava-tests/test/com/google/common/collect/IterablesTest.java | 2 +- guava-tests/test/com/google/common/collect/IteratorsTest.java | 2 +- .../test/com/google/common/collect/LegacyComparable.java | 2 +- .../com/google/common/collect/LinkedHashMultimapTest.java | 2 +- .../com/google/common/collect/LinkedListMultimapTest.java | 2 +- guava-tests/test/com/google/common/collect/ListsImplTest.java | 2 +- .../test/com/google/common/collect/MapsCollectionTest.java | 2 +- guava-tests/test/com/google/common/collect/MapsTest.java | 2 +- .../collect/MapsTransformValuesUnmodifiableIteratorTest.java | 2 +- .../com/google/common/collect/MinMaxPriorityQueueTest.java | 2 +- .../test/com/google/common/collect/MoreCollectorsTest.java | 2 +- .../test/com/google/common/collect/MultimapBuilderTest.java | 2 +- guava-tests/test/com/google/common/collect/MultimapsTest.java | 2 +- .../google/common/collect/MultisetsImmutableEntryTest.java | 2 +- .../test/com/google/common/collect/NewCustomTableTest.java | 2 +- .../test/com/google/common/collect/ObjectArraysTest.java | 2 +- guava-tests/test/com/google/common/collect/OrderingTest.java | 4 ++-- .../test/com/google/common/collect/PeekingIteratorTest.java | 2 +- guava-tests/test/com/google/common/collect/QueuesTest.java | 2 +- guava-tests/test/com/google/common/collect/RangeTest.java | 2 +- .../com/google/common/collect/ReflectionFreeAssertThrows.java | 2 +- .../com/google/common/collect/RegularImmutableAsListTest.java | 2 +- guava-tests/test/com/google/common/collect/SetsTest.java | 2 +- .../com/google/common/collect/SimpleAbstractMultisetTest.java | 2 +- guava-tests/test/com/google/common/collect/StreamsTest.java | 2 +- .../test/com/google/common/collect/SynchronizedBiMapTest.java | 2 +- .../test/com/google/common/collect/SynchronizedDequeTest.java | 2 +- .../test/com/google/common/collect/SynchronizedMapTest.java | 2 +- .../com/google/common/collect/SynchronizedMultimapTest.java | 2 +- .../google/common/collect/SynchronizedNavigableMapTest.java | 2 +- .../google/common/collect/SynchronizedNavigableSetTest.java | 2 +- .../test/com/google/common/collect/SynchronizedQueueTest.java | 2 +- .../test/com/google/common/collect/SynchronizedSetTest.java | 2 +- .../test/com/google/common/collect/SynchronizedTableTest.java | 2 +- .../test/com/google/common/collect/TableCollectionTest.java | 2 +- .../test/com/google/common/collect/TableCollectorsTest.java | 2 +- guava-tests/test/com/google/common/collect/TablesTest.java | 2 +- .../com/google/common/collect/TablesTransformValuesTest.java | 2 +- .../test/com/google/common/collect/TransposedTableTest.java | 2 +- .../test/com/google/common/collect/TreeBasedTableTest.java | 2 +- .../com/google/common/collect/TreeMultimapExplicitTest.java | 2 +- .../test/com/google/common/collect/TreeMultisetTest.java | 2 +- .../com/google/common/escape/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/escape/UnicodeEscaperTest.java | 2 +- .../test/com/google/common/eventbus/PackageSanityTests.java | 2 +- .../test/com/google/common/eventbus/StringCatcher.java | 2 +- .../test/com/google/common/eventbus/SubscriberTest.java | 2 +- .../google/common/eventbus/outside/AbstractEventBusTest.java | 2 +- .../test/com/google/common/graph/AbstractNetworkTest.java | 2 +- guava-tests/test/com/google/common/graph/ValueGraphTest.java | 2 +- guava-tests/test/com/google/common/hash/BloomFilterTest.java | 2 +- guava-tests/test/com/google/common/hash/HashCodeTest.java | 2 +- .../test/com/google/common/hash/MacHashFunctionTest.java | 2 +- guava-tests/test/com/google/common/io/BaseEncodingTest.java | 2 +- guava-tests/test/com/google/common/io/ByteSourceTest.java | 2 +- guava-tests/test/com/google/common/io/CloserTest.java | 2 +- guava-tests/test/com/google/common/io/IoTestCase.java | 2 +- .../test/com/google/common/io/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/io/SourceSinkFactories.java | 2 +- guava-tests/test/com/google/common/math/QuantilesTest.java | 2 +- .../com/google/common/math/ReflectionFreeAssertThrows.java | 2 +- guava-tests/test/com/google/common/net/HostAndPortTest.java | 2 +- .../com/google/common/net/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/primitives/BooleansTest.java | 2 +- guava-tests/test/com/google/common/primitives/BytesTest.java | 2 +- guava-tests/test/com/google/common/primitives/CharsTest.java | 2 +- .../test/com/google/common/primitives/DoublesTest.java | 2 +- guava-tests/test/com/google/common/primitives/FloatsTest.java | 2 +- guava-tests/test/com/google/common/primitives/IntsTest.java | 2 +- guava-tests/test/com/google/common/primitives/LongsTest.java | 2 +- .../google/common/primitives/ReflectionFreeAssertThrows.java | 2 +- guava-tests/test/com/google/common/primitives/ShortsTest.java | 2 +- .../google/common/reflect/AbstractInvocationHandlerTest.java | 2 +- guava-tests/test/com/google/common/reflect/InvokableTest.java | 2 +- guava-tests/test/com/google/common/reflect/SubtypeTester.java | 2 +- .../common/util/concurrent/AbstractAbstractFutureTest.java | 2 +- .../common/util/concurrent/AbstractFutureBenchmarks.java | 2 +- .../com/google/common/util/concurrent/AbstractFutureTest.java | 2 +- .../common/util/concurrent/AbstractScheduledServiceTest.java | 2 +- .../test/com/google/common/util/concurrent/CallablesTest.java | 2 +- .../google/common/util/concurrent/ExecutionSequencerTest.java | 2 +- .../com/google/common/util/concurrent/FutureCallbackTest.java | 2 +- .../common/util/concurrent/FuturesGetCheckedInputs.java | 2 +- .../com/google/common/util/concurrent/FuturesGetDoneTest.java | 2 +- .../test/com/google/common/util/concurrent/FuturesTest.java | 2 +- .../google/common/util/concurrent/GeneratedMonitorTest.java | 2 +- .../google/common/util/concurrent/InterruptibleTaskTest.java | 2 +- .../google/common/util/concurrent/ListenableFutureTester.java | 2 +- .../com/google/common/util/concurrent/MoreExecutorsTest.java | 2 +- .../common/util/concurrent/ReflectionFreeAssertThrows.java | 2 +- .../test/com/google/common/util/concurrent/TestPlatform.java | 2 +- .../test/com/google/common/util/concurrent/TestThread.java | 2 +- .../util/concurrent/TrustedListenableFutureTaskTest.java | 2 +- guava/src/com/google/common/base/Absent.java | 2 +- guava/src/com/google/common/base/AbstractIterator.java | 2 +- guava/src/com/google/common/base/CaseFormat.java | 2 +- guava/src/com/google/common/base/Converter.java | 2 +- guava/src/com/google/common/base/Defaults.java | 2 +- guava/src/com/google/common/base/Enums.java | 2 +- guava/src/com/google/common/base/Equivalence.java | 4 ++-- .../com/google/common/base/FinalizablePhantomReference.java | 2 +- .../src/com/google/common/base/FinalizableReferenceQueue.java | 2 +- .../src/com/google/common/base/FinalizableSoftReference.java | 2 +- .../src/com/google/common/base/FinalizableWeakReference.java | 2 +- guava/src/com/google/common/base/Function.java | 2 +- guava/src/com/google/common/base/FunctionalEquivalence.java | 2 +- guava/src/com/google/common/base/Functions.java | 2 +- guava/src/com/google/common/base/Joiner.java | 2 +- guava/src/com/google/common/base/MoreObjects.java | 2 +- guava/src/com/google/common/base/NullnessCasts.java | 2 +- guava/src/com/google/common/base/Objects.java | 2 +- guava/src/com/google/common/base/Optional.java | 2 +- guava/src/com/google/common/base/PairwiseEquivalence.java | 2 +- guava/src/com/google/common/base/Platform.java | 2 +- guava/src/com/google/common/base/Preconditions.java | 2 +- guava/src/com/google/common/base/Predicate.java | 2 +- guava/src/com/google/common/base/Predicates.java | 2 +- guava/src/com/google/common/base/Present.java | 2 +- guava/src/com/google/common/base/Splitter.java | 2 +- guava/src/com/google/common/base/StandardSystemProperty.java | 2 +- guava/src/com/google/common/base/Strings.java | 2 +- guava/src/com/google/common/base/Supplier.java | 2 +- guava/src/com/google/common/base/Suppliers.java | 2 +- guava/src/com/google/common/base/Throwables.java | 2 +- guava/src/com/google/common/base/Verify.java | 2 +- guava/src/com/google/common/base/VerifyException.java | 2 +- guava/src/com/google/common/base/internal/Finalizer.java | 2 +- guava/src/com/google/common/cache/Cache.java | 2 +- guava/src/com/google/common/cache/CacheBuilder.java | 2 +- guava/src/com/google/common/cache/CacheBuilderSpec.java | 2 +- guava/src/com/google/common/cache/CacheStats.java | 2 +- guava/src/com/google/common/cache/ForwardingCache.java | 2 +- guava/src/com/google/common/cache/LocalCache.java | 2 +- guava/src/com/google/common/cache/ReferenceEntry.java | 2 +- guava/src/com/google/common/cache/RemovalNotification.java | 2 +- guava/src/com/google/common/cache/Striped64.java | 2 +- guava/src/com/google/common/collect/AbstractBiMap.java | 2 +- .../google/common/collect/AbstractIndexedListIterator.java | 2 +- guava/src/com/google/common/collect/AbstractIterator.java | 2 +- guava/src/com/google/common/collect/AbstractListMultimap.java | 2 +- .../com/google/common/collect/AbstractMapBasedMultimap.java | 2 +- .../com/google/common/collect/AbstractMapBasedMultiset.java | 2 +- guava/src/com/google/common/collect/AbstractMapEntry.java | 2 +- guava/src/com/google/common/collect/AbstractMultimap.java | 2 +- guava/src/com/google/common/collect/AbstractMultiset.java | 2 +- guava/src/com/google/common/collect/AbstractNavigableMap.java | 2 +- guava/src/com/google/common/collect/AbstractRangeSet.java | 2 +- .../com/google/common/collect/AbstractSequentialIterator.java | 2 +- guava/src/com/google/common/collect/AbstractSetMultimap.java | 2 +- .../common/collect/AbstractSortedKeySortedSetMultimap.java | 2 +- .../src/com/google/common/collect/AbstractSortedMultiset.java | 2 +- .../com/google/common/collect/AbstractSortedSetMultimap.java | 2 +- guava/src/com/google/common/collect/AbstractTable.java | 2 +- guava/src/com/google/common/collect/AllEqualOrdering.java | 2 +- guava/src/com/google/common/collect/ArrayListMultimap.java | 2 +- .../ArrayListMultimapGwtSerializationDependencies.java | 2 +- guava/src/com/google/common/collect/ArrayTable.java | 2 +- guava/src/com/google/common/collect/BiMap.java | 2 +- guava/src/com/google/common/collect/ByFunctionOrdering.java | 2 +- guava/src/com/google/common/collect/CartesianList.java | 2 +- guava/src/com/google/common/collect/ClassToInstanceMap.java | 4 ++-- guava/src/com/google/common/collect/CollectCollectors.java | 2 +- guava/src/com/google/common/collect/CollectSpliterators.java | 2 +- guava/src/com/google/common/collect/Collections2.java | 2 +- guava/src/com/google/common/collect/CompactHashMap.java | 2 +- guava/src/com/google/common/collect/CompactHashSet.java | 2 +- guava/src/com/google/common/collect/CompactHashing.java | 2 +- guava/src/com/google/common/collect/CompactLinkedHashMap.java | 2 +- guava/src/com/google/common/collect/CompactLinkedHashSet.java | 2 +- guava/src/com/google/common/collect/ComparatorOrdering.java | 2 +- guava/src/com/google/common/collect/Comparators.java | 2 +- guava/src/com/google/common/collect/ComparisonChain.java | 2 +- guava/src/com/google/common/collect/CompoundOrdering.java | 2 +- guava/src/com/google/common/collect/ComputationException.java | 2 +- .../src/com/google/common/collect/ConcurrentHashMultiset.java | 2 +- .../src/com/google/common/collect/ConsumingQueueIterator.java | 2 +- guava/src/com/google/common/collect/Count.java | 2 +- guava/src/com/google/common/collect/Cut.java | 2 +- guava/src/com/google/common/collect/DenseImmutableTable.java | 2 +- .../common/collect/DescendingImmutableSortedMultiset.java | 2 +- .../google/common/collect/DescendingImmutableSortedSet.java | 2 +- guava/src/com/google/common/collect/DescendingMultiset.java | 2 +- guava/src/com/google/common/collect/DiscreteDomain.java | 2 +- guava/src/com/google/common/collect/EmptyContiguousSet.java | 2 +- guava/src/com/google/common/collect/EnumHashBiMap.java | 2 +- guava/src/com/google/common/collect/EnumMultiset.java | 2 +- guava/src/com/google/common/collect/ExplicitOrdering.java | 2 +- .../src/com/google/common/collect/FilteredEntryMultimap.java | 2 +- .../com/google/common/collect/FilteredEntrySetMultimap.java | 2 +- .../com/google/common/collect/FilteredKeyListMultimap.java | 2 +- guava/src/com/google/common/collect/FilteredKeyMultimap.java | 2 +- .../src/com/google/common/collect/FilteredKeySetMultimap.java | 2 +- guava/src/com/google/common/collect/FilteredMultimap.java | 2 +- .../src/com/google/common/collect/FilteredMultimapValues.java | 2 +- guava/src/com/google/common/collect/FilteredSetMultimap.java | 2 +- guava/src/com/google/common/collect/FluentIterable.java | 4 ++-- .../com/google/common/collect/ForwardingBlockingDeque.java | 2 +- guava/src/com/google/common/collect/ForwardingCollection.java | 2 +- .../com/google/common/collect/ForwardingConcurrentMap.java | 2 +- guava/src/com/google/common/collect/ForwardingDeque.java | 2 +- guava/src/com/google/common/collect/ForwardingIterator.java | 2 +- guava/src/com/google/common/collect/ForwardingList.java | 2 +- .../src/com/google/common/collect/ForwardingListIterator.java | 2 +- .../src/com/google/common/collect/ForwardingListMultimap.java | 2 +- guava/src/com/google/common/collect/ForwardingMap.java | 2 +- guava/src/com/google/common/collect/ForwardingMapEntry.java | 2 +- guava/src/com/google/common/collect/ForwardingMultimap.java | 2 +- guava/src/com/google/common/collect/ForwardingMultiset.java | 2 +- .../src/com/google/common/collect/ForwardingNavigableMap.java | 2 +- .../src/com/google/common/collect/ForwardingNavigableSet.java | 2 +- guava/src/com/google/common/collect/ForwardingQueue.java | 2 +- guava/src/com/google/common/collect/ForwardingSet.java | 2 +- .../src/com/google/common/collect/ForwardingSetMultimap.java | 2 +- guava/src/com/google/common/collect/ForwardingSortedMap.java | 2 +- .../com/google/common/collect/ForwardingSortedMultiset.java | 2 +- guava/src/com/google/common/collect/ForwardingSortedSet.java | 2 +- .../google/common/collect/ForwardingSortedSetMultimap.java | 2 +- guava/src/com/google/common/collect/ForwardingTable.java | 2 +- guava/src/com/google/common/collect/GeneralRange.java | 2 +- guava/src/com/google/common/collect/HashBiMap.java | 2 +- guava/src/com/google/common/collect/HashMultimap.java | 2 +- .../collect/HashMultimapGwtSerializationDependencies.java | 2 +- guava/src/com/google/common/collect/HashMultiset.java | 2 +- guava/src/com/google/common/collect/Hashing.java | 2 +- guava/src/com/google/common/collect/ImmutableAsList.java | 2 +- guava/src/com/google/common/collect/ImmutableBiMap.java | 2 +- .../google/common/collect/ImmutableClassToInstanceMap.java | 4 ++-- guava/src/com/google/common/collect/ImmutableCollection.java | 2 +- guava/src/com/google/common/collect/ImmutableEntry.java | 2 +- guava/src/com/google/common/collect/ImmutableEnumMap.java | 2 +- guava/src/com/google/common/collect/ImmutableEnumSet.java | 2 +- guava/src/com/google/common/collect/ImmutableList.java | 2 +- .../src/com/google/common/collect/ImmutableListMultimap.java | 2 +- guava/src/com/google/common/collect/ImmutableMap.java | 2 +- guava/src/com/google/common/collect/ImmutableMapEntry.java | 2 +- guava/src/com/google/common/collect/ImmutableMapEntrySet.java | 2 +- guava/src/com/google/common/collect/ImmutableMapKeySet.java | 2 +- guava/src/com/google/common/collect/ImmutableMapValues.java | 2 +- guava/src/com/google/common/collect/ImmutableMultimap.java | 2 +- guava/src/com/google/common/collect/ImmutableMultiset.java | 2 +- guava/src/com/google/common/collect/ImmutableRangeMap.java | 2 +- guava/src/com/google/common/collect/ImmutableRangeSet.java | 2 +- guava/src/com/google/common/collect/ImmutableSet.java | 2 +- guava/src/com/google/common/collect/ImmutableSetMultimap.java | 2 +- .../src/com/google/common/collect/ImmutableSortedAsList.java | 2 +- guava/src/com/google/common/collect/ImmutableSortedMap.java | 2 +- .../com/google/common/collect/ImmutableSortedMultiset.java | 2 +- guava/src/com/google/common/collect/ImmutableSortedSet.java | 2 +- guava/src/com/google/common/collect/ImmutableTable.java | 2 +- guava/src/com/google/common/collect/IndexedImmutableSet.java | 2 +- guava/src/com/google/common/collect/Interners.java | 2 +- guava/src/com/google/common/collect/Iterables.java | 4 ++-- guava/src/com/google/common/collect/Iterators.java | 4 ++-- .../com/google/common/collect/JdkBackedImmutableBiMap.java | 2 +- .../src/com/google/common/collect/JdkBackedImmutableMap.java | 2 +- .../com/google/common/collect/JdkBackedImmutableMultiset.java | 2 +- .../src/com/google/common/collect/JdkBackedImmutableSet.java | 2 +- .../com/google/common/collect/LexicographicalOrdering.java | 2 +- guava/src/com/google/common/collect/LinkedHashMultimap.java | 2 +- .../LinkedHashMultimapGwtSerializationDependencies.java | 2 +- guava/src/com/google/common/collect/LinkedHashMultiset.java | 2 +- guava/src/com/google/common/collect/LinkedListMultimap.java | 2 +- guava/src/com/google/common/collect/ListMultimap.java | 2 +- guava/src/com/google/common/collect/Lists.java | 2 +- guava/src/com/google/common/collect/MapDifference.java | 2 +- guava/src/com/google/common/collect/MapMaker.java | 2 +- guava/src/com/google/common/collect/MapMakerInternalMap.java | 2 +- guava/src/com/google/common/collect/Maps.java | 4 ++-- guava/src/com/google/common/collect/MinMaxPriorityQueue.java | 2 +- guava/src/com/google/common/collect/MoreCollectors.java | 2 +- guava/src/com/google/common/collect/Multimap.java | 2 +- guava/src/com/google/common/collect/MultimapBuilder.java | 2 +- guava/src/com/google/common/collect/Multimaps.java | 2 +- guava/src/com/google/common/collect/Multiset.java | 2 +- guava/src/com/google/common/collect/Multisets.java | 2 +- .../com/google/common/collect/MutableClassToInstanceMap.java | 4 ++-- guava/src/com/google/common/collect/NaturalOrdering.java | 2 +- guava/src/com/google/common/collect/NullnessCasts.java | 2 +- guava/src/com/google/common/collect/NullsFirstOrdering.java | 4 ++-- guava/src/com/google/common/collect/NullsLastOrdering.java | 4 ++-- guava/src/com/google/common/collect/ObjectArrays.java | 4 ++-- guava/src/com/google/common/collect/Ordering.java | 4 ++-- guava/src/com/google/common/collect/PeekingIterator.java | 2 +- guava/src/com/google/common/collect/Platform.java | 2 +- guava/src/com/google/common/collect/Queues.java | 2 +- guava/src/com/google/common/collect/Range.java | 2 +- guava/src/com/google/common/collect/RangeMap.java | 2 +- guava/src/com/google/common/collect/RangeSet.java | 2 +- guava/src/com/google/common/collect/RegularContiguousSet.java | 2 +- .../src/com/google/common/collect/RegularImmutableAsList.java | 2 +- .../src/com/google/common/collect/RegularImmutableBiMap.java | 2 +- guava/src/com/google/common/collect/RegularImmutableList.java | 2 +- guava/src/com/google/common/collect/RegularImmutableMap.java | 2 +- .../com/google/common/collect/RegularImmutableMultiset.java | 2 +- guava/src/com/google/common/collect/RegularImmutableSet.java | 2 +- .../google/common/collect/RegularImmutableSortedMultiset.java | 2 +- .../com/google/common/collect/RegularImmutableSortedSet.java | 2 +- .../src/com/google/common/collect/RegularImmutableTable.java | 2 +- guava/src/com/google/common/collect/ReverseOrdering.java | 2 +- guava/src/com/google/common/collect/RowSortedTable.java | 2 +- guava/src/com/google/common/collect/Serialization.java | 2 +- guava/src/com/google/common/collect/SetMultimap.java | 2 +- guava/src/com/google/common/collect/Sets.java | 4 ++-- .../com/google/common/collect/SingletonImmutableBiMap.java | 2 +- .../src/com/google/common/collect/SingletonImmutableSet.java | 2 +- guava/src/com/google/common/collect/SortedIterable.java | 2 +- guava/src/com/google/common/collect/SortedIterables.java | 2 +- guava/src/com/google/common/collect/SortedLists.java | 2 +- guava/src/com/google/common/collect/SortedMapDifference.java | 2 +- guava/src/com/google/common/collect/SortedMultiset.java | 2 +- guava/src/com/google/common/collect/SortedMultisetBridge.java | 2 +- guava/src/com/google/common/collect/SortedMultisets.java | 2 +- guava/src/com/google/common/collect/SortedSetMultimap.java | 2 +- .../src/com/google/common/collect/StandardRowSortedTable.java | 2 +- guava/src/com/google/common/collect/StandardTable.java | 2 +- guava/src/com/google/common/collect/Streams.java | 2 +- guava/src/com/google/common/collect/Synchronized.java | 4 ++-- guava/src/com/google/common/collect/Table.java | 2 +- guava/src/com/google/common/collect/TableCollectors.java | 2 +- guava/src/com/google/common/collect/Tables.java | 2 +- guava/src/com/google/common/collect/TopKSelector.java | 2 +- guava/src/com/google/common/collect/TransformedIterator.java | 2 +- .../com/google/common/collect/TransformedListIterator.java | 2 +- guava/src/com/google/common/collect/TreeBasedTable.java | 2 +- guava/src/com/google/common/collect/TreeMultimap.java | 2 +- guava/src/com/google/common/collect/TreeMultiset.java | 2 +- guava/src/com/google/common/collect/TreeRangeMap.java | 2 +- guava/src/com/google/common/collect/TreeRangeSet.java | 2 +- guava/src/com/google/common/collect/TreeTraverser.java | 2 +- guava/src/com/google/common/collect/UnmodifiableIterator.java | 2 +- .../com/google/common/collect/UnmodifiableListIterator.java | 2 +- .../com/google/common/collect/UnmodifiableSortedMultiset.java | 2 +- guava/src/com/google/common/escape/ArrayBasedCharEscaper.java | 2 +- .../com/google/common/escape/ArrayBasedUnicodeEscaper.java | 2 +- guava/src/com/google/common/escape/CharEscaper.java | 2 +- guava/src/com/google/common/escape/CharEscaperBuilder.java | 2 +- guava/src/com/google/common/escape/Escapers.java | 2 +- guava/src/com/google/common/escape/UnicodeEscaper.java | 2 +- guava/src/com/google/common/eventbus/Subscriber.java | 2 +- guava/src/com/google/common/eventbus/SubscriberRegistry.java | 2 +- guava/src/com/google/common/graph/AbstractBaseGraph.java | 2 +- .../common/graph/AbstractDirectedNetworkConnections.java | 2 +- guava/src/com/google/common/graph/AbstractGraph.java | 2 +- guava/src/com/google/common/graph/AbstractNetwork.java | 2 +- .../common/graph/AbstractUndirectedNetworkConnections.java | 2 +- guava/src/com/google/common/graph/AbstractValueGraph.java | 2 +- .../src/com/google/common/graph/DirectedGraphConnections.java | 2 +- .../google/common/graph/DirectedMultiNetworkConnections.java | 2 +- guava/src/com/google/common/graph/EdgesConnecting.java | 2 +- guava/src/com/google/common/graph/ElementOrder.java | 2 +- guava/src/com/google/common/graph/EndpointPair.java | 2 +- guava/src/com/google/common/graph/EndpointPairIterator.java | 2 +- guava/src/com/google/common/graph/ForwardingNetwork.java | 2 +- guava/src/com/google/common/graph/ForwardingValueGraph.java | 2 +- guava/src/com/google/common/graph/Graph.java | 2 +- guava/src/com/google/common/graph/GraphConnections.java | 2 +- guava/src/com/google/common/graph/Graphs.java | 2 +- guava/src/com/google/common/graph/IncidentEdgeSet.java | 2 +- guava/src/com/google/common/graph/MapIteratorCache.java | 2 +- guava/src/com/google/common/graph/MapRetrievalCache.java | 2 +- guava/src/com/google/common/graph/MultiEdgesConnecting.java | 2 +- guava/src/com/google/common/graph/MutableValueGraph.java | 2 +- guava/src/com/google/common/graph/Network.java | 2 +- guava/src/com/google/common/graph/NetworkConnections.java | 2 +- .../com/google/common/graph/StandardMutableValueGraph.java | 2 +- guava/src/com/google/common/graph/StandardValueGraph.java | 2 +- guava/src/com/google/common/graph/Traverser.java | 2 +- .../com/google/common/graph/UndirectedGraphConnections.java | 2 +- .../common/graph/UndirectedMultiNetworkConnections.java | 2 +- guava/src/com/google/common/graph/ValueGraph.java | 2 +- .../com/google/common/hash/AbstractCompositeHashFunction.java | 2 +- guava/src/com/google/common/hash/AbstractHashFunction.java | 2 +- guava/src/com/google/common/hash/AbstractHasher.java | 2 +- guava/src/com/google/common/hash/BloomFilter.java | 2 +- guava/src/com/google/common/hash/BloomFilterStrategies.java | 2 +- guava/src/com/google/common/hash/ChecksumHashFunction.java | 2 +- guava/src/com/google/common/hash/Funnel.java | 2 +- guava/src/com/google/common/hash/Funnels.java | 2 +- guava/src/com/google/common/hash/HashCode.java | 2 +- guava/src/com/google/common/hash/HashFunction.java | 2 +- guava/src/com/google/common/hash/Hasher.java | 2 +- guava/src/com/google/common/hash/Hashing.java | 2 +- guava/src/com/google/common/hash/Murmur3_128HashFunction.java | 2 +- guava/src/com/google/common/hash/Murmur3_32HashFunction.java | 2 +- guava/src/com/google/common/hash/SipHashFunction.java | 2 +- guava/src/com/google/common/hash/Striped64.java | 2 +- guava/src/com/google/common/io/AppendableWriter.java | 2 +- guava/src/com/google/common/io/BaseEncoding.java | 2 +- guava/src/com/google/common/io/ByteArrayDataInput.java | 2 +- guava/src/com/google/common/io/ByteProcessor.java | 2 +- guava/src/com/google/common/io/ByteSource.java | 2 +- guava/src/com/google/common/io/ByteStreams.java | 2 +- guava/src/com/google/common/io/CharSequenceReader.java | 2 +- guava/src/com/google/common/io/CharSource.java | 2 +- guava/src/com/google/common/io/CharStreams.java | 2 +- guava/src/com/google/common/io/Closeables.java | 2 +- guava/src/com/google/common/io/Closer.java | 2 +- guava/src/com/google/common/io/FileBackedOutputStream.java | 2 +- guava/src/com/google/common/io/Files.java | 2 +- .../google/common/io/InsecureRecursiveDeleteException.java | 2 +- guava/src/com/google/common/io/LineProcessor.java | 2 +- guava/src/com/google/common/io/LineReader.java | 2 +- guava/src/com/google/common/io/MoreFiles.java | 2 +- guava/src/com/google/common/io/MultiInputStream.java | 2 +- guava/src/com/google/common/io/MultiReader.java | 2 +- guava/src/com/google/common/io/Resources.java | 2 +- guava/src/com/google/common/math/LinearTransformation.java | 2 +- guava/src/com/google/common/math/PairedStats.java | 2 +- guava/src/com/google/common/math/Stats.java | 2 +- guava/src/com/google/common/net/HostAndPort.java | 2 +- guava/src/com/google/common/net/HostSpecifier.java | 2 +- guava/src/com/google/common/net/InetAddresses.java | 2 +- guava/src/com/google/common/net/InternetDomainName.java | 2 +- guava/src/com/google/common/net/MediaType.java | 2 +- guava/src/com/google/common/net/PercentEscaper.java | 2 +- guava/src/com/google/common/primitives/Booleans.java | 2 +- guava/src/com/google/common/primitives/Bytes.java | 2 +- guava/src/com/google/common/primitives/Chars.java | 2 +- guava/src/com/google/common/primitives/Doubles.java | 2 +- guava/src/com/google/common/primitives/Floats.java | 2 +- .../com/google/common/primitives/ImmutableDoubleArray.java | 2 +- guava/src/com/google/common/primitives/ImmutableIntArray.java | 2 +- .../src/com/google/common/primitives/ImmutableLongArray.java | 2 +- guava/src/com/google/common/primitives/Ints.java | 2 +- guava/src/com/google/common/primitives/Longs.java | 2 +- guava/src/com/google/common/primitives/Shorts.java | 2 +- guava/src/com/google/common/primitives/UnsignedInteger.java | 2 +- guava/src/com/google/common/primitives/UnsignedLong.java | 2 +- .../com/google/common/reflect/AbstractInvocationHandler.java | 2 +- guava/src/com/google/common/reflect/ClassPath.java | 2 +- .../com/google/common/reflect/ImmutableTypeToInstanceMap.java | 2 +- guava/src/com/google/common/reflect/Invokable.java | 2 +- .../com/google/common/reflect/MutableTypeToInstanceMap.java | 4 ++-- guava/src/com/google/common/reflect/Parameter.java | 2 +- guava/src/com/google/common/reflect/TypeParameter.java | 2 +- guava/src/com/google/common/reflect/TypeResolver.java | 2 +- guava/src/com/google/common/reflect/TypeToInstanceMap.java | 4 ++-- guava/src/com/google/common/reflect/TypeToken.java | 2 +- guava/src/com/google/common/reflect/TypeVisitor.java | 2 +- guava/src/com/google/common/reflect/Types.java | 2 +- .../google/common/util/concurrent/AbstractCatchingFuture.java | 2 +- .../src/com/google/common/util/concurrent/AbstractFuture.java | 2 +- .../util/concurrent/AbstractListeningExecutorService.java | 2 +- .../common/util/concurrent/AbstractScheduledService.java | 2 +- .../com/google/common/util/concurrent/AbstractService.java | 2 +- .../common/util/concurrent/AbstractTransformFuture.java | 2 +- .../com/google/common/util/concurrent/AggregateFuture.java | 2 +- .../google/common/util/concurrent/AggregateFutureState.java | 2 +- .../src/com/google/common/util/concurrent/AsyncCallable.java | 2 +- .../src/com/google/common/util/concurrent/AsyncFunction.java | 2 +- .../src/com/google/common/util/concurrent/AtomicLongMap.java | 2 +- guava/src/com/google/common/util/concurrent/Atomics.java | 2 +- guava/src/com/google/common/util/concurrent/Callables.java | 2 +- .../src/com/google/common/util/concurrent/ClosingFuture.java | 2 +- .../com/google/common/util/concurrent/CollectionFuture.java | 2 +- .../src/com/google/common/util/concurrent/CombinedFuture.java | 2 +- .../common/util/concurrent/CycleDetectingLockFactory.java | 2 +- .../src/com/google/common/util/concurrent/ExecutionError.java | 2 +- .../src/com/google/common/util/concurrent/ExecutionList.java | 2 +- .../com/google/common/util/concurrent/ExecutionSequencer.java | 2 +- .../com/google/common/util/concurrent/FakeTimeLimiter.java | 2 +- guava/src/com/google/common/util/concurrent/FluentFuture.java | 2 +- .../common/util/concurrent/ForwardingBlockingDeque.java | 2 +- .../common/util/concurrent/ForwardingBlockingQueue.java | 2 +- .../common/util/concurrent/ForwardingExecutorService.java | 2 +- .../google/common/util/concurrent/ForwardingFluentFuture.java | 2 +- .../com/google/common/util/concurrent/ForwardingFuture.java | 2 +- .../common/util/concurrent/ForwardingListenableFuture.java | 2 +- .../util/concurrent/ForwardingListeningExecutorService.java | 2 +- .../src/com/google/common/util/concurrent/FutureCallback.java | 2 +- guava/src/com/google/common/util/concurrent/Futures.java | 2 +- .../com/google/common/util/concurrent/FuturesGetChecked.java | 2 +- .../concurrent/GwtFluentFutureCatchingSpecialization.java | 2 +- .../com/google/common/util/concurrent/ImmediateFuture.java | 2 +- .../com/google/common/util/concurrent/InterruptibleTask.java | 2 +- .../com/google/common/util/concurrent/JdkFutureAdapters.java | 2 +- guava/src/com/google/common/util/concurrent/LazyLogger.java | 2 +- .../com/google/common/util/concurrent/ListenableFuture.java | 2 +- .../google/common/util/concurrent/ListenableFutureTask.java | 2 +- .../common/util/concurrent/ListenableScheduledFuture.java | 2 +- .../common/util/concurrent/ListeningExecutorService.java | 2 +- .../util/concurrent/ListeningScheduledExecutorService.java | 2 +- guava/src/com/google/common/util/concurrent/Monitor.java | 2 +- .../src/com/google/common/util/concurrent/MoreExecutors.java | 2 +- .../src/com/google/common/util/concurrent/NullnessCasts.java | 2 +- .../common/util/concurrent/OverflowAvoidingLockSupport.java | 2 +- guava/src/com/google/common/util/concurrent/Platform.java | 2 +- guava/src/com/google/common/util/concurrent/RateLimiter.java | 2 +- .../com/google/common/util/concurrent/SequentialExecutor.java | 2 +- .../src/com/google/common/util/concurrent/SettableFuture.java | 2 +- .../com/google/common/util/concurrent/SimpleTimeLimiter.java | 2 +- guava/src/com/google/common/util/concurrent/Striped.java | 2 +- .../google/common/util/concurrent/ThreadFactoryBuilder.java | 2 +- guava/src/com/google/common/util/concurrent/TimeLimiter.java | 2 +- .../src/com/google/common/util/concurrent/TimeoutFuture.java | 2 +- .../common/util/concurrent/TrustedListenableFutureTask.java | 2 +- .../common/util/concurrent/UncheckedExecutionException.java | 2 +- .../common/util/concurrent/UncheckedTimeoutException.java | 2 +- .../com/google/common/util/concurrent/Uninterruptibles.java | 2 +- .../common/util/concurrent/WrappingExecutorService.java | 2 +- .../util/concurrent/WrappingScheduledExecutorService.java | 2 +- 1317 files changed, 1356 insertions(+), 1356 deletions(-) diff --git a/android/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java b/android/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java index 33a3a83746b8..c2f0ffe809fa 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java b/android/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java index 92e6f5a1ec94..baa8371cf10e 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java index 417e67dc2c2e..cb599a32837d 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java @@ -35,7 +35,7 @@ import java.util.Set; import java.util.Stack; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Most of the logic for {@link IteratorTester} and {@link ListIteratorTester}. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java b/android/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java index fc8cbdd9c545..9b72beb16cf2 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java b/android/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java index 4ae6fc9f87a6..c220f30e21b3 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java @@ -21,7 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This abstract base class for testers allows the framework to inject needed information after diff --git a/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java b/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java index cf3a11eabc24..796363d05c17 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Simple base class to verify that we handle generics correctly. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java b/android/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java index b13345794c57..ed68a490d401 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java @@ -34,7 +34,7 @@ import java.util.SortedMap; import java.util.SortedSet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Derived suite generators, split out of the suite builders so that they are available to GWT. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java b/android/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java index d91fe70d7337..4481d7619587 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java @@ -42,7 +42,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates, based on your criteria, a JUnit test suite that exhaustively tests the object generated diff --git a/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java b/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java index 360793345a0a..fe1ae83b5f74 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/Helpers.java @@ -45,7 +45,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) @NullMarked diff --git a/android/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java index fcd39baeac99..ecb81dacf5e6 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.Iterator; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A utility for testing an Iterator implementation by comparing its behavior to that of a "known diff --git a/android/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java index 3a9404e66772..96c920f4a2ec 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.ListIterator; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A utility similar to {@link IteratorTester} for testing a {@link ListIterator} against a known diff --git a/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java b/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java index 38864047f9e8..bbceb1ca278d 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java @@ -34,7 +34,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests representing the contract of {@link Map}. Concrete subclasses of this base class test diff --git a/android/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java b/android/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java index d09b8afc4f03..93645d9ea7d2 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java @@ -23,9 +23,9 @@ import java.util.AbstractCollection; import java.util.Collection; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A simplistic collection which implements only the bare minimum allowed by the spec, and throws diff --git a/android/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java b/android/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java index ab4019c011f1..1cc49efa3dcc 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@code Iterable} which throws an exception on all invocations of the {@link diff --git a/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java b/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java index b78a5ce21597..db09a4edd544 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A simplistic set which implements the bare minimum so that it can be used in tests without diff --git a/android/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java index 7625463adf75..4baec8023be7 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generator for collection of a particular size. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java index 72fbf0224eac..85feb9d3edfc 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java @@ -20,7 +20,7 @@ import com.google.common.collect.testing.features.CollectionSize; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The subject-generator interface accepted by Collection testers, for testing a Collection at one diff --git a/android/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java b/android/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java index 6e0431b1319e..f38500e53388 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java index c958dee8ec6e..b9fc32b941d9 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper around {@code TreeMap} that aggressively checks to see if keys are mutually comparable. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java index d75559d7de33..cbb8b1421aab 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java @@ -25,7 +25,7 @@ import java.util.NavigableSet; import java.util.SortedSet; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper around {@code TreeSet} that aggressively checks to see if elements are mutually diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SampleElements.java b/android/guava-testlib/src/com/google/common/collect/testing/SampleElements.java index 153d68467712..1abda002ef39 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SampleElements.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SampleElements.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A container class for the five sample elements we need for testing. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java b/android/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java index 9c07d490bdd5..e8c46d51d222 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Set; import junit.framework.TestSuite; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates, based on your criteria, a JUnit test suite that exhaustively tests a SortedMap diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java index 45804ef22a7d..a77cc1fde216 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java @@ -43,7 +43,7 @@ import java.util.function.Function; import java.util.function.Supplier; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester for {@code Spliterator} implementations. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java index 5f336be4ce95..704ec159172a 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates collections, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java index 08d2e31f43a5..23d702b266f4 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * To be implemented by test generators of things that can contain elements. Such things include diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java index 886bb105bb74..6dcffa779f4d 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sets, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java index eb62f12b5d8c..95319d10e056 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java @@ -24,7 +24,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates map entries using sample keys and sample values. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java index 86b79469b1f1..50530ba16449 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates maps, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java index e0aebf66919d..25863e224538 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Queue; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates queues, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java index 83fd9075de46..319feb449a2d 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sets, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java index ae462fe31f00..3fc2e5b8ceca 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java @@ -20,7 +20,7 @@ import java.util.Map.Entry; import java.util.SortedMap; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sorted maps, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java index dc9e94222006..6218fe5aee93 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.SortedSet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sorted sets, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java index 978fa683d8c8..2cf33c668909 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * To be implemented by test generators that can produce test subjects without requiring any diff --git a/android/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java b/android/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java index 3e1d3b4ee369..eda5aac70239 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java @@ -17,7 +17,7 @@ package com.google.common.collect.testing; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An unhashable object to be used in testing as values in our collections. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java b/android/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java index 3bed2093eee9..1ca44740a01a 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java @@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.Collection; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * When describing the features of the collection produced by a given generator (i.e. in a call to diff --git a/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java b/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java index 3b478573ff16..4abcef48f15e 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Encapsulates the constraints that a class under test must satisfy in order for a tester method to diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java index 553fbb8f5423..a1e6ca4ae8e2 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** Skeleton for a tester of a {@code BiMap}. */ diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java index 5134c913e0e0..0c4534e55468 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java @@ -21,7 +21,7 @@ import com.google.common.collect.ListMultimap; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java index 5ffeefccbfb1..c12835009f9a 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java b/android/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java index 11eb5d910ca1..45376acba99b 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Derived suite generators for Guava collection interfaces, split out of the suite builders so that diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java index afea133492f0..7fdf762936e2 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java index 95fd02dd767c..9a56b0d56a2d 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java index 6cf7607f2fa9..b25763d4aa21 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java index 950290116e84..03d5e07d2f87 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java index 970d5139ffac..5c6c6c6f4233 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java b/android/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java index a4a37259a178..92da5482f879 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java index 961dc4f24f56..a9045eae21a7 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java index 4f6edeb87e2c..af48b03606a3 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java @@ -21,7 +21,7 @@ import com.google.common.collect.testing.TestContainerGenerator; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates bimaps, containing sample entries, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java index 35df19804775..26a1f2f57e09 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.collect.ListMultimap; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A generator for {@code ListMultimap} implementations based on test data. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java index 8f473def24ba..d555f51c2c1d 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates multimaps, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java b/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java index 63a02bf0561b..0a36c8946904 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java @@ -20,7 +20,7 @@ import com.google.common.collect.Multiset; import com.google.common.collect.testing.TestCollectionGenerator; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates multisets, containing sample elements, to be tested. diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java b/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java index f118ecf7ac2b..ec64f375593e 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java @@ -36,7 +36,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A series of tests that support asserting that collections cannot be modified, either through diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java index 1ac4325c560f..ef0b917fe69a 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java @@ -23,7 +23,7 @@ import com.google.common.collect.testing.WrongType; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.collect.testing.features.CollectionSize; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java index 8b52204b620b..0f8900c066ef 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java index 0b27237f3709..73e260fa3e59 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java @@ -36,7 +36,7 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java index d7621fd7494d..f8c2d4c2cf11 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java @@ -41,7 +41,7 @@ import java.util.NoSuchElementException; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java index 472e1f50abf7..a16b523e5be8 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java @@ -40,7 +40,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java index 9b1a11f6863a..16056a112523 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java index a9dc1191dfc2..d2e90ba6a007 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java index 6e94a3ad886a..7023cf47b980 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import java.util.SortedSet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java b/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java index 8ee0cd94f6ea..214c1e168641 100644 --- a/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java +++ b/android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java @@ -146,7 +146,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Supplies an arbitrary "default" instance for a wide range of types, often useful in testing diff --git a/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java b/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java index 8e63b9831bfc..db0843517a81 100644 --- a/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java +++ b/android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java @@ -53,7 +53,7 @@ import junit.framework.Assert; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester that runs automated sanity tests for any given class. A typical use case is to test static diff --git a/android/guava-testlib/src/com/google/common/testing/DummyProxy.java b/android/guava-testlib/src/com/google/common/testing/DummyProxy.java index 4515963f4613..837ea36a4122 100644 --- a/android/guava-testlib/src/com/google/common/testing/DummyProxy.java +++ b/android/guava-testlib/src/com/google/common/testing/DummyProxy.java @@ -32,7 +32,7 @@ import java.lang.reflect.Proxy; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generates a dummy interface proxy that simply returns a dummy value for each method. diff --git a/android/guava-testlib/src/com/google/common/testing/EqualsTester.java b/android/guava-testlib/src/com/google/common/testing/EqualsTester.java index 9d311d3fa360..699acb38b568 100644 --- a/android/guava-testlib/src/com/google/common/testing/EqualsTester.java +++ b/android/guava-testlib/src/com/google/common/testing/EqualsTester.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester for equals() and hashCode() methods of a class. diff --git a/android/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java b/android/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java index ca57703d9fc5..193c9fe41859 100644 --- a/android/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java +++ b/android/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester to ensure forwarding wrapper works by delegating calls to the corresponding method with diff --git a/android/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java b/android/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java index d059f3b98fec..45be229ac4e0 100644 --- a/android/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java +++ b/android/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java @@ -121,7 +121,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generates fresh instances of types that are different from each other (if possible). diff --git a/android/guava-testlib/src/com/google/common/testing/NullPointerTester.java b/android/guava-testlib/src/com/google/common/testing/NullPointerTester.java index ba140359d1f8..fb2f9cc94d25 100644 --- a/android/guava-testlib/src/com/google/common/testing/NullPointerTester.java +++ b/android/guava-testlib/src/com/google/common/testing/NullPointerTester.java @@ -47,7 +47,7 @@ import java.util.concurrent.ConcurrentMap; import junit.framework.Assert; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A test utility that verifies that your methods and constructors throw {@link diff --git a/android/guava-testlib/src/com/google/common/testing/TestLogHandler.java b/android/guava-testlib/src/com/google/common/testing/TestLogHandler.java index ec01f81b5f81..f21a49d77695 100644 --- a/android/guava-testlib/src/com/google/common/testing/TestLogHandler.java +++ b/android/guava-testlib/src/com/google/common/testing/TestLogHandler.java @@ -24,7 +24,7 @@ import java.util.logging.Handler; import java.util.logging.LogRecord; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests may use this to intercept messages that are logged by the code under test. Example: diff --git a/android/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java b/android/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java index 325388342a9c..2baae7e9eb71 100644 --- a/android/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java +++ b/android/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract test case parent for anything implementing {@link ListenableFuture}. Tests the two get diff --git a/android/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java b/android/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java index 7b56959a81ea..62724243fce2 100644 --- a/android/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java +++ b/android/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java @@ -45,7 +45,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests {@link MapTestSuiteBuilder} by using it against maps that have various negative behaviors. diff --git a/android/guava-testlib/test/com/google/common/collect/testing/MyTester.java b/android/guava-testlib/test/com/google/common/collect/testing/MyTester.java index de79059a6033..b82dc8b29a6e 100644 --- a/android/guava-testlib/test/com/google/common/collect/testing/MyTester.java +++ b/android/guava-testlib/test/com/google/common/collect/testing/MyTester.java @@ -16,7 +16,7 @@ package com.google.common.collect.testing; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** Support class added to a suite as part of {@link FeatureSpecificTestSuiteBuilderTest}. */ diff --git a/android/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java b/android/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java index 072150830f7f..bbd5c6404476 100644 --- a/android/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java +++ b/android/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java @@ -130,7 +130,7 @@ import java.util.regex.Pattern; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ArbitraryInstances}. diff --git a/android/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java b/android/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java index 039ae877ecb7..7899a76ff231 100644 --- a/android/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java +++ b/android/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java @@ -27,7 +27,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link EqualsTester}. diff --git a/android/guava-testlib/test/com/google/common/testing/FakeTickerTest.java b/android/guava-testlib/test/com/google/common/testing/FakeTickerTest.java index 209b9f5b3536..8529f8f14a66 100644 --- a/android/guava-testlib/test/com/google/common/testing/FakeTickerTest.java +++ b/android/guava-testlib/test/com/google/common/testing/FakeTickerTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link FakeTicker}. diff --git a/android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java b/android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java index 7a83cc740a9c..97ebec3e8172 100644 --- a/android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java +++ b/android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link GcFinalization}. diff --git a/android/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java b/android/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java index 05ff429bbdf5..d08735297ad5 100644 --- a/android/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java +++ b/android/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java b/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java index dbab0b6c5a5b..67f11de2e6ed 100644 --- a/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java +++ b/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java @@ -20,7 +20,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link SerializableTester}. diff --git a/android/guava-testlib/test/com/google/common/testing/TearDownStackTest.java b/android/guava-testlib/test/com/google/common/testing/TearDownStackTest.java index 1e23183baf3c..9a5a68dfb055 100644 --- a/android/guava-testlib/test/com/google/common/testing/TearDownStackTest.java +++ b/android/guava-testlib/test/com/google/common/testing/TearDownStackTest.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * @author Luiz-Otavio "Z" Zorzella diff --git a/android/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java b/android/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java index 6365c5be1e9b..e2d96b5394aa 100644 --- a/android/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java +++ b/android/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ForwardingWrapperTester}. Live in a different package to detect reflection diff --git a/android/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java b/android/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java index 4ffc712078d6..01d47a6e47f6 100644 --- a/android/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java @@ -21,7 +21,7 @@ import com.google.caliper.Param; import com.google.common.cache.LocalCache.Segment; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Benchmark for {@code LocalCache.Segment.removeEntryFromChain}. diff --git a/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java b/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java index 4a70a0e07988..1001350a0513 100644 --- a/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java @@ -39,7 +39,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Benchmarks for {@link ConcurrentHashMultiset}. diff --git a/android/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java b/android/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java index 432414accc62..04496c0bfa35 100644 --- a/android/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java @@ -26,7 +26,7 @@ import java.util.Queue; import java.util.Random; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Benchmarks to compare performance of MinMaxPriorityQueue and PriorityQueue. diff --git a/android/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java b/android/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java index a8411cec1afd..c7e1de2c3f35 100644 --- a/android/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java @@ -43,7 +43,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import sun.misc.Unsafe; /** Benchmarks for {@link ExecutionList}. */ diff --git a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java index 7ad6e961a2f2..a1c0ab02910d 100644 --- a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java +++ b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java @@ -26,7 +26,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A bounded {@linkplain BlockingQueue blocking queue} backed by an array. This queue orders diff --git a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java index e5dd26f62b2f..85923d826caf 100644 --- a/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java +++ b/android/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java @@ -31,7 +31,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An unbounded {@linkplain BlockingQueue blocking queue} that uses the same ordering rules as class diff --git a/android/guava-tests/test/com/google/common/base/AbstractIteratorTest.java b/android/guava-tests/test/com/google/common/base/AbstractIteratorTest.java index 1aed9378725d..0b0293f58b72 100644 --- a/android/guava-tests/test/com/google/common/base/AbstractIteratorTest.java +++ b/android/guava-tests/test/com/google/common/base/AbstractIteratorTest.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code AbstractIterator}. diff --git a/android/guava-tests/test/com/google/common/base/EquivalenceTest.java b/android/guava-tests/test/com/google/common/base/EquivalenceTest.java index 8b5db3ab2ae2..5de187b1b8be 100644 --- a/android/guava-tests/test/com/google/common/base/EquivalenceTest.java +++ b/android/guava-tests/test/com/google/common/base/EquivalenceTest.java @@ -27,7 +27,7 @@ import com.google.common.testing.SerializableTester; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Equivalence}. diff --git a/android/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java b/android/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java index fb4ca4da972c..b1258e93799e 100644 --- a/android/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java +++ b/android/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/android/guava-tests/test/com/google/common/base/FunctionsTest.java b/android/guava-tests/test/com/google/common/base/FunctionsTest.java index 54380fe53d3b..9533c00af2e7 100644 --- a/android/guava-tests/test/com/google/common/base/FunctionsTest.java +++ b/android/guava-tests/test/com/google/common/base/FunctionsTest.java @@ -31,7 +31,7 @@ import java.util.Map; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Functions}. diff --git a/android/guava-tests/test/com/google/common/base/JoinerTest.java b/android/guava-tests/test/com/google/common/base/JoinerTest.java index 5d427dd7a5d6..aea2ab5b1c4e 100644 --- a/android/guava-tests/test/com/google/common/base/JoinerTest.java +++ b/android/guava-tests/test/com/google/common/base/JoinerTest.java @@ -37,7 +37,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Joiner}. diff --git a/android/guava-tests/test/com/google/common/base/OptionalTest.java b/android/guava-tests/test/com/google/common/base/OptionalTest.java index 3c6e2e9f072b..8961f1f228f7 100644 --- a/android/guava-tests/test/com/google/common/base/OptionalTest.java +++ b/android/guava-tests/test/com/google/common/base/OptionalTest.java @@ -32,7 +32,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Optional}. diff --git a/android/guava-tests/test/com/google/common/base/PreconditionsTest.java b/android/guava-tests/test/com/google/common/base/PreconditionsTest.java index 10ee1296bd13..5716598053f0 100644 --- a/android/guava-tests/test/com/google/common/base/PreconditionsTest.java +++ b/android/guava-tests/test/com/google/common/base/PreconditionsTest.java @@ -40,7 +40,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Preconditions}. diff --git a/android/guava-tests/test/com/google/common/base/PredicatesTest.java b/android/guava-tests/test/com/google/common/base/PredicatesTest.java index 6fc9660f4bd7..26fd6bb5909b 100644 --- a/android/guava-tests/test/com/google/common/base/PredicatesTest.java +++ b/android/guava-tests/test/com/google/common/base/PredicatesTest.java @@ -39,7 +39,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Predicates}. diff --git a/android/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java index 2315bae34bc6..f583b4bf043a 100644 --- a/android/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/base/SuppliersTest.java b/android/guava-tests/test/com/google/common/base/SuppliersTest.java index 5971816134e7..b894146330f9 100644 --- a/android/guava-tests/test/com/google/common/base/SuppliersTest.java +++ b/android/guava-tests/test/com/google/common/base/SuppliersTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests com.google.common.base.Suppliers. diff --git a/android/guava-tests/test/com/google/common/base/ToStringHelperTest.java b/android/guava-tests/test/com/google/common/base/ToStringHelperTest.java index 1a31c0eb0a7d..7129a7011d56 100644 --- a/android/guava-tests/test/com/google/common/base/ToStringHelperTest.java +++ b/android/guava-tests/test/com/google/common/base/ToStringHelperTest.java @@ -29,7 +29,7 @@ import java.util.Map; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link MoreObjects#toStringHelper(Object)}. diff --git a/android/guava-tests/test/com/google/common/cache/AbstractCacheTest.java b/android/guava-tests/test/com/google/common/cache/AbstractCacheTest.java index 856164a6c331..ed42350b30a7 100644 --- a/android/guava-tests/test/com/google/common/cache/AbstractCacheTest.java +++ b/android/guava-tests/test/com/google/common/cache/AbstractCacheTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractCache}. diff --git a/android/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java b/android/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java index 2cb08ef6dc03..8d1c8a5ed19f 100644 --- a/android/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java +++ b/android/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractLoadingCache}. diff --git a/android/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java b/android/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java index 695298f6ebc8..d4a512adbfe8 100644 --- a/android/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java +++ b/android/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper class for creating {@link CacheBuilder} instances with all combinations of several sets of diff --git a/android/guava-tests/test/com/google/common/cache/CacheTesting.java b/android/guava-tests/test/com/google/common/cache/CacheTesting.java index 31a126524870..3156e409ca29 100644 --- a/android/guava-tests/test/com/google/common/cache/CacheTesting.java +++ b/android/guava-tests/test/com/google/common/cache/CacheTesting.java @@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReferenceArray; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection of utilities for {@link Cache} testing. diff --git a/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java b/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java index 1d0979297dca..e5c8be9ba5cc 100644 --- a/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java +++ b/android/guava-tests/test/com/google/common/cache/LocalCacheTest.java @@ -87,7 +87,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * @author Charles Fry diff --git a/android/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java index c496603719d7..c29f754b140b 100644 --- a/android/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java b/android/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java index 239c71fceaa6..5479550a8af2 100644 --- a/android/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java +++ b/android/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utility {@link CacheLoader} implementations intended for use in testing. diff --git a/android/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java b/android/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java index 21c7b8bde46c..ab39d750352d 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible @NullMarked diff --git a/android/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java b/android/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java index 58f5fbc10cbe..b000664293c2 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java @@ -41,7 +41,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for {@link ImmutableSet} and {@link ImmutableSortedSet} tests. diff --git a/android/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java b/android/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java index c935a962b9fe..0120ba36b56e 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code AbstractIterator}. diff --git a/android/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java b/android/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java index 80c9526665f4..7e58e81b4303 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java @@ -22,7 +22,7 @@ import java.util.Map.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code AbstractMapEntry}. diff --git a/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java b/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java index 6808c3cf13fa..e529b1f33660 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java @@ -30,7 +30,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Superclass for tests for {@link Maps#transformValues} overloads. diff --git a/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java b/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java index e93736a6b89f..3d0b4776be97 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java @@ -29,7 +29,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Tests for {@link AbstractSequentialIterator}. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java b/android/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java index 2d6a94d28e67..a613102dac08 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java @@ -27,7 +27,7 @@ import com.google.common.testing.NullPointerTester; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Table} read operations. diff --git a/android/guava-tests/test/com/google/common/collect/AbstractTableTest.java b/android/guava-tests/test/com/google/common/collect/AbstractTableTest.java index 4f479f49d9be..c0b267b0bc7d 100644 --- a/android/guava-tests/test/com/google/common/collect/AbstractTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/AbstractTableTest.java @@ -21,9 +21,9 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for a {@link Table} implementation supporting reads and writes. diff --git a/android/guava-tests/test/com/google/common/collect/ArrayTableTest.java b/android/guava-tests/test/com/google/common/collect/ArrayTableTest.java index a0399d3cf49f..a698b357e560 100644 --- a/android/guava-tests/test/com/google/common/collect/ArrayTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/ArrayTableTest.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.Map; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link ArrayTable}. diff --git a/android/guava-tests/test/com/google/common/collect/Base.java b/android/guava-tests/test/com/google/common/collect/Base.java index d39cd87c57a4..5304acbb04da 100644 --- a/android/guava-tests/test/com/google/common/collect/Base.java +++ b/android/guava-tests/test/com/google/common/collect/Base.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Simple base class to verify that we handle generics correctly. */ @GwtCompatible diff --git a/android/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java b/android/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java index 86624974fd41..6c4a951623ea 100644 --- a/android/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java +++ b/android/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Package up sample data for common collections benchmarking. diff --git a/android/guava-tests/test/com/google/common/collect/Collections2Test.java b/android/guava-tests/test/com/google/common/collect/Collections2Test.java index 69adcaeb6fe5..221ba566f7ae 100644 --- a/android/guava-tests/test/com/google/common/collect/Collections2Test.java +++ b/android/guava-tests/test/com/google/common/collect/Collections2Test.java @@ -41,7 +41,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Collections2}. diff --git a/android/guava-tests/test/com/google/common/collect/ComparatorsTest.java b/android/guava-tests/test/com/google/common/collect/ComparatorsTest.java index 8710c49fafed..be94a9d650b4 100644 --- a/android/guava-tests/test/com/google/common/collect/ComparatorsTest.java +++ b/android/guava-tests/test/com/google/common/collect/ComparatorsTest.java @@ -37,7 +37,7 @@ import java.util.Optional; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Comparators}. diff --git a/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java index 61db37fec916..98cd431c904d 100644 --- a/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java +++ b/android/guava-tests/test/com/google/common/collect/FauxveridesTest.java @@ -36,7 +36,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests that all {@code public static} methods "inherited" from superclasses are "overridden" in diff --git a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java index 248674e3553f..9bfb1e2f5f3a 100644 --- a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java +++ b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java @@ -50,7 +50,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link FluentIterable}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingListTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingListTest.java index d0bac259adac..ef5915545696 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingListTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingListTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingList}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingMapTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingMapTest.java index 39643eb61016..908c9c9dde42 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingMapTest.java @@ -50,7 +50,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ForwardingMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java index e070713703db..ca4f28aef3ad 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ForwardingMultiset}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java index f85fd1f21b2b..170f6d5e6f02 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java @@ -40,7 +40,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingNavigableMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java index 1fdac7a84137..6256c97f721f 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java @@ -36,7 +36,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingNavigableSet}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java index a421c0acd577..96ad8da83690 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java @@ -30,7 +30,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingQueue}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingSetTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingSetTest.java index a6f02f7069fc..73d6004a6058 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingSetTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingSet}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java index dedb8a8fd361..2a6777a0590a 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java @@ -37,7 +37,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingSortedMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java index 03f3199310e7..78711789c2fc 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ForwardingSortedMultiset}. diff --git a/android/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java b/android/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java index 9af2ef4f44ef..188a3892a027 100644 --- a/android/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java @@ -33,7 +33,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingSortedSet}. diff --git a/android/guava-tests/test/com/google/common/collect/GeneralRangeTest.java b/android/guava-tests/test/com/google/common/collect/GeneralRangeTest.java index b9dbffcd501c..91852de9f9bd 100644 --- a/android/guava-tests/test/com/google/common/collect/GeneralRangeTest.java +++ b/android/guava-tests/test/com/google/common/collect/GeneralRangeTest.java @@ -27,7 +27,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code GeneralRange}. diff --git a/android/guava-tests/test/com/google/common/collect/HashBasedTableTest.java b/android/guava-tests/test/com/google/common/collect/HashBasedTableTest.java index a6a23beaaf30..d0d3950d9bc4 100644 --- a/android/guava-tests/test/com/google/common/collect/HashBasedTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/HashBasedTableTest.java @@ -25,7 +25,7 @@ import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link HashBasedTable}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java index 6e3803df599f..964be11d9790 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java @@ -45,7 +45,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableBiMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java index d075f580b036..2c855c95c7c4 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java @@ -37,7 +37,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ImmutableClassToInstanceMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java index b85c43168618..c4f9e661e888 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java @@ -43,7 +43,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableListMultimap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableListTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableListTest.java index 158965501622..4b3d18d9edbc 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableListTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableListTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ImmutableList}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java index 9a65525d7ea0..d22e5682c998 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java @@ -62,7 +62,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java index 7d8860a873dd..2e4ea543f74d 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java @@ -33,7 +33,7 @@ import java.util.Map.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableMultimap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java index c381b1f3702e..2aa3ab1e1974 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java @@ -50,7 +50,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableMultiset}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java index 4faa55b20174..db36f10b9a43 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java @@ -42,7 +42,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableSetMultimap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java index c9321c40be6a..ca9c6a564a6c 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java @@ -51,7 +51,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableSortedMap}. diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableTableTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableTableTest.java index aef92ea1bc75..7054ff7559e3 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableTableTest.java @@ -25,7 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.testing.SerializableTester; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests common methods in {@link ImmutableTable} diff --git a/android/guava-tests/test/com/google/common/collect/IterablesTest.java b/android/guava-tests/test/com/google/common/collect/IterablesTest.java index ccca7a71067f..162bd3730173 100644 --- a/android/guava-tests/test/com/google/common/collect/IterablesTest.java +++ b/android/guava-tests/test/com/google/common/collect/IterablesTest.java @@ -66,7 +66,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Iterables}. diff --git a/android/guava-tests/test/com/google/common/collect/IteratorsTest.java b/android/guava-tests/test/com/google/common/collect/IteratorsTest.java index c940e7490157..83d53f7b8f68 100644 --- a/android/guava-tests/test/com/google/common/collect/IteratorsTest.java +++ b/android/guava-tests/test/com/google/common/collect/IteratorsTest.java @@ -75,7 +75,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Iterators}. diff --git a/android/guava-tests/test/com/google/common/collect/LegacyComparable.java b/android/guava-tests/test/com/google/common/collect/LegacyComparable.java index c7285a92d912..00f8517bfe12 100644 --- a/android/guava-tests/test/com/google/common/collect/LegacyComparable.java +++ b/android/guava-tests/test/com/google/common/collect/LegacyComparable.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class that implements {@code Comparable} without generics, such as those found in libraries diff --git a/android/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java b/android/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java index cf1ed0f76f36..6b758aa13d1d 100644 --- a/android/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java @@ -47,7 +47,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@code LinkedHashMultimap}. diff --git a/android/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java b/android/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java index 2c942644628b..9d6248478d86 100644 --- a/android/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java @@ -52,7 +52,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code LinkedListMultimap}. diff --git a/android/guava-tests/test/com/google/common/collect/ListsImplTest.java b/android/guava-tests/test/com/google/common/collect/ListsImplTest.java index 68ce8362d7f3..f00095ccf52c 100644 --- a/android/guava-tests/test/com/google/common/collect/ListsImplTest.java +++ b/android/guava-tests/test/com/google/common/collect/ListsImplTest.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Tests the package level *impl methods directly using various types of lists. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/collect/MapsCollectionTest.java b/android/guava-tests/test/com/google/common/collect/MapsCollectionTest.java index 7a964e1d3d3c..a52b7a8f50c3 100644 --- a/android/guava-tests/test/com/google/common/collect/MapsCollectionTest.java +++ b/android/guava-tests/test/com/google/common/collect/MapsCollectionTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test suites for wrappers in {@code Maps}. diff --git a/android/guava-tests/test/com/google/common/collect/MapsTest.java b/android/guava-tests/test/com/google/common/collect/MapsTest.java index b468f78bb595..902e49daae5a 100644 --- a/android/guava-tests/test/com/google/common/collect/MapsTest.java +++ b/android/guava-tests/test/com/google/common/collect/MapsTest.java @@ -67,7 +67,7 @@ import java.util.concurrent.ConcurrentMap; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Maps}. diff --git a/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java b/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java index def9d6847706..d53579f14f9f 100644 --- a/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java +++ b/android/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java @@ -30,7 +30,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Maps#transformValues} when the backing map's views have iterators that don't diff --git a/android/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java b/android/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java index 2ba38f132a0b..f3b58b220093 100644 --- a/android/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java +++ b/android/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link MinMaxPriorityQueue}. diff --git a/android/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java b/android/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java index 97857ffdeb0a..27b3de8d9bbd 100644 --- a/android/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java +++ b/android/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java @@ -30,7 +30,7 @@ import java.util.SortedSet; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link MultimapBuilder}. diff --git a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java index 448988bece58..674b17f0fa32 100644 --- a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java +++ b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java @@ -67,7 +67,7 @@ import java.util.TreeSet; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Multimaps}. diff --git a/android/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java b/android/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java index a442aa814691..63e01282cfe1 100644 --- a/android/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java +++ b/android/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java @@ -23,7 +23,7 @@ import com.google.common.collect.Multiset.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Multisets#immutableEntry}. diff --git a/android/guava-tests/test/com/google/common/collect/NewCustomTableTest.java b/android/guava-tests/test/com/google/common/collect/NewCustomTableTest.java index d8ff7eda0633..947dda86b406 100644 --- a/android/guava-tests/test/com/google/common/collect/NewCustomTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/NewCustomTableTest.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.TreeMap; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Tables#newCustomTable}. diff --git a/android/guava-tests/test/com/google/common/collect/ObjectArraysTest.java b/android/guava-tests/test/com/google/common/collect/ObjectArraysTest.java index 6afb08a509e4..46781fcfeae2 100644 --- a/android/guava-tests/test/com/google/common/collect/ObjectArraysTest.java +++ b/android/guava-tests/test/com/google/common/collect/ObjectArraysTest.java @@ -26,7 +26,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code ObjectArrays}. diff --git a/android/guava-tests/test/com/google/common/collect/OrderingTest.java b/android/guava-tests/test/com/google/common/collect/OrderingTest.java index e52589461ab2..dfe3373a0b86 100644 --- a/android/guava-tests/test/com/google/common/collect/OrderingTest.java +++ b/android/guava-tests/test/com/google/common/collect/OrderingTest.java @@ -49,9 +49,9 @@ import java.util.Random; import java.util.RandomAccess; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@code Ordering}. diff --git a/android/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java b/android/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java index 76f3b50df872..b725ad4fc71f 100644 --- a/android/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java +++ b/android/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java @@ -33,7 +33,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link PeekingIterator}. diff --git a/android/guava-tests/test/com/google/common/collect/QueuesTest.java b/android/guava-tests/test/com/google/common/collect/QueuesTest.java index 22725fe4ed72..53d7509dee99 100644 --- a/android/guava-tests/test/com/google/common/collect/QueuesTest.java +++ b/android/guava-tests/test/com/google/common/collect/QueuesTest.java @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Queues}. diff --git a/android/guava-tests/test/com/google/common/collect/RangeTest.java b/android/guava-tests/test/com/google/common/collect/RangeTest.java index e1431f09d76e..b0db5296a8cd 100644 --- a/android/guava-tests/test/com/google/common/collect/RangeTest.java +++ b/android/guava-tests/test/com/google/common/collect/RangeTest.java @@ -34,7 +34,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Range}. diff --git a/android/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java index 308e25eb0c3b..93f5a5c94358 100644 --- a/android/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java b/android/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java index 74f719efe374..9c1a09c1a052 100644 --- a/android/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java +++ b/android/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link RegularImmutableAsList}. diff --git a/android/guava-tests/test/com/google/common/collect/SetsTest.java b/android/guava-tests/test/com/google/common/collect/SetsTest.java index 2e12936c81e6..721e5397d5dd 100644 --- a/android/guava-tests/test/com/google/common/collect/SetsTest.java +++ b/android/guava-tests/test/com/google/common/collect/SetsTest.java @@ -81,7 +81,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Sets}. diff --git a/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java b/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java index 6ffa66df4d77..e6244281876d 100644 --- a/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java @@ -34,7 +34,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractMultiset}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java index 98e49d696207..3f1950ccd40b 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java @@ -30,7 +30,7 @@ import java.util.Set; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#biMap}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java index 5d1394fbf3e0..6f0f7a734cec 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java @@ -22,7 +22,7 @@ import java.util.Iterator; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Synchronized#deque} and {@link Queues#synchronizedDeque}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java index 55425e73aba3..b1ab77b6ff46 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java @@ -29,7 +29,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#map}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java index b4499f96371d..7f7508c7155b 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java @@ -36,7 +36,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#multimap}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java index 0c414a269be6..1a75965c8dcc 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java @@ -34,7 +34,7 @@ import java.util.SortedMap; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Maps#synchronizedNavigableMap(NavigableMap)}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java index 870cc12b0258..962e7512782c 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java @@ -33,7 +33,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Sets#synchronizedNavigableSet(NavigableSet)}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java index 8697239cd6f5..4f236aa7b84d 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java @@ -22,7 +22,7 @@ import java.util.Queue; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Synchronized#queue} and {@link Queues#synchronizedQueue}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java index f202d6691673..bd6295f2ad2a 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java @@ -30,7 +30,7 @@ import junit.framework.Test; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#set}. diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java index 365ab36b8670..a80315812249 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @NullUnmarked public class SynchronizedTableTest extends AbstractTableTest { diff --git a/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java index 82b46b12a463..6f1d51a82c08 100644 --- a/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java +++ b/android/guava-tests/test/com/google/common/collect/TableCollectionTest.java @@ -52,7 +52,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Collection tests for {@link Table} implementations. diff --git a/android/guava-tests/test/com/google/common/collect/TablesTest.java b/android/guava-tests/test/com/google/common/collect/TablesTest.java index 57505ef2bfa0..fbbdb5149228 100644 --- a/android/guava-tests/test/com/google/common/collect/TablesTest.java +++ b/android/guava-tests/test/com/google/common/collect/TablesTest.java @@ -25,7 +25,7 @@ import com.google.common.testing.SerializableTester; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Tables}. diff --git a/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java b/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java index e06865dbc263..35d32ad17daf 100644 --- a/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java +++ b/android/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java @@ -25,7 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Function; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Tables#transformValues}. diff --git a/android/guava-tests/test/com/google/common/collect/TransposedTableTest.java b/android/guava-tests/test/com/google/common/collect/TransposedTableTest.java index 736c8ff4518d..49a4910161cc 100644 --- a/android/guava-tests/test/com/google/common/collect/TransposedTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/TransposedTableTest.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtCompatible; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Tables#transpose}. diff --git a/android/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java b/android/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java index aedd2e5d7422..cd14b4b87359 100644 --- a/android/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java @@ -38,7 +38,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link TreeBasedTable}. diff --git a/android/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java b/android/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java index cb85a7bfb017..7622c411f9f3 100644 --- a/android/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java +++ b/android/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java @@ -31,7 +31,7 @@ import java.util.SortedSet; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@code TreeMultimap} with explicit comparators. diff --git a/android/guava-tests/test/com/google/common/collect/TreeMultisetTest.java b/android/guava-tests/test/com/google/common/collect/TreeMultisetTest.java index 38149fc57386..05453e85e279 100644 --- a/android/guava-tests/test/com/google/common/collect/TreeMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/TreeMultisetTest.java @@ -42,7 +42,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link TreeMultiset}. diff --git a/android/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java index f03f7b6e57ac..7e9747348019 100644 --- a/android/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java b/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java index 1817cdff8efa..686473e57d17 100644 --- a/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java +++ b/android/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link UnicodeEscaper}. diff --git a/android/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java b/android/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java index 441e79a730fc..c1fc3d2512a5 100644 --- a/android/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java +++ b/android/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java @@ -19,7 +19,7 @@ import com.google.common.testing.AbstractPackageSanityTests; import java.lang.reflect.Method; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic sanity tests for the entire package. diff --git a/android/guava-tests/test/com/google/common/eventbus/StringCatcher.java b/android/guava-tests/test/com/google/common/eventbus/StringCatcher.java index 56be3f2ac1ae..1f30e2384427 100644 --- a/android/guava-tests/test/com/google/common/eventbus/StringCatcher.java +++ b/android/guava-tests/test/com/google/common/eventbus/StringCatcher.java @@ -20,7 +20,7 @@ import java.util.List; import junit.framework.Assert; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A simple EventSubscriber mock that records Strings. diff --git a/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java b/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java index 4f9c7bdce788..4c9bbb7b6254 100644 --- a/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java +++ b/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Subscriber}. diff --git a/android/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java b/android/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java index 54d6c93f588b..b8738c3cb8cb 100644 --- a/android/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java +++ b/android/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java @@ -18,7 +18,7 @@ import com.google.common.eventbus.EventBus; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract base class for tests that EventBus finds the correct subscribers. diff --git a/android/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java b/android/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java index 98eaba7f012e..15a9a989a746 100644 --- a/android/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java +++ b/android/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/android/guava-tests/test/com/google/common/graph/ValueGraphTest.java b/android/guava-tests/test/com/google/common/graph/ValueGraphTest.java index 0a17427a8c6c..effd9a494735 100644 --- a/android/guava-tests/test/com/google/common/graph/ValueGraphTest.java +++ b/android/guava-tests/test/com/google/common/graph/ValueGraphTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java b/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java index 06b28eee645f..22453f3e6cc6 100644 --- a/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java +++ b/android/guava-tests/test/com/google/common/hash/BloomFilterTest.java @@ -39,7 +39,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for SimpleGenericBloomFilter and derived BloomFilter views. diff --git a/android/guava-tests/test/com/google/common/hash/HashCodeTest.java b/android/guava-tests/test/com/google/common/hash/HashCodeTest.java index 7e2b051ccbe0..46c6ac4b7f0e 100644 --- a/android/guava-tests/test/com/google/common/hash/HashCodeTest.java +++ b/android/guava-tests/test/com/google/common/hash/HashCodeTest.java @@ -26,7 +26,7 @@ import java.util.Arrays; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link HashCode}. diff --git a/android/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java b/android/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java index 5d9d6489a458..cc54edad90fb 100644 --- a/android/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java +++ b/android/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java @@ -31,7 +31,7 @@ import javax.crypto.spec.SecretKeySpec; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import sun.security.jca.ProviderList; import sun.security.jca.Providers; diff --git a/android/guava-tests/test/com/google/common/io/BaseEncodingTest.java b/android/guava-tests/test/com/google/common/io/BaseEncodingTest.java index 93d62cbe8553..1fb945643cd7 100644 --- a/android/guava-tests/test/com/google/common/io/BaseEncodingTest.java +++ b/android/guava-tests/test/com/google/common/io/BaseEncodingTest.java @@ -38,7 +38,7 @@ import java.io.StringWriter; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code BaseEncoding}. diff --git a/android/guava-tests/test/com/google/common/io/ByteSourceTest.java b/android/guava-tests/test/com/google/common/io/ByteSourceTest.java index 723224717d99..580e3ae0c3f7 100644 --- a/android/guava-tests/test/com/google/common/io/ByteSourceTest.java +++ b/android/guava-tests/test/com/google/common/io/ByteSourceTest.java @@ -43,7 +43,7 @@ import java.util.EnumSet; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for the default implementations of {@code ByteSource} methods. diff --git a/android/guava-tests/test/com/google/common/io/CloserTest.java b/android/guava-tests/test/com/google/common/io/CloserTest.java index f906c4c793f8..1181b9c46740 100644 --- a/android/guava-tests/test/com/google/common/io/CloserTest.java +++ b/android/guava-tests/test/com/google/common/io/CloserTest.java @@ -30,7 +30,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Closer}. diff --git a/android/guava-tests/test/com/google/common/io/IoTestCase.java b/android/guava-tests/test/com/google/common/io/IoTestCase.java index d188ccf43185..a8c462734d42 100644 --- a/android/guava-tests/test/com/google/common/io/IoTestCase.java +++ b/android/guava-tests/test/com/google/common/io/IoTestCase.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base test case class for I/O tests. diff --git a/android/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java index dda6301ade7d..b428136b0265 100644 --- a/android/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/io/SourceSinkFactories.java b/android/guava-tests/test/com/google/common/io/SourceSinkFactories.java index bf654242d8f9..1fdcc8c13d21 100644 --- a/android/guava-tests/test/com/google/common/io/SourceSinkFactories.java +++ b/android/guava-tests/test/com/google/common/io/SourceSinkFactories.java @@ -39,7 +39,7 @@ import java.util.Arrays; import java.util.logging.Logger; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link SourceSinkFactory} implementations. diff --git a/android/guava-tests/test/com/google/common/math/QuantilesTest.java b/android/guava-tests/test/com/google/common/math/QuantilesTest.java index aed6208630a4..64f74e486c45 100644 --- a/android/guava-tests/test/com/google/common/math/QuantilesTest.java +++ b/android/guava-tests/test/com/google/common/math/QuantilesTest.java @@ -44,7 +44,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Quantiles}. diff --git a/android/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java index 3c7c363b3264..28dff1009f28 100644 --- a/android/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/net/HostAndPortTest.java b/android/guava-tests/test/com/google/common/net/HostAndPortTest.java index 0396cef709e6..58a735fc28b4 100644 --- a/android/guava-tests/test/com/google/common/net/HostAndPortTest.java +++ b/android/guava-tests/test/com/google/common/net/HostAndPortTest.java @@ -23,7 +23,7 @@ import com.google.common.testing.SerializableTester; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link HostAndPort} diff --git a/android/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java index 86e8f9903637..806c2a1b133b 100644 --- a/android/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/primitives/BooleansTest.java b/android/guava-tests/test/com/google/common/primitives/BooleansTest.java index 67ab066c41dc..7d081054102c 100644 --- a/android/guava-tests/test/com/google/common/primitives/BooleansTest.java +++ b/android/guava-tests/test/com/google/common/primitives/BooleansTest.java @@ -33,7 +33,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Booleans}. diff --git a/android/guava-tests/test/com/google/common/primitives/BytesTest.java b/android/guava-tests/test/com/google/common/primitives/BytesTest.java index 6c56ad0e1d7f..3aa23f5f7b2e 100644 --- a/android/guava-tests/test/com/google/common/primitives/BytesTest.java +++ b/android/guava-tests/test/com/google/common/primitives/BytesTest.java @@ -30,7 +30,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Bytes}. diff --git a/android/guava-tests/test/com/google/common/primitives/CharsTest.java b/android/guava-tests/test/com/google/common/primitives/CharsTest.java index 5645a0f14cc7..c8e861ff940c 100644 --- a/android/guava-tests/test/com/google/common/primitives/CharsTest.java +++ b/android/guava-tests/test/com/google/common/primitives/CharsTest.java @@ -36,7 +36,7 @@ import java.util.Locale; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Chars}. diff --git a/android/guava-tests/test/com/google/common/primitives/DoublesTest.java b/android/guava-tests/test/com/google/common/primitives/DoublesTest.java index fa7aa36cbf2d..c5b00d688268 100644 --- a/android/guava-tests/test/com/google/common/primitives/DoublesTest.java +++ b/android/guava-tests/test/com/google/common/primitives/DoublesTest.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Doubles}. diff --git a/android/guava-tests/test/com/google/common/primitives/FloatsTest.java b/android/guava-tests/test/com/google/common/primitives/FloatsTest.java index 6522be8bff55..3adaf8d15bf3 100644 --- a/android/guava-tests/test/com/google/common/primitives/FloatsTest.java +++ b/android/guava-tests/test/com/google/common/primitives/FloatsTest.java @@ -38,7 +38,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Floats}. diff --git a/android/guava-tests/test/com/google/common/primitives/IntsTest.java b/android/guava-tests/test/com/google/common/primitives/IntsTest.java index 2c5aa1913727..9e267a36f4ff 100644 --- a/android/guava-tests/test/com/google/common/primitives/IntsTest.java +++ b/android/guava-tests/test/com/google/common/primitives/IntsTest.java @@ -37,7 +37,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Ints}. diff --git a/android/guava-tests/test/com/google/common/primitives/LongsTest.java b/android/guava-tests/test/com/google/common/primitives/LongsTest.java index 0bfa4dd5d82d..a86f8aca965e 100644 --- a/android/guava-tests/test/com/google/common/primitives/LongsTest.java +++ b/android/guava-tests/test/com/google/common/primitives/LongsTest.java @@ -40,7 +40,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Longs}. diff --git a/android/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java index 67654ea330ef..e86fd59bad3f 100644 --- a/android/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/primitives/ShortsTest.java b/android/guava-tests/test/com/google/common/primitives/ShortsTest.java index 60d8670c4be9..dc44f39ac83c 100644 --- a/android/guava-tests/test/com/google/common/primitives/ShortsTest.java +++ b/android/guava-tests/test/com/google/common/primitives/ShortsTest.java @@ -37,7 +37,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Shorts}. diff --git a/android/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java b/android/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java index 17a45870e71b..7a02d07db059 100644 --- a/android/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java +++ b/android/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java @@ -27,7 +27,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link AbstractInvocationHandler}. diff --git a/android/guava-tests/test/com/google/common/reflect/InvokableTest.java b/android/guava-tests/test/com/google/common/reflect/InvokableTest.java index 5a96126489bc..fcfcc7e92a28 100644 --- a/android/guava-tests/test/com/google/common/reflect/InvokableTest.java +++ b/android/guava-tests/test/com/google/common/reflect/InvokableTest.java @@ -36,7 +36,7 @@ import java.util.Collections; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link Invokable}. diff --git a/android/guava-tests/test/com/google/common/reflect/SubtypeTester.java b/android/guava-tests/test/com/google/common/reflect/SubtypeTester.java index 5caca8c420b8..eda28b5ec790 100644 --- a/android/guava-tests/test/com/google/common/reflect/SubtypeTester.java +++ b/android/guava-tests/test/com/google/common/reflect/SubtypeTester.java @@ -31,7 +31,7 @@ import java.util.Comparator; import javax.lang.model.element.Modifier; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester of subtyping relationships between two types. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java b/android/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java index 8f690b60c682..3688400f8ca5 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java @@ -37,7 +37,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for tests for emulated {@link AbstractFuture} that allow subclasses to swap in a diff --git a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java index a4d53d778573..0b5774b9ac09 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.AbstractQueuedSynchronizer; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Utilities for the AbstractFutureBenchmarks */ @NullUnmarked diff --git a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java index d955501aabd3..aa73f4df2e5e 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java @@ -59,7 +59,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link AbstractFuture}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java b/android/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java index fd33281c0037..24f7c9b2e21c 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractScheduledService}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java b/android/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java index dccd36366f88..75de1d6df65f 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link Callables}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java b/android/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java index 4a07ef071959..ee51de22fded 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java @@ -38,7 +38,7 @@ import java.util.logging.Logger; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Tests for {@link ExecutionSequencer} */ @NullUnmarked diff --git a/android/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java b/android/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java index c772f4d8975c..8b4b63614bda 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.Executor; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test for {@link FutureCallback}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java b/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java index 06ef3674fecb..71708beca24c 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Classes and futures used in {@link FuturesGetCheckedTest} and {@link FuturesGetUncheckedTest}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java b/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java index 9a8b1e6dff74..7c8cf27d1914 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.ExecutionException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Unit tests for {@link Futures#getDone}. */ @GwtCompatible diff --git a/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java b/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java index 1fc69011f37b..aa900d6a0802 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java @@ -95,7 +95,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link Futures}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java b/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java index bda4dcac5e85..aee24a5f60bf 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generated tests for {@link Monitor}. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java b/android/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java index cdeb907d8207..92a7b5accccd 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.locks.LockSupport; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @NullUnmarked public final class InterruptibleTaskTest extends TestCase { diff --git a/android/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java b/android/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java index 96bf05887b96..8cef591033a2 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java @@ -31,7 +31,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Used to test listenable future implementations. diff --git a/android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java b/android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java index f592e7995afb..1d00fb2ce6a9 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java @@ -76,7 +76,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/android/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java b/android/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java index a0f455ec170c..8bb5a7cc8010 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java b/android/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java index 91df560584e7..c8fc26da8afe 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Methods factored out so that they can be emulated differently in GWT. */ @GwtCompatible(emulated = true) diff --git a/android/guava-tests/test/com/google/common/util/concurrent/TestThread.java b/android/guava-tests/test/com/google/common/util/concurrent/TestThread.java index 7c3186da5fc5..e183f5b69f07 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/TestThread.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/TestThread.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A helper for concurrency testing. One or more {@code TestThread} instances are instantiated in a diff --git a/android/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java b/android/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java index 969357713648..397c41d8f526 100644 --- a/android/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java +++ b/android/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Test case for {@link TrustedListenableFutureTask}. */ @NullMarked diff --git a/android/guava/src/com/google/common/base/Absent.java b/android/guava/src/com/google/common/base/Absent.java index 4223b39e6c24..1aa84642ccc1 100644 --- a/android/guava/src/com/google/common/base/Absent.java +++ b/android/guava/src/com/google/common/base/Absent.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementation of an {@link Optional} not containing a reference. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/base/AbstractIterator.java b/android/guava/src/com/google/common/base/AbstractIterator.java index 5fb09d376712..f46e12ecbe0b 100644 --- a/android/guava/src/com/google/common/base/AbstractIterator.java +++ b/android/guava/src/com/google/common/base/AbstractIterator.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Iterator; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Note this class is a copy of {@link com.google.common.collect.AbstractIterator} (for dependency diff --git a/android/guava/src/com/google/common/base/CaseFormat.java b/android/guava/src/com/google/common/base/CaseFormat.java index 62d4e22a8c5b..c865e29606a9 100644 --- a/android/guava/src/com/google/common/base/CaseFormat.java +++ b/android/guava/src/com/google/common/base/CaseFormat.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utility class for converting between various ASCII case formats. Behavior is undefined for diff --git a/android/guava/src/com/google/common/base/Converter.java b/android/guava/src/com/google/common/base/Converter.java index d01e548ca168..b6e8e5048e88 100644 --- a/android/guava/src/com/google/common/base/Converter.java +++ b/android/guava/src/com/google/common/base/Converter.java @@ -25,7 +25,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.Serializable; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A function from {@code A} to {@code B} with an associated reverse function from {@code B} diff --git a/android/guava/src/com/google/common/base/Defaults.java b/android/guava/src/com/google/common/base/Defaults.java index 60e52a8a026b..8105badc59b3 100644 --- a/android/guava/src/com/google/common/base/Defaults.java +++ b/android/guava/src/com/google/common/base/Defaults.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides default values for all Java types, as defined by the JLS. diff --git a/android/guava/src/com/google/common/base/Enums.java b/android/guava/src/com/google/common/base/Enums.java index ebf95c507854..4b185d29c2f8 100644 --- a/android/guava/src/com/google/common/base/Enums.java +++ b/android/guava/src/com/google/common/base/Enums.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utility methods for working with {@link Enum} instances. diff --git a/android/guava/src/com/google/common/base/Equivalence.java b/android/guava/src/com/google/common/base/Equivalence.java index f6dfa4326563..0389922e7cc2 100644 --- a/android/guava/src/com/google/common/base/Equivalence.java +++ b/android/guava/src/com/google/common/base/Equivalence.java @@ -19,8 +19,8 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.ForOverride; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A strategy for determining whether two instances are considered equivalent, and for computing diff --git a/android/guava/src/com/google/common/base/FinalizablePhantomReference.java b/android/guava/src/com/google/common/base/FinalizablePhantomReference.java index 91afc3b3a198..89b600f4fa13 100644 --- a/android/guava/src/com/google/common/base/FinalizablePhantomReference.java +++ b/android/guava/src/com/google/common/base/FinalizablePhantomReference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Phantom reference with a {@code finalizeReferent()} method which a background thread invokes diff --git a/android/guava/src/com/google/common/base/FinalizableReferenceQueue.java b/android/guava/src/com/google/common/base/FinalizableReferenceQueue.java index 86f1d891dfe5..e6059dc280b6 100644 --- a/android/guava/src/com/google/common/base/FinalizableReferenceQueue.java +++ b/android/guava/src/com/google/common/base/FinalizableReferenceQueue.java @@ -28,7 +28,7 @@ import java.net.URLClassLoader; import java.util.logging.Level; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A reference queue with an associated background thread that dequeues references and invokes diff --git a/android/guava/src/com/google/common/base/FinalizableSoftReference.java b/android/guava/src/com/google/common/base/FinalizableSoftReference.java index 9acdeec45206..c4f6baa3c7de 100644 --- a/android/guava/src/com/google/common/base/FinalizableSoftReference.java +++ b/android/guava/src/com/google/common/base/FinalizableSoftReference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Soft reference with a {@code finalizeReferent()} method which a background thread invokes after diff --git a/android/guava/src/com/google/common/base/FinalizableWeakReference.java b/android/guava/src/com/google/common/base/FinalizableWeakReference.java index 3160fbff6f57..aeea7c7f8508 100644 --- a/android/guava/src/com/google/common/base/FinalizableWeakReference.java +++ b/android/guava/src/com/google/common/base/FinalizableWeakReference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Weak reference with a {@code finalizeReferent()} method which a background thread invokes after diff --git a/android/guava/src/com/google/common/base/Function.java b/android/guava/src/com/google/common/base/Function.java index 9ec46a780051..ef0780eb380c 100644 --- a/android/guava/src/com/google/common/base/Function.java +++ b/android/guava/src/com/google/common/base/Function.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Determines an output value based on an input value; a pre-Java-8 version of {@link diff --git a/android/guava/src/com/google/common/base/FunctionalEquivalence.java b/android/guava/src/com/google/common/base/FunctionalEquivalence.java index 1d4d70dd0039..8d5a50b449e4 100644 --- a/android/guava/src/com/google/common/base/FunctionalEquivalence.java +++ b/android/guava/src/com/google/common/base/FunctionalEquivalence.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Equivalence applied on functional result. diff --git a/android/guava/src/com/google/common/base/Functions.java b/android/guava/src/com/google/common/base/Functions.java index 4772da7be8e1..70fa63640834 100644 --- a/android/guava/src/com/google/common/base/Functions.java +++ b/android/guava/src/com/google/common/base/Functions.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code com.google.common.base.Function} instances; see that diff --git a/android/guava/src/com/google/common/base/Joiner.java b/android/guava/src/com/google/common/base/Joiner.java index 839c93b1e834..7f95b591907f 100644 --- a/android/guava/src/com/google/common/base/Joiner.java +++ b/android/guava/src/com/google/common/base/Joiner.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object which joins pieces of text (specified as an array, {@link Iterable}, varargs or even a diff --git a/android/guava/src/com/google/common/base/MoreObjects.java b/android/guava/src/com/google/common/base/MoreObjects.java index e9b2976d88c7..38d549663383 100644 --- a/android/guava/src/com/google/common/base/MoreObjects.java +++ b/android/guava/src/com/google/common/base/MoreObjects.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper functions that operate on any {@code Object}, and are not already provided in {@link diff --git a/android/guava/src/com/google/common/base/NullnessCasts.java b/android/guava/src/com/google/common/base/NullnessCasts.java index 85b18b225624..5c99948ad47c 100644 --- a/android/guava/src/com/google/common/base/NullnessCasts.java +++ b/android/guava/src/com/google/common/base/NullnessCasts.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A utility method to perform unchecked casts to suppress errors produced by nullness analyses. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/base/Objects.java b/android/guava/src/com/google/common/base/Objects.java index c0ebbcd7d3b9..114520c51d4b 100644 --- a/android/guava/src/com/google/common/base/Objects.java +++ b/android/guava/src/com/google/common/base/Objects.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper functions that can operate on any {@code Object}. diff --git a/android/guava/src/com/google/common/base/Optional.java b/android/guava/src/com/google/common/base/Optional.java index ae44ebeb5701..1de6b59bbe85 100644 --- a/android/guava/src/com/google/common/base/Optional.java +++ b/android/guava/src/com/google/common/base/Optional.java @@ -21,7 +21,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable object that may contain a non-null reference to another object. Each instance of diff --git a/android/guava/src/com/google/common/base/PairwiseEquivalence.java b/android/guava/src/com/google/common/base/PairwiseEquivalence.java index 93ccea2e208e..9720f774fed1 100644 --- a/android/guava/src/com/google/common/base/PairwiseEquivalence.java +++ b/android/guava/src/com/google/common/base/PairwiseEquivalence.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(serializable = true) final class PairwiseEquivalence extends Equivalence> diff --git a/android/guava/src/com/google/common/base/Platform.java b/android/guava/src/com/google/common/base/Platform.java index 885288288f5b..4c54555dc5a0 100644 --- a/android/guava/src/com/google/common/base/Platform.java +++ b/android/guava/src/com/google/common/base/Platform.java @@ -18,7 +18,7 @@ import java.lang.ref.WeakReference; import java.util.Locale; import java.util.regex.Pattern; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Methods factored out so that they can be emulated differently in GWT. diff --git a/android/guava/src/com/google/common/base/Preconditions.java b/android/guava/src/com/google/common/base/Preconditions.java index 2d1cf2ceca63..4799af51e72a 100644 --- a/android/guava/src/com/google/common/base/Preconditions.java +++ b/android/guava/src/com/google/common/base/Preconditions.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static convenience methods that help a method or constructor check whether it was invoked diff --git a/android/guava/src/com/google/common/base/Predicate.java b/android/guava/src/com/google/common/base/Predicate.java index da4bb8dfe4b6..54438f36419a 100644 --- a/android/guava/src/com/google/common/base/Predicate.java +++ b/android/guava/src/com/google/common/base/Predicate.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Determines a true or false value for a given input; a pre-Java-8 version of {@link diff --git a/android/guava/src/com/google/common/base/Predicates.java b/android/guava/src/com/google/common/base/Predicates.java index e819d5bef5e5..934c381b0f33 100644 --- a/android/guava/src/com/google/common/base/Predicates.java +++ b/android/guava/src/com/google/common/base/Predicates.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.regex.Pattern; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code Predicate} instances. diff --git a/android/guava/src/com/google/common/base/Present.java b/android/guava/src/com/google/common/base/Present.java index 34c329cc0467..97bf8ce14ad5 100644 --- a/android/guava/src/com/google/common/base/Present.java +++ b/android/guava/src/com/google/common/base/Present.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementation of an {@link Optional} containing a reference. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/base/Splitter.java b/android/guava/src/com/google/common/base/Splitter.java index 642540194ec1..e6abafa79da3 100644 --- a/android/guava/src/com/google/common/base/Splitter.java +++ b/android/guava/src/com/google/common/base/Splitter.java @@ -28,7 +28,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Extracts non-overlapping substrings from an input string, typically by recognizing appearances of diff --git a/android/guava/src/com/google/common/base/StandardSystemProperty.java b/android/guava/src/com/google/common/base/StandardSystemProperty.java index d3dbdaf979b4..29f62a28eff2 100644 --- a/android/guava/src/com/google/common/base/StandardSystemProperty.java +++ b/android/guava/src/com/google/common/base/StandardSystemProperty.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Represents a {@linkplain System#getProperties() standard system property}. diff --git a/android/guava/src/com/google/common/base/Strings.java b/android/guava/src/com/google/common/base/Strings.java index 52ceb3efda7a..8cd4e27e670a 100644 --- a/android/guava/src/com/google/common/base/Strings.java +++ b/android/guava/src/com/google/common/base/Strings.java @@ -22,7 +22,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.VisibleForTesting; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code String} or {@code CharSequence} instances. diff --git a/android/guava/src/com/google/common/base/Supplier.java b/android/guava/src/com/google/common/base/Supplier.java index 83e5d594196e..85a05229aa0a 100644 --- a/android/guava/src/com/google/common/base/Supplier.java +++ b/android/guava/src/com/google/common/base/Supplier.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class that can supply objects of a single type; a pre-Java-8 version of {@link diff --git a/android/guava/src/com/google/common/base/Suppliers.java b/android/guava/src/com/google/common/base/Suppliers.java index 570eb8868f90..32b9fec0a92f 100644 --- a/android/guava/src/com/google/common/base/Suppliers.java +++ b/android/guava/src/com/google/common/base/Suppliers.java @@ -28,7 +28,7 @@ import java.io.Serializable; import java.time.Duration; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Useful suppliers. diff --git a/android/guava/src/com/google/common/base/Throwables.java b/android/guava/src/com/google/common/base/Throwables.java index a6f1ab64fdd5..1ac398a8f8c7 100644 --- a/android/guava/src/com/google/common/base/Throwables.java +++ b/android/guava/src/com/google/common/base/Throwables.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to instances of {@link Throwable}. diff --git a/android/guava/src/com/google/common/base/Verify.java b/android/guava/src/com/google/common/base/Verify.java index 6c7ea3787da9..5ff06d11fead 100644 --- a/android/guava/src/com/google/common/base/Verify.java +++ b/android/guava/src/com/google/common/base/Verify.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static convenience methods that serve the same purpose as Java language } backed by an instance of {@code diff --git a/android/guava/src/com/google/common/collect/AbstractMapEntry.java b/android/guava/src/com/google/common/collect/AbstractMapEntry.java index 014899c897a9..6b87b90b1641 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapEntry.java +++ b/android/guava/src/com/google/common/collect/AbstractMapEntry.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of the {@code equals}, {@code hashCode}, and {@code toString} methods of {@code diff --git a/android/guava/src/com/google/common/collect/AbstractMultimap.java b/android/guava/src/com/google/common/collect/AbstractMultimap.java index 405eed7d30a3..cca1bf9cea15 100644 --- a/android/guava/src/com/google/common/collect/AbstractMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractMultimap.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeleton {@code Multimap} implementation, not necessarily in terms of a {@code Map}. diff --git a/android/guava/src/com/google/common/collect/AbstractMultiset.java b/android/guava/src/com/google/common/collect/AbstractMultiset.java index da1cc909dc47..55848b24b496 100644 --- a/android/guava/src/com/google/common/collect/AbstractMultiset.java +++ b/android/guava/src/com/google/common/collect/AbstractMultiset.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@link Multiset} interface. A new multiset diff --git a/android/guava/src/com/google/common/collect/AbstractNavigableMap.java b/android/guava/src/com/google/common/collect/AbstractNavigableMap.java index d1a17f163311..ef2f20b04fa4 100644 --- a/android/guava/src/com/google/common/collect/AbstractNavigableMap.java +++ b/android/guava/src/com/google/common/collect/AbstractNavigableMap.java @@ -24,7 +24,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.SortedMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Skeletal implementation of {@link NavigableMap}. diff --git a/android/guava/src/com/google/common/collect/AbstractRangeSet.java b/android/guava/src/com/google/common/collect/AbstractRangeSet.java index f45d4191b062..7a879a4a885a 100644 --- a/android/guava/src/com/google/common/collect/AbstractRangeSet.java +++ b/android/guava/src/com/google/common/collect/AbstractRangeSet.java @@ -15,7 +15,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeletal implementation of {@code RangeSet}. diff --git a/android/guava/src/com/google/common/collect/AbstractSequentialIterator.java b/android/guava/src/com/google/common/collect/AbstractSequentialIterator.java index 2a5cef39e82d..8c2d24be124b 100644 --- a/android/guava/src/com/google/common/collect/AbstractSequentialIterator.java +++ b/android/guava/src/com/google/common/collect/AbstractSequentialIterator.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@code Iterator} interface for sequences diff --git a/android/guava/src/com/google/common/collect/AbstractSetMultimap.java b/android/guava/src/com/google/common/collect/AbstractSetMultimap.java index 9c9a7e03498c..afb34e96de29 100644 --- a/android/guava/src/com/google/common/collect/AbstractSetMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractSetMultimap.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic implementation of the {@link SetMultimap} interface. It's a wrapper around {@link diff --git a/android/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java b/android/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java index 70a1744ea143..b07e226df411 100644 --- a/android/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic implementation of a {@link SortedSetMultimap} with a sorted key set. diff --git a/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java b/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java index 927098fe4f7d..27ab0dd4213e 100644 --- a/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/AbstractSortedMultiset.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.NavigableSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@link SortedMultiset} interface. diff --git a/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java b/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java index 3617674ffc5d..b137973f87ec 100644 --- a/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.NavigableSet; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic implementation of the {@link SortedSetMultimap} interface. It's a wrapper around {@link diff --git a/android/guava/src/com/google/common/collect/AbstractTable.java b/android/guava/src/com/google/common/collect/AbstractTable.java index fd881c7edd90..9f71fdfecd16 100644 --- a/android/guava/src/com/google/common/collect/AbstractTable.java +++ b/android/guava/src/com/google/common/collect/AbstractTable.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; /** * Skeletal, implementation-agnostic implementation of the {@link Table} interface. diff --git a/android/guava/src/com/google/common/collect/AllEqualOrdering.java b/android/guava/src/com/google/common/collect/AllEqualOrdering.java index 8f9312d7f4d8..9ac88ca94923 100644 --- a/android/guava/src/com/google/common/collect/AllEqualOrdering.java +++ b/android/guava/src/com/google/common/collect/AllEqualOrdering.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An ordering that treats all references as equals, even nulls. diff --git a/android/guava/src/com/google/common/collect/ArrayListMultimap.java b/android/guava/src/com/google/common/collect/ArrayListMultimap.java index da2fdb8c4625..6eb18a3ee8d1 100644 --- a/android/guava/src/com/google/common/collect/ArrayListMultimap.java +++ b/android/guava/src/com/google/common/collect/ArrayListMultimap.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Multimap} that uses an {@code ArrayList} to store the values for a given diff --git a/android/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java b/android/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java index 4b12ebf6ed9a..6d0eef163409 100644 --- a/android/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java +++ b/android/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A dummy superclass to support GWT serialization of the element types of an {@link diff --git a/android/guava/src/com/google/common/collect/ArrayTable.java b/android/guava/src/com/google/common/collect/ArrayTable.java index f0683aa899bf..1377d6fa3414 100644 --- a/android/guava/src/com/google/common/collect/ArrayTable.java +++ b/android/guava/src/com/google/common/collect/ArrayTable.java @@ -37,7 +37,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; /** * Fixed-size {@link Table} implementation backed by a two-dimensional array. diff --git a/android/guava/src/com/google/common/collect/BiMap.java b/android/guava/src/com/google/common/collect/BiMap.java index 192b4ad48706..9adbff493fad 100644 --- a/android/guava/src/com/google/common/collect/BiMap.java +++ b/android/guava/src/com/google/common/collect/BiMap.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A bimap (or "bidirectional map") is a map that preserves the uniqueness of its values as well as diff --git a/android/guava/src/com/google/common/collect/ByFunctionOrdering.java b/android/guava/src/com/google/common/collect/ByFunctionOrdering.java index 4d9abeb7cfbf..e21cfbca6c60 100644 --- a/android/guava/src/com/google/common/collect/ByFunctionOrdering.java +++ b/android/guava/src/com/google/common/collect/ByFunctionOrdering.java @@ -22,7 +22,7 @@ import com.google.common.base.Function; import com.google.common.base.Objects; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An ordering that orders elements by applying an order to the result of a function on those diff --git a/android/guava/src/com/google/common/collect/CartesianList.java b/android/guava/src/com/google/common/collect/CartesianList.java index eeabdf9a310d..8150370afd04 100644 --- a/android/guava/src/com/google/common/collect/CartesianList.java +++ b/android/guava/src/com/google/common/collect/CartesianList.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.ListIterator; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Lists#cartesianProduct(List)}. diff --git a/android/guava/src/com/google/common/collect/ClassToInstanceMap.java b/android/guava/src/com/google/common/collect/ClassToInstanceMap.java index e256ccd58b9f..12c8ee32a346 100644 --- a/android/guava/src/com/google/common/collect/ClassToInstanceMap.java +++ b/android/guava/src/com/google/common/collect/ClassToInstanceMap.java @@ -20,8 +20,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotMock; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A map, each entry of which maps a Java raw type to an diff --git a/android/guava/src/com/google/common/collect/CollectCollectors.java b/android/guava/src/com/google/common/collect/CollectCollectors.java index 87f494913c79..65d76536b279 100644 --- a/android/guava/src/com/google/common/collect/CollectCollectors.java +++ b/android/guava/src/com/google/common/collect/CollectCollectors.java @@ -36,7 +36,7 @@ import java.util.function.ToIntFunction; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Collectors utilities for {@code common.collect} internals. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/collect/CollectSpliterators.java b/android/guava/src/com/google/common/collect/CollectSpliterators.java index 03d705abce92..207aa2d09c96 100644 --- a/android/guava/src/com/google/common/collect/CollectSpliterators.java +++ b/android/guava/src/com/google/common/collect/CollectSpliterators.java @@ -33,7 +33,7 @@ import java.util.function.LongConsumer; import java.util.function.Predicate; import java.util.stream.IntStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Spliterator utilities for {@code common.collect} internals. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/collect/Collections2.java b/android/guava/src/com/google/common/collect/Collections2.java index fa8d2dd0c964..3ffc20077181 100644 --- a/android/guava/src/com/google/common/collect/Collections2.java +++ b/android/guava/src/com/google/common/collect/Collections2.java @@ -36,7 +36,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods for working with {@code Collection} instances. diff --git a/android/guava/src/com/google/common/collect/CompactHashMap.java b/android/guava/src/com/google/common/collect/CompactHashMap.java index 2567a4609163..b2e01092ec16 100644 --- a/android/guava/src/com/google/common/collect/CompactHashMap.java +++ b/android/guava/src/com/google/common/collect/CompactHashMap.java @@ -50,7 +50,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactHashMap is an implementation of a Map. All optional operations (put and remove) are diff --git a/android/guava/src/com/google/common/collect/CompactHashSet.java b/android/guava/src/com/google/common/collect/CompactHashSet.java index 95b88417930c..0c55bc8ac9cb 100644 --- a/android/guava/src/com/google/common/collect/CompactHashSet.java +++ b/android/guava/src/com/google/common/collect/CompactHashSet.java @@ -44,7 +44,7 @@ import java.util.LinkedHashSet; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactHashSet is an implementation of a Set. All optional operations (adding and removing) are diff --git a/android/guava/src/com/google/common/collect/CompactHashing.java b/android/guava/src/com/google/common/collect/CompactHashing.java index 5436574bb846..67ec6b5cffac 100644 --- a/android/guava/src/com/google/common/collect/CompactHashing.java +++ b/android/guava/src/com/google/common/collect/CompactHashing.java @@ -22,7 +22,7 @@ import com.google.common.base.Objects; import com.google.common.primitives.Ints; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper classes and static methods for implementing compact hash-based collections. diff --git a/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java b/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java index 50aaab149250..3979ebf40ada 100644 --- a/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java +++ b/android/guava/src/com/google/common/collect/CompactLinkedHashMap.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactLinkedHashMap is an implementation of a Map with insertion or LRU iteration order, diff --git a/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java b/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java index 270bbf0b8796..d9f9618971d6 100644 --- a/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java +++ b/android/guava/src/com/google/common/collect/CompactLinkedHashSet.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactLinkedHashSet is an implementation of a Set, which a predictable iteration order that diff --git a/android/guava/src/com/google/common/collect/ComparatorOrdering.java b/android/guava/src/com/google/common/collect/ComparatorOrdering.java index 6e2dc19b9a24..7e4fa25b63b4 100644 --- a/android/guava/src/com/google/common/collect/ComparatorOrdering.java +++ b/android/guava/src/com/google/common/collect/ComparatorOrdering.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering for a pre-existing comparator. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/Comparators.java b/android/guava/src/com/google/common/collect/Comparators.java index 52c76aad5f7e..8ff31df70dfb 100644 --- a/android/guava/src/com/google/common/collect/Comparators.java +++ b/android/guava/src/com/google/common/collect/Comparators.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods for working with {@link Comparator} instances. For many other helpful diff --git a/android/guava/src/com/google/common/collect/ComparisonChain.java b/android/guava/src/com/google/common/collect/ComparisonChain.java index c1471634f506..dcb5939cf7a5 100644 --- a/android/guava/src/com/google/common/collect/ComparisonChain.java +++ b/android/guava/src/com/google/common/collect/ComparisonChain.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A utility for performing a chained comparison statement. For example: diff --git a/android/guava/src/com/google/common/collect/CompoundOrdering.java b/android/guava/src/com/google/common/collect/CompoundOrdering.java index 6d9f74b2368d..7008d229502b 100644 --- a/android/guava/src/com/google/common/collect/CompoundOrdering.java +++ b/android/guava/src/com/google/common/collect/CompoundOrdering.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that tries several comparators in order. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/ComputationException.java b/android/guava/src/com/google/common/collect/ComputationException.java index df8d37799077..4c0b261df0df 100644 --- a/android/guava/src/com/google/common/collect/ComputationException.java +++ b/android/guava/src/com/google/common/collect/ComputationException.java @@ -17,7 +17,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Wraps an exception that occurred during a computation. diff --git a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index e28be6b8a54c..ce1ad289f8b6 100644 --- a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -45,7 +45,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; /** * A multiset that supports concurrent modifications and that provides atomic versions of most diff --git a/android/guava/src/com/google/common/collect/ConsumingQueueIterator.java b/android/guava/src/com/google/common/collect/ConsumingQueueIterator.java index 49beb86ccd6e..847229e6a299 100644 --- a/android/guava/src/com/google/common/collect/ConsumingQueueIterator.java +++ b/android/guava/src/com/google/common/collect/ConsumingQueueIterator.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An Iterator implementation which draws elements from a queue, removing them from the queue as it diff --git a/android/guava/src/com/google/common/collect/Count.java b/android/guava/src/com/google/common/collect/Count.java index e2da82a36144..fa01412d9c54 100644 --- a/android/guava/src/com/google/common/collect/Count.java +++ b/android/guava/src/com/google/common/collect/Count.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A mutable value of type {@code int}, for multisets to use in tracking counts of values. diff --git a/android/guava/src/com/google/common/collect/Cut.java b/android/guava/src/com/google/common/collect/Cut.java index 3d323b00fb24..241f369d1d06 100644 --- a/android/guava/src/com/google/common/collect/Cut.java +++ b/android/guava/src/com/google/common/collect/Cut.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation detail for the internal structure of {@link Range} instances. Represents a unique diff --git a/android/guava/src/com/google/common/collect/DenseImmutableTable.java b/android/guava/src/com/google/common/collect/DenseImmutableTable.java index f2b8cc502a21..42fdeebeeae6 100644 --- a/android/guava/src/com/google/common/collect/DenseImmutableTable.java +++ b/android/guava/src/com/google/common/collect/DenseImmutableTable.java @@ -24,7 +24,7 @@ import com.google.errorprone.annotations.Immutable; import com.google.j2objc.annotations.WeakOuter; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A {@code RegularImmutableTable} optimized for dense data. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java b/android/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java index b9742a97b998..a5fec75bce63 100644 --- a/android/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A descending wrapper around an {@code ImmutableSortedMultiset} diff --git a/android/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java b/android/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java index c69590a7d22f..4a13415c540b 100644 --- a/android/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java +++ b/android/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Skeletal implementation of {@link ImmutableSortedSet#descendingSet()}. diff --git a/android/guava/src/com/google/common/collect/DescendingMultiset.java b/android/guava/src/com/google/common/collect/DescendingMultiset.java index a37c7c9583ba..146fac334494 100644 --- a/android/guava/src/com/google/common/collect/DescendingMultiset.java +++ b/android/guava/src/com/google/common/collect/DescendingMultiset.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.NavigableSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeleton implementation of a descending multiset. Only needs {@code forwardMultiset()} and diff --git a/android/guava/src/com/google/common/collect/DiscreteDomain.java b/android/guava/src/com/google/common/collect/DiscreteDomain.java index 1747179063a1..873c64a6f8c7 100644 --- a/android/guava/src/com/google/common/collect/DiscreteDomain.java +++ b/android/guava/src/com/google/common/collect/DiscreteDomain.java @@ -25,7 +25,7 @@ import java.io.Serializable; import java.math.BigInteger; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A descriptor for a discrete {@code Comparable} domain such as all {@link Integer} diff --git a/android/guava/src/com/google/common/collect/EmptyContiguousSet.java b/android/guava/src/com/google/common/collect/EmptyContiguousSet.java index 049d86a19fb1..1ce608eeff15 100644 --- a/android/guava/src/com/google/common/collect/EmptyContiguousSet.java +++ b/android/guava/src/com/google/common/collect/EmptyContiguousSet.java @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An empty contiguous set. diff --git a/android/guava/src/com/google/common/collect/EnumHashBiMap.java b/android/guava/src/com/google/common/collect/EnumHashBiMap.java index 6b27b5df37c6..54f7dc12b2b8 100644 --- a/android/guava/src/com/google/common/collect/EnumHashBiMap.java +++ b/android/guava/src/com/google/common/collect/EnumHashBiMap.java @@ -29,7 +29,7 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code BiMap} backed by an {@code EnumMap} instance for keys-to-values, and a {@code HashMap} diff --git a/android/guava/src/com/google/common/collect/EnumMultiset.java b/android/guava/src/com/google/common/collect/EnumMultiset.java index 712857bb7dba..8cfa4d045d76 100644 --- a/android/guava/src/com/google/common/collect/EnumMultiset.java +++ b/android/guava/src/com/google/common/collect/EnumMultiset.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Multiset implementation specialized for enum elements, supporting all single-element operations diff --git a/android/guava/src/com/google/common/collect/ExplicitOrdering.java b/android/guava/src/com/google/common/collect/ExplicitOrdering.java index 526e6e39b425..314c6dcb8da5 100644 --- a/android/guava/src/com/google/common/collect/ExplicitOrdering.java +++ b/android/guava/src/com/google/common/collect/ExplicitOrdering.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that compares objects according to a given order. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java b/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java index 0141dbbfacdb..c71ad1476dbb 100644 --- a/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredEntryMultimap.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterEntries(Multimap, Predicate)}. diff --git a/android/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java b/android/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java index 910f2186b113..c01894aad5ab 100644 --- a/android/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java @@ -20,7 +20,7 @@ import com.google.common.base.Predicate; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterEntries(SetMultimap, Predicate)}. diff --git a/android/guava/src/com/google/common/collect/FilteredKeyListMultimap.java b/android/guava/src/com/google/common/collect/FilteredKeyListMultimap.java index 196320190506..d7b66a71994b 100644 --- a/android/guava/src/com/google/common/collect/FilteredKeyListMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredKeyListMultimap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Predicate; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterKeys(ListMultimap, Predicate)}. diff --git a/android/guava/src/com/google/common/collect/FilteredKeyMultimap.java b/android/guava/src/com/google/common/collect/FilteredKeyMultimap.java index f6c1445edb44..1ca1aa0371e7 100644 --- a/android/guava/src/com/google/common/collect/FilteredKeyMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredKeyMultimap.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterKeys(Multimap, Predicate)}. diff --git a/android/guava/src/com/google/common/collect/FilteredKeySetMultimap.java b/android/guava/src/com/google/common/collect/FilteredKeySetMultimap.java index 4f20fbe45425..58c473c9846b 100644 --- a/android/guava/src/com/google/common/collect/FilteredKeySetMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredKeySetMultimap.java @@ -20,7 +20,7 @@ import com.google.common.base.Predicate; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterKeys(SetMultimap, Predicate)}. diff --git a/android/guava/src/com/google/common/collect/FilteredMultimap.java b/android/guava/src/com/google/common/collect/FilteredMultimap.java index 29b4dd1fd7e5..173302e29b5f 100644 --- a/android/guava/src/com/google/common/collect/FilteredMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredMultimap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Predicate; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An interface for all filtered multimap types. diff --git a/android/guava/src/com/google/common/collect/FilteredMultimapValues.java b/android/guava/src/com/google/common/collect/FilteredMultimapValues.java index 723842e6aaa9..b39dd9a8802f 100644 --- a/android/guava/src/com/google/common/collect/FilteredMultimapValues.java +++ b/android/guava/src/com/google/common/collect/FilteredMultimapValues.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation for {@link FilteredMultimap#values()}. diff --git a/android/guava/src/com/google/common/collect/FilteredSetMultimap.java b/android/guava/src/com/google/common/collect/FilteredSetMultimap.java index f858af50bc3c..7737377ea202 100644 --- a/android/guava/src/com/google/common/collect/FilteredSetMultimap.java +++ b/android/guava/src/com/google/common/collect/FilteredSetMultimap.java @@ -17,7 +17,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A supertype for filtered {@link SetMultimap} implementations. diff --git a/android/guava/src/com/google/common/collect/FluentIterable.java b/android/guava/src/com/google/common/collect/FluentIterable.java index 30c5d0b1d3b6..580d355587f8 100644 --- a/android/guava/src/com/google/common/collect/FluentIterable.java +++ b/android/guava/src/com/google/common/collect/FluentIterable.java @@ -31,8 +31,8 @@ import java.util.Iterator; import java.util.List; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * An expanded {@code Iterable} API, providing functionality similar to Java 8's powerful extends ImmutableSet { diff --git a/android/guava/src/com/google/common/collect/Interners.java b/android/guava/src/com/google/common/collect/Interners.java index 0ec1b1186c26..93b0b509c4fb 100644 --- a/android/guava/src/com/google/common/collect/Interners.java +++ b/android/guava/src/com/google/common/collect/Interners.java @@ -23,7 +23,7 @@ import com.google.common.base.Function; import com.google.common.collect.MapMaker.Dummy; import com.google.common.collect.MapMakerInternalMap.InternalEntry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Contains static methods pertaining to instances of {@link Interner}. diff --git a/android/guava/src/com/google/common/collect/Iterables.java b/android/guava/src/com/google/common/collect/Iterables.java index b75d5263109a..a73bb1d07eb2 100644 --- a/android/guava/src/com/google/common/collect/Iterables.java +++ b/android/guava/src/com/google/common/collect/Iterables.java @@ -35,8 +35,8 @@ import java.util.Queue; import java.util.RandomAccess; import java.util.Set; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * An assortment of mainly legacy static utility methods that operate on or return objects of type diff --git a/android/guava/src/com/google/common/collect/Iterators.java b/android/guava/src/com/google/common/collect/Iterators.java index 2d7ab4af6c6c..afbd4ffb660c 100644 --- a/android/guava/src/com/google/common/collect/Iterators.java +++ b/android/guava/src/com/google/common/collect/Iterators.java @@ -47,8 +47,8 @@ import java.util.NoSuchElementException; import java.util.PriorityQueue; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * This class contains static utility methods that operate on or return objects of type {@link diff --git a/android/guava/src/com/google/common/collect/LexicographicalOrdering.java b/android/guava/src/com/google/common/collect/LexicographicalOrdering.java index 50844c66457a..2bbb0f10d9e1 100644 --- a/android/guava/src/com/google/common/collect/LexicographicalOrdering.java +++ b/android/guava/src/com/google/common/collect/LexicographicalOrdering.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering which sorts iterables by comparing corresponding elements pairwise. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/LinkedHashMultimap.java b/android/guava/src/com/google/common/collect/LinkedHashMultimap.java index 90f8f547c5fc..11ef8138b6ae 100644 --- a/android/guava/src/com/google/common/collect/LinkedHashMultimap.java +++ b/android/guava/src/com/google/common/collect/LinkedHashMultimap.java @@ -38,7 +38,7 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Multimap} that does not allow duplicate key-value entries and that diff --git a/android/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java b/android/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java index 75e76024e2de..8c91683d19c0 100644 --- a/android/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java +++ b/android/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A dummy superclass to support GWT serialization of the element types of a {@link diff --git a/android/guava/src/com/google/common/collect/LinkedHashMultiset.java b/android/guava/src/com/google/common/collect/LinkedHashMultiset.java index a17c823ffe6a..65761c99eea1 100644 --- a/android/guava/src/com/google/common/collect/LinkedHashMultiset.java +++ b/android/guava/src/com/google/common/collect/LinkedHashMultiset.java @@ -17,7 +17,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code Multiset} implementation with predictable iteration order. Its iterator orders elements diff --git a/android/guava/src/com/google/common/collect/LinkedListMultimap.java b/android/guava/src/com/google/common/collect/LinkedListMultimap.java index aa10bacb665f..014d1af55ca8 100644 --- a/android/guava/src/com/google/common/collect/LinkedListMultimap.java +++ b/android/guava/src/com/google/common/collect/LinkedListMultimap.java @@ -40,7 +40,7 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@code ListMultimap} that supports deterministic iteration order for both diff --git a/android/guava/src/com/google/common/collect/ListMultimap.java b/android/guava/src/com/google/common/collect/ListMultimap.java index 8052b853e7a5..a530833267f4 100644 --- a/android/guava/src/com/google/common/collect/ListMultimap.java +++ b/android/guava/src/com/google/common/collect/ListMultimap.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code Multimap} that can hold duplicate key-value pairs and that maintains the insertion diff --git a/android/guava/src/com/google/common/collect/Lists.java b/android/guava/src/com/google/common/collect/Lists.java index c0551a630abc..e237fd758563 100644 --- a/android/guava/src/com/google/common/collect/Lists.java +++ b/android/guava/src/com/google/common/collect/Lists.java @@ -50,7 +50,7 @@ import java.util.NoSuchElementException; import java.util.RandomAccess; import java.util.concurrent.CopyOnWriteArrayList; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link List} instances. Also see this class's counterparts diff --git a/android/guava/src/com/google/common/collect/MapDifference.java b/android/guava/src/com/google/common/collect/MapDifference.java index 82f3a4def73f..b8044d070683 100644 --- a/android/guava/src/com/google/common/collect/MapDifference.java +++ b/android/guava/src/com/google/common/collect/MapDifference.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotMock; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object representing the differences between two maps. diff --git a/android/guava/src/com/google/common/collect/MapMaker.java b/android/guava/src/com/google/common/collect/MapMaker.java index e51edc42684e..a8a0f09e7b7f 100644 --- a/android/guava/src/com/google/common/collect/MapMaker.java +++ b/android/guava/src/com/google/common/collect/MapMaker.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A builder of {@link ConcurrentMap} instances that can have keys or values automatically wrapped diff --git a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java index c32bff9d96fe..d82fdd6d2547 100644 --- a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java +++ b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java @@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.concurrent.locks.ReentrantLock; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The concurrent hash map implementation built by {@link MapMaker}. diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java index a12ee0d3dd2e..14e3e892edb1 100644 --- a/android/guava/src/com/google/common/collect/Maps.java +++ b/android/guava/src/com/google/common/collect/Maps.java @@ -70,8 +70,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.BinaryOperator; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Map} instances (including instances of {@link diff --git a/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java b/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java index 07b6c6dd9beb..d365ffb718a9 100644 --- a/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java +++ b/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java @@ -45,7 +45,7 @@ import java.util.NoSuchElementException; import java.util.PriorityQueue; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A double-ended priority queue, which provides constant-time access to both its least element and diff --git a/android/guava/src/com/google/common/collect/MoreCollectors.java b/android/guava/src/com/google/common/collect/MoreCollectors.java index d45f911e29db..905bf14e8ec7 100644 --- a/android/guava/src/com/google/common/collect/MoreCollectors.java +++ b/android/guava/src/com/google/common/collect/MoreCollectors.java @@ -25,7 +25,7 @@ import java.util.NoSuchElementException; import java.util.Optional; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Collectors not present in {@code java.util.stream.Collectors} that are not otherwise associated diff --git a/android/guava/src/com/google/common/collect/Multimap.java b/android/guava/src/com/google/common/collect/Multimap.java index cbbdbf1a4026..a02c6ea6f6a2 100644 --- a/android/guava/src/com/google/common/collect/Multimap.java +++ b/android/guava/src/com/google/common/collect/Multimap.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection that maps keys to values, similar to {@link Map}, but in which each key may be diff --git a/android/guava/src/com/google/common/collect/MultimapBuilder.java b/android/guava/src/com/google/common/collect/MultimapBuilder.java index 0104cf4f8cb6..8f8da008042c 100644 --- a/android/guava/src/com/google/common/collect/MultimapBuilder.java +++ b/android/guava/src/com/google/common/collect/MultimapBuilder.java @@ -34,7 +34,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable builder for {@link Multimap} instances, letting you independently select the desired diff --git a/android/guava/src/com/google/common/collect/Multimaps.java b/android/guava/src/com/google/common/collect/Multimaps.java index 102e4a35a634..6cc2a8657c5e 100644 --- a/android/guava/src/com/google/common/collect/Multimaps.java +++ b/android/guava/src/com/google/common/collect/Multimaps.java @@ -53,7 +53,7 @@ import java.util.SortedSet; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods acting on or generating a {@code Multimap}. diff --git a/android/guava/src/com/google/common/collect/Multiset.java b/android/guava/src/com/google/common/collect/Multiset.java index 459d03465014..79255a9f9b74 100644 --- a/android/guava/src/com/google/common/collect/Multiset.java +++ b/android/guava/src/com/google/common/collect/Multiset.java @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection that supports order-independent equality, like {@link Set}, but may have duplicate diff --git a/android/guava/src/com/google/common/collect/Multisets.java b/android/guava/src/com/google/common/collect/Multisets.java index 18ef34aa9cbb..ac77316ce11c 100644 --- a/android/guava/src/com/google/common/collect/Multisets.java +++ b/android/guava/src/com/google/common/collect/Multisets.java @@ -46,7 +46,7 @@ import java.util.function.Supplier; import java.util.function.ToIntFunction; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static utility methods for creating and working with {@link Multiset} instances. diff --git a/android/guava/src/com/google/common/collect/MutableClassToInstanceMap.java b/android/guava/src/com/google/common/collect/MutableClassToInstanceMap.java index 1d1fc4c8f90f..e50e4c27c345 100644 --- a/android/guava/src/com/google/common/collect/MutableClassToInstanceMap.java +++ b/android/guava/src/com/google/common/collect/MutableClassToInstanceMap.java @@ -30,8 +30,8 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A mutable class-to-instance map backed by an arbitrary user-provided map. See also {@link diff --git a/android/guava/src/com/google/common/collect/NaturalOrdering.java b/android/guava/src/com/google/common/collect/NaturalOrdering.java index 72721302d99a..8f148748e47b 100644 --- a/android/guava/src/com/google/common/collect/NaturalOrdering.java +++ b/android/guava/src/com/google/common/collect/NaturalOrdering.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that uses the natural order of the values. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/NullnessCasts.java b/android/guava/src/com/google/common/collect/NullnessCasts.java index 884ff51d628f..82bcc2dbeaef 100644 --- a/android/guava/src/com/google/common/collect/NullnessCasts.java +++ b/android/guava/src/com/google/common/collect/NullnessCasts.java @@ -15,7 +15,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A utility method to perform unchecked casts to suppress errors produced by nullness analyses. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/collect/NullsFirstOrdering.java b/android/guava/src/com/google/common/collect/NullsFirstOrdering.java index 4ee5122dd3d3..b13a55213633 100644 --- a/android/guava/src/com/google/common/collect/NullsFirstOrdering.java +++ b/android/guava/src/com/google/common/collect/NullsFirstOrdering.java @@ -18,8 +18,8 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** An ordering that treats {@code null} as less than all other values. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/NullsLastOrdering.java b/android/guava/src/com/google/common/collect/NullsLastOrdering.java index df4ac0710cb5..3d8c1e9e0ca0 100644 --- a/android/guava/src/com/google/common/collect/NullsLastOrdering.java +++ b/android/guava/src/com/google/common/collect/NullsLastOrdering.java @@ -18,8 +18,8 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** An ordering that treats {@code null} as greater than all other values. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/ObjectArrays.java b/android/guava/src/com/google/common/collect/ObjectArrays.java index 00f07d6f4c3f..3505037bf971 100644 --- a/android/guava/src/com/google/common/collect/ObjectArrays.java +++ b/android/guava/src/com/google/common/collect/ObjectArrays.java @@ -25,8 +25,8 @@ import java.lang.reflect.Array; import java.util.Arrays; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to object arrays. diff --git a/android/guava/src/com/google/common/collect/ObjectCountHashMap.java b/android/guava/src/com/google/common/collect/ObjectCountHashMap.java index 4116ff15b581..250fcb77d415 100644 --- a/android/guava/src/com/google/common/collect/ObjectCountHashMap.java +++ b/android/guava/src/com/google/common/collect/ObjectCountHashMap.java @@ -29,7 +29,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Arrays; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@code ObjectCountHashMap} uses arrays to store key objects and count values. Comparing to using diff --git a/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java b/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java index 71a3cd57dedf..1e8b092b9feb 100644 --- a/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java +++ b/android/guava/src/com/google/common/collect/ObjectCountLinkedHashMap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.Arrays; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@code ObjectCountLinkedHashMap} is a subclass of {@code ObjectCountHashMap} with insertion diff --git a/android/guava/src/com/google/common/collect/Ordering.java b/android/guava/src/com/google/common/collect/Ordering.java index f82839961cdf..7338ee85677a 100644 --- a/android/guava/src/com/google/common/collect/Ordering.java +++ b/android/guava/src/com/google/common/collect/Ordering.java @@ -43,8 +43,8 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A comparator, with additional methods to support common operations. This is an "enriched" version diff --git a/android/guava/src/com/google/common/collect/PeekingIterator.java b/android/guava/src/com/google/common/collect/PeekingIterator.java index bf1e10d9bdde..2c214c1ec809 100644 --- a/android/guava/src/com/google/common/collect/PeekingIterator.java +++ b/android/guava/src/com/google/common/collect/PeekingIterator.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.Iterator; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that supports a one-element lookahead while iterating. diff --git a/android/guava/src/com/google/common/collect/Platform.java b/android/guava/src/com/google/common/collect/Platform.java index e7a7e1366943..141bff4c4d70 100644 --- a/android/guava/src/com/google/common/collect/Platform.java +++ b/android/guava/src/com/google/common/collect/Platform.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Methods factored out so that they can be emulated differently in GWT. diff --git a/android/guava/src/com/google/common/collect/Queues.java b/android/guava/src/com/google/common/collect/Queues.java index 9be7b4989e80..7d050f33f5cb 100644 --- a/android/guava/src/com/google/common/collect/Queues.java +++ b/android/guava/src/com/google/common/collect/Queues.java @@ -35,7 +35,7 @@ import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Queue} and {@link Deque} instances. Also see this diff --git a/android/guava/src/com/google/common/collect/Range.java b/android/guava/src/com/google/common/collect/Range.java index 867d63aa0b29..ad6dfb0c4bf7 100644 --- a/android/guava/src/com/google/common/collect/Range.java +++ b/android/guava/src/com/google/common/collect/Range.java @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A range (or "interval") defines the boundaries around a contiguous span of values of some diff --git a/android/guava/src/com/google/common/collect/RangeMap.java b/android/guava/src/com/google/common/collect/RangeMap.java index 9f23852267ca..083a12cc5c87 100644 --- a/android/guava/src/com/google/common/collect/RangeMap.java +++ b/android/guava/src/com/google/common/collect/RangeMap.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A mapping from disjoint nonempty ranges to non-null values. Queries look up the value associated diff --git a/android/guava/src/com/google/common/collect/RangeSet.java b/android/guava/src/com/google/common/collect/RangeSet.java index f49363afb0ca..76f2098b9d52 100644 --- a/android/guava/src/com/google/common/collect/RangeSet.java +++ b/android/guava/src/com/google/common/collect/RangeSet.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A set comprising zero or more {@linkplain Range#isEmpty nonempty}, {@linkplain diff --git a/android/guava/src/com/google/common/collect/RegularContiguousSet.java b/android/guava/src/com/google/common/collect/RegularContiguousSet.java index 896b7960b16a..8732c4eef3d8 100644 --- a/android/guava/src/com/google/common/collect/RegularContiguousSet.java +++ b/android/guava/src/com/google/common/collect/RegularContiguousSet.java @@ -27,7 +27,7 @@ import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link ContiguousSet} that contains one or more elements. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableAsList.java b/android/guava/src/com/google/common/collect/RegularImmutableAsList.java index 766943e1221b..557359ad753d 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableAsList.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableAsList.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@link ImmutableAsList} implementation specialized for when the delegate collection is already diff --git a/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java b/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java index e5a9bea122c3..253af71b056e 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableBiMap.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Bimap with zero or more mappings. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableList.java b/android/guava/src/com/google/common/collect/RegularImmutableList.java index 784d7ae65dec..9839c420c8d0 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableList.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableList.java @@ -24,7 +24,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableList} backed by a simple array. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableMap.java b/android/guava/src/com/google/common/collect/RegularImmutableMap.java index 3af1387b725b..c0801713d996 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableMap.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableMap.java @@ -28,7 +28,7 @@ import java.util.AbstractMap; import java.util.Arrays; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A hash-based implementation of {@link ImmutableMap}. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java b/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java index 8564ffa503e6..17eeb52f0003 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -22,7 +22,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableMultiset} with zero or more elements. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableSet.java b/android/guava/src/com/google/common/collect/RegularImmutableSet.java index 9e4bf4c5adbd..765e5ce6805d 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableSet.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableSet.java @@ -22,7 +22,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableSet} with two or more elements. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java b/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java index d105c99fa71e..40253d00e628 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java @@ -23,7 +23,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable sorted multiset with one or more distinct elements. diff --git a/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java b/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java index 674e921ffd06..f7d2804f08bb 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable sorted set with one or more elements. TODO(jlevy): Consider separate class for a diff --git a/android/guava/src/com/google/common/collect/RegularImmutableTable.java b/android/guava/src/com/google/common/collect/RegularImmutableTable.java index a992a1541f07..820bd100e09b 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableTable.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableTable.java @@ -26,7 +26,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link ImmutableTable} holding an arbitrary number of cells. diff --git a/android/guava/src/com/google/common/collect/ReverseOrdering.java b/android/guava/src/com/google/common/collect/ReverseOrdering.java index 579b620b7287..310b9663a279 100644 --- a/android/guava/src/com/google/common/collect/ReverseOrdering.java +++ b/android/guava/src/com/google/common/collect/ReverseOrdering.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that uses the reverse of a given order. */ @GwtCompatible(serializable = true) diff --git a/android/guava/src/com/google/common/collect/RowSortedTable.java b/android/guava/src/com/google/common/collect/RowSortedTable.java index 0bd724a82d26..99e59b9edd41 100644 --- a/android/guava/src/com/google/common/collect/RowSortedTable.java +++ b/android/guava/src/com/google/common/collect/RowSortedTable.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Interface that extends {@code Table} and whose rows are sorted. diff --git a/android/guava/src/com/google/common/collect/Serialization.java b/android/guava/src/com/google/common/collect/Serialization.java index d9a11b612267..81035be120a9 100644 --- a/android/guava/src/com/google/common/collect/Serialization.java +++ b/android/guava/src/com/google/common/collect/Serialization.java @@ -24,7 +24,7 @@ import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods for serializing collection classes. diff --git a/android/guava/src/com/google/common/collect/SetMultimap.java b/android/guava/src/com/google/common/collect/SetMultimap.java index bb8e4b6efde0..4b21111f9959 100644 --- a/android/guava/src/com/google/common/collect/SetMultimap.java +++ b/android/guava/src/com/google/common/collect/SetMultimap.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code Multimap} that cannot hold duplicate key-value pairs. Adding a key-value pair that's diff --git a/android/guava/src/com/google/common/collect/Sets.java b/android/guava/src/com/google/common/collect/Sets.java index 2d0a3444aa5b..096a0e4f2026 100644 --- a/android/guava/src/com/google/common/collect/Sets.java +++ b/android/guava/src/com/google/common/collect/Sets.java @@ -53,8 +53,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Set} instances. Also see this class's counterparts diff --git a/android/guava/src/com/google/common/collect/SingletonImmutableSet.java b/android/guava/src/com/google/common/collect/SingletonImmutableSet.java index d3687d9ed61b..09894261d31e 100644 --- a/android/guava/src/com/google/common/collect/SingletonImmutableSet.java +++ b/android/guava/src/com/google/common/collect/SingletonImmutableSet.java @@ -22,7 +22,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableSet} with exactly one element. diff --git a/android/guava/src/com/google/common/collect/SortedIterable.java b/android/guava/src/com/google/common/collect/SortedIterable.java index 515fd207ddb8..0b17fe6fa8c8 100644 --- a/android/guava/src/com/google/common/collect/SortedIterable.java +++ b/android/guava/src/com/google/common/collect/SortedIterable.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@code Iterable} whose elements are sorted relative to a {@code Comparator}, typically diff --git a/android/guava/src/com/google/common/collect/SortedIterables.java b/android/guava/src/com/google/common/collect/SortedIterables.java index 5b61bc9b643e..a1acb8f2811f 100644 --- a/android/guava/src/com/google/common/collect/SortedIterables.java +++ b/android/guava/src/com/google/common/collect/SortedIterables.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities for dealing with sorted collections of all types. diff --git a/android/guava/src/com/google/common/collect/SortedLists.java b/android/guava/src/com/google/common/collect/SortedLists.java index 45e93772b4a1..5ea430648869 100644 --- a/android/guava/src/com/google/common/collect/SortedLists.java +++ b/android/guava/src/com/google/common/collect/SortedLists.java @@ -24,7 +24,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static methods pertaining to sorted {@link List} instances. diff --git a/android/guava/src/com/google/common/collect/SortedMapDifference.java b/android/guava/src/com/google/common/collect/SortedMapDifference.java index 7019378e99ec..ba4fd80b779c 100644 --- a/android/guava/src/com/google/common/collect/SortedMapDifference.java +++ b/android/guava/src/com/google/common/collect/SortedMapDifference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.SortedMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object representing the differences between two sorted maps. diff --git a/android/guava/src/com/google/common/collect/SortedMultiset.java b/android/guava/src/com/google/common/collect/SortedMultiset.java index 8054cbcbcd12..8042b36703fb 100644 --- a/android/guava/src/com/google/common/collect/SortedMultiset.java +++ b/android/guava/src/com/google/common/collect/SortedMultiset.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.NavigableSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Multiset} which maintains the ordering of its elements, according to either their diff --git a/android/guava/src/com/google/common/collect/SortedMultisetBridge.java b/android/guava/src/com/google/common/collect/SortedMultisetBridge.java index 336f59957e94..6c46c73fb195 100644 --- a/android/guava/src/com/google/common/collect/SortedMultisetBridge.java +++ b/android/guava/src/com/google/common/collect/SortedMultisetBridge.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Superinterface of {@link SortedMultiset} to introduce a bridge method for {@code elementSet()}, diff --git a/android/guava/src/com/google/common/collect/SortedMultisets.java b/android/guava/src/com/google/common/collect/SortedMultisets.java index cd306769b711..530b663be6cc 100644 --- a/android/guava/src/com/google/common/collect/SortedMultisets.java +++ b/android/guava/src/com/google/common/collect/SortedMultisets.java @@ -28,7 +28,7 @@ import java.util.NavigableSet; import java.util.NoSuchElementException; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static utility methods for creating and working with {@link SortedMultiset} instances. diff --git a/android/guava/src/com/google/common/collect/SortedSetMultimap.java b/android/guava/src/com/google/common/collect/SortedSetMultimap.java index d1d0345c7882..ab3f499910fc 100644 --- a/android/guava/src/com/google/common/collect/SortedSetMultimap.java +++ b/android/guava/src/com/google/common/collect/SortedSetMultimap.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code SetMultimap} whose set of values for a given key are kept sorted; that is, they comprise diff --git a/android/guava/src/com/google/common/collect/StandardRowSortedTable.java b/android/guava/src/com/google/common/collect/StandardRowSortedTable.java index 3f69e7fc7e48..3ae5ba24ee0c 100644 --- a/android/guava/src/com/google/common/collect/StandardRowSortedTable.java +++ b/android/guava/src/com/google/common/collect/StandardRowSortedTable.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Table} whose iteration ordering across row keys is sorted by their diff --git a/android/guava/src/com/google/common/collect/StandardTable.java b/android/guava/src/com/google/common/collect/StandardTable.java index aa3e0c67808b..4cddcaa586f2 100644 --- a/android/guava/src/com/google/common/collect/StandardTable.java +++ b/android/guava/src/com/google/common/collect/StandardTable.java @@ -46,7 +46,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link Table} implementation backed by a map that associates row keys with column key / value diff --git a/android/guava/src/com/google/common/collect/Streams.java b/android/guava/src/com/google/common/collect/Streams.java index 5e8563b8dbd9..9c1d58133c65 100644 --- a/android/guava/src/com/google/common/collect/Streams.java +++ b/android/guava/src/com/google/common/collect/Streams.java @@ -49,7 +49,7 @@ import java.util.stream.LongStream; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods related to {@code Stream} instances. diff --git a/android/guava/src/com/google/common/collect/Synchronized.java b/android/guava/src/com/google/common/collect/Synchronized.java index 9e906ad659d9..b1cd1c317657 100644 --- a/android/guava/src/com/google/common/collect/Synchronized.java +++ b/android/guava/src/com/google/common/collect/Synchronized.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Synchronized collection views. The returned synchronized collection views are serializable if the diff --git a/android/guava/src/com/google/common/collect/Table.java b/android/guava/src/com/google/common/collect/Table.java index e3b1fd23b3a8..054ec519d282 100644 --- a/android/guava/src/com/google/common/collect/Table.java +++ b/android/guava/src/com/google/common/collect/Table.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection that associates an ordered pair of keys, called a row key and a column key, with a diff --git a/android/guava/src/com/google/common/collect/TableCollectors.java b/android/guava/src/com/google/common/collect/TableCollectors.java index 31bb45d1704a..bcbf41451e8f 100644 --- a/android/guava/src/com/google/common/collect/TableCollectors.java +++ b/android/guava/src/com/google/common/collect/TableCollectors.java @@ -26,7 +26,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Collectors utilities for {@code common.collect.Table} internals. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/collect/Tables.java b/android/guava/src/com/google/common/collect/Tables.java index 30e66d884d32..60dd8b3e9150 100644 --- a/android/guava/src/com/google/common/collect/Tables.java +++ b/android/guava/src/com/google/common/collect/Tables.java @@ -36,7 +36,7 @@ import java.util.SortedSet; import java.util.function.BinaryOperator; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods that involve a {@code Table}. diff --git a/android/guava/src/com/google/common/collect/TopKSelector.java b/android/guava/src/com/google/common/collect/TopKSelector.java index 2eccd012e6c6..0509021ad5dc 100644 --- a/android/guava/src/com/google/common/collect/TopKSelector.java +++ b/android/guava/src/com/google/common/collect/TopKSelector.java @@ -31,7 +31,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An accumulator that selects the "top" {@code k} elements added to it, relative to a provided diff --git a/android/guava/src/com/google/common/collect/TransformedIterator.java b/android/guava/src/com/google/common/collect/TransformedIterator.java index a866c7c05061..6499e7d80b49 100644 --- a/android/guava/src/com/google/common/collect/TransformedIterator.java +++ b/android/guava/src/com/google/common/collect/TransformedIterator.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that transforms a backing iterator; for internal use. This avoids the object overhead diff --git a/android/guava/src/com/google/common/collect/TransformedListIterator.java b/android/guava/src/com/google/common/collect/TransformedListIterator.java index 0ebe3acacc8a..111588987ee5 100644 --- a/android/guava/src/com/google/common/collect/TransformedListIterator.java +++ b/android/guava/src/com/google/common/collect/TransformedListIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import java.util.ListIterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that transforms a backing list iterator; for internal use. This avoids the object diff --git a/android/guava/src/com/google/common/collect/TreeBasedTable.java b/android/guava/src/com/google/common/collect/TreeBasedTable.java index 38637a7c10ec..e6e533df6351 100644 --- a/android/guava/src/com/google/common/collect/TreeBasedTable.java +++ b/android/guava/src/com/google/common/collect/TreeBasedTable.java @@ -33,7 +33,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Table} whose row keys and column keys are ordered by their natural diff --git a/android/guava/src/com/google/common/collect/TreeMultimap.java b/android/guava/src/com/google/common/collect/TreeMultimap.java index d7b14a9930dc..89b106a1a316 100644 --- a/android/guava/src/com/google/common/collect/TreeMultimap.java +++ b/android/guava/src/com/google/common/collect/TreeMultimap.java @@ -33,7 +33,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Multimap} whose keys and values are ordered by their natural ordering or diff --git a/android/guava/src/com/google/common/collect/TreeMultiset.java b/android/guava/src/com/google/common/collect/TreeMultiset.java index 8881ce6dea34..ecef8a46eaea 100644 --- a/android/guava/src/com/google/common/collect/TreeMultiset.java +++ b/android/guava/src/com/google/common/collect/TreeMultiset.java @@ -37,7 +37,7 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A multiset which maintains the ordering of its elements, according to either their natural order diff --git a/android/guava/src/com/google/common/collect/TreeRangeMap.java b/android/guava/src/com/google/common/collect/TreeRangeMap.java index df9c3c1fb929..a5be86f00e70 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/android/guava/src/com/google/common/collect/TreeRangeMap.java @@ -39,7 +39,7 @@ import java.util.NavigableMap; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@code RangeMap} based on a {@code TreeMap}, supporting all optional diff --git a/android/guava/src/com/google/common/collect/TreeRangeSet.java b/android/guava/src/com/google/common/collect/TreeRangeSet.java index 440816c6ecf7..2ee5b08ffa67 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeSet.java +++ b/android/guava/src/com/google/common/collect/TreeRangeSet.java @@ -32,7 +32,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.TreeMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link RangeSet} backed by a {@link TreeMap}. diff --git a/android/guava/src/com/google/common/collect/TreeTraverser.java b/android/guava/src/com/google/common/collect/TreeTraverser.java index ee1f918c5596..b483ca0b3319 100644 --- a/android/guava/src/com/google/common/collect/TreeTraverser.java +++ b/android/guava/src/com/google/common/collect/TreeTraverser.java @@ -26,7 +26,7 @@ import java.util.Deque; import java.util.Iterator; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Views elements of a type {@code T} as nodes in a tree, and provides methods to traverse the trees diff --git a/android/guava/src/com/google/common/collect/UnmodifiableIterator.java b/android/guava/src/com/google/common/collect/UnmodifiableIterator.java index d66e6fcbcab0..a159121a7b90 100644 --- a/android/guava/src/com/google/common/collect/UnmodifiableIterator.java +++ b/android/guava/src/com/google/common/collect/UnmodifiableIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotCall; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that does not support {@link #remove}. diff --git a/android/guava/src/com/google/common/collect/UnmodifiableListIterator.java b/android/guava/src/com/google/common/collect/UnmodifiableListIterator.java index f58a4f414ec2..2917d5914b60 100644 --- a/android/guava/src/com/google/common/collect/UnmodifiableListIterator.java +++ b/android/guava/src/com/google/common/collect/UnmodifiableListIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotCall; import java.util.ListIterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A list iterator that does not support {@link #remove}, {@link #add}, or {@link #set}. diff --git a/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java b/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java index 9fbef4d56287..ddf332487160 100644 --- a/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java @@ -23,7 +23,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.util.Comparator; import java.util.NavigableSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multisets#unmodifiableSortedMultiset(SortedMultiset)}, split out into diff --git a/android/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java b/android/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java index 63955c600822..8f9dddabe0d3 100644 --- a/android/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java +++ b/android/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link CharEscaper} that uses an array to quickly look up replacement characters for a given diff --git a/android/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java b/android/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java index 050c726d3ca5..d7b1e6b2a9c9 100644 --- a/android/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java +++ b/android/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link UnicodeEscaper} that uses an array to quickly look up replacement characters for a given diff --git a/android/guava/src/com/google/common/escape/CharEscaper.java b/android/guava/src/com/google/common/escape/CharEscaper.java index a34789f83d17..8a90efd8ae3c 100644 --- a/android/guava/src/com/google/common/escape/CharEscaper.java +++ b/android/guava/src/com/google/common/escape/CharEscaper.java @@ -17,7 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object that converts literal text into a format safe for inclusion in a particular context diff --git a/android/guava/src/com/google/common/escape/CharEscaperBuilder.java b/android/guava/src/com/google/common/escape/CharEscaperBuilder.java index 650fd8a53ca1..3496d91366f2 100644 --- a/android/guava/src/com/google/common/escape/CharEscaperBuilder.java +++ b/android/guava/src/com/google/common/escape/CharEscaperBuilder.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Simple helper class to build a "sparse" array of objects based on the indexes that were added to diff --git a/android/guava/src/com/google/common/escape/Escapers.java b/android/guava/src/com/google/common/escape/Escapers.java index 51f47a17645a..c5f2bd026fdb 100644 --- a/android/guava/src/com/google/common/escape/Escapers.java +++ b/android/guava/src/com/google/common/escape/Escapers.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.HashMap; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Escaper} instances. diff --git a/android/guava/src/com/google/common/escape/UnicodeEscaper.java b/android/guava/src/com/google/common/escape/UnicodeEscaper.java index bfe66af95d69..725032964899 100644 --- a/android/guava/src/com/google/common/escape/UnicodeEscaper.java +++ b/android/guava/src/com/google/common/escape/UnicodeEscaper.java @@ -17,7 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@link Escaper} that converts literal text into a format safe for inclusion in a particular diff --git a/android/guava/src/com/google/common/eventbus/Subscriber.java b/android/guava/src/com/google/common/eventbus/Subscriber.java index d67f9362cba6..bd87333de9d8 100644 --- a/android/guava/src/com/google/common/eventbus/Subscriber.java +++ b/android/guava/src/com/google/common/eventbus/Subscriber.java @@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A subscriber method on a specific object, plus the executor that should be used for dispatching diff --git a/android/guava/src/com/google/common/eventbus/SubscriberRegistry.java b/android/guava/src/com/google/common/eventbus/SubscriberRegistry.java index ce59aa0cae3f..94bf471053f5 100644 --- a/android/guava/src/com/google/common/eventbus/SubscriberRegistry.java +++ b/android/guava/src/com/google/common/eventbus/SubscriberRegistry.java @@ -44,7 +44,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Registry of subscribers to a single event bus. diff --git a/android/guava/src/com/google/common/graph/AbstractBaseGraph.java b/android/guava/src/com/google/common/graph/AbstractBaseGraph.java index 356c104f4acf..9ce3838947b8 100644 --- a/android/guava/src/com/google/common/graph/AbstractBaseGraph.java +++ b/android/guava/src/com/google/common/graph/AbstractBaseGraph.java @@ -31,7 +31,7 @@ import com.google.common.primitives.Ints; import java.util.AbstractSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link BaseGraph}. diff --git a/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java b/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java index 16d6bc7a0af8..92b203872e5f 100644 --- a/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java +++ b/android/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A base implementation of {@link NetworkConnections} for directed networks. diff --git a/android/guava/src/com/google/common/graph/AbstractGraph.java b/android/guava/src/com/google/common/graph/AbstractGraph.java index 9d5d92aa3bbf..968c627bc5cc 100644 --- a/android/guava/src/com/google/common/graph/AbstractGraph.java +++ b/android/guava/src/com/google/common/graph/AbstractGraph.java @@ -17,7 +17,7 @@ package com.google.common.graph; import com.google.common.annotations.Beta; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link Graph}. It is recommended to extend this diff --git a/android/guava/src/com/google/common/graph/AbstractNetwork.java b/android/guava/src/com/google/common/graph/AbstractNetwork.java index 89750179aba1..2516b0239bb1 100644 --- a/android/guava/src/com/google/common/graph/AbstractNetwork.java +++ b/android/guava/src/com/google/common/graph/AbstractNetwork.java @@ -36,7 +36,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; /** * This class provides a skeletal implementation of {@link Network}. It is recommended to extend diff --git a/android/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java b/android/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java index 884ccb16aa61..dc4ab842f5b2 100644 --- a/android/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java +++ b/android/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A base implementation of {@link NetworkConnections} for undirected networks. diff --git a/android/guava/src/com/google/common/graph/AbstractValueGraph.java b/android/guava/src/com/google/common/graph/AbstractValueGraph.java index 82aa9c7a6047..fc637441c199 100644 --- a/android/guava/src/com/google/common/graph/AbstractValueGraph.java +++ b/android/guava/src/com/google/common/graph/AbstractValueGraph.java @@ -22,7 +22,7 @@ import com.google.common.collect.Maps; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link ValueGraph}. It is recommended to extend diff --git a/android/guava/src/com/google/common/graph/DirectedGraphConnections.java b/android/guava/src/com/google/common/graph/DirectedGraphConnections.java index 9fec7989faee..43b69d137b0d 100644 --- a/android/guava/src/com/google/common/graph/DirectedGraphConnections.java +++ b/android/guava/src/com/google/common/graph/DirectedGraphConnections.java @@ -40,7 +40,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link GraphConnections} for directed graphs. diff --git a/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java b/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java index 9a3e1a7d9f4a..b21a63a48d99 100644 --- a/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java +++ b/android/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link NetworkConnections} for directed networks with parallel edges. diff --git a/android/guava/src/com/google/common/graph/EdgesConnecting.java b/android/guava/src/com/google/common/graph/EdgesConnecting.java index 1c4673544238..234c9bb3ee6c 100644 --- a/android/guava/src/com/google/common/graph/EdgesConnecting.java +++ b/android/guava/src/com/google/common/graph/EdgesConnecting.java @@ -23,7 +23,7 @@ import com.google.common.collect.UnmodifiableIterator; import java.util.AbstractSet; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to represent the set of edges connecting an (implicit) origin node to a target node. diff --git a/android/guava/src/com/google/common/graph/ElementOrder.java b/android/guava/src/com/google/common/graph/ElementOrder.java index dee03377153f..88562a3bda3f 100644 --- a/android/guava/src/com/google/common/graph/ElementOrder.java +++ b/android/guava/src/com/google/common/graph/ElementOrder.java @@ -28,7 +28,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Comparator; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Used to represent the order of elements in a data structure that supports different options for diff --git a/android/guava/src/com/google/common/graph/EndpointPair.java b/android/guava/src/com/google/common/graph/EndpointPair.java index 2015a7ad10b0..3bf575186525 100644 --- a/android/guava/src/com/google/common/graph/EndpointPair.java +++ b/android/guava/src/com/google/common/graph/EndpointPair.java @@ -24,7 +24,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; import com.google.errorprone.annotations.Immutable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable pair representing the two endpoints of an edge in a graph. The {@link EndpointPair} diff --git a/android/guava/src/com/google/common/graph/EndpointPairIterator.java b/android/guava/src/com/google/common/graph/EndpointPairIterator.java index b49e24bde5da..f9b563989bb9 100644 --- a/android/guava/src/com/google/common/graph/EndpointPairIterator.java +++ b/android/guava/src/com/google/common/graph/EndpointPairIterator.java @@ -24,7 +24,7 @@ import com.google.common.collect.Sets; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to facilitate the set returned by {@link Graph#edges()}. diff --git a/android/guava/src/com/google/common/graph/ForwardingNetwork.java b/android/guava/src/com/google/common/graph/ForwardingNetwork.java index 3a487cb2c8ff..4a2f62c17579 100644 --- a/android/guava/src/com/google/common/graph/ForwardingNetwork.java +++ b/android/guava/src/com/google/common/graph/ForwardingNetwork.java @@ -17,7 +17,7 @@ package com.google.common.graph; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to allow {@link Network} implementations to be backed by a provided delegate. This is not diff --git a/android/guava/src/com/google/common/graph/ForwardingValueGraph.java b/android/guava/src/com/google/common/graph/ForwardingValueGraph.java index 64899340e91e..04a4a39e25a8 100644 --- a/android/guava/src/com/google/common/graph/ForwardingValueGraph.java +++ b/android/guava/src/com/google/common/graph/ForwardingValueGraph.java @@ -17,7 +17,7 @@ package com.google.common.graph; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to allow {@link ValueGraph} implementations to be backed by a provided delegate. This is diff --git a/android/guava/src/com/google/common/graph/Graph.java b/android/guava/src/com/google/common/graph/Graph.java index af07f3c30783..b9ebd5cd1a0c 100644 --- a/android/guava/src/com/google/common/graph/Graph.java +++ b/android/guava/src/com/google/common/graph/Graph.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.Collection; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An interface for the diff --git a/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java b/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java index 3ffcb5d4df8a..a40c2fbeb00e 100644 --- a/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java +++ b/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java @@ -39,7 +39,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * See MurmurHash3_x86_32 in Internet Media Type diff --git a/android/guava/src/com/google/common/net/PercentEscaper.java b/android/guava/src/com/google/common/net/PercentEscaper.java index d9fc726aec27..8e9cdc5e6c27 100644 --- a/android/guava/src/com/google/common/net/PercentEscaper.java +++ b/android/guava/src/com/google/common/net/PercentEscaper.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.escape.UnicodeEscaper; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code UnicodeEscaper} that escapes some set of Java characters using a UTF-8 based percent diff --git a/android/guava/src/com/google/common/primitives/Booleans.java b/android/guava/src/com/google/common/primitives/Booleans.java index 770141bc1eec..4232a251f582 100644 --- a/android/guava/src/com/google/common/primitives/Booleans.java +++ b/android/guava/src/com/google/common/primitives/Booleans.java @@ -30,7 +30,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code boolean} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/Bytes.java b/android/guava/src/com/google/common/primitives/Bytes.java index ee5ce5bfef2d..871159dab7ee 100644 --- a/android/guava/src/com/google/common/primitives/Bytes.java +++ b/android/guava/src/com/google/common/primitives/Bytes.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code byte} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/Chars.java b/android/guava/src/com/google/common/primitives/Chars.java index fe94f55636af..d509de230d48 100644 --- a/android/guava/src/com/google/common/primitives/Chars.java +++ b/android/guava/src/com/google/common/primitives/Chars.java @@ -30,7 +30,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code char} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/Doubles.java b/android/guava/src/com/google/common/primitives/Doubles.java index 646e58ac6f6e..3cfd49968480 100644 --- a/android/guava/src/com/google/common/primitives/Doubles.java +++ b/android/guava/src/com/google/common/primitives/Doubles.java @@ -36,7 +36,7 @@ import java.util.RandomAccess; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code double} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/Floats.java b/android/guava/src/com/google/common/primitives/Floats.java index 455c31d7e200..bc70bd76e968 100644 --- a/android/guava/src/com/google/common/primitives/Floats.java +++ b/android/guava/src/com/google/common/primitives/Floats.java @@ -34,7 +34,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code float} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java index c5d58cf58489..d05637fa239c 100644 --- a/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java +++ b/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java @@ -31,7 +31,7 @@ import java.util.Spliterators; import java.util.function.DoubleConsumer; import java.util.stream.DoubleStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable array of {@code double} values, with an API resembling {@link List}. diff --git a/android/guava/src/com/google/common/primitives/ImmutableIntArray.java b/android/guava/src/com/google/common/primitives/ImmutableIntArray.java index 44c2fda8866d..5b26c5b7d3eb 100644 --- a/android/guava/src/com/google/common/primitives/ImmutableIntArray.java +++ b/android/guava/src/com/google/common/primitives/ImmutableIntArray.java @@ -31,7 +31,7 @@ import java.util.Spliterators; import java.util.function.IntConsumer; import java.util.stream.IntStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable array of {@code int} values, with an API resembling {@link List}. diff --git a/android/guava/src/com/google/common/primitives/ImmutableLongArray.java b/android/guava/src/com/google/common/primitives/ImmutableLongArray.java index 4c25278b3ec1..726238c9f0f0 100644 --- a/android/guava/src/com/google/common/primitives/ImmutableLongArray.java +++ b/android/guava/src/com/google/common/primitives/ImmutableLongArray.java @@ -31,7 +31,7 @@ import java.util.Spliterators; import java.util.function.LongConsumer; import java.util.stream.LongStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable array of {@code long} values, with an API resembling {@link List}. diff --git a/android/guava/src/com/google/common/primitives/Ints.java b/android/guava/src/com/google/common/primitives/Ints.java index 8f3417e77c8f..ee81ad6c9f59 100644 --- a/android/guava/src/com/google/common/primitives/Ints.java +++ b/android/guava/src/com/google/common/primitives/Ints.java @@ -33,7 +33,7 @@ import java.util.RandomAccess; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code int} primitives, that are not already found in either diff --git a/android/guava/src/com/google/common/primitives/Longs.java b/android/guava/src/com/google/common/primitives/Longs.java index 2b715cbd246d..a1130a3b128a 100644 --- a/android/guava/src/com/google/common/primitives/Longs.java +++ b/android/guava/src/com/google/common/primitives/Longs.java @@ -32,7 +32,7 @@ import java.util.RandomAccess; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code long} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/Shorts.java b/android/guava/src/com/google/common/primitives/Shorts.java index f4c192a958a8..8c9e0b19e463 100644 --- a/android/guava/src/com/google/common/primitives/Shorts.java +++ b/android/guava/src/com/google/common/primitives/Shorts.java @@ -31,7 +31,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code short} primitives, that are not already found in diff --git a/android/guava/src/com/google/common/primitives/UnsignedInteger.java b/android/guava/src/com/google/common/primitives/UnsignedInteger.java index 3608c6d28676..0bc2eb467a74 100644 --- a/android/guava/src/com/google/common/primitives/UnsignedInteger.java +++ b/android/guava/src/com/google/common/primitives/UnsignedInteger.java @@ -24,7 +24,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.math.BigInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper class for unsigned {@code int} values, supporting arithmetic operations. diff --git a/android/guava/src/com/google/common/primitives/UnsignedLong.java b/android/guava/src/com/google/common/primitives/UnsignedLong.java index bb598cbddc4b..7e1c82815525 100644 --- a/android/guava/src/com/google/common/primitives/UnsignedLong.java +++ b/android/guava/src/com/google/common/primitives/UnsignedLong.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.Serializable; import java.math.BigInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper class for unsigned {@code long} values, supporting arithmetic operations. diff --git a/android/guava/src/com/google/common/reflect/AbstractInvocationHandler.java b/android/guava/src/com/google/common/reflect/AbstractInvocationHandler.java index da00442d302b..622596817bdd 100644 --- a/android/guava/src/com/google/common/reflect/AbstractInvocationHandler.java +++ b/android/guava/src/com/google/common/reflect/AbstractInvocationHandler.java @@ -18,7 +18,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract implementation of {@link InvocationHandler} that handles {@link Object#equals}, {@link diff --git a/android/guava/src/com/google/common/reflect/ClassPath.java b/android/guava/src/com/google/common/reflect/ClassPath.java index 3fac6111b905..34f9eb82ffbd 100644 --- a/android/guava/src/com/google/common/reflect/ClassPath.java +++ b/android/guava/src/com/google/common/reflect/ClassPath.java @@ -49,7 +49,7 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Scans the source of a {@link ClassLoader} and finds all loadable classes and resources. diff --git a/android/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java b/android/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java index 5c9cf6466605..18bce983963d 100644 --- a/android/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java +++ b/android/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java @@ -19,7 +19,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotCall; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A type-to-instance map backed by an {@link ImmutableMap}. See also {@link diff --git a/android/guava/src/com/google/common/reflect/Invokable.java b/android/guava/src/com/google/common/reflect/Invokable.java index 81ef9f5774fa..f33f207f69d9 100644 --- a/android/guava/src/com/google/common/reflect/Invokable.java +++ b/android/guava/src/com/google/common/reflect/Invokable.java @@ -29,7 +29,7 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around either a {@link Method} or a {@link Constructor}. Convenience API is provided to diff --git a/android/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java b/android/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java index 91bea50de7e1..3904ecd699ef 100644 --- a/android/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java +++ b/android/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java @@ -26,8 +26,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A mutable type-to-instance map. See also {@link ImmutableTypeToInstanceMap}. diff --git a/android/guava/src/com/google/common/reflect/Parameter.java b/android/guava/src/com/google/common/reflect/Parameter.java index 5675379940ca..d0492bf54d9f 100644 --- a/android/guava/src/com/google/common/reflect/Parameter.java +++ b/android/guava/src/com/google/common/reflect/Parameter.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableList; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Represents a method or constructor parameter. diff --git a/android/guava/src/com/google/common/reflect/TypeParameter.java b/android/guava/src/com/google/common/reflect/TypeParameter.java index 654c248256dc..0d04e847df88 100644 --- a/android/guava/src/com/google/common/reflect/TypeParameter.java +++ b/android/guava/src/com/google/common/reflect/TypeParameter.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Captures a free type variable that can be used in {@link TypeToken#where}. For example: diff --git a/android/guava/src/com/google/common/reflect/TypeResolver.java b/android/guava/src/com/google/common/reflect/TypeResolver.java index 0b854d935b84..139cdd5f934d 100644 --- a/android/guava/src/com/google/common/reflect/TypeResolver.java +++ b/android/guava/src/com/google/common/reflect/TypeResolver.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object of this class encapsulates type mappings from type variables. Mappings are established diff --git a/android/guava/src/com/google/common/reflect/TypeToInstanceMap.java b/android/guava/src/com/google/common/reflect/TypeToInstanceMap.java index 1a4518e5436e..b1ffbadb52ec 100644 --- a/android/guava/src/com/google/common/reflect/TypeToInstanceMap.java +++ b/android/guava/src/com/google/common/reflect/TypeToInstanceMap.java @@ -17,8 +17,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotMock; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A map, each entry of which maps a {@link TypeToken} to an instance of that type. In addition to diff --git a/android/guava/src/com/google/common/reflect/TypeToken.java b/android/guava/src/com/google/common/reflect/TypeToken.java index 36a546f69ccd..77d613eb66f9 100644 --- a/android/guava/src/com/google/common/reflect/TypeToken.java +++ b/android/guava/src/com/google/common/reflect/TypeToken.java @@ -48,7 +48,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; /** * A {@link Type} with generics. diff --git a/android/guava/src/com/google/common/reflect/TypeVisitor.java b/android/guava/src/com/google/common/reflect/TypeVisitor.java index db3d4a71b527..3cff3f90f809 100644 --- a/android/guava/src/com/google/common/reflect/TypeVisitor.java +++ b/android/guava/src/com/google/common/reflect/TypeVisitor.java @@ -21,7 +21,7 @@ import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Based on what a {@link Type} is, dispatch it to the corresponding {@code visit*} method. By diff --git a/android/guava/src/com/google/common/reflect/Types.java b/android/guava/src/com/google/common/reflect/Types.java index d69da04cdc05..0e9885168472 100644 --- a/android/guava/src/com/google/common/reflect/Types.java +++ b/android/guava/src/com/google/common/reflect/Types.java @@ -44,7 +44,7 @@ import java.util.Collection; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities for working with {@link Type}. diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java index 9c529d2ad0f9..c15f6cb658e2 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java @@ -30,7 +30,7 @@ import com.google.j2objc.annotations.RetainedLocalRef; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementations of {@code Futures.catching*}. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java index 895af579f8f5..1e3942fe0def 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.concurrent.locks.LockSupport; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import sun.misc.Unsafe; /** diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java index e56043858842..60ec28ab87b9 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java @@ -21,7 +21,7 @@ import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.Callable; import java.util.concurrent.RunnableFuture; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract {@link ListeningExecutorService} implementation that creates {@link ListenableFuture} diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java b/android/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java index 0c5c080307a8..f0083fa4a199 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for services that can implement {@link #startUp} and {@link #shutDown} but while in diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractService.java b/android/guava/src/com/google/common/util/concurrent/AbstractService.java index bba1c904a511..74ead92afd1c 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractService.java @@ -37,7 +37,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for implementing services that can handle {@link #doStart} and {@link #doStop} diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java index cf33227f06e2..5a078eb48901 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java @@ -27,7 +27,7 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementations of {@code Futures.transform*}. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java b/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java index 1e351a3ca290..9647758bdc66 100644 --- a/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AggregateFuture.java @@ -32,7 +32,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A future whose value is derived from a collection of input futures. diff --git a/android/guava/src/com/google/common/util/concurrent/AggregateFutureState.java b/android/guava/src/com/google/common/util/concurrent/AggregateFutureState.java index 92939b1c94a5..eca2e4f713fc 100644 --- a/android/guava/src/com/google/common/util/concurrent/AggregateFutureState.java +++ b/android/guava/src/com/google/common/util/concurrent/AggregateFutureState.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A helper which does some thread-safe operations for aggregate futures, which must be implemented diff --git a/android/guava/src/com/google/common/util/concurrent/AsyncCallable.java b/android/guava/src/com/google/common/util/concurrent/AsyncCallable.java index 3cdad62125f7..3f2405a22098 100644 --- a/android/guava/src/com/google/common/util/concurrent/AsyncCallable.java +++ b/android/guava/src/com/google/common/util/concurrent/AsyncCallable.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Computes a value, possibly asynchronously. For an example usage and more information, see {@link diff --git a/android/guava/src/com/google/common/util/concurrent/AsyncFunction.java b/android/guava/src/com/google/common/util/concurrent/AsyncFunction.java index c5be9dcdb0e3..c79e1ffcf093 100644 --- a/android/guava/src/com/google/common/util/concurrent/AsyncFunction.java +++ b/android/guava/src/com/google/common/util/concurrent/AsyncFunction.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Transforms a value, possibly asynchronously. For an example usage and more information, see diff --git a/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index a56f788d164c..3f97967be5ae 100644 --- a/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java @@ -29,7 +29,7 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A map containing {@code long} values that can be atomically updated. While writes to a diff --git a/android/guava/src/com/google/common/util/concurrent/Atomics.java b/android/guava/src/com/google/common/util/concurrent/Atomics.java index e49b0c1e7f1c..99098cb96763 100644 --- a/android/guava/src/com/google/common/util/concurrent/Atomics.java +++ b/android/guava/src/com/google/common/util/concurrent/Atomics.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtIncompatible; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReferenceArray; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to classes in the {@code java.util.concurrent.atomic} package. diff --git a/android/guava/src/com/google/common/util/concurrent/Callables.java b/android/guava/src/com/google/common/util/concurrent/Callables.java index a022a23a085c..756237020362 100644 --- a/android/guava/src/com/google/common/util/concurrent/Callables.java +++ b/android/guava/src/com/google/common/util/concurrent/Callables.java @@ -21,7 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; import java.util.concurrent.Callable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to the {@link Callable} interface. diff --git a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java index 8a8b70fb6ee4..05ca0e93b237 100644 --- a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java @@ -58,7 +58,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A step in a pipeline of an asynchronous computation. When the last step in the computation is diff --git a/android/guava/src/com/google/common/util/concurrent/CollectionFuture.java b/android/guava/src/com/google/common/util/concurrent/CollectionFuture.java index 102fc9b4311f..3b32f0f0a47d 100644 --- a/android/guava/src/com/google/common/util/concurrent/CollectionFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/CollectionFuture.java @@ -24,7 +24,7 @@ import com.google.j2objc.annotations.RetainedLocalRef; import java.util.Collections; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Aggregate future that collects (stores) results of each future. */ @GwtCompatible(emulated = true) diff --git a/android/guava/src/com/google/common/util/concurrent/CombinedFuture.java b/android/guava/src/com/google/common/util/concurrent/CombinedFuture.java index 055db72c4926..3820200d730c 100644 --- a/android/guava/src/com/google/common/util/concurrent/CombinedFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/CombinedFuture.java @@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Aggregate future that computes its value by calling a callable. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java b/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java index c55eac94a8c5..8cd223e3b669 100644 --- a/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java +++ b/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java @@ -41,7 +41,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The {@code CycleDetectingLockFactory} creates {@link ReentrantLock} instances and {@link diff --git a/android/guava/src/com/google/common/util/concurrent/ExecutionError.java b/android/guava/src/com/google/common/util/concurrent/ExecutionError.java index 0f0dad01cbf0..9dc474af8786 100644 --- a/android/guava/src/com/google/common/util/concurrent/ExecutionError.java +++ b/android/guava/src/com/google/common/util/concurrent/ExecutionError.java @@ -15,7 +15,7 @@ package com.google.common.util.concurrent; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link Error} variant of {@link java.util.concurrent.ExecutionException}. As with {@code diff --git a/android/guava/src/com/google/common/util/concurrent/ExecutionList.java b/android/guava/src/com/google/common/util/concurrent/ExecutionList.java index 97330488ee1b..fbf2e4bcc16e 100644 --- a/android/guava/src/com/google/common/util/concurrent/ExecutionList.java +++ b/android/guava/src/com/google/common/util/concurrent/ExecutionList.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.concurrent.Executor; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A support class for {@code ListenableFuture} implementations to manage their listeners. An diff --git a/android/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java b/android/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java index adbc1517582b..6103e9c08a5a 100644 --- a/android/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java +++ b/android/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java @@ -30,7 +30,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Serializes execution of tasks, somewhat like an "asynchronous {@code synchronized} block." Each diff --git a/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java b/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java index 3cbb80cf7bbe..cfd3a2a489f5 100644 --- a/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java @@ -23,7 +23,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A TimeLimiter implementation which actually does not attempt to limit time at all. This may be diff --git a/android/guava/src/com/google/common/util/concurrent/FluentFuture.java b/android/guava/src/com/google/common/util/concurrent/FluentFuture.java index 6c42304d299e..eaa8b30a9774 100644 --- a/android/guava/src/com/google/common/util/concurrent/FluentFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/FluentFuture.java @@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListenableFuture} that supports fluent chains of operations. For example: diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java b/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java index e7162827c5bd..2cdf348d12d8 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.concurrent.BlockingDeque; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BlockingDeque} which forwards all its method calls to another {@code BlockingDeque}. diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java b/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java index f4a17855a2d7..ae52c9626ddf 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BlockingQueue} which forwards all its method calls to another {@link BlockingQueue}. diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java b/android/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java index 6a6919343466..92a3a72fa233 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java @@ -27,7 +27,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An executor service which forwards all its method calls to another executor service. Subclasses diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java b/android/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java index 3fdb360faa09..52fc1b039dfa 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link FluentFuture} that forwards all calls to a delegate. diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingFuture.java b/android/guava/src/com/google/common/util/concurrent/ForwardingFuture.java index 980363487087..b8ea27ba845c 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingFuture.java @@ -22,7 +22,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Future} which forwards all its method calls to another future. Subclasses should diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java b/android/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java index 216c25c153fa..d204518bb048 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Preconditions; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListenableFuture} which forwards all its method calls to another future. Subclasses diff --git a/android/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java b/android/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java index fdd205957a36..a362379426e6 100644 --- a/android/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.util.concurrent.Callable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A listening executor service which forwards all its method calls to another listening executor diff --git a/android/guava/src/com/google/common/util/concurrent/FutureCallback.java b/android/guava/src/com/google/common/util/concurrent/FutureCallback.java index 3af949526eb0..35033faf8664 100644 --- a/android/guava/src/com/google/common/util/concurrent/FutureCallback.java +++ b/android/guava/src/com/google/common/util/concurrent/FutureCallback.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A callback for accepting the results of a {@link java.util.concurrent.Future} computation diff --git a/android/guava/src/com/google/common/util/concurrent/Futures.java b/android/guava/src/com/google/common/util/concurrent/Futures.java index f0826df837e7..f5b419f95469 100644 --- a/android/guava/src/com/google/common/util/concurrent/Futures.java +++ b/android/guava/src/com/google/common/util/concurrent/Futures.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to the {@link Future} interface. diff --git a/android/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java b/android/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java index 341a1266daa0..4f65cbda5bb0 100644 --- a/android/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java +++ b/android/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java @@ -34,7 +34,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Static methods used to implement {@link Futures#getChecked(Future, Class)}. */ @J2ktIncompatible diff --git a/android/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java b/android/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java index 863d97f9de8f..e21f556c266b 100644 --- a/android/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java +++ b/android/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Hidden superclass of {@link FluentFuture} that provides us a place to declare special GWT diff --git a/android/guava/src/com/google/common/util/concurrent/ImmediateFuture.java b/android/guava/src/com/google/common/util/concurrent/ImmediateFuture.java index d5bf53def5a3..fd1aaed0f24a 100644 --- a/android/guava/src/com/google/common/util/concurrent/ImmediateFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ImmediateFuture.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementation of {@link Futures#immediateFuture}. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/util/concurrent/InterruptibleTask.java b/android/guava/src/com/google/common/util/concurrent/InterruptibleTask.java index d16f3de482b2..a85abb2bc25e 100644 --- a/android/guava/src/com/google/common/util/concurrent/InterruptibleTask.java +++ b/android/guava/src/com/google/common/util/concurrent/InterruptibleTask.java @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.AbstractOwnableSynchronizer; import java.util.concurrent.locks.LockSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) @ReflectionSupport(value = ReflectionSupport.Level.FULL) diff --git a/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java b/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java index 6d3557636fe6..611c91e6bf20 100644 --- a/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java +++ b/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java @@ -24,7 +24,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicBoolean; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities necessary for working with libraries that supply plain {@link Future} instances. Note diff --git a/android/guava/src/com/google/common/util/concurrent/LazyLogger.java b/android/guava/src/com/google/common/util/concurrent/LazyLogger.java index e0f2100139d7..0b79ff43d068 100644 --- a/android/guava/src/com/google/common/util/concurrent/LazyLogger.java +++ b/android/guava/src/com/google/common/util/concurrent/LazyLogger.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A holder for a {@link Logger} that is initialized only when requested. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/util/concurrent/ListenableFuture.java b/android/guava/src/com/google/common/util/concurrent/ListenableFuture.java index ba5c58820023..c3d84c6200f7 100644 --- a/android/guava/src/com/google/common/util/concurrent/ListenableFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ListenableFuture.java @@ -19,7 +19,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Future} that accepts completion listeners. Each listener has an associated executor, and diff --git a/android/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java b/android/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java index 6b31f9ea887f..02bcd1c0745e 100644 --- a/android/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java +++ b/android/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java @@ -26,7 +26,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link FutureTask} that also implements the {@link ListenableFuture} interface. Unlike {@code diff --git a/android/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java b/android/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java index cadf87910af3..73a1c2008d43 100644 --- a/android/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.ScheduledFuture; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper interface to implement both {@link ListenableFuture} and {@link ScheduledFuture}. diff --git a/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java b/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java index 76d1cf8f25de..2e00ecfeece4 100644 --- a/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java @@ -23,7 +23,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@link ExecutorService} that returns {@link ListenableFuture} instances. To create an instance diff --git a/android/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java b/android/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java index c9128f3c0a56..605fa47ac4e9 100644 --- a/android/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java @@ -19,7 +19,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ScheduledExecutorService} that returns {@link ListenableFuture} instances from its diff --git a/android/guava/src/com/google/common/util/concurrent/Monitor.java b/android/guava/src/com/google/common/util/concurrent/Monitor.java index 95189bdbe625..f47a66c2b459 100644 --- a/android/guava/src/com/google/common/util/concurrent/Monitor.java +++ b/android/guava/src/com/google/common/util/concurrent/Monitor.java @@ -27,7 +27,7 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.function.BooleanSupplier; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A synchronization abstraction supporting waiting on arbitrary boolean conditions. diff --git a/android/guava/src/com/google/common/util/concurrent/MoreExecutors.java b/android/guava/src/com/google/common/util/concurrent/MoreExecutors.java index cb3d58f8b96b..110a2458b909 100644 --- a/android/guava/src/com/google/common/util/concurrent/MoreExecutors.java +++ b/android/guava/src/com/google/common/util/concurrent/MoreExecutors.java @@ -51,7 +51,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory and utility methods for {@link java.util.concurrent.Executor}, {@link ExecutorService}, diff --git a/android/guava/src/com/google/common/util/concurrent/NullnessCasts.java b/android/guava/src/com/google/common/util/concurrent/NullnessCasts.java index a0144374db46..7ef866d26f1e 100644 --- a/android/guava/src/com/google/common/util/concurrent/NullnessCasts.java +++ b/android/guava/src/com/google/common/util/concurrent/NullnessCasts.java @@ -15,7 +15,7 @@ package com.google.common.util.concurrent; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A utility method to perform unchecked casts to suppress errors produced by nullness analyses. */ @GwtCompatible diff --git a/android/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java b/android/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java index da1ba5262a6b..d62a18ffa526 100644 --- a/android/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java +++ b/android/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.util.concurrent.locks.LockSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Works around an android bug, where parking for more than INT_MAX seconds can produce an abort diff --git a/android/guava/src/com/google/common/util/concurrent/Platform.java b/android/guava/src/com/google/common/util/concurrent/Platform.java index 2c025575297c..22bef2dbd0f1 100644 --- a/android/guava/src/com/google/common/util/concurrent/Platform.java +++ b/android/guava/src/com/google/common/util/concurrent/Platform.java @@ -18,7 +18,7 @@ import static java.lang.Thread.currentThread; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Methods factored out so that they can be emulated differently in GWT. */ @GwtCompatible(emulated = true) diff --git a/android/guava/src/com/google/common/util/concurrent/RateLimiter.java b/android/guava/src/com/google/common/util/concurrent/RateLimiter.java index fc5957d9147b..2329fe43194a 100644 --- a/android/guava/src/com/google/common/util/concurrent/RateLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/RateLimiter.java @@ -32,7 +32,7 @@ import java.time.Duration; import java.util.Locale; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A rate limiter. Conceptually, a rate limiter distributes permits at a configurable rate. Each diff --git a/android/guava/src/com/google/common/util/concurrent/SequentialExecutor.java b/android/guava/src/com/google/common/util/concurrent/SequentialExecutor.java index 8ae686c610a4..3bff3b628a26 100644 --- a/android/guava/src/com/google/common/util/concurrent/SequentialExecutor.java +++ b/android/guava/src/com/google/common/util/concurrent/SequentialExecutor.java @@ -32,7 +32,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Executor ensuring that all Runnables submitted are executed in order, using the provided diff --git a/android/guava/src/com/google/common/util/concurrent/SettableFuture.java b/android/guava/src/com/google/common/util/concurrent/SettableFuture.java index f4c9d4bbb2d1..cc0714ecc7c1 100644 --- a/android/guava/src/com/google/common/util/concurrent/SettableFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/SettableFuture.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListenableFuture} whose result can be set by a {@link #set(Object)}, {@link diff --git a/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java b/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java index 5e90adde0bdf..c621007587cf 100644 --- a/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java @@ -35,7 +35,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A TimeLimiter that runs method calls in the background using an {@link ExecutorService}. If the diff --git a/android/guava/src/com/google/common/util/concurrent/Striped.java b/android/guava/src/com/google/common/util/concurrent/Striped.java index 1ff9b90287e5..0ab7d43388db 100644 --- a/android/guava/src/com/google/common/util/concurrent/Striped.java +++ b/android/guava/src/com/google/common/util/concurrent/Striped.java @@ -41,7 +41,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A striped {@code Lock/Semaphore/ReadWriteLock}. This offers the underlying lock striping similar diff --git a/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java b/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java index 1fedee93377e..1241ed07457c 100644 --- a/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java +++ b/android/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A ThreadFactory builder, providing any combination of these features: diff --git a/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java b/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java index c735b5469b5e..1d3e26513210 100644 --- a/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Imposes a time limit on method calls. diff --git a/android/guava/src/com/google/common/util/concurrent/TimeoutFuture.java b/android/guava/src/com/google/common/util/concurrent/TimeoutFuture.java index f2a7c0730209..b914a2fac915 100644 --- a/android/guava/src/com/google/common/util/concurrent/TimeoutFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/TimeoutFuture.java @@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Futures#withTimeout}. diff --git a/android/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java b/android/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java index 8d1eeb37c11b..4549eda39940 100644 --- a/android/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java +++ b/android/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java @@ -21,7 +21,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.RunnableFuture; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link RunnableFuture} that also implements the {@link ListenableFuture} interface. diff --git a/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java b/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java index dfdafe81f63b..b450721a12bf 100644 --- a/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java +++ b/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java @@ -15,7 +15,7 @@ package com.google.common.util.concurrent; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unchecked variant of {@link java.util.concurrent.ExecutionException}. As with {@code diff --git a/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java b/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java index d11964f48dc6..375b712028ee 100644 --- a/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java +++ b/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unchecked version of {@link java.util.concurrent.TimeoutException}. diff --git a/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java b/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java index 5791133c06cf..89e6b0710618 100644 --- a/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java +++ b/android/guava/src/com/google/common/util/concurrent/Uninterruptibles.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities for treating interruptible operations as uninterruptible. In all cases, if a thread is diff --git a/android/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java b/android/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java index a48d7423330a..0bfcf66189ae 100644 --- a/android/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java @@ -31,7 +31,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An abstract {@code ExecutorService} that allows subclasses to {@linkplain #wrapTask(Callable) diff --git a/android/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java b/android/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java index a403e98022e9..4df26ddc6280 100644 --- a/android/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java @@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An abstract {@code ScheduledExecutorService} that allows subclasses to {@linkplain diff --git a/futures/listenablefuture1/src/com/google/common/util/concurrent/ListenableFuture.java b/futures/listenablefuture1/src/com/google/common/util/concurrent/ListenableFuture.java index ba5c58820023..c3d84c6200f7 100644 --- a/futures/listenablefuture1/src/com/google/common/util/concurrent/ListenableFuture.java +++ b/futures/listenablefuture1/src/com/google/common/util/concurrent/ListenableFuture.java @@ -19,7 +19,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Future} that accepts completion listeners. Each listener has an associated executor, and diff --git a/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/ExtraObjectsMethodsForWeb.java b/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/ExtraObjectsMethodsForWeb.java index 5cb5febc392e..80744af47583 100644 --- a/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/ExtraObjectsMethodsForWeb.java +++ b/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/ExtraObjectsMethodsForWeb.java @@ -14,7 +14,7 @@ package com.google.common.base; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Holder for extra methods of {@code Objects} only in web. */ public abstract class ExtraObjectsMethodsForWeb { diff --git a/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/Platform.java b/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/Platform.java index 8c8c05ec1d12..3efd8960d9e1 100644 --- a/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/Platform.java +++ b/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/Platform.java @@ -18,7 +18,7 @@ import jsinterop.annotations.JsMethod; import jsinterop.annotations.JsPackage; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** @author Jesse Wilson */ final class Platform { diff --git a/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java b/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java index 36b21b53c87c..0b6fb02d384c 100644 --- a/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java +++ b/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/LocalCache.java @@ -41,7 +41,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * LocalCache emulation for GWT. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java index d10ac9212422..eedc81fbd1a1 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java @@ -20,7 +20,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@link SortedMultiset} interface. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java index 1d0901e11dc4..c74c93c3cf6a 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) abstract class ArrayListMultimapGwtSerializationDependencies< diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java index 03d442e1eaa2..aeaf8f22ed8e 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/DescendingMultiset.java @@ -21,7 +21,7 @@ import java.util.Iterator; import java.util.Set; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeleton implementation of a descending multiset. Only needs {@code forwardMultiset()} and diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableCollection.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableCollection.java index d30e7fd4ac92..a651b866475f 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableCollection.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableCollection.java @@ -17,7 +17,7 @@ package com.google.common.collect; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A GWT-only class only used by GWT emulations. It is used to consolidate the definitions of method diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableList.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableList.java index 82743678a91b..7d95f7153254 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableList.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableList.java @@ -18,7 +18,7 @@ import java.util.Collection; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulated version of {@link ImmutableList}. TODO(cpovirk): more doc diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java index 0101f76c0a2d..7f07e1e1dcbf 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableMap.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT implementation of {@link ImmutableMap} that forwards to another map. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableSet.java index 7ed0d09d2497..881ade83d892 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableSet.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingImmutableSet.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT implementation of {@link ImmutableSet} that forwards to another {@code Set} implementation. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingSortedMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingSortedMultiset.java index 4c316af4afb2..600d32c5dfc1 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingSortedMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ForwardingSortedMultiset.java @@ -17,7 +17,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A sorted multiset which forwards all its method calls to another sorted multiset. Subclasses diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/HashMultimapGwtSerializationDependencies.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/HashMultimapGwtSerializationDependencies.java index 92ff76a3d0b7..24cdda097740 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/HashMultimapGwtSerializationDependencies.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/HashMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) abstract class HashMultimapGwtSerializationDependencies< diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableBiMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableBiMap.java index 98bb59a03b9c..4a10bd16f345 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableBiMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableBiMap.java @@ -24,7 +24,7 @@ import java.util.Map.Entry; import java.util.function.Function; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@link com.google.common.collect.ImmutableBiMap}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java index 77ba991a1c23..d6f90f2a26bb 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableCollection.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.Spliterator; import java.util.function.Predicate; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulated version of {@link ImmutableCollection}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java index 53707342a575..149035a00a18 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableList.java @@ -30,7 +30,7 @@ import java.util.RandomAccess; import java.util.stream.Collector; import jsinterop.annotations.JsMethod; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulated version of {@link com.google.common.collect.ImmutableList}. TODO(cpovirk): more doc diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java index 12a7ecedc4ed..17601a192d9c 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableMap.java @@ -37,7 +37,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Collectors; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@link com.google.common.collect.ImmutableMap}. For non sorted maps, it is a diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSet.java index d91ede2130f8..8ff68390b5ce 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSet.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSet.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.stream.Collector; import jsinterop.annotations.JsMethod; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulated version of {@link com.google.common.collect.ImmutableSet}. For the unsorted sets, diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java index f92fa305bfeb..8a48f78d71f0 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedMap.java @@ -32,7 +32,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Collectors; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulated version of {@link com.google.common.collect.ImmutableSortedMap}. It's a thin wrapper diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java index d83fcad8d314..11ed51e6492f 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/ImmutableSortedSet.java @@ -29,7 +29,7 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@link com.google.common.collect.ImmutableSortedSet}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java index 95b326c32259..c1d46dcd4859 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) abstract class LinkedHashMultimapGwtSerializationDependencies< diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Platform.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Platform.java index 5371eae04288..d9c5635f7bce 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Platform.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Platform.java @@ -25,7 +25,7 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Minimal GWT emulation of {@code com.google.common.collect.Platform}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableList.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableList.java index cd551596a2eb..c9a8773e82ce 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableList.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableList.java @@ -20,7 +20,7 @@ import static java.util.Collections.unmodifiableList; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulated version of {@link RegularImmutableList}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMultiset.java index 52890cb8cb33..dfba53380a69 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMultiset.java @@ -14,7 +14,7 @@ package com.google.common.collect; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Never actually created; instead delegates to JdkBackedImmutableMultiset. */ class RegularImmutableMultiset extends ImmutableMultiset { diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableSortedSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableSortedSet.java index b15365d59ed3..20ec47ff9299 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableSortedSet.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableSortedSet.java @@ -18,7 +18,7 @@ import java.util.Comparator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@link RegularImmutableSortedSet}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableBiMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableBiMap.java index f87f8b1f8e6b..9ba8bf7f2ae6 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableBiMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableBiMap.java @@ -19,7 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@link SingletonImmutableBiMap}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableSet.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableSet.java index fe08d2c3f6b9..1aab639de718 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableSet.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SingletonImmutableSet.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@link SingletonImmutableSet}. diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SortedMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SortedMultiset.java index 81110c06f506..4e26e4b0b939 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SortedMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/SortedMultiset.java @@ -18,7 +18,7 @@ import java.util.Comparator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * GWT emulation of {@code SortedMultiset}, with {@code elementSet} reduced to returning a {@code diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java index 8added2a7b7d..e06a96c02e40 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multisets#unmodifiableSortedMultiset(SortedMultiset)} for GWT. diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AbstractFuture.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AbstractFuture.java index 82e03ef57c90..d5ea2dd8a18e 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AbstractFuture.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AbstractFuture.java @@ -33,7 +33,7 @@ import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Emulation for AbstractFuture in GWT. */ @SuppressWarnings("nullness") // TODO(b/147136275): Remove once our checker understands & and |. diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AggregateFutureState.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AggregateFutureState.java index 75473b39905e..642efa8edcca 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AggregateFutureState.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/AggregateFutureState.java @@ -19,7 +19,7 @@ import static com.google.common.collect.Sets.newHashSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Emulation of AggregateFutureState. */ abstract class AggregateFutureState diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java index f1a58dfd9286..6b43bc51cac8 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java @@ -16,7 +16,7 @@ import com.google.common.base.Function; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Hidden superclass of {@link FluentFuture} that provides us a place to declare special GWT diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFuturesCatchingSpecialization.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFuturesCatchingSpecialization.java index 5139b18c7952..752ce5a0a768 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFuturesCatchingSpecialization.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/GwtFuturesCatchingSpecialization.java @@ -16,7 +16,7 @@ import com.google.common.base.Function; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Hidden superclass of {@link Futures} that provides us a place to declare special GWT versions of diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/InterruptibleTask.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/InterruptibleTask.java index e9e38332deb5..66fe05fdbba7 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/InterruptibleTask.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/InterruptibleTask.java @@ -18,7 +18,7 @@ import static com.google.common.util.concurrent.NullnessCasts.uncheckedCastNullableTToT; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Emulation for InterruptibleTask in GWT. */ abstract class InterruptibleTask implements Runnable { diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/ListenableFuture.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/ListenableFuture.java index b50aeca7431b..4196d198bc00 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/ListenableFuture.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/ListenableFuture.java @@ -21,7 +21,7 @@ import jsinterop.annotations.JsOptional; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Java super source for ListenableFuture, implementing a structural thenable via a default method. diff --git a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/Uninterruptibles.java b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/Uninterruptibles.java index 79b65ad5f2ac..bb66dd41df69 100644 --- a/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/Uninterruptibles.java +++ b/guava-gwt/src-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/Uninterruptibles.java @@ -19,7 +19,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Emulation of Uninterruptibles in GWT. */ public final class Uninterruptibles { diff --git a/guava-gwt/test-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/TestPlatform.java b/guava-gwt/test-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/TestPlatform.java index 1cca355bea71..87606bc4980a 100644 --- a/guava-gwt/test-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/TestPlatform.java +++ b/guava-gwt/test-super/com/google/common/util/concurrent/super/com/google/common/util/concurrent/TestPlatform.java @@ -24,7 +24,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Methods factored out so that they can be emulated differently in GWT. */ final class TestPlatform { diff --git a/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java b/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java index 33a3a83746b8..c2f0ffe809fa 100644 --- a/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java b/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java index 92e6f5a1ec94..baa8371cf10e 100644 --- a/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java index 4464acf0f3fa..8465f127b4dd 100644 --- a/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.Stack; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Most of the logic for {@link IteratorTester} and {@link ListIteratorTester}. diff --git a/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java b/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java index fc8cbdd9c545..9b72beb16cf2 100644 --- a/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java b/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java index 4ae6fc9f87a6..c220f30e21b3 100644 --- a/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java @@ -21,7 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This abstract base class for testers allows the framework to inject needed information after diff --git a/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java b/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java index cf3a11eabc24..796363d05c17 100644 --- a/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java +++ b/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Simple base class to verify that we handle generics correctly. diff --git a/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java b/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java index b13345794c57..ed68a490d401 100644 --- a/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java +++ b/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java @@ -34,7 +34,7 @@ import java.util.SortedMap; import java.util.SortedSet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Derived suite generators, split out of the suite builders so that they are available to GWT. diff --git a/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java b/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java index d91fe70d7337..4481d7619587 100644 --- a/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java +++ b/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java @@ -42,7 +42,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates, based on your criteria, a JUnit test suite that exhaustively tests the object generated diff --git a/guava-testlib/src/com/google/common/collect/testing/Helpers.java b/guava-testlib/src/com/google/common/collect/testing/Helpers.java index 360793345a0a..fe1ae83b5f74 100644 --- a/guava-testlib/src/com/google/common/collect/testing/Helpers.java +++ b/guava-testlib/src/com/google/common/collect/testing/Helpers.java @@ -45,7 +45,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) @NullMarked diff --git a/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java index fcd39baeac99..ecb81dacf5e6 100644 --- a/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.Iterator; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A utility for testing an Iterator implementation by comparing its behavior to that of a "known diff --git a/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java index 3a9404e66772..96c920f4a2ec 100644 --- a/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/ListIteratorTester.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.ListIterator; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A utility similar to {@link IteratorTester} for testing a {@link ListIterator} against a known diff --git a/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java b/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java index 38864047f9e8..bbceb1ca278d 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java +++ b/guava-testlib/src/com/google/common/collect/testing/MapInterfaceTest.java @@ -34,7 +34,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests representing the contract of {@link Map}. Concrete subclasses of this base class test diff --git a/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java b/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java index d09b8afc4f03..93645d9ea7d2 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java +++ b/guava-testlib/src/com/google/common/collect/testing/MinimalCollection.java @@ -23,9 +23,9 @@ import java.util.AbstractCollection; import java.util.Collection; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A simplistic collection which implements only the bare minimum allowed by the spec, and throws diff --git a/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java b/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java index ab4019c011f1..1cc49efa3dcc 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java +++ b/guava-testlib/src/com/google/common/collect/testing/MinimalIterable.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@code Iterable} which throws an exception on all invocations of the {@link diff --git a/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java b/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java index b78a5ce21597..db09a4edd544 100644 --- a/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java +++ b/guava-testlib/src/com/google/common/collect/testing/MinimalSet.java @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A simplistic set which implements the bare minimum so that it can be used in tests without diff --git a/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java b/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java index 7625463adf75..4baec8023be7 100644 --- a/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/OneSizeGenerator.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generator for collection of a particular size. diff --git a/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java b/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java index 72fbf0224eac..85feb9d3edfc 100644 --- a/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/OneSizeTestContainerGenerator.java @@ -20,7 +20,7 @@ import com.google.common.collect.testing.features.CollectionSize; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The subject-generator interface accepted by Collection testers, for testing a Collection at one diff --git a/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java b/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java index 6e0431b1319e..f38500e53388 100644 --- a/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java +++ b/guava-testlib/src/com/google/common/collect/testing/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java b/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java index c958dee8ec6e..b9fc32b941d9 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java +++ b/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper around {@code TreeMap} that aggressively checks to see if keys are mutually comparable. diff --git a/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java b/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java index d75559d7de33..cbb8b1421aab 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java +++ b/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java @@ -25,7 +25,7 @@ import java.util.NavigableSet; import java.util.SortedSet; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper around {@code TreeSet} that aggressively checks to see if elements are mutually diff --git a/guava-testlib/src/com/google/common/collect/testing/SampleElements.java b/guava-testlib/src/com/google/common/collect/testing/SampleElements.java index 153d68467712..1abda002ef39 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SampleElements.java +++ b/guava-testlib/src/com/google/common/collect/testing/SampleElements.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A container class for the five sample elements we need for testing. diff --git a/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java b/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java index 9c07d490bdd5..e8c46d51d222 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java +++ b/guava-testlib/src/com/google/common/collect/testing/SortedMapTestSuiteBuilder.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Set; import junit.framework.TestSuite; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates, based on your criteria, a JUnit test suite that exhaustively tests a SortedMap diff --git a/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java index 62540b94ec46..cbc7bab17a82 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/SpliteratorTester.java @@ -43,7 +43,7 @@ import java.util.function.Function; import java.util.function.Supplier; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester for {@code Spliterator} implementations. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java index 5f336be4ce95..704ec159172a 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestCollectionGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates collections, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java index 08d2e31f43a5..23d702b266f4 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestContainerGenerator.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * To be implemented by test generators of things that can contain elements. Such things include diff --git a/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java index 886bb105bb74..6dcffa779f4d 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestListGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sets, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java index eb62f12b5d8c..95319d10e056 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestMapEntrySetGenerator.java @@ -24,7 +24,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates map entries using sample keys and sample values. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java index 86b79469b1f1..50530ba16449 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestMapGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates maps, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java index e0aebf66919d..25863e224538 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestQueueGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Queue; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates queues, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java index 83fd9075de46..319feb449a2d 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestSetGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sets, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java index ae462fe31f00..3fc2e5b8ceca 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestSortedMapGenerator.java @@ -20,7 +20,7 @@ import java.util.Map.Entry; import java.util.SortedMap; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sorted maps, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java index dc9e94222006..6218fe5aee93 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestSortedSetGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.SortedSet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates sorted sets, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java b/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java index 978fa683d8c8..2cf33c668909 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestSubjectGenerator.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * To be implemented by test generators that can produce test subjects without requiring any diff --git a/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java b/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java index 3e1d3b4ee369..eda5aac70239 100644 --- a/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java +++ b/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java @@ -17,7 +17,7 @@ package com.google.common.collect.testing; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An unhashable object to be used in testing as values in our collections. diff --git a/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java b/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java index 3bed2093eee9..1ca44740a01a 100644 --- a/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java +++ b/guava-testlib/src/com/google/common/collect/testing/features/CollectionSize.java @@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.Collection; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * When describing the features of the collection produced by a given generator (i.e. in a call to diff --git a/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java b/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java index 3b478573ff16..4abcef48f15e 100644 --- a/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java +++ b/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Encapsulates the constraints that a class under test must satisfy in order for a tester method to diff --git a/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java b/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java index 553fbb8f5423..a1e6ca4ae8e2 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/AbstractBiMapTester.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** Skeleton for a tester of a {@code BiMap}. */ diff --git a/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java b/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java index 5134c913e0e0..0c4534e55468 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/AbstractListMultimapTester.java @@ -21,7 +21,7 @@ import com.google.common.collect.ListMultimap; import java.util.Collection; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java b/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java index 5ffeefccbfb1..c12835009f9a 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/AbstractMultimapTester.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java b/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java index 11eb5d910ca1..45376acba99b 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/DerivedGoogleCollectionGenerators.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Derived suite generators for Guava collection interfaces, split out of the suite builders so that diff --git a/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java b/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java index afea133492f0..7fdf762936e2 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/ListMultimapAsMapTester.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java b/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java index 95fd02dd767c..9a56b0d56a2d 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/MultimapEqualsTester.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java b/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java index 6cf7607f2fa9..b25763d4aa21 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/MultimapPutTester.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java b/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java index 950290116e84..03d5e07d2f87 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/MultimapSizeTester.java @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java index 970d5139ffac..5c6c6c6f4233 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/MultisetIteratorTester.java @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java b/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java index a4a37259a178..92da5482f879 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java b/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java index 961dc4f24f56..a9045eae21a7 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/SetMultimapAsMapTester.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java b/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java index 4f6edeb87e2c..af48b03606a3 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/TestBiMapGenerator.java @@ -21,7 +21,7 @@ import com.google.common.collect.testing.TestContainerGenerator; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates bimaps, containing sample entries, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java b/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java index 35df19804775..26a1f2f57e09 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/TestListMultimapGenerator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.collect.ListMultimap; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A generator for {@code ListMultimap} implementations based on test data. diff --git a/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java b/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java index 8f473def24ba..d555f51c2c1d 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/TestMultimapGenerator.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates multimaps, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java b/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java index 63a02bf0561b..0a36c8946904 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/TestMultisetGenerator.java @@ -20,7 +20,7 @@ import com.google.common.collect.Multiset; import com.google.common.collect.testing.TestCollectionGenerator; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates multisets, containing sample elements, to be tested. diff --git a/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java b/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java index 81b641ebfe13..8c5e5ca15a51 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java @@ -36,7 +36,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A series of tests that support asserting that collections cannot be modified, either through diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java index 1ac4325c560f..ef0b917fe69a 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListIndexOfTester.java @@ -23,7 +23,7 @@ import com.google.common.collect.testing.WrongType; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.collect.testing.features.CollectionSize; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java index 8b52204b620b..0f8900c066ef 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/AbstractListTester.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java index 0b27237f3709..73e260fa3e59 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java @@ -36,7 +36,7 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java index d7621fd7494d..f8c2d4c2cf11 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/CollectionIteratorTester.java @@ -41,7 +41,7 @@ import java.util.NoSuchElementException; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java index 472e1f50abf7..a16b523e5be8 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java @@ -40,7 +40,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java index 9b1a11f6863a..16056a112523 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Map.Entry; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java b/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java index a9dc1191dfc2..d2e90ba6a007 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/ReflectionFreeAssertThrows.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java index 6e94a3ad886a..7023cf47b980 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/SortedSetNavigationTester.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import java.util.SortedSet; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** diff --git a/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java b/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java index dd802130da9e..9512180f806f 100644 --- a/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java +++ b/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java @@ -151,7 +151,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Supplies an arbitrary "default" instance for a wide range of types, often useful in testing diff --git a/guava-testlib/src/com/google/common/testing/ClassSanityTester.java b/guava-testlib/src/com/google/common/testing/ClassSanityTester.java index 5df094bf0228..f0dbae13ecf5 100644 --- a/guava-testlib/src/com/google/common/testing/ClassSanityTester.java +++ b/guava-testlib/src/com/google/common/testing/ClassSanityTester.java @@ -53,7 +53,7 @@ import junit.framework.Assert; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester that runs automated sanity tests for any given class. A typical use case is to test static diff --git a/guava-testlib/src/com/google/common/testing/CollectorTester.java b/guava-testlib/src/com/google/common/testing/CollectorTester.java index eec85c7f0ce4..81cd1a662f18 100644 --- a/guava-testlib/src/com/google/common/testing/CollectorTester.java +++ b/guava-testlib/src/com/google/common/testing/CollectorTester.java @@ -29,7 +29,7 @@ import java.util.function.BiPredicate; import java.util.stream.Collector; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester for {@code Collector} implementations. diff --git a/guava-testlib/src/com/google/common/testing/DummyProxy.java b/guava-testlib/src/com/google/common/testing/DummyProxy.java index 4515963f4613..837ea36a4122 100644 --- a/guava-testlib/src/com/google/common/testing/DummyProxy.java +++ b/guava-testlib/src/com/google/common/testing/DummyProxy.java @@ -32,7 +32,7 @@ import java.lang.reflect.Proxy; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generates a dummy interface proxy that simply returns a dummy value for each method. diff --git a/guava-testlib/src/com/google/common/testing/EqualsTester.java b/guava-testlib/src/com/google/common/testing/EqualsTester.java index 9d311d3fa360..699acb38b568 100644 --- a/guava-testlib/src/com/google/common/testing/EqualsTester.java +++ b/guava-testlib/src/com/google/common/testing/EqualsTester.java @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester for equals() and hashCode() methods of a class. diff --git a/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java b/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java index ca57703d9fc5..193c9fe41859 100644 --- a/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java +++ b/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester to ensure forwarding wrapper works by delegating calls to the corresponding method with diff --git a/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java b/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java index 53aaa1085174..a597ee8ec109 100644 --- a/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java +++ b/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java @@ -125,7 +125,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generates fresh instances of types that are different from each other (if possible). diff --git a/guava-testlib/src/com/google/common/testing/NullPointerTester.java b/guava-testlib/src/com/google/common/testing/NullPointerTester.java index 12ad0a9e2460..df819583d62e 100644 --- a/guava-testlib/src/com/google/common/testing/NullPointerTester.java +++ b/guava-testlib/src/com/google/common/testing/NullPointerTester.java @@ -49,7 +49,7 @@ import java.util.concurrent.ConcurrentMap; import junit.framework.Assert; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A test utility that verifies that your methods and constructors throw {@link diff --git a/guava-testlib/src/com/google/common/testing/TestLogHandler.java b/guava-testlib/src/com/google/common/testing/TestLogHandler.java index ec01f81b5f81..f21a49d77695 100644 --- a/guava-testlib/src/com/google/common/testing/TestLogHandler.java +++ b/guava-testlib/src/com/google/common/testing/TestLogHandler.java @@ -24,7 +24,7 @@ import java.util.logging.Handler; import java.util.logging.LogRecord; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests may use this to intercept messages that are logged by the code under test. Example: diff --git a/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java b/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java index 325388342a9c..2baae7e9eb71 100644 --- a/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java +++ b/guava-testlib/src/com/google/common/util/concurrent/testing/AbstractListenableFutureTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract test case parent for anything implementing {@link ListenableFuture}. Tests the two get diff --git a/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java b/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java index 84447b78941f..b0ed1a7788b7 100644 --- a/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java +++ b/guava-testlib/test/com/google/common/collect/testing/MapTestSuiteBuilderTests.java @@ -46,7 +46,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests {@link MapTestSuiteBuilder} by using it against maps that have various negative behaviors. diff --git a/guava-testlib/test/com/google/common/collect/testing/MyTester.java b/guava-testlib/test/com/google/common/collect/testing/MyTester.java index de79059a6033..b82dc8b29a6e 100644 --- a/guava-testlib/test/com/google/common/collect/testing/MyTester.java +++ b/guava-testlib/test/com/google/common/collect/testing/MyTester.java @@ -16,7 +16,7 @@ package com.google.common.collect.testing; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.Ignore; /** Support class added to a suite as part of {@link FeatureSpecificTestSuiteBuilderTest}. */ diff --git a/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java b/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java index 72046c845a9a..b8de2e88b04f 100644 --- a/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java +++ b/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java @@ -134,7 +134,7 @@ import java.util.regex.Pattern; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ArbitraryInstances}. diff --git a/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java b/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java index 490a1c4a40d6..bcc894273715 100644 --- a/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/ClassSanityTesterTest.java @@ -39,7 +39,7 @@ import java.util.stream.Stream; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link ClassSanityTester}. diff --git a/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java b/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java index 039ae877ecb7..7899a76ff231 100644 --- a/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java @@ -27,7 +27,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link EqualsTester}. diff --git a/guava-testlib/test/com/google/common/testing/FakeTickerTest.java b/guava-testlib/test/com/google/common/testing/FakeTickerTest.java index 460a2d65d3f0..35dc4050272f 100644 --- a/guava-testlib/test/com/google/common/testing/FakeTickerTest.java +++ b/guava-testlib/test/com/google/common/testing/FakeTickerTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link FakeTicker}. diff --git a/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java b/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java index 7a83cc740a9c..97ebec3e8172 100644 --- a/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java +++ b/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link GcFinalization}. diff --git a/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java b/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java index e82997a5062e..fd8f6d869224 100644 --- a/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java @@ -49,7 +49,7 @@ import javax.annotation.CheckForNull; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link NullPointerTester}. diff --git a/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java b/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java index 05ff429bbdf5..d08735297ad5 100644 --- a/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java +++ b/guava-testlib/test/com/google/common/testing/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java b/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java index dbab0b6c5a5b..67f11de2e6ed 100644 --- a/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java @@ -20,7 +20,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link SerializableTester}. diff --git a/guava-testlib/test/com/google/common/testing/TearDownStackTest.java b/guava-testlib/test/com/google/common/testing/TearDownStackTest.java index 1e23183baf3c..9a5a68dfb055 100644 --- a/guava-testlib/test/com/google/common/testing/TearDownStackTest.java +++ b/guava-testlib/test/com/google/common/testing/TearDownStackTest.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * @author Luiz-Otavio "Z" Zorzella diff --git a/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java b/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java index 6365c5be1e9b..e2d96b5394aa 100644 --- a/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/anotherpackage/ForwardingWrapperTesterTest.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ForwardingWrapperTester}. Live in a different package to detect reflection diff --git a/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java b/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java index 4ffc712078d6..01d47a6e47f6 100644 --- a/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java +++ b/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java @@ -21,7 +21,7 @@ import com.google.caliper.Param; import com.google.common.cache.LocalCache.Segment; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Benchmark for {@code LocalCache.Segment.removeEntryFromChain}. diff --git a/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java b/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java index 4a70a0e07988..1001350a0513 100644 --- a/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java +++ b/guava-tests/benchmark/com/google/common/collect/ConcurrentHashMultisetBenchmark.java @@ -39,7 +39,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Benchmarks for {@link ConcurrentHashMultiset}. diff --git a/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java b/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java index 432414accc62..04496c0bfa35 100644 --- a/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java +++ b/guava-tests/benchmark/com/google/common/collect/MinMaxPriorityQueueBenchmark.java @@ -26,7 +26,7 @@ import java.util.Queue; import java.util.Random; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Benchmarks to compare performance of MinMaxPriorityQueue and PriorityQueue. diff --git a/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java b/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java index a8411cec1afd..c7e1de2c3f35 100644 --- a/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java +++ b/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java @@ -43,7 +43,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import sun.misc.Unsafe; /** Benchmarks for {@link ExecutionList}. */ diff --git a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java index 7ad6e961a2f2..a1c0ab02910d 100644 --- a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java +++ b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedArrayBlockingQueue.java @@ -26,7 +26,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A bounded {@linkplain BlockingQueue blocking queue} backed by an array. This queue orders diff --git a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java index e5dd26f62b2f..85923d826caf 100644 --- a/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java +++ b/guava-tests/benchmark/com/google/common/util/concurrent/MonitorBasedPriorityBlockingQueue.java @@ -31,7 +31,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An unbounded {@linkplain BlockingQueue blocking queue} that uses the same ordering rules as class diff --git a/guava-tests/test/com/google/common/base/AbstractIteratorTest.java b/guava-tests/test/com/google/common/base/AbstractIteratorTest.java index 1aed9378725d..0b0293f58b72 100644 --- a/guava-tests/test/com/google/common/base/AbstractIteratorTest.java +++ b/guava-tests/test/com/google/common/base/AbstractIteratorTest.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code AbstractIterator}. diff --git a/guava-tests/test/com/google/common/base/EquivalenceTest.java b/guava-tests/test/com/google/common/base/EquivalenceTest.java index 8b5db3ab2ae2..5de187b1b8be 100644 --- a/guava-tests/test/com/google/common/base/EquivalenceTest.java +++ b/guava-tests/test/com/google/common/base/EquivalenceTest.java @@ -27,7 +27,7 @@ import com.google.common.testing.SerializableTester; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Equivalence}. diff --git a/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java b/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java index fb4ca4da972c..b1258e93799e 100644 --- a/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java +++ b/guava-tests/test/com/google/common/base/FinalizableReferenceQueueTest.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/guava-tests/test/com/google/common/base/FunctionsTest.java b/guava-tests/test/com/google/common/base/FunctionsTest.java index 54380fe53d3b..9533c00af2e7 100644 --- a/guava-tests/test/com/google/common/base/FunctionsTest.java +++ b/guava-tests/test/com/google/common/base/FunctionsTest.java @@ -31,7 +31,7 @@ import java.util.Map; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Functions}. diff --git a/guava-tests/test/com/google/common/base/JoinerTest.java b/guava-tests/test/com/google/common/base/JoinerTest.java index 5d427dd7a5d6..aea2ab5b1c4e 100644 --- a/guava-tests/test/com/google/common/base/JoinerTest.java +++ b/guava-tests/test/com/google/common/base/JoinerTest.java @@ -37,7 +37,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Joiner}. diff --git a/guava-tests/test/com/google/common/base/OptionalTest.java b/guava-tests/test/com/google/common/base/OptionalTest.java index 3c6e2e9f072b..8961f1f228f7 100644 --- a/guava-tests/test/com/google/common/base/OptionalTest.java +++ b/guava-tests/test/com/google/common/base/OptionalTest.java @@ -32,7 +32,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Optional}. diff --git a/guava-tests/test/com/google/common/base/PreconditionsTest.java b/guava-tests/test/com/google/common/base/PreconditionsTest.java index 10ee1296bd13..5716598053f0 100644 --- a/guava-tests/test/com/google/common/base/PreconditionsTest.java +++ b/guava-tests/test/com/google/common/base/PreconditionsTest.java @@ -40,7 +40,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Preconditions}. diff --git a/guava-tests/test/com/google/common/base/PredicatesTest.java b/guava-tests/test/com/google/common/base/PredicatesTest.java index 6fc9660f4bd7..26fd6bb5909b 100644 --- a/guava-tests/test/com/google/common/base/PredicatesTest.java +++ b/guava-tests/test/com/google/common/base/PredicatesTest.java @@ -39,7 +39,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Predicates}. diff --git a/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java index 2315bae34bc6..f583b4bf043a 100644 --- a/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/base/ReflectionFreeAssertThrows.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/base/SuppliersTest.java b/guava-tests/test/com/google/common/base/SuppliersTest.java index 5971816134e7..b894146330f9 100644 --- a/guava-tests/test/com/google/common/base/SuppliersTest.java +++ b/guava-tests/test/com/google/common/base/SuppliersTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests com.google.common.base.Suppliers. diff --git a/guava-tests/test/com/google/common/base/ToStringHelperTest.java b/guava-tests/test/com/google/common/base/ToStringHelperTest.java index ebc795140b65..6703dc6c348e 100644 --- a/guava-tests/test/com/google/common/base/ToStringHelperTest.java +++ b/guava-tests/test/com/google/common/base/ToStringHelperTest.java @@ -32,7 +32,7 @@ import java.util.OptionalLong; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link MoreObjects#toStringHelper(Object)}. diff --git a/guava-tests/test/com/google/common/cache/AbstractCacheTest.java b/guava-tests/test/com/google/common/cache/AbstractCacheTest.java index 856164a6c331..ed42350b30a7 100644 --- a/guava-tests/test/com/google/common/cache/AbstractCacheTest.java +++ b/guava-tests/test/com/google/common/cache/AbstractCacheTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractCache}. diff --git a/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java b/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java index 2cb08ef6dc03..8d1c8a5ed19f 100644 --- a/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java +++ b/guava-tests/test/com/google/common/cache/AbstractLoadingCacheTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractLoadingCache}. diff --git a/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java b/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java index 695298f6ebc8..d4a512adbfe8 100644 --- a/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java +++ b/guava-tests/test/com/google/common/cache/CacheBuilderFactory.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper class for creating {@link CacheBuilder} instances with all combinations of several sets of diff --git a/guava-tests/test/com/google/common/cache/CacheTesting.java b/guava-tests/test/com/google/common/cache/CacheTesting.java index 31a126524870..3156e409ca29 100644 --- a/guava-tests/test/com/google/common/cache/CacheTesting.java +++ b/guava-tests/test/com/google/common/cache/CacheTesting.java @@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReferenceArray; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection of utilities for {@link Cache} testing. diff --git a/guava-tests/test/com/google/common/cache/LocalCacheTest.java b/guava-tests/test/com/google/common/cache/LocalCacheTest.java index 12264d176d0a..9ade4ccf4f7a 100644 --- a/guava-tests/test/com/google/common/cache/LocalCacheTest.java +++ b/guava-tests/test/com/google/common/cache/LocalCacheTest.java @@ -87,7 +87,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * @author Charles Fry diff --git a/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java index c496603719d7..c29f754b140b 100644 --- a/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/cache/ReflectionFreeAssertThrows.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java b/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java index 239c71fceaa6..5479550a8af2 100644 --- a/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java +++ b/guava-tests/test/com/google/common/cache/TestingCacheLoaders.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utility {@link CacheLoader} implementations intended for use in testing. diff --git a/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java b/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java index 21c7b8bde46c..ab39d750352d 100644 --- a/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractFilteredMapTest.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible @NullMarked diff --git a/guava-tests/test/com/google/common/collect/AbstractHashFloodingTest.java b/guava-tests/test/com/google/common/collect/AbstractHashFloodingTest.java index cc726dbe0d2e..d937d0c6fa1d 100644 --- a/guava-tests/test/com/google/common/collect/AbstractHashFloodingTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractHashFloodingTest.java @@ -32,7 +32,7 @@ import java.util.function.Supplier; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract superclass for tests that hash flooding a collection has controlled worst-case diff --git a/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java b/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java index 58f5fbc10cbe..b000664293c2 100644 --- a/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java @@ -41,7 +41,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for {@link ImmutableSet} and {@link ImmutableSortedSet} tests. diff --git a/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java b/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java index c935a962b9fe..0120ba36b56e 100644 --- a/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code AbstractIterator}. diff --git a/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java b/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java index 80c9526665f4..7e58e81b4303 100644 --- a/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractMapEntryTest.java @@ -22,7 +22,7 @@ import java.util.Map.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code AbstractMapEntry}. diff --git a/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java b/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java index 6808c3cf13fa..e529b1f33660 100644 --- a/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractMapsTransformValuesTest.java @@ -30,7 +30,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Superclass for tests for {@link Maps#transformValues} overloads. diff --git a/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java b/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java index e93736a6b89f..3d0b4776be97 100644 --- a/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractSequentialIteratorTest.java @@ -29,7 +29,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Tests for {@link AbstractSequentialIterator}. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java b/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java index 2d6a94d28e67..a613102dac08 100644 --- a/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractTableReadTest.java @@ -27,7 +27,7 @@ import com.google.common.testing.NullPointerTester; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Table} read operations. diff --git a/guava-tests/test/com/google/common/collect/AbstractTableTest.java b/guava-tests/test/com/google/common/collect/AbstractTableTest.java index 4f479f49d9be..c0b267b0bc7d 100644 --- a/guava-tests/test/com/google/common/collect/AbstractTableTest.java +++ b/guava-tests/test/com/google/common/collect/AbstractTableTest.java @@ -21,9 +21,9 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for a {@link Table} implementation supporting reads and writes. diff --git a/guava-tests/test/com/google/common/collect/ArrayTableTest.java b/guava-tests/test/com/google/common/collect/ArrayTableTest.java index a0399d3cf49f..a698b357e560 100644 --- a/guava-tests/test/com/google/common/collect/ArrayTableTest.java +++ b/guava-tests/test/com/google/common/collect/ArrayTableTest.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.Map; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link ArrayTable}. diff --git a/guava-tests/test/com/google/common/collect/Base.java b/guava-tests/test/com/google/common/collect/Base.java index d39cd87c57a4..5304acbb04da 100644 --- a/guava-tests/test/com/google/common/collect/Base.java +++ b/guava-tests/test/com/google/common/collect/Base.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Simple base class to verify that we handle generics correctly. */ @GwtCompatible diff --git a/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java b/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java index 86624974fd41..6c4a951623ea 100644 --- a/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java +++ b/guava-tests/test/com/google/common/collect/CollectionBenchmarkSampleData.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Package up sample data for common collections benchmarking. diff --git a/guava-tests/test/com/google/common/collect/Collections2Test.java b/guava-tests/test/com/google/common/collect/Collections2Test.java index 69adcaeb6fe5..221ba566f7ae 100644 --- a/guava-tests/test/com/google/common/collect/Collections2Test.java +++ b/guava-tests/test/com/google/common/collect/Collections2Test.java @@ -41,7 +41,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Collections2}. diff --git a/guava-tests/test/com/google/common/collect/ComparatorsTest.java b/guava-tests/test/com/google/common/collect/ComparatorsTest.java index 8710c49fafed..be94a9d650b4 100644 --- a/guava-tests/test/com/google/common/collect/ComparatorsTest.java +++ b/guava-tests/test/com/google/common/collect/ComparatorsTest.java @@ -37,7 +37,7 @@ import java.util.Optional; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Comparators}. diff --git a/guava-tests/test/com/google/common/collect/ComparisonChainTest.java b/guava-tests/test/com/google/common/collect/ComparisonChainTest.java index 8bb8ddf99ee3..bd745a6fbbfc 100644 --- a/guava-tests/test/com/google/common/collect/ComparisonChainTest.java +++ b/guava-tests/test/com/google/common/collect/ComparisonChainTest.java @@ -31,7 +31,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ComparisonChain}. diff --git a/guava-tests/test/com/google/common/collect/FauxveridesTest.java b/guava-tests/test/com/google/common/collect/FauxveridesTest.java index 61db37fec916..98cd431c904d 100644 --- a/guava-tests/test/com/google/common/collect/FauxveridesTest.java +++ b/guava-tests/test/com/google/common/collect/FauxveridesTest.java @@ -36,7 +36,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests that all {@code public static} methods "inherited" from superclasses are "overridden" in diff --git a/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/guava-tests/test/com/google/common/collect/FluentIterableTest.java index eb97a98b15ae..1019453cca0f 100644 --- a/guava-tests/test/com/google/common/collect/FluentIterableTest.java +++ b/guava-tests/test/com/google/common/collect/FluentIterableTest.java @@ -50,7 +50,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link FluentIterable}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingListTest.java b/guava-tests/test/com/google/common/collect/ForwardingListTest.java index d0bac259adac..ef5915545696 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingListTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingListTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingList}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingMapTest.java b/guava-tests/test/com/google/common/collect/ForwardingMapTest.java index 39643eb61016..908c9c9dde42 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingMapTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingMapTest.java @@ -50,7 +50,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ForwardingMap}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java b/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java index e070713703db..ca4f28aef3ad 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingMultisetTest.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ForwardingMultiset}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java b/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java index f85fd1f21b2b..170f6d5e6f02 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingNavigableMapTest.java @@ -40,7 +40,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingNavigableMap}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java b/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java index 1fdac7a84137..6256c97f721f 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingNavigableSetTest.java @@ -36,7 +36,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingNavigableSet}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java b/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java index a421c0acd577..96ad8da83690 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingQueueTest.java @@ -30,7 +30,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingQueue}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingSetTest.java b/guava-tests/test/com/google/common/collect/ForwardingSetTest.java index a6f02f7069fc..73d6004a6058 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingSetTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingSetTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingSet}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java b/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java index dedb8a8fd361..2a6777a0590a 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingSortedMapTest.java @@ -37,7 +37,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingSortedMap}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java b/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java index 03f3199310e7..78711789c2fc 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingSortedMultisetTest.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ForwardingSortedMultiset}. diff --git a/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java b/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java index 9af2ef4f44ef..188a3892a027 100644 --- a/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java +++ b/guava-tests/test/com/google/common/collect/ForwardingSortedSetTest.java @@ -33,7 +33,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code ForwardingSortedSet}. diff --git a/guava-tests/test/com/google/common/collect/GeneralRangeTest.java b/guava-tests/test/com/google/common/collect/GeneralRangeTest.java index b9dbffcd501c..91852de9f9bd 100644 --- a/guava-tests/test/com/google/common/collect/GeneralRangeTest.java +++ b/guava-tests/test/com/google/common/collect/GeneralRangeTest.java @@ -27,7 +27,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code GeneralRange}. diff --git a/guava-tests/test/com/google/common/collect/HashBasedTableTest.java b/guava-tests/test/com/google/common/collect/HashBasedTableTest.java index a6a23beaaf30..d0d3950d9bc4 100644 --- a/guava-tests/test/com/google/common/collect/HashBasedTableTest.java +++ b/guava-tests/test/com/google/common/collect/HashBasedTableTest.java @@ -25,7 +25,7 @@ import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link HashBasedTable}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java index f742f10ca78a..c3347aa39353 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableBiMapTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableBiMap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java index d075f580b036..2c855c95c7c4 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableClassToInstanceMapTest.java @@ -37,7 +37,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ImmutableClassToInstanceMap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java index ddbbb1e3dc36..ea074f572d22 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java @@ -51,7 +51,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableListMultimap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableListTest.java b/guava-tests/test/com/google/common/collect/ImmutableListTest.java index 753f26d15c9e..0599ea79fe71 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableListTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableListTest.java @@ -54,7 +54,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ImmutableList}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableMapTest.java index 91df03876a3c..bafea9dc0bf6 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableMapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableMapTest.java @@ -71,7 +71,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableMap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java index 7d8860a873dd..2e4ea543f74d 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableMultimapTest.java @@ -33,7 +33,7 @@ import java.util.Map.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableMultimap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java b/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java index b1dd49d6e0bb..c8cbdae28d38 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java @@ -54,7 +54,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableMultiset}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java index 9d4a7d2b3abd..19587243b107 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableSetMultimapTest.java @@ -50,7 +50,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableSetMultimap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableSetTest.java b/guava-tests/test/com/google/common/collect/ImmutableSetTest.java index e072256ffdc8..ff4e37b61850 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableSetTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableSetTest.java @@ -49,7 +49,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link ImmutableSet}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java index 83e60204c222..72092806711b 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java @@ -59,7 +59,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link ImmutableSortedMap}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java b/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java index 5b4ffae39e01..26574d6f6f50 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableSortedSetTest.java @@ -61,7 +61,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link ImmutableSortedSet}. diff --git a/guava-tests/test/com/google/common/collect/ImmutableTableTest.java b/guava-tests/test/com/google/common/collect/ImmutableTableTest.java index 4b40a94977de..ffeb15c239dc 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableTableTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableTableTest.java @@ -29,7 +29,7 @@ import com.google.common.testing.SerializableTester; import java.util.stream.Collector; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests common methods in {@link ImmutableTable} diff --git a/guava-tests/test/com/google/common/collect/IterablesTest.java b/guava-tests/test/com/google/common/collect/IterablesTest.java index 822afba35109..cd4879c8f602 100644 --- a/guava-tests/test/com/google/common/collect/IterablesTest.java +++ b/guava-tests/test/com/google/common/collect/IterablesTest.java @@ -66,7 +66,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Iterables}. diff --git a/guava-tests/test/com/google/common/collect/IteratorsTest.java b/guava-tests/test/com/google/common/collect/IteratorsTest.java index c61e04ba7df4..5cbc63ac1569 100644 --- a/guava-tests/test/com/google/common/collect/IteratorsTest.java +++ b/guava-tests/test/com/google/common/collect/IteratorsTest.java @@ -75,7 +75,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Iterators}. diff --git a/guava-tests/test/com/google/common/collect/LegacyComparable.java b/guava-tests/test/com/google/common/collect/LegacyComparable.java index c7285a92d912..00f8517bfe12 100644 --- a/guava-tests/test/com/google/common/collect/LegacyComparable.java +++ b/guava-tests/test/com/google/common/collect/LegacyComparable.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class that implements {@code Comparable} without generics, such as those found in libraries diff --git a/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java b/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java index 451917e3c70f..870d27fff58f 100644 --- a/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/LinkedHashMultimapTest.java @@ -49,7 +49,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@code LinkedHashMultimap}. diff --git a/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java b/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java index 502ac3e16289..caea53de70c4 100644 --- a/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/LinkedListMultimapTest.java @@ -51,7 +51,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code LinkedListMultimap}. diff --git a/guava-tests/test/com/google/common/collect/ListsImplTest.java b/guava-tests/test/com/google/common/collect/ListsImplTest.java index 68ce8362d7f3..f00095ccf52c 100644 --- a/guava-tests/test/com/google/common/collect/ListsImplTest.java +++ b/guava-tests/test/com/google/common/collect/ListsImplTest.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Tests the package level *impl methods directly using various types of lists. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/collect/MapsCollectionTest.java b/guava-tests/test/com/google/common/collect/MapsCollectionTest.java index 7a964e1d3d3c..a52b7a8f50c3 100644 --- a/guava-tests/test/com/google/common/collect/MapsCollectionTest.java +++ b/guava-tests/test/com/google/common/collect/MapsCollectionTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test suites for wrappers in {@code Maps}. diff --git a/guava-tests/test/com/google/common/collect/MapsTest.java b/guava-tests/test/com/google/common/collect/MapsTest.java index 40e7a73e7f73..859a92c3c58f 100644 --- a/guava-tests/test/com/google/common/collect/MapsTest.java +++ b/guava-tests/test/com/google/common/collect/MapsTest.java @@ -67,7 +67,7 @@ import java.util.concurrent.ConcurrentMap; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Maps}. diff --git a/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java b/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java index def9d6847706..d53579f14f9f 100644 --- a/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java +++ b/guava-tests/test/com/google/common/collect/MapsTransformValuesUnmodifiableIteratorTest.java @@ -30,7 +30,7 @@ import java.util.Map.Entry; import java.util.Set; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Maps#transformValues} when the backing map's views have iterators that don't diff --git a/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java b/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java index 2ba38f132a0b..f3b58b220093 100644 --- a/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java +++ b/guava-tests/test/com/google/common/collect/MinMaxPriorityQueueTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link MinMaxPriorityQueue}. diff --git a/guava-tests/test/com/google/common/collect/MoreCollectorsTest.java b/guava-tests/test/com/google/common/collect/MoreCollectorsTest.java index acdf8eb513d1..d0e7af517d8f 100644 --- a/guava-tests/test/com/google/common/collect/MoreCollectorsTest.java +++ b/guava-tests/test/com/google/common/collect/MoreCollectorsTest.java @@ -26,7 +26,7 @@ import java.util.stream.Stream; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code MoreCollectors}. diff --git a/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java b/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java index 97857ffdeb0a..27b3de8d9bbd 100644 --- a/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java +++ b/guava-tests/test/com/google/common/collect/MultimapBuilderTest.java @@ -30,7 +30,7 @@ import java.util.SortedSet; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link MultimapBuilder}. diff --git a/guava-tests/test/com/google/common/collect/MultimapsTest.java b/guava-tests/test/com/google/common/collect/MultimapsTest.java index 6731614f8152..d13bb5d24661 100644 --- a/guava-tests/test/com/google/common/collect/MultimapsTest.java +++ b/guava-tests/test/com/google/common/collect/MultimapsTest.java @@ -77,7 +77,7 @@ import java.util.stream.Stream; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Multimaps}. diff --git a/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java b/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java index a442aa814691..63e01282cfe1 100644 --- a/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java +++ b/guava-tests/test/com/google/common/collect/MultisetsImmutableEntryTest.java @@ -23,7 +23,7 @@ import com.google.common.collect.Multiset.Entry; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Multisets#immutableEntry}. diff --git a/guava-tests/test/com/google/common/collect/NewCustomTableTest.java b/guava-tests/test/com/google/common/collect/NewCustomTableTest.java index d8ff7eda0633..947dda86b406 100644 --- a/guava-tests/test/com/google/common/collect/NewCustomTableTest.java +++ b/guava-tests/test/com/google/common/collect/NewCustomTableTest.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.TreeMap; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Tables#newCustomTable}. diff --git a/guava-tests/test/com/google/common/collect/ObjectArraysTest.java b/guava-tests/test/com/google/common/collect/ObjectArraysTest.java index 6afb08a509e4..46781fcfeae2 100644 --- a/guava-tests/test/com/google/common/collect/ObjectArraysTest.java +++ b/guava-tests/test/com/google/common/collect/ObjectArraysTest.java @@ -26,7 +26,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code ObjectArrays}. diff --git a/guava-tests/test/com/google/common/collect/OrderingTest.java b/guava-tests/test/com/google/common/collect/OrderingTest.java index e52589461ab2..dfe3373a0b86 100644 --- a/guava-tests/test/com/google/common/collect/OrderingTest.java +++ b/guava-tests/test/com/google/common/collect/OrderingTest.java @@ -49,9 +49,9 @@ import java.util.Random; import java.util.RandomAccess; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@code Ordering}. diff --git a/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java b/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java index 76f3b50df872..b725ad4fc71f 100644 --- a/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java +++ b/guava-tests/test/com/google/common/collect/PeekingIteratorTest.java @@ -33,7 +33,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link PeekingIterator}. diff --git a/guava-tests/test/com/google/common/collect/QueuesTest.java b/guava-tests/test/com/google/common/collect/QueuesTest.java index 22725fe4ed72..53d7509dee99 100644 --- a/guava-tests/test/com/google/common/collect/QueuesTest.java +++ b/guava-tests/test/com/google/common/collect/QueuesTest.java @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Queues}. diff --git a/guava-tests/test/com/google/common/collect/RangeTest.java b/guava-tests/test/com/google/common/collect/RangeTest.java index e1431f09d76e..b0db5296a8cd 100644 --- a/guava-tests/test/com/google/common/collect/RangeTest.java +++ b/guava-tests/test/com/google/common/collect/RangeTest.java @@ -34,7 +34,7 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Range}. diff --git a/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java index 308e25eb0c3b..93f5a5c94358 100644 --- a/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/collect/ReflectionFreeAssertThrows.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java b/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java index 74f719efe374..9c1a09c1a052 100644 --- a/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java +++ b/guava-tests/test/com/google/common/collect/RegularImmutableAsListTest.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link RegularImmutableAsList}. diff --git a/guava-tests/test/com/google/common/collect/SetsTest.java b/guava-tests/test/com/google/common/collect/SetsTest.java index de4b4cf28fd3..2dba31fb2bf6 100644 --- a/guava-tests/test/com/google/common/collect/SetsTest.java +++ b/guava-tests/test/com/google/common/collect/SetsTest.java @@ -85,7 +85,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@code Sets}. diff --git a/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java b/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java index 6ffa66df4d77..e6244281876d 100644 --- a/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/SimpleAbstractMultisetTest.java @@ -34,7 +34,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractMultiset}. diff --git a/guava-tests/test/com/google/common/collect/StreamsTest.java b/guava-tests/test/com/google/common/collect/StreamsTest.java index c1f286908bf2..0c77151badcb 100644 --- a/guava-tests/test/com/google/common/collect/StreamsTest.java +++ b/guava-tests/test/com/google/common/collect/StreamsTest.java @@ -41,7 +41,7 @@ import java.util.stream.Stream; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Unit test for {@link Streams}. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java index 96ec1da931c9..7e4ac851dd07 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java @@ -31,7 +31,7 @@ import java.util.function.BiFunction; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#biMap}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java index 5d1394fbf3e0..6f0f7a734cec 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java @@ -22,7 +22,7 @@ import java.util.Iterator; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Synchronized#deque} and {@link Queues#synchronizedDeque}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java index 55425e73aba3..b1ab77b6ff46 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java @@ -29,7 +29,7 @@ import java.util.Set; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#map}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java index b4499f96371d..7f7508c7155b 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java @@ -36,7 +36,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#multimap}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java index 0c414a269be6..1a75965c8dcc 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java @@ -34,7 +34,7 @@ import java.util.SortedMap; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Maps#synchronizedNavigableMap(NavigableMap)}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java b/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java index 870cc12b0258..962e7512782c 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java @@ -33,7 +33,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Sets#synchronizedNavigableSet(NavigableSet)}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java b/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java index 8697239cd6f5..4f236aa7b84d 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java @@ -22,7 +22,7 @@ import java.util.Queue; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Synchronized#queue} and {@link Queues#synchronizedQueue}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java b/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java index 9d0fff3a1253..dd7073579359 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedSetTest.java @@ -32,7 +32,7 @@ import junit.framework.Test; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code Synchronized#set}. diff --git a/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java b/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java index 365ab36b8670..a80315812249 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @NullUnmarked public class SynchronizedTableTest extends AbstractTableTest { diff --git a/guava-tests/test/com/google/common/collect/TableCollectionTest.java b/guava-tests/test/com/google/common/collect/TableCollectionTest.java index 82b46b12a463..6f1d51a82c08 100644 --- a/guava-tests/test/com/google/common/collect/TableCollectionTest.java +++ b/guava-tests/test/com/google/common/collect/TableCollectionTest.java @@ -52,7 +52,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Collection tests for {@link Table} implementations. diff --git a/guava-tests/test/com/google/common/collect/TableCollectorsTest.java b/guava-tests/test/com/google/common/collect/TableCollectorsTest.java index afdf96928515..18f3041bab4b 100644 --- a/guava-tests/test/com/google/common/collect/TableCollectorsTest.java +++ b/guava-tests/test/com/google/common/collect/TableCollectorsTest.java @@ -33,7 +33,7 @@ import java.util.stream.Stream; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Unit tests for {@link TableCollectors}. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/collect/TablesTest.java b/guava-tests/test/com/google/common/collect/TablesTest.java index ebf096d3f429..85edb8cd6a9f 100644 --- a/guava-tests/test/com/google/common/collect/TablesTest.java +++ b/guava-tests/test/com/google/common/collect/TablesTest.java @@ -25,7 +25,7 @@ import com.google.common.testing.SerializableTester; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Tables}. diff --git a/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java b/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java index e06865dbc263..35d32ad17daf 100644 --- a/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java +++ b/guava-tests/test/com/google/common/collect/TablesTransformValuesTest.java @@ -25,7 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Function; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Tables#transformValues}. diff --git a/guava-tests/test/com/google/common/collect/TransposedTableTest.java b/guava-tests/test/com/google/common/collect/TransposedTableTest.java index 736c8ff4518d..49a4910161cc 100644 --- a/guava-tests/test/com/google/common/collect/TransposedTableTest.java +++ b/guava-tests/test/com/google/common/collect/TransposedTableTest.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtCompatible; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link Tables#transpose}. diff --git a/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java b/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java index aedd2e5d7422..cd14b4b87359 100644 --- a/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java +++ b/guava-tests/test/com/google/common/collect/TreeBasedTableTest.java @@ -38,7 +38,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test cases for {@link TreeBasedTable}. diff --git a/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java b/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java index cb85a7bfb017..7622c411f9f3 100644 --- a/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java +++ b/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java @@ -31,7 +31,7 @@ import java.util.SortedSet; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@code TreeMultimap} with explicit comparators. diff --git a/guava-tests/test/com/google/common/collect/TreeMultisetTest.java b/guava-tests/test/com/google/common/collect/TreeMultisetTest.java index 38149fc57386..05453e85e279 100644 --- a/guava-tests/test/com/google/common/collect/TreeMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/TreeMultisetTest.java @@ -42,7 +42,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link TreeMultiset}. diff --git a/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java index f03f7b6e57ac..7e9747348019 100644 --- a/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/escape/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java b/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java index 1817cdff8efa..686473e57d17 100644 --- a/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java +++ b/guava-tests/test/com/google/common/escape/UnicodeEscaperTest.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link UnicodeEscaper}. diff --git a/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java b/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java index 441e79a730fc..c1fc3d2512a5 100644 --- a/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java +++ b/guava-tests/test/com/google/common/eventbus/PackageSanityTests.java @@ -19,7 +19,7 @@ import com.google.common.testing.AbstractPackageSanityTests; import java.lang.reflect.Method; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic sanity tests for the entire package. diff --git a/guava-tests/test/com/google/common/eventbus/StringCatcher.java b/guava-tests/test/com/google/common/eventbus/StringCatcher.java index 56be3f2ac1ae..1f30e2384427 100644 --- a/guava-tests/test/com/google/common/eventbus/StringCatcher.java +++ b/guava-tests/test/com/google/common/eventbus/StringCatcher.java @@ -20,7 +20,7 @@ import java.util.List; import junit.framework.Assert; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A simple EventSubscriber mock that records Strings. diff --git a/guava-tests/test/com/google/common/eventbus/SubscriberTest.java b/guava-tests/test/com/google/common/eventbus/SubscriberTest.java index 4f9c7bdce788..4c9bbb7b6254 100644 --- a/guava-tests/test/com/google/common/eventbus/SubscriberTest.java +++ b/guava-tests/test/com/google/common/eventbus/SubscriberTest.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Subscriber}. diff --git a/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java b/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java index 54d6c93f588b..b8738c3cb8cb 100644 --- a/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java +++ b/guava-tests/test/com/google/common/eventbus/outside/AbstractEventBusTest.java @@ -18,7 +18,7 @@ import com.google.common.eventbus.EventBus; import junit.framework.TestCase; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract base class for tests that EventBus finds the correct subscribers. diff --git a/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java b/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java index 70ecbc028d52..d55a7e2d2125 100644 --- a/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java +++ b/guava-tests/test/com/google/common/graph/AbstractNetworkTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/guava-tests/test/com/google/common/graph/ValueGraphTest.java b/guava-tests/test/com/google/common/graph/ValueGraphTest.java index 2e91de5820b8..7204e4617388 100644 --- a/guava-tests/test/com/google/common/graph/ValueGraphTest.java +++ b/guava-tests/test/com/google/common/graph/ValueGraphTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/guava-tests/test/com/google/common/hash/BloomFilterTest.java b/guava-tests/test/com/google/common/hash/BloomFilterTest.java index 06b28eee645f..22453f3e6cc6 100644 --- a/guava-tests/test/com/google/common/hash/BloomFilterTest.java +++ b/guava-tests/test/com/google/common/hash/BloomFilterTest.java @@ -39,7 +39,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for SimpleGenericBloomFilter and derived BloomFilter views. diff --git a/guava-tests/test/com/google/common/hash/HashCodeTest.java b/guava-tests/test/com/google/common/hash/HashCodeTest.java index 7e2b051ccbe0..46c6ac4b7f0e 100644 --- a/guava-tests/test/com/google/common/hash/HashCodeTest.java +++ b/guava-tests/test/com/google/common/hash/HashCodeTest.java @@ -26,7 +26,7 @@ import java.util.Arrays; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link HashCode}. diff --git a/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java b/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java index 5d9d6489a458..cc54edad90fb 100644 --- a/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java +++ b/guava-tests/test/com/google/common/hash/MacHashFunctionTest.java @@ -31,7 +31,7 @@ import javax.crypto.spec.SecretKeySpec; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import sun.security.jca.ProviderList; import sun.security.jca.Providers; diff --git a/guava-tests/test/com/google/common/io/BaseEncodingTest.java b/guava-tests/test/com/google/common/io/BaseEncodingTest.java index 93d62cbe8553..1fb945643cd7 100644 --- a/guava-tests/test/com/google/common/io/BaseEncodingTest.java +++ b/guava-tests/test/com/google/common/io/BaseEncodingTest.java @@ -38,7 +38,7 @@ import java.io.StringWriter; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@code BaseEncoding}. diff --git a/guava-tests/test/com/google/common/io/ByteSourceTest.java b/guava-tests/test/com/google/common/io/ByteSourceTest.java index 723224717d99..580e3ae0c3f7 100644 --- a/guava-tests/test/com/google/common/io/ByteSourceTest.java +++ b/guava-tests/test/com/google/common/io/ByteSourceTest.java @@ -43,7 +43,7 @@ import java.util.EnumSet; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for the default implementations of {@code ByteSource} methods. diff --git a/guava-tests/test/com/google/common/io/CloserTest.java b/guava-tests/test/com/google/common/io/CloserTest.java index f906c4c793f8..1181b9c46740 100644 --- a/guava-tests/test/com/google/common/io/CloserTest.java +++ b/guava-tests/test/com/google/common/io/CloserTest.java @@ -30,7 +30,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Closer}. diff --git a/guava-tests/test/com/google/common/io/IoTestCase.java b/guava-tests/test/com/google/common/io/IoTestCase.java index d188ccf43185..a8c462734d42 100644 --- a/guava-tests/test/com/google/common/io/IoTestCase.java +++ b/guava-tests/test/com/google/common/io/IoTestCase.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base test case class for I/O tests. diff --git a/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java index dda6301ade7d..b428136b0265 100644 --- a/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/io/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/io/SourceSinkFactories.java b/guava-tests/test/com/google/common/io/SourceSinkFactories.java index e61ec6d27ede..200a6e2d827b 100644 --- a/guava-tests/test/com/google/common/io/SourceSinkFactories.java +++ b/guava-tests/test/com/google/common/io/SourceSinkFactories.java @@ -42,7 +42,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link SourceSinkFactory} implementations. diff --git a/guava-tests/test/com/google/common/math/QuantilesTest.java b/guava-tests/test/com/google/common/math/QuantilesTest.java index aed6208630a4..64f74e486c45 100644 --- a/guava-tests/test/com/google/common/math/QuantilesTest.java +++ b/guava-tests/test/com/google/common/math/QuantilesTest.java @@ -44,7 +44,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link Quantiles}. diff --git a/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java index 3c7c363b3264..28dff1009f28 100644 --- a/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/math/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/net/HostAndPortTest.java b/guava-tests/test/com/google/common/net/HostAndPortTest.java index 3b55c9f9ff0d..5d5b3ce48bd7 100644 --- a/guava-tests/test/com/google/common/net/HostAndPortTest.java +++ b/guava-tests/test/com/google/common/net/HostAndPortTest.java @@ -23,7 +23,7 @@ import com.google.common.testing.SerializableTester; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link HostAndPort} diff --git a/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java index 86e8f9903637..806c2a1b133b 100644 --- a/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/net/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/primitives/BooleansTest.java b/guava-tests/test/com/google/common/primitives/BooleansTest.java index 67ab066c41dc..7d081054102c 100644 --- a/guava-tests/test/com/google/common/primitives/BooleansTest.java +++ b/guava-tests/test/com/google/common/primitives/BooleansTest.java @@ -33,7 +33,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Booleans}. diff --git a/guava-tests/test/com/google/common/primitives/BytesTest.java b/guava-tests/test/com/google/common/primitives/BytesTest.java index 6c56ad0e1d7f..3aa23f5f7b2e 100644 --- a/guava-tests/test/com/google/common/primitives/BytesTest.java +++ b/guava-tests/test/com/google/common/primitives/BytesTest.java @@ -30,7 +30,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Bytes}. diff --git a/guava-tests/test/com/google/common/primitives/CharsTest.java b/guava-tests/test/com/google/common/primitives/CharsTest.java index 5645a0f14cc7..c8e861ff940c 100644 --- a/guava-tests/test/com/google/common/primitives/CharsTest.java +++ b/guava-tests/test/com/google/common/primitives/CharsTest.java @@ -36,7 +36,7 @@ import java.util.Locale; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Chars}. diff --git a/guava-tests/test/com/google/common/primitives/DoublesTest.java b/guava-tests/test/com/google/common/primitives/DoublesTest.java index fa7aa36cbf2d..c5b00d688268 100644 --- a/guava-tests/test/com/google/common/primitives/DoublesTest.java +++ b/guava-tests/test/com/google/common/primitives/DoublesTest.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Doubles}. diff --git a/guava-tests/test/com/google/common/primitives/FloatsTest.java b/guava-tests/test/com/google/common/primitives/FloatsTest.java index 6522be8bff55..3adaf8d15bf3 100644 --- a/guava-tests/test/com/google/common/primitives/FloatsTest.java +++ b/guava-tests/test/com/google/common/primitives/FloatsTest.java @@ -38,7 +38,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Floats}. diff --git a/guava-tests/test/com/google/common/primitives/IntsTest.java b/guava-tests/test/com/google/common/primitives/IntsTest.java index 2c5aa1913727..9e267a36f4ff 100644 --- a/guava-tests/test/com/google/common/primitives/IntsTest.java +++ b/guava-tests/test/com/google/common/primitives/IntsTest.java @@ -37,7 +37,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Ints}. diff --git a/guava-tests/test/com/google/common/primitives/LongsTest.java b/guava-tests/test/com/google/common/primitives/LongsTest.java index 0bfa4dd5d82d..a86f8aca965e 100644 --- a/guava-tests/test/com/google/common/primitives/LongsTest.java +++ b/guava-tests/test/com/google/common/primitives/LongsTest.java @@ -40,7 +40,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Longs}. diff --git a/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java index 67654ea330ef..e86fd59bad3f 100644 --- a/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/primitives/ReflectionFreeAssertThrows.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/primitives/ShortsTest.java b/guava-tests/test/com/google/common/primitives/ShortsTest.java index 60d8670c4be9..dc44f39ac83c 100644 --- a/guava-tests/test/com/google/common/primitives/ShortsTest.java +++ b/guava-tests/test/com/google/common/primitives/ShortsTest.java @@ -37,7 +37,7 @@ import java.util.Random; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link Shorts}. diff --git a/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java b/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java index 17a45870e71b..7a02d07db059 100644 --- a/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java +++ b/guava-tests/test/com/google/common/reflect/AbstractInvocationHandlerTest.java @@ -27,7 +27,7 @@ import java.util.List; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link AbstractInvocationHandler}. diff --git a/guava-tests/test/com/google/common/reflect/InvokableTest.java b/guava-tests/test/com/google/common/reflect/InvokableTest.java index 04ac9d0bc789..6c868b4365f9 100644 --- a/guava-tests/test/com/google/common/reflect/InvokableTest.java +++ b/guava-tests/test/com/google/common/reflect/InvokableTest.java @@ -36,7 +36,7 @@ import java.util.Collections; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link Invokable}. diff --git a/guava-tests/test/com/google/common/reflect/SubtypeTester.java b/guava-tests/test/com/google/common/reflect/SubtypeTester.java index 5caca8c420b8..eda28b5ec790 100644 --- a/guava-tests/test/com/google/common/reflect/SubtypeTester.java +++ b/guava-tests/test/com/google/common/reflect/SubtypeTester.java @@ -31,7 +31,7 @@ import java.util.Comparator; import javax.lang.model.element.Modifier; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tester of subtyping relationships between two types. diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java b/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java index 8f690b60c682..3688400f8ca5 100644 --- a/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/AbstractAbstractFutureTest.java @@ -37,7 +37,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for tests for emulated {@link AbstractFuture} that allow subclasses to swap in a diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java index a4d53d778573..0b5774b9ac09 100644 --- a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java +++ b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureBenchmarks.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.AbstractQueuedSynchronizer; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Utilities for the AbstractFutureBenchmarks */ @NullUnmarked diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java index d955501aabd3..aa73f4df2e5e 100644 --- a/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/AbstractFutureTest.java @@ -59,7 +59,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Tests for {@link AbstractFuture}. diff --git a/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java b/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java index fd33281c0037..24f7c9b2e21c 100644 --- a/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/AbstractScheduledServiceTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicReference; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit test for {@link AbstractScheduledService}. diff --git a/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java b/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java index dccd36366f88..75de1d6df65f 100644 --- a/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/CallablesTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link Callables}. diff --git a/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java b/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java index 4a07ef071959..ee51de22fded 100644 --- a/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/ExecutionSequencerTest.java @@ -38,7 +38,7 @@ import java.util.logging.Logger; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Tests for {@link ExecutionSequencer} */ @NullUnmarked diff --git a/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java b/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java index c772f4d8975c..8b4b63614bda 100644 --- a/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/FutureCallbackTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.Executor; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Test for {@link FutureCallback}. diff --git a/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java b/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java index 06ef3674fecb..71708beca24c 100644 --- a/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java +++ b/guava-tests/test/com/google/common/util/concurrent/FuturesGetCheckedInputs.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.Future; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Classes and futures used in {@link FuturesGetCheckedTest} and {@link FuturesGetUncheckedTest}. diff --git a/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java b/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java index 9a8b1e6dff74..7c8cf27d1914 100644 --- a/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/FuturesGetDoneTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.ExecutionException; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Unit tests for {@link Futures#getDone}. */ @GwtCompatible diff --git a/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java b/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java index 1fc69011f37b..aa900d6a0802 100644 --- a/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/FuturesTest.java @@ -95,7 +95,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unit tests for {@link Futures}. diff --git a/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java b/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java index bda4dcac5e85..aee24a5f60bf 100644 --- a/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/GeneratedMonitorTest.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Generated tests for {@link Monitor}. diff --git a/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java b/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java index cdeb907d8207..92a7b5accccd 100644 --- a/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/InterruptibleTaskTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.locks.LockSupport; import junit.framework.TestCase; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @NullUnmarked public final class InterruptibleTaskTest extends TestCase { diff --git a/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java b/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java index 96bf05887b96..8cef591033a2 100644 --- a/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java +++ b/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java @@ -31,7 +31,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Used to test listenable future implementations. diff --git a/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java b/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java index f592e7995afb..1d00fb2ce6a9 100644 --- a/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/MoreExecutorsTest.java @@ -76,7 +76,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java b/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java index a0f455ec170c..8bb5a7cc8010 100644 --- a/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java +++ b/guava-tests/test/com/google/common/util/concurrent/ReflectionFreeAssertThrows.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Replacements for JUnit's {@code assertThrows} that work under GWT/J2CL. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java b/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java index 91df560584e7..c8fc26da8afe 100644 --- a/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java +++ b/guava-tests/test/com/google/common/util/concurrent/TestPlatform.java @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Methods factored out so that they can be emulated differently in GWT. */ @GwtCompatible(emulated = true) diff --git a/guava-tests/test/com/google/common/util/concurrent/TestThread.java b/guava-tests/test/com/google/common/util/concurrent/TestThread.java index 7c3186da5fc5..e183f5b69f07 100644 --- a/guava-tests/test/com/google/common/util/concurrent/TestThread.java +++ b/guava-tests/test/com/google/common/util/concurrent/TestThread.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeoutException; import junit.framework.AssertionFailedError; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A helper for concurrency testing. One or more {@code TestThread} instances are instantiated in a diff --git a/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java b/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java index 969357713648..397c41d8f526 100644 --- a/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java +++ b/guava-tests/test/com/google/common/util/concurrent/TrustedListenableFutureTaskTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; import junit.framework.TestCase; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Test case for {@link TrustedListenableFutureTask}. */ @NullMarked diff --git a/guava/src/com/google/common/base/Absent.java b/guava/src/com/google/common/base/Absent.java index 4223b39e6c24..1aa84642ccc1 100644 --- a/guava/src/com/google/common/base/Absent.java +++ b/guava/src/com/google/common/base/Absent.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementation of an {@link Optional} not containing a reference. */ @GwtCompatible diff --git a/guava/src/com/google/common/base/AbstractIterator.java b/guava/src/com/google/common/base/AbstractIterator.java index 5fb09d376712..f46e12ecbe0b 100644 --- a/guava/src/com/google/common/base/AbstractIterator.java +++ b/guava/src/com/google/common/base/AbstractIterator.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Iterator; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Note this class is a copy of {@link com.google.common.collect.AbstractIterator} (for dependency diff --git a/guava/src/com/google/common/base/CaseFormat.java b/guava/src/com/google/common/base/CaseFormat.java index 62d4e22a8c5b..c865e29606a9 100644 --- a/guava/src/com/google/common/base/CaseFormat.java +++ b/guava/src/com/google/common/base/CaseFormat.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utility class for converting between various ASCII case formats. Behavior is undefined for diff --git a/guava/src/com/google/common/base/Converter.java b/guava/src/com/google/common/base/Converter.java index d01e548ca168..b6e8e5048e88 100644 --- a/guava/src/com/google/common/base/Converter.java +++ b/guava/src/com/google/common/base/Converter.java @@ -25,7 +25,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.Serializable; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A function from {@code A} to {@code B} with an associated reverse function from {@code B} diff --git a/guava/src/com/google/common/base/Defaults.java b/guava/src/com/google/common/base/Defaults.java index 60e52a8a026b..8105badc59b3 100644 --- a/guava/src/com/google/common/base/Defaults.java +++ b/guava/src/com/google/common/base/Defaults.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides default values for all Java types, as defined by the JLS. diff --git a/guava/src/com/google/common/base/Enums.java b/guava/src/com/google/common/base/Enums.java index ebf95c507854..4b185d29c2f8 100644 --- a/guava/src/com/google/common/base/Enums.java +++ b/guava/src/com/google/common/base/Enums.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utility methods for working with {@link Enum} instances. diff --git a/guava/src/com/google/common/base/Equivalence.java b/guava/src/com/google/common/base/Equivalence.java index 07ccc7139554..c5e07ddd6c95 100644 --- a/guava/src/com/google/common/base/Equivalence.java +++ b/guava/src/com/google/common/base/Equivalence.java @@ -20,8 +20,8 @@ import com.google.errorprone.annotations.ForOverride; import java.io.Serializable; import java.util.function.BiPredicate; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A strategy for determining whether two instances are considered equivalent, and for computing diff --git a/guava/src/com/google/common/base/FinalizablePhantomReference.java b/guava/src/com/google/common/base/FinalizablePhantomReference.java index 91afc3b3a198..89b600f4fa13 100644 --- a/guava/src/com/google/common/base/FinalizablePhantomReference.java +++ b/guava/src/com/google/common/base/FinalizablePhantomReference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Phantom reference with a {@code finalizeReferent()} method which a background thread invokes diff --git a/guava/src/com/google/common/base/FinalizableReferenceQueue.java b/guava/src/com/google/common/base/FinalizableReferenceQueue.java index 6a985ba691e6..1e07bee2e086 100644 --- a/guava/src/com/google/common/base/FinalizableReferenceQueue.java +++ b/guava/src/com/google/common/base/FinalizableReferenceQueue.java @@ -28,7 +28,7 @@ import java.net.URLClassLoader; import java.util.logging.Level; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A reference queue with an associated background thread that dequeues references and invokes diff --git a/guava/src/com/google/common/base/FinalizableSoftReference.java b/guava/src/com/google/common/base/FinalizableSoftReference.java index 9acdeec45206..c4f6baa3c7de 100644 --- a/guava/src/com/google/common/base/FinalizableSoftReference.java +++ b/guava/src/com/google/common/base/FinalizableSoftReference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Soft reference with a {@code finalizeReferent()} method which a background thread invokes after diff --git a/guava/src/com/google/common/base/FinalizableWeakReference.java b/guava/src/com/google/common/base/FinalizableWeakReference.java index 3160fbff6f57..aeea7c7f8508 100644 --- a/guava/src/com/google/common/base/FinalizableWeakReference.java +++ b/guava/src/com/google/common/base/FinalizableWeakReference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Weak reference with a {@code finalizeReferent()} method which a background thread invokes after diff --git a/guava/src/com/google/common/base/Function.java b/guava/src/com/google/common/base/Function.java index b2390762ba22..0b42fdc4199c 100644 --- a/guava/src/com/google/common/base/Function.java +++ b/guava/src/com/google/common/base/Function.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Legacy version of {@link java.util.function.Function java.util.function.Function}. diff --git a/guava/src/com/google/common/base/FunctionalEquivalence.java b/guava/src/com/google/common/base/FunctionalEquivalence.java index 1d4d70dd0039..8d5a50b449e4 100644 --- a/guava/src/com/google/common/base/FunctionalEquivalence.java +++ b/guava/src/com/google/common/base/FunctionalEquivalence.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Equivalence applied on functional result. diff --git a/guava/src/com/google/common/base/Functions.java b/guava/src/com/google/common/base/Functions.java index 4772da7be8e1..70fa63640834 100644 --- a/guava/src/com/google/common/base/Functions.java +++ b/guava/src/com/google/common/base/Functions.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code com.google.common.base.Function} instances; see that diff --git a/guava/src/com/google/common/base/Joiner.java b/guava/src/com/google/common/base/Joiner.java index 418a7fbb85f8..1b3504fbe99a 100644 --- a/guava/src/com/google/common/base/Joiner.java +++ b/guava/src/com/google/common/base/Joiner.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object which joins pieces of text (specified as an array, {@link Iterable}, varargs or even a diff --git a/guava/src/com/google/common/base/MoreObjects.java b/guava/src/com/google/common/base/MoreObjects.java index 49b7c80025d5..09bc683dba94 100644 --- a/guava/src/com/google/common/base/MoreObjects.java +++ b/guava/src/com/google/common/base/MoreObjects.java @@ -25,7 +25,7 @@ import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.OptionalLong; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper functions that operate on any {@code Object}, and are not already provided in {@link diff --git a/guava/src/com/google/common/base/NullnessCasts.java b/guava/src/com/google/common/base/NullnessCasts.java index 85b18b225624..5c99948ad47c 100644 --- a/guava/src/com/google/common/base/NullnessCasts.java +++ b/guava/src/com/google/common/base/NullnessCasts.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A utility method to perform unchecked casts to suppress errors produced by nullness analyses. */ @GwtCompatible diff --git a/guava/src/com/google/common/base/Objects.java b/guava/src/com/google/common/base/Objects.java index c0ebbcd7d3b9..114520c51d4b 100644 --- a/guava/src/com/google/common/base/Objects.java +++ b/guava/src/com/google/common/base/Objects.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper functions that can operate on any {@code Object}. diff --git a/guava/src/com/google/common/base/Optional.java b/guava/src/com/google/common/base/Optional.java index 09d687060454..a08fe1c538ed 100644 --- a/guava/src/com/google/common/base/Optional.java +++ b/guava/src/com/google/common/base/Optional.java @@ -21,7 +21,7 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable object that may contain a non-null reference to another object. Each instance of diff --git a/guava/src/com/google/common/base/PairwiseEquivalence.java b/guava/src/com/google/common/base/PairwiseEquivalence.java index 93ccea2e208e..9720f774fed1 100644 --- a/guava/src/com/google/common/base/PairwiseEquivalence.java +++ b/guava/src/com/google/common/base/PairwiseEquivalence.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(serializable = true) final class PairwiseEquivalence extends Equivalence> diff --git a/guava/src/com/google/common/base/Platform.java b/guava/src/com/google/common/base/Platform.java index fca406e1589f..e0bef84ead68 100644 --- a/guava/src/com/google/common/base/Platform.java +++ b/guava/src/com/google/common/base/Platform.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Methods factored out so that they can be emulated differently in GWT. diff --git a/guava/src/com/google/common/base/Preconditions.java b/guava/src/com/google/common/base/Preconditions.java index 2d1cf2ceca63..4799af51e72a 100644 --- a/guava/src/com/google/common/base/Preconditions.java +++ b/guava/src/com/google/common/base/Preconditions.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static convenience methods that help a method or constructor check whether it was invoked diff --git a/guava/src/com/google/common/base/Predicate.java b/guava/src/com/google/common/base/Predicate.java index 5c6e9b1b99e3..3f28d64f89b8 100644 --- a/guava/src/com/google/common/base/Predicate.java +++ b/guava/src/com/google/common/base/Predicate.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Legacy version of {@link java.util.function.Predicate java.util.function.Predicate}. Determines a diff --git a/guava/src/com/google/common/base/Predicates.java b/guava/src/com/google/common/base/Predicates.java index e819d5bef5e5..934c381b0f33 100644 --- a/guava/src/com/google/common/base/Predicates.java +++ b/guava/src/com/google/common/base/Predicates.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.regex.Pattern; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code Predicate} instances. diff --git a/guava/src/com/google/common/base/Present.java b/guava/src/com/google/common/base/Present.java index 34c329cc0467..97bf8ce14ad5 100644 --- a/guava/src/com/google/common/base/Present.java +++ b/guava/src/com/google/common/base/Present.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collections; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementation of an {@link Optional} containing a reference. */ @GwtCompatible diff --git a/guava/src/com/google/common/base/Splitter.java b/guava/src/com/google/common/base/Splitter.java index 9e2fc1d8e447..0773a97a6dbc 100644 --- a/guava/src/com/google/common/base/Splitter.java +++ b/guava/src/com/google/common/base/Splitter.java @@ -28,7 +28,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Extracts non-overlapping substrings from an input string, typically by recognizing appearances of diff --git a/guava/src/com/google/common/base/StandardSystemProperty.java b/guava/src/com/google/common/base/StandardSystemProperty.java index d3dbdaf979b4..29f62a28eff2 100644 --- a/guava/src/com/google/common/base/StandardSystemProperty.java +++ b/guava/src/com/google/common/base/StandardSystemProperty.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Represents a {@linkplain System#getProperties() standard system property}. diff --git a/guava/src/com/google/common/base/Strings.java b/guava/src/com/google/common/base/Strings.java index a91fae760893..c70427cdb15b 100644 --- a/guava/src/com/google/common/base/Strings.java +++ b/guava/src/com/google/common/base/Strings.java @@ -24,7 +24,7 @@ import com.google.errorprone.annotations.InlineMe; import com.google.errorprone.annotations.InlineMeValidationDisabled; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code String} or {@code CharSequence} instances. diff --git a/guava/src/com/google/common/base/Supplier.java b/guava/src/com/google/common/base/Supplier.java index 5a4b0f4204a5..041141338602 100644 --- a/guava/src/com/google/common/base/Supplier.java +++ b/guava/src/com/google/common/base/Supplier.java @@ -15,7 +15,7 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Legacy version of {@link java.util.function.Supplier java.util.function.Supplier}. Semantically, diff --git a/guava/src/com/google/common/base/Suppliers.java b/guava/src/com/google/common/base/Suppliers.java index 570eb8868f90..32b9fec0a92f 100644 --- a/guava/src/com/google/common/base/Suppliers.java +++ b/guava/src/com/google/common/base/Suppliers.java @@ -28,7 +28,7 @@ import java.io.Serializable; import java.time.Duration; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Useful suppliers. diff --git a/guava/src/com/google/common/base/Throwables.java b/guava/src/com/google/common/base/Throwables.java index a6f1ab64fdd5..1ac398a8f8c7 100644 --- a/guava/src/com/google/common/base/Throwables.java +++ b/guava/src/com/google/common/base/Throwables.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to instances of {@link Throwable}. diff --git a/guava/src/com/google/common/base/Verify.java b/guava/src/com/google/common/base/Verify.java index 6c7ea3787da9..5ff06d11fead 100644 --- a/guava/src/com/google/common/base/Verify.java +++ b/guava/src/com/google/common/base/Verify.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static convenience methods that serve the same purpose as Java language } backed by an instance of {@code Map}. diff --git a/guava/src/com/google/common/collect/AbstractMapEntry.java b/guava/src/com/google/common/collect/AbstractMapEntry.java index 014899c897a9..6b87b90b1641 100644 --- a/guava/src/com/google/common/collect/AbstractMapEntry.java +++ b/guava/src/com/google/common/collect/AbstractMapEntry.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of the {@code equals}, {@code hashCode}, and {@code toString} methods of {@code diff --git a/guava/src/com/google/common/collect/AbstractMultimap.java b/guava/src/com/google/common/collect/AbstractMultimap.java index 742ced4bd695..69364132932e 100644 --- a/guava/src/com/google/common/collect/AbstractMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMultimap.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeleton {@code Multimap} implementation, not necessarily in terms of a {@code Map}. diff --git a/guava/src/com/google/common/collect/AbstractMultiset.java b/guava/src/com/google/common/collect/AbstractMultiset.java index da1cc909dc47..55848b24b496 100644 --- a/guava/src/com/google/common/collect/AbstractMultiset.java +++ b/guava/src/com/google/common/collect/AbstractMultiset.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@link Multiset} interface. A new multiset diff --git a/guava/src/com/google/common/collect/AbstractNavigableMap.java b/guava/src/com/google/common/collect/AbstractNavigableMap.java index d1a17f163311..ef2f20b04fa4 100644 --- a/guava/src/com/google/common/collect/AbstractNavigableMap.java +++ b/guava/src/com/google/common/collect/AbstractNavigableMap.java @@ -24,7 +24,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.SortedMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Skeletal implementation of {@link NavigableMap}. diff --git a/guava/src/com/google/common/collect/AbstractRangeSet.java b/guava/src/com/google/common/collect/AbstractRangeSet.java index d78fadc3b6ea..4b57bfc464f6 100644 --- a/guava/src/com/google/common/collect/AbstractRangeSet.java +++ b/guava/src/com/google/common/collect/AbstractRangeSet.java @@ -15,7 +15,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeletal implementation of {@code RangeSet}. diff --git a/guava/src/com/google/common/collect/AbstractSequentialIterator.java b/guava/src/com/google/common/collect/AbstractSequentialIterator.java index 2a5cef39e82d..8c2d24be124b 100644 --- a/guava/src/com/google/common/collect/AbstractSequentialIterator.java +++ b/guava/src/com/google/common/collect/AbstractSequentialIterator.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@code Iterator} interface for sequences diff --git a/guava/src/com/google/common/collect/AbstractSetMultimap.java b/guava/src/com/google/common/collect/AbstractSetMultimap.java index 9c9a7e03498c..afb34e96de29 100644 --- a/guava/src/com/google/common/collect/AbstractSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSetMultimap.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic implementation of the {@link SetMultimap} interface. It's a wrapper around {@link diff --git a/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java b/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java index 70a1744ea143..b07e226df411 100644 --- a/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic implementation of a {@link SortedSetMultimap} with a sorted key set. diff --git a/guava/src/com/google/common/collect/AbstractSortedMultiset.java b/guava/src/com/google/common/collect/AbstractSortedMultiset.java index 927098fe4f7d..27ab0dd4213e 100644 --- a/guava/src/com/google/common/collect/AbstractSortedMultiset.java +++ b/guava/src/com/google/common/collect/AbstractSortedMultiset.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.NavigableSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of the {@link SortedMultiset} interface. diff --git a/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java b/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java index 3617674ffc5d..b137973f87ec 100644 --- a/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.NavigableSet; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Basic implementation of the {@link SortedSetMultimap} interface. It's a wrapper around {@link diff --git a/guava/src/com/google/common/collect/AbstractTable.java b/guava/src/com/google/common/collect/AbstractTable.java index 88bf89340a65..6371ee89cc8c 100644 --- a/guava/src/com/google/common/collect/AbstractTable.java +++ b/guava/src/com/google/common/collect/AbstractTable.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.Spliterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Skeletal, implementation-agnostic implementation of the {@link Table} interface. diff --git a/guava/src/com/google/common/collect/AllEqualOrdering.java b/guava/src/com/google/common/collect/AllEqualOrdering.java index 8f9312d7f4d8..9ac88ca94923 100644 --- a/guava/src/com/google/common/collect/AllEqualOrdering.java +++ b/guava/src/com/google/common/collect/AllEqualOrdering.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An ordering that treats all references as equals, even nulls. diff --git a/guava/src/com/google/common/collect/ArrayListMultimap.java b/guava/src/com/google/common/collect/ArrayListMultimap.java index a5cf81928c65..d6b3919e6eae 100644 --- a/guava/src/com/google/common/collect/ArrayListMultimap.java +++ b/guava/src/com/google/common/collect/ArrayListMultimap.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Multimap} that uses an {@code ArrayList} to store the values for a given diff --git a/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java b/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java index 4b12ebf6ed9a..6d0eef163409 100644 --- a/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java +++ b/guava/src/com/google/common/collect/ArrayListMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A dummy superclass to support GWT serialization of the element types of an {@link diff --git a/guava/src/com/google/common/collect/ArrayTable.java b/guava/src/com/google/common/collect/ArrayTable.java index 10f3e1e8e3e6..1fe2771b8c96 100644 --- a/guava/src/com/google/common/collect/ArrayTable.java +++ b/guava/src/com/google/common/collect/ArrayTable.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.Set; import java.util.Spliterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Fixed-size {@link Table} implementation backed by a two-dimensional array. diff --git a/guava/src/com/google/common/collect/BiMap.java b/guava/src/com/google/common/collect/BiMap.java index 192b4ad48706..9adbff493fad 100644 --- a/guava/src/com/google/common/collect/BiMap.java +++ b/guava/src/com/google/common/collect/BiMap.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A bimap (or "bidirectional map") is a map that preserves the uniqueness of its values as well as diff --git a/guava/src/com/google/common/collect/ByFunctionOrdering.java b/guava/src/com/google/common/collect/ByFunctionOrdering.java index 4d9abeb7cfbf..e21cfbca6c60 100644 --- a/guava/src/com/google/common/collect/ByFunctionOrdering.java +++ b/guava/src/com/google/common/collect/ByFunctionOrdering.java @@ -22,7 +22,7 @@ import com.google.common.base.Function; import com.google.common.base.Objects; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An ordering that orders elements by applying an order to the result of a function on those diff --git a/guava/src/com/google/common/collect/CartesianList.java b/guava/src/com/google/common/collect/CartesianList.java index eeabdf9a310d..8150370afd04 100644 --- a/guava/src/com/google/common/collect/CartesianList.java +++ b/guava/src/com/google/common/collect/CartesianList.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.ListIterator; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Lists#cartesianProduct(List)}. diff --git a/guava/src/com/google/common/collect/ClassToInstanceMap.java b/guava/src/com/google/common/collect/ClassToInstanceMap.java index e256ccd58b9f..12c8ee32a346 100644 --- a/guava/src/com/google/common/collect/ClassToInstanceMap.java +++ b/guava/src/com/google/common/collect/ClassToInstanceMap.java @@ -20,8 +20,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotMock; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A map, each entry of which maps a Java raw type to an diff --git a/guava/src/com/google/common/collect/CollectCollectors.java b/guava/src/com/google/common/collect/CollectCollectors.java index feba2d4f9d97..a18c7f724f4b 100644 --- a/guava/src/com/google/common/collect/CollectCollectors.java +++ b/guava/src/com/google/common/collect/CollectCollectors.java @@ -36,7 +36,7 @@ import java.util.function.ToIntFunction; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Collectors utilities for {@code common.collect} internals. */ @GwtCompatible diff --git a/guava/src/com/google/common/collect/CollectSpliterators.java b/guava/src/com/google/common/collect/CollectSpliterators.java index d33db58fd773..dcd84b02f71a 100644 --- a/guava/src/com/google/common/collect/CollectSpliterators.java +++ b/guava/src/com/google/common/collect/CollectSpliterators.java @@ -33,7 +33,7 @@ import java.util.function.LongConsumer; import java.util.function.Predicate; import java.util.stream.IntStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Spliterator utilities for {@code common.collect} internals. */ @GwtCompatible diff --git a/guava/src/com/google/common/collect/Collections2.java b/guava/src/com/google/common/collect/Collections2.java index b7bbf808a80b..bcfa525e33e6 100644 --- a/guava/src/com/google/common/collect/Collections2.java +++ b/guava/src/com/google/common/collect/Collections2.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods for working with {@code Collection} instances. diff --git a/guava/src/com/google/common/collect/CompactHashMap.java b/guava/src/com/google/common/collect/CompactHashMap.java index 3413c3ad0fe3..53885deb1f16 100644 --- a/guava/src/com/google/common/collect/CompactHashMap.java +++ b/guava/src/com/google/common/collect/CompactHashMap.java @@ -54,7 +54,7 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactHashMap is an implementation of a Map. All optional operations (put and remove) are diff --git a/guava/src/com/google/common/collect/CompactHashSet.java b/guava/src/com/google/common/collect/CompactHashSet.java index 08c7df04548d..6dc59b9b4a69 100644 --- a/guava/src/com/google/common/collect/CompactHashSet.java +++ b/guava/src/com/google/common/collect/CompactHashSet.java @@ -48,7 +48,7 @@ import java.util.Spliterator; import java.util.Spliterators; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactHashSet is an implementation of a Set. All optional operations (adding and removing) are diff --git a/guava/src/com/google/common/collect/CompactHashing.java b/guava/src/com/google/common/collect/CompactHashing.java index 5436574bb846..67ec6b5cffac 100644 --- a/guava/src/com/google/common/collect/CompactHashing.java +++ b/guava/src/com/google/common/collect/CompactHashing.java @@ -22,7 +22,7 @@ import com.google.common.base.Objects; import com.google.common.primitives.Ints; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper classes and static methods for implementing compact hash-based collections. diff --git a/guava/src/com/google/common/collect/CompactLinkedHashMap.java b/guava/src/com/google/common/collect/CompactLinkedHashMap.java index 65aefeb37668..6ab36e1e0495 100644 --- a/guava/src/com/google/common/collect/CompactLinkedHashMap.java +++ b/guava/src/com/google/common/collect/CompactLinkedHashMap.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactLinkedHashMap is an implementation of a Map with insertion or LRU iteration order, diff --git a/guava/src/com/google/common/collect/CompactLinkedHashSet.java b/guava/src/com/google/common/collect/CompactLinkedHashSet.java index 39a5d9ffaddb..62d3601a8515 100644 --- a/guava/src/com/google/common/collect/CompactLinkedHashSet.java +++ b/guava/src/com/google/common/collect/CompactLinkedHashSet.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * CompactLinkedHashSet is an implementation of a Set, which a predictable iteration order that diff --git a/guava/src/com/google/common/collect/ComparatorOrdering.java b/guava/src/com/google/common/collect/ComparatorOrdering.java index 6e2dc19b9a24..7e4fa25b63b4 100644 --- a/guava/src/com/google/common/collect/ComparatorOrdering.java +++ b/guava/src/com/google/common/collect/ComparatorOrdering.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering for a pre-existing comparator. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/Comparators.java b/guava/src/com/google/common/collect/Comparators.java index 4cf35fcd71e6..9eb68ce1ac94 100644 --- a/guava/src/com/google/common/collect/Comparators.java +++ b/guava/src/com/google/common/collect/Comparators.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods for working with {@link Comparator} instances. For many other helpful diff --git a/guava/src/com/google/common/collect/ComparisonChain.java b/guava/src/com/google/common/collect/ComparisonChain.java index f54704c7f717..77f709389bea 100644 --- a/guava/src/com/google/common/collect/ComparisonChain.java +++ b/guava/src/com/google/common/collect/ComparisonChain.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.primitives.Booleans; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A utility for performing a chained comparison statement. Note: Java 8+ users should diff --git a/guava/src/com/google/common/collect/CompoundOrdering.java b/guava/src/com/google/common/collect/CompoundOrdering.java index 6d9f74b2368d..7008d229502b 100644 --- a/guava/src/com/google/common/collect/CompoundOrdering.java +++ b/guava/src/com/google/common/collect/CompoundOrdering.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that tries several comparators in order. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/ComputationException.java b/guava/src/com/google/common/collect/ComputationException.java index df8d37799077..4c0b261df0df 100644 --- a/guava/src/com/google/common/collect/ComputationException.java +++ b/guava/src/com/google/common/collect/ComputationException.java @@ -17,7 +17,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Wraps an exception that occurred during a computation. diff --git a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index e28be6b8a54c..ce1ad289f8b6 100644 --- a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -45,7 +45,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; /** * A multiset that supports concurrent modifications and that provides atomic versions of most diff --git a/guava/src/com/google/common/collect/ConsumingQueueIterator.java b/guava/src/com/google/common/collect/ConsumingQueueIterator.java index 49beb86ccd6e..847229e6a299 100644 --- a/guava/src/com/google/common/collect/ConsumingQueueIterator.java +++ b/guava/src/com/google/common/collect/ConsumingQueueIterator.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An Iterator implementation which draws elements from a queue, removing them from the queue as it diff --git a/guava/src/com/google/common/collect/Count.java b/guava/src/com/google/common/collect/Count.java index e2da82a36144..fa01412d9c54 100644 --- a/guava/src/com/google/common/collect/Count.java +++ b/guava/src/com/google/common/collect/Count.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A mutable value of type {@code int}, for multisets to use in tracking counts of values. diff --git a/guava/src/com/google/common/collect/Cut.java b/guava/src/com/google/common/collect/Cut.java index 3d323b00fb24..241f369d1d06 100644 --- a/guava/src/com/google/common/collect/Cut.java +++ b/guava/src/com/google/common/collect/Cut.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation detail for the internal structure of {@link Range} instances. Represents a unique diff --git a/guava/src/com/google/common/collect/DenseImmutableTable.java b/guava/src/com/google/common/collect/DenseImmutableTable.java index f2b8cc502a21..42fdeebeeae6 100644 --- a/guava/src/com/google/common/collect/DenseImmutableTable.java +++ b/guava/src/com/google/common/collect/DenseImmutableTable.java @@ -24,7 +24,7 @@ import com.google.errorprone.annotations.Immutable; import com.google.j2objc.annotations.WeakOuter; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A {@code RegularImmutableTable} optimized for dense data. */ @GwtCompatible diff --git a/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java b/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java index b9742a97b998..a5fec75bce63 100644 --- a/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/DescendingImmutableSortedMultiset.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A descending wrapper around an {@code ImmutableSortedMultiset} diff --git a/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java b/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java index c69590a7d22f..4a13415c540b 100644 --- a/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java +++ b/guava/src/com/google/common/collect/DescendingImmutableSortedSet.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Skeletal implementation of {@link ImmutableSortedSet#descendingSet()}. diff --git a/guava/src/com/google/common/collect/DescendingMultiset.java b/guava/src/com/google/common/collect/DescendingMultiset.java index a37c7c9583ba..146fac334494 100644 --- a/guava/src/com/google/common/collect/DescendingMultiset.java +++ b/guava/src/com/google/common/collect/DescendingMultiset.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.NavigableSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A skeleton implementation of a descending multiset. Only needs {@code forwardMultiset()} and diff --git a/guava/src/com/google/common/collect/DiscreteDomain.java b/guava/src/com/google/common/collect/DiscreteDomain.java index 1747179063a1..873c64a6f8c7 100644 --- a/guava/src/com/google/common/collect/DiscreteDomain.java +++ b/guava/src/com/google/common/collect/DiscreteDomain.java @@ -25,7 +25,7 @@ import java.io.Serializable; import java.math.BigInteger; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A descriptor for a discrete {@code Comparable} domain such as all {@link Integer} diff --git a/guava/src/com/google/common/collect/EmptyContiguousSet.java b/guava/src/com/google/common/collect/EmptyContiguousSet.java index 049d86a19fb1..1ce608eeff15 100644 --- a/guava/src/com/google/common/collect/EmptyContiguousSet.java +++ b/guava/src/com/google/common/collect/EmptyContiguousSet.java @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An empty contiguous set. diff --git a/guava/src/com/google/common/collect/EnumHashBiMap.java b/guava/src/com/google/common/collect/EnumHashBiMap.java index 6b27b5df37c6..54f7dc12b2b8 100644 --- a/guava/src/com/google/common/collect/EnumHashBiMap.java +++ b/guava/src/com/google/common/collect/EnumHashBiMap.java @@ -29,7 +29,7 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code BiMap} backed by an {@code EnumMap} instance for keys-to-values, and a {@code HashMap} diff --git a/guava/src/com/google/common/collect/EnumMultiset.java b/guava/src/com/google/common/collect/EnumMultiset.java index b1613946b1d3..6da9df66ac7c 100644 --- a/guava/src/com/google/common/collect/EnumMultiset.java +++ b/guava/src/com/google/common/collect/EnumMultiset.java @@ -33,7 +33,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.function.ObjIntConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Multiset implementation specialized for enum elements, supporting all single-element operations diff --git a/guava/src/com/google/common/collect/ExplicitOrdering.java b/guava/src/com/google/common/collect/ExplicitOrdering.java index 526e6e39b425..314c6dcb8da5 100644 --- a/guava/src/com/google/common/collect/ExplicitOrdering.java +++ b/guava/src/com/google/common/collect/ExplicitOrdering.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that compares objects according to a given order. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/FilteredEntryMultimap.java b/guava/src/com/google/common/collect/FilteredEntryMultimap.java index 0141dbbfacdb..c71ad1476dbb 100644 --- a/guava/src/com/google/common/collect/FilteredEntryMultimap.java +++ b/guava/src/com/google/common/collect/FilteredEntryMultimap.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterEntries(Multimap, Predicate)}. diff --git a/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java b/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java index 910f2186b113..c01894aad5ab 100644 --- a/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java +++ b/guava/src/com/google/common/collect/FilteredEntrySetMultimap.java @@ -20,7 +20,7 @@ import com.google.common.base.Predicate; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterEntries(SetMultimap, Predicate)}. diff --git a/guava/src/com/google/common/collect/FilteredKeyListMultimap.java b/guava/src/com/google/common/collect/FilteredKeyListMultimap.java index 196320190506..d7b66a71994b 100644 --- a/guava/src/com/google/common/collect/FilteredKeyListMultimap.java +++ b/guava/src/com/google/common/collect/FilteredKeyListMultimap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Predicate; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterKeys(ListMultimap, Predicate)}. diff --git a/guava/src/com/google/common/collect/FilteredKeyMultimap.java b/guava/src/com/google/common/collect/FilteredKeyMultimap.java index f6c1445edb44..1ca1aa0371e7 100644 --- a/guava/src/com/google/common/collect/FilteredKeyMultimap.java +++ b/guava/src/com/google/common/collect/FilteredKeyMultimap.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterKeys(Multimap, Predicate)}. diff --git a/guava/src/com/google/common/collect/FilteredKeySetMultimap.java b/guava/src/com/google/common/collect/FilteredKeySetMultimap.java index 4f20fbe45425..58c473c9846b 100644 --- a/guava/src/com/google/common/collect/FilteredKeySetMultimap.java +++ b/guava/src/com/google/common/collect/FilteredKeySetMultimap.java @@ -20,7 +20,7 @@ import com.google.common.base.Predicate; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimaps#filterKeys(SetMultimap, Predicate)}. diff --git a/guava/src/com/google/common/collect/FilteredMultimap.java b/guava/src/com/google/common/collect/FilteredMultimap.java index 29b4dd1fd7e5..173302e29b5f 100644 --- a/guava/src/com/google/common/collect/FilteredMultimap.java +++ b/guava/src/com/google/common/collect/FilteredMultimap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Predicate; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An interface for all filtered multimap types. diff --git a/guava/src/com/google/common/collect/FilteredMultimapValues.java b/guava/src/com/google/common/collect/FilteredMultimapValues.java index 723842e6aaa9..b39dd9a8802f 100644 --- a/guava/src/com/google/common/collect/FilteredMultimapValues.java +++ b/guava/src/com/google/common/collect/FilteredMultimapValues.java @@ -28,7 +28,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation for {@link FilteredMultimap#values()}. diff --git a/guava/src/com/google/common/collect/FilteredSetMultimap.java b/guava/src/com/google/common/collect/FilteredSetMultimap.java index f858af50bc3c..7737377ea202 100644 --- a/guava/src/com/google/common/collect/FilteredSetMultimap.java +++ b/guava/src/com/google/common/collect/FilteredSetMultimap.java @@ -17,7 +17,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A supertype for filtered {@link SetMultimap} implementations. diff --git a/guava/src/com/google/common/collect/FluentIterable.java b/guava/src/com/google/common/collect/FluentIterable.java index 979532e1ae14..f57a449ec7d8 100644 --- a/guava/src/com/google/common/collect/FluentIterable.java +++ b/guava/src/com/google/common/collect/FluentIterable.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.SortedSet; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A discouraged (but not deprecated) precursor to Java's superior {@link Stream} library. diff --git a/guava/src/com/google/common/collect/ForwardingBlockingDeque.java b/guava/src/com/google/common/collect/ForwardingBlockingDeque.java index 81ec95a1992c..4be9c3072dff 100644 --- a/guava/src/com/google/common/collect/ForwardingBlockingDeque.java +++ b/guava/src/com/google/common/collect/ForwardingBlockingDeque.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.concurrent.BlockingDeque; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BlockingDeque} which forwards all its method calls to another {@code BlockingDeque}. diff --git a/guava/src/com/google/common/collect/ForwardingCollection.java b/guava/src/com/google/common/collect/ForwardingCollection.java index 4ef3d83d6d41..45cb5a86c0f8 100644 --- a/guava/src/com/google/common/collect/ForwardingCollection.java +++ b/guava/src/com/google/common/collect/ForwardingCollection.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collection; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection which forwards all its method calls to another collection. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java index 55f2a096115c..ef6893c03732 100644 --- a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java +++ b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.concurrent.ConcurrentMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A concurrent map which forwards all its method calls to another concurrent map. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingDeque.java b/guava/src/com/google/common/collect/ForwardingDeque.java index 362c3354749f..33663142d773 100644 --- a/guava/src/com/google/common/collect/ForwardingDeque.java +++ b/guava/src/com/google/common/collect/ForwardingDeque.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Deque; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A deque which forwards all its method calls to another deque. Subclasses should override one or diff --git a/guava/src/com/google/common/collect/ForwardingIterator.java b/guava/src/com/google/common/collect/ForwardingIterator.java index 0924bbdfe293..47449aa6207a 100644 --- a/guava/src/com/google/common/collect/ForwardingIterator.java +++ b/guava/src/com/google/common/collect/ForwardingIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator which forwards all its method calls to another iterator. Subclasses should override diff --git a/guava/src/com/google/common/collect/ForwardingList.java b/guava/src/com/google/common/collect/ForwardingList.java index 03021703850a..eae6d3e8a06b 100644 --- a/guava/src/com/google/common/collect/ForwardingList.java +++ b/guava/src/com/google/common/collect/ForwardingList.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A list which forwards all its method calls to another list. Subclasses should override one or diff --git a/guava/src/com/google/common/collect/ForwardingListIterator.java b/guava/src/com/google/common/collect/ForwardingListIterator.java index 2fdc88570542..5b2518c23c09 100644 --- a/guava/src/com/google/common/collect/ForwardingListIterator.java +++ b/guava/src/com/google/common/collect/ForwardingListIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.ListIterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A list iterator which forwards all its method calls to another list iterator. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingListMultimap.java b/guava/src/com/google/common/collect/ForwardingListMultimap.java index 63d4727bb25f..5ba9b978d160 100644 --- a/guava/src/com/google/common/collect/ForwardingListMultimap.java +++ b/guava/src/com/google/common/collect/ForwardingListMultimap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A list multimap which forwards all its method calls to another list multimap. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingMap.java b/guava/src/com/google/common/collect/ForwardingMap.java index 81213c427a3c..b1d8bfc866ef 100644 --- a/guava/src/com/google/common/collect/ForwardingMap.java +++ b/guava/src/com/google/common/collect/ForwardingMap.java @@ -23,7 +23,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; /** * A map which forwards all its method calls to another map. Subclasses should override one or more diff --git a/guava/src/com/google/common/collect/ForwardingMapEntry.java b/guava/src/com/google/common/collect/ForwardingMapEntry.java index 0afd866ada2c..001af42de011 100644 --- a/guava/src/com/google/common/collect/ForwardingMapEntry.java +++ b/guava/src/com/google/common/collect/ForwardingMapEntry.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Map; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A map entry which forwards all its method calls to another map entry. Subclasses should override diff --git a/guava/src/com/google/common/collect/ForwardingMultimap.java b/guava/src/com/google/common/collect/ForwardingMultimap.java index c71ce6513311..98edd44b9b41 100644 --- a/guava/src/com/google/common/collect/ForwardingMultimap.java +++ b/guava/src/com/google/common/collect/ForwardingMultimap.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A multimap which forwards all its method calls to another multimap. Subclasses should override diff --git a/guava/src/com/google/common/collect/ForwardingMultiset.java b/guava/src/com/google/common/collect/ForwardingMultiset.java index 06404d0f3cf6..5c59b5ab4302 100644 --- a/guava/src/com/google/common/collect/ForwardingMultiset.java +++ b/guava/src/com/google/common/collect/ForwardingMultiset.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A multiset which forwards all its method calls to another multiset. Subclasses should override diff --git a/guava/src/com/google/common/collect/ForwardingNavigableMap.java b/guava/src/com/google/common/collect/ForwardingNavigableMap.java index 064818699f78..03339898d946 100644 --- a/guava/src/com/google/common/collect/ForwardingNavigableMap.java +++ b/guava/src/com/google/common/collect/ForwardingNavigableMap.java @@ -25,7 +25,7 @@ import java.util.NoSuchElementException; import java.util.SortedMap; import java.util.function.BiFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A navigable map which forwards all its method calls to another navigable map. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingNavigableSet.java b/guava/src/com/google/common/collect/ForwardingNavigableSet.java index b43442301849..8cf8286325ce 100644 --- a/guava/src/com/google/common/collect/ForwardingNavigableSet.java +++ b/guava/src/com/google/common/collect/ForwardingNavigableSet.java @@ -20,7 +20,7 @@ import java.util.Iterator; import java.util.NavigableSet; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A navigable set which forwards all its method calls to another navigable set. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingQueue.java b/guava/src/com/google/common/collect/ForwardingQueue.java index 673095ceac83..8fbe467a07eb 100644 --- a/guava/src/com/google/common/collect/ForwardingQueue.java +++ b/guava/src/com/google/common/collect/ForwardingQueue.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.NoSuchElementException; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A queue which forwards all its method calls to another queue. Subclasses should override one or diff --git a/guava/src/com/google/common/collect/ForwardingSet.java b/guava/src/com/google/common/collect/ForwardingSet.java index 96825fe1c88a..6a2444402102 100644 --- a/guava/src/com/google/common/collect/ForwardingSet.java +++ b/guava/src/com/google/common/collect/ForwardingSet.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A set which forwards all its method calls to another set. Subclasses should override one or more diff --git a/guava/src/com/google/common/collect/ForwardingSetMultimap.java b/guava/src/com/google/common/collect/ForwardingSetMultimap.java index b6e604351c2c..84876397917d 100644 --- a/guava/src/com/google/common/collect/ForwardingSetMultimap.java +++ b/guava/src/com/google/common/collect/ForwardingSetMultimap.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A set multimap which forwards all its method calls to another set multimap. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingSortedMap.java b/guava/src/com/google/common/collect/ForwardingSortedMap.java index f10927f6cf3c..5f2b4078f5c8 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedMap.java +++ b/guava/src/com/google/common/collect/ForwardingSortedMap.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.NoSuchElementException; import java.util.SortedMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A sorted map which forwards all its method calls to another sorted map. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingSortedMultiset.java b/guava/src/com/google/common/collect/ForwardingSortedMultiset.java index eac30a1bb245..18d3c61d1554 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedMultiset.java +++ b/guava/src/com/google/common/collect/ForwardingSortedMultiset.java @@ -18,7 +18,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.NavigableSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A sorted multiset which forwards all its method calls to another sorted multiset. Subclasses diff --git a/guava/src/com/google/common/collect/ForwardingSortedSet.java b/guava/src/com/google/common/collect/ForwardingSortedSet.java index 473e5f59bb6d..00bc8412c626 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedSet.java +++ b/guava/src/com/google/common/collect/ForwardingSortedSet.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A sorted set which forwards all its method calls to another sorted set. Subclasses should diff --git a/guava/src/com/google/common/collect/ForwardingSortedSetMultimap.java b/guava/src/com/google/common/collect/ForwardingSortedSetMultimap.java index 2ab891500986..ff405066f856 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedSetMultimap.java +++ b/guava/src/com/google/common/collect/ForwardingSortedSetMultimap.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A sorted set multimap which forwards all its method calls to another sorted set multimap. diff --git a/guava/src/com/google/common/collect/ForwardingTable.java b/guava/src/com/google/common/collect/ForwardingTable.java index adf728f36652..51f5861b051e 100644 --- a/guava/src/com/google/common/collect/ForwardingTable.java +++ b/guava/src/com/google/common/collect/ForwardingTable.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A table which forwards all its method calls to another table. Subclasses should override one or diff --git a/guava/src/com/google/common/collect/GeneralRange.java b/guava/src/com/google/common/collect/GeneralRange.java index 6c99abc5d6e0..69bd0695563f 100644 --- a/guava/src/com/google/common/collect/GeneralRange.java +++ b/guava/src/com/google/common/collect/GeneralRange.java @@ -25,7 +25,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; import java.util.Comparator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A generalized interval on any ordering, for internal use. Supports {@code null}. Unlike {@link diff --git a/guava/src/com/google/common/collect/HashBiMap.java b/guava/src/com/google/common/collect/HashBiMap.java index 06273bf64602..733c64a9de52 100644 --- a/guava/src/com/google/common/collect/HashBiMap.java +++ b/guava/src/com/google/common/collect/HashBiMap.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.function.BiConsumer; import java.util.function.BiFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BiMap} backed by two hash tables. This implementation allows null keys and values. A diff --git a/guava/src/com/google/common/collect/HashMultimap.java b/guava/src/com/google/common/collect/HashMultimap.java index 5183823a3307..785cebe8baf0 100644 --- a/guava/src/com/google/common/collect/HashMultimap.java +++ b/guava/src/com/google/common/collect/HashMultimap.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multimap} using hash tables. diff --git a/guava/src/com/google/common/collect/HashMultimapGwtSerializationDependencies.java b/guava/src/com/google/common/collect/HashMultimapGwtSerializationDependencies.java index e46fa7ddd6b1..66ec054ec575 100644 --- a/guava/src/com/google/common/collect/HashMultimapGwtSerializationDependencies.java +++ b/guava/src/com/google/common/collect/HashMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A dummy superclass to support GWT serialization of the element types of a {@link HashMultimap}. diff --git a/guava/src/com/google/common/collect/HashMultiset.java b/guava/src/com/google/common/collect/HashMultiset.java index f758f8049c74..55cf8ba90172 100644 --- a/guava/src/com/google/common/collect/HashMultiset.java +++ b/guava/src/com/google/common/collect/HashMultiset.java @@ -23,7 +23,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.HashMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Multiset implementation backed by a {@link HashMap}. diff --git a/guava/src/com/google/common/collect/Hashing.java b/guava/src/com/google/common/collect/Hashing.java index 0e8fb5e0109e..1ea3af1c91d8 100644 --- a/guava/src/com/google/common/collect/Hashing.java +++ b/guava/src/com/google/common/collect/Hashing.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.primitives.Ints; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static methods for implementing hash-based collections. diff --git a/guava/src/com/google/common/collect/ImmutableAsList.java b/guava/src/com/google/common/collect/ImmutableAsList.java index a66cdda541d2..2edaab740a6b 100644 --- a/guava/src/com/google/common/collect/ImmutableAsList.java +++ b/guava/src/com/google/common/collect/ImmutableAsList.java @@ -22,7 +22,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * List returned by {@link ImmutableCollection#asList} that delegates {@code contains} checks to the diff --git a/guava/src/com/google/common/collect/ImmutableBiMap.java b/guava/src/com/google/common/collect/ImmutableBiMap.java index 7a82fdfbaf77..c5df8d646f20 100644 --- a/guava/src/com/google/common/collect/ImmutableBiMap.java +++ b/guava/src/com/google/common/collect/ImmutableBiMap.java @@ -35,7 +35,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Collectors; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BiMap} whose contents will never change, with many other important properties detailed diff --git a/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java b/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java index 27fb4a4ec8eb..f93a47969eff 100644 --- a/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java +++ b/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java @@ -25,8 +25,8 @@ import com.google.errorprone.annotations.Immutable; import java.io.Serializable; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A {@link ClassToInstanceMap} whose contents will never change, with many other important diff --git a/guava/src/com/google/common/collect/ImmutableCollection.java b/guava/src/com/google/common/collect/ImmutableCollection.java index c0842cdd855c..131875331c2f 100644 --- a/guava/src/com/google/common/collect/ImmutableCollection.java +++ b/guava/src/com/google/common/collect/ImmutableCollection.java @@ -36,7 +36,7 @@ import java.util.Spliterator; import java.util.Spliterators; import java.util.function.Predicate; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Collection} whose contents will never change, and which offers a few additional diff --git a/guava/src/com/google/common/collect/ImmutableEntry.java b/guava/src/com/google/common/collect/ImmutableEntry.java index 4685f2a8375c..2dbcc75f44a9 100644 --- a/guava/src/com/google/common/collect/ImmutableEntry.java +++ b/guava/src/com/google/common/collect/ImmutableEntry.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable {@code Map.Entry}, used both by {@link diff --git a/guava/src/com/google/common/collect/ImmutableEnumMap.java b/guava/src/com/google/common/collect/ImmutableEnumMap.java index 2ffd53cfce32..bf6ec82521c3 100644 --- a/guava/src/com/google/common/collect/ImmutableEnumMap.java +++ b/guava/src/com/google/common/collect/ImmutableEnumMap.java @@ -28,7 +28,7 @@ import java.util.EnumMap; import java.util.Spliterator; import java.util.function.BiConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableMap} backed by a non-empty {@link java.util.EnumMap}. diff --git a/guava/src/com/google/common/collect/ImmutableEnumSet.java b/guava/src/com/google/common/collect/ImmutableEnumSet.java index 10afb731f275..4527754b0083 100644 --- a/guava/src/com/google/common/collect/ImmutableEnumSet.java +++ b/guava/src/com/google/common/collect/ImmutableEnumSet.java @@ -28,7 +28,7 @@ import java.util.EnumSet; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableSet} backed by a non-empty {@link java.util.EnumSet}. diff --git a/guava/src/com/google/common/collect/ImmutableList.java b/guava/src/com/google/common/collect/ImmutableList.java index 00178592cb26..f7f7d1e39055 100644 --- a/guava/src/com/google/common/collect/ImmutableList.java +++ b/guava/src/com/google/common/collect/ImmutableList.java @@ -46,7 +46,7 @@ import java.util.function.Consumer; import java.util.function.UnaryOperator; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link List} whose contents will never change, with many other important properties detailed at diff --git a/guava/src/com/google/common/collect/ImmutableListMultimap.java b/guava/src/com/google/common/collect/ImmutableListMultimap.java index 4d77cf79cb4b..23c9407cd183 100644 --- a/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -37,7 +37,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListMultimap} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java index abb2dcc6bd24..1c7e16e233a6 100644 --- a/guava/src/com/google/common/collect/ImmutableMap.java +++ b/guava/src/com/google/common/collect/ImmutableMap.java @@ -55,7 +55,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Collectors; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Map} whose contents will never change, with many other important properties detailed at diff --git a/guava/src/com/google/common/collect/ImmutableMapEntry.java b/guava/src/com/google/common/collect/ImmutableMapEntry.java index 8cb6d2b1d4d1..337befeeb623 100644 --- a/guava/src/com/google/common/collect/ImmutableMapEntry.java +++ b/guava/src/com/google/common/collect/ImmutableMapEntry.java @@ -19,7 +19,7 @@ import static com.google.common.collect.CollectPreconditions.checkEntryNotNull; import com.google.common.annotations.GwtIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Entry} for {@link ImmutableMap} that adds extra methods to traverse hash diff --git a/guava/src/com/google/common/collect/ImmutableMapEntrySet.java b/guava/src/com/google/common/collect/ImmutableMapEntrySet.java index 7df659ce7720..abca823f7ad8 100644 --- a/guava/src/com/google/common/collect/ImmutableMapEntrySet.java +++ b/guava/src/com/google/common/collect/ImmutableMapEntrySet.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@code entrySet()} implementation for {@link ImmutableMap}. diff --git a/guava/src/com/google/common/collect/ImmutableMapKeySet.java b/guava/src/com/google/common/collect/ImmutableMapKeySet.java index 5111ea8ec039..8be15850681c 100644 --- a/guava/src/com/google/common/collect/ImmutableMapKeySet.java +++ b/guava/src/com/google/common/collect/ImmutableMapKeySet.java @@ -24,7 +24,7 @@ import java.io.Serializable; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@code keySet()} implementation for {@link ImmutableMap}. diff --git a/guava/src/com/google/common/collect/ImmutableMapValues.java b/guava/src/com/google/common/collect/ImmutableMapValues.java index ab86f62688dc..bd2ca50e8f4d 100644 --- a/guava/src/com/google/common/collect/ImmutableMapValues.java +++ b/guava/src/com/google/common/collect/ImmutableMapValues.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@code values()} implementation for {@link ImmutableMap}. diff --git a/guava/src/com/google/common/collect/ImmutableMultimap.java b/guava/src/com/google/common/collect/ImmutableMultimap.java index 9b4b28ac76b2..146d87a7dcab 100644 --- a/guava/src/com/google/common/collect/ImmutableMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableMultimap.java @@ -44,7 +44,7 @@ import java.util.Set; import java.util.Spliterator; import java.util.function.BiConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Multimap} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableMultiset.java b/guava/src/com/google/common/collect/ImmutableMultiset.java index 7a01df2aaa30..29169b9aff82 100644 --- a/guava/src/com/google/common/collect/ImmutableMultiset.java +++ b/guava/src/com/google/common/collect/ImmutableMultiset.java @@ -38,7 +38,7 @@ import java.util.function.Function; import java.util.function.ToIntFunction; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Multiset} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableRangeMap.java b/guava/src/com/google/common/collect/ImmutableRangeMap.java index 5eec7bbb5f24..595b3eb3c815 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -37,7 +37,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link RangeMap} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableRangeSet.java b/guava/src/com/google/common/collect/ImmutableRangeSet.java index 87cca5f5d2a0..d2342555394e 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeSet.java +++ b/guava/src/com/google/common/collect/ImmutableRangeSet.java @@ -42,7 +42,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link RangeSet} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableSet.java b/guava/src/com/google/common/collect/ImmutableSet.java index d4746a0574b3..c702de1626b3 100644 --- a/guava/src/com/google/common/collect/ImmutableSet.java +++ b/guava/src/com/google/common/collect/ImmutableSet.java @@ -46,7 +46,7 @@ import java.util.Spliterator; import java.util.function.Consumer; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Set} whose contents will never change, with many other important properties detailed at diff --git a/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/guava/src/com/google/common/collect/ImmutableSetMultimap.java index cd1c10568a8e..2fb8fab747c9 100644 --- a/guava/src/com/google/common/collect/ImmutableSetMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableSetMultimap.java @@ -43,7 +43,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link SetMultimap} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableSortedAsList.java b/guava/src/com/google/common/collect/ImmutableSortedAsList.java index ec3ce2f9ba4e..8e824dff61f0 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedAsList.java +++ b/guava/src/com/google/common/collect/ImmutableSortedAsList.java @@ -19,7 +19,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.util.Comparator; import java.util.Spliterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * List returned by {@code ImmutableSortedSet.asList()} when the set isn't empty. diff --git a/guava/src/com/google/common/collect/ImmutableSortedMap.java b/guava/src/com/google/common/collect/ImmutableSortedMap.java index 2fd54564d097..520b9bf41d66 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -43,7 +43,7 @@ import java.util.function.Function; import java.util.stream.Collector; import java.util.stream.Collectors; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link NavigableMap} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableSortedMultiset.java b/guava/src/com/google/common/collect/ImmutableSortedMultiset.java index 6869f9a99a37..9059ee78f22e 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/ImmutableSortedMultiset.java @@ -34,7 +34,7 @@ import java.util.function.Function; import java.util.function.ToIntFunction; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link SortedMultiset} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableSortedSet.java b/guava/src/com/google/common/collect/ImmutableSortedSet.java index 718925d4a451..649faeb60bbe 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedSet.java +++ b/guava/src/com/google/common/collect/ImmutableSortedSet.java @@ -42,7 +42,7 @@ import java.util.Spliterators; import java.util.function.Consumer; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link NavigableSet} whose contents will never change, with many other important properties diff --git a/guava/src/com/google/common/collect/ImmutableTable.java b/guava/src/com/google/common/collect/ImmutableTable.java index b37c59fd828c..7131c6c0f887 100644 --- a/guava/src/com/google/common/collect/ImmutableTable.java +++ b/guava/src/com/google/common/collect/ImmutableTable.java @@ -38,7 +38,7 @@ import java.util.function.BinaryOperator; import java.util.function.Function; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Table} whose contents will never change, with many other important properties detailed diff --git a/guava/src/com/google/common/collect/IndexedImmutableSet.java b/guava/src/com/google/common/collect/IndexedImmutableSet.java index 6572876d2759..6783559c1923 100644 --- a/guava/src/com/google/common/collect/IndexedImmutableSet.java +++ b/guava/src/com/google/common/collect/IndexedImmutableSet.java @@ -23,7 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) abstract class IndexedImmutableSet extends ImmutableSet.CachingAsList { diff --git a/guava/src/com/google/common/collect/Interners.java b/guava/src/com/google/common/collect/Interners.java index 0ec1b1186c26..93b0b509c4fb 100644 --- a/guava/src/com/google/common/collect/Interners.java +++ b/guava/src/com/google/common/collect/Interners.java @@ -23,7 +23,7 @@ import com.google.common.base.Function; import com.google.common.collect.MapMaker.Dummy; import com.google.common.collect.MapMakerInternalMap.InternalEntry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Contains static methods pertaining to instances of {@link Interner}. diff --git a/guava/src/com/google/common/collect/Iterables.java b/guava/src/com/google/common/collect/Iterables.java index dea6efa8a3ff..37f42995a709 100644 --- a/guava/src/com/google/common/collect/Iterables.java +++ b/guava/src/com/google/common/collect/Iterables.java @@ -38,8 +38,8 @@ import java.util.Spliterator; import java.util.function.Consumer; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * An assortment of mainly legacy static utility methods that operate on or return objects of type diff --git a/guava/src/com/google/common/collect/Iterators.java b/guava/src/com/google/common/collect/Iterators.java index 2d7ab4af6c6c..afbd4ffb660c 100644 --- a/guava/src/com/google/common/collect/Iterators.java +++ b/guava/src/com/google/common/collect/Iterators.java @@ -47,8 +47,8 @@ import java.util.NoSuchElementException; import java.util.PriorityQueue; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * This class contains static utility methods that operate on or return objects of type {@link diff --git a/guava/src/com/google/common/collect/JdkBackedImmutableBiMap.java b/guava/src/com/google/common/collect/JdkBackedImmutableBiMap.java index 35a0ed547503..ed5b7e56bc83 100644 --- a/guava/src/com/google/common/collect/JdkBackedImmutableBiMap.java +++ b/guava/src/com/google/common/collect/JdkBackedImmutableBiMap.java @@ -25,7 +25,7 @@ import com.google.j2objc.annotations.RetainedWith; import com.google.j2objc.annotations.WeakOuter; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of ImmutableBiMap backed by a pair of JDK HashMaps, which have smartness diff --git a/guava/src/com/google/common/collect/JdkBackedImmutableMap.java b/guava/src/com/google/common/collect/JdkBackedImmutableMap.java index e46641cfd9d0..7a30c58fc6ac 100644 --- a/guava/src/com/google/common/collect/JdkBackedImmutableMap.java +++ b/guava/src/com/google/common/collect/JdkBackedImmutableMap.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.BiConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of ImmutableMap backed by a JDK HashMap, which has smartness protecting against diff --git a/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java b/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java index 02f36028f37c..c1ffc97eebd4 100644 --- a/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java +++ b/guava/src/com/google/common/collect/JdkBackedImmutableMultiset.java @@ -23,7 +23,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of ImmutableMultiset backed by a JDK Map and a list of entries. Used to protect diff --git a/guava/src/com/google/common/collect/JdkBackedImmutableSet.java b/guava/src/com/google/common/collect/JdkBackedImmutableSet.java index f06459a561da..6cd73f0a6e12 100644 --- a/guava/src/com/google/common/collect/JdkBackedImmutableSet.java +++ b/guava/src/com/google/common/collect/JdkBackedImmutableSet.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * ImmutableSet implementation backed by a JDK HashSet, used to defend against apparent hash diff --git a/guava/src/com/google/common/collect/LexicographicalOrdering.java b/guava/src/com/google/common/collect/LexicographicalOrdering.java index 50844c66457a..2bbb0f10d9e1 100644 --- a/guava/src/com/google/common/collect/LexicographicalOrdering.java +++ b/guava/src/com/google/common/collect/LexicographicalOrdering.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering which sorts iterables by comparing corresponding elements pairwise. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/LinkedHashMultimap.java b/guava/src/com/google/common/collect/LinkedHashMultimap.java index dfc5b2bb82b2..1e1bc5c82dcc 100644 --- a/guava/src/com/google/common/collect/LinkedHashMultimap.java +++ b/guava/src/com/google/common/collect/LinkedHashMultimap.java @@ -42,7 +42,7 @@ import java.util.Spliterator; import java.util.Spliterators; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Multimap} that does not allow duplicate key-value entries and that diff --git a/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java b/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java index 75e76024e2de..8c91683d19c0 100644 --- a/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java +++ b/guava/src/com/google/common/collect/LinkedHashMultimapGwtSerializationDependencies.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A dummy superclass to support GWT serialization of the element types of a {@link diff --git a/guava/src/com/google/common/collect/LinkedHashMultiset.java b/guava/src/com/google/common/collect/LinkedHashMultiset.java index 76a5f27a0be7..25a0d33b1576 100644 --- a/guava/src/com/google/common/collect/LinkedHashMultiset.java +++ b/guava/src/com/google/common/collect/LinkedHashMultiset.java @@ -23,7 +23,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.LinkedHashMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code Multiset} implementation with predictable iteration order. Its iterator orders elements diff --git a/guava/src/com/google/common/collect/LinkedListMultimap.java b/guava/src/com/google/common/collect/LinkedListMultimap.java index 1715999ab99a..7f4e639a95b4 100644 --- a/guava/src/com/google/common/collect/LinkedListMultimap.java +++ b/guava/src/com/google/common/collect/LinkedListMultimap.java @@ -42,7 +42,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@code ListMultimap} that supports deterministic iteration order for both diff --git a/guava/src/com/google/common/collect/ListMultimap.java b/guava/src/com/google/common/collect/ListMultimap.java index 8052b853e7a5..a530833267f4 100644 --- a/guava/src/com/google/common/collect/ListMultimap.java +++ b/guava/src/com/google/common/collect/ListMultimap.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code Multimap} that can hold duplicate key-value pairs and that maintains the insertion diff --git a/guava/src/com/google/common/collect/Lists.java b/guava/src/com/google/common/collect/Lists.java index e41bd82021f1..443d45d06b72 100644 --- a/guava/src/com/google/common/collect/Lists.java +++ b/guava/src/com/google/common/collect/Lists.java @@ -51,7 +51,7 @@ import java.util.RandomAccess; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Predicate; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link List} instances. Also see this class's counterparts diff --git a/guava/src/com/google/common/collect/MapDifference.java b/guava/src/com/google/common/collect/MapDifference.java index 82f3a4def73f..b8044d070683 100644 --- a/guava/src/com/google/common/collect/MapDifference.java +++ b/guava/src/com/google/common/collect/MapDifference.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotMock; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object representing the differences between two maps. diff --git a/guava/src/com/google/common/collect/MapMaker.java b/guava/src/com/google/common/collect/MapMaker.java index e51edc42684e..a8a0f09e7b7f 100644 --- a/guava/src/com/google/common/collect/MapMaker.java +++ b/guava/src/com/google/common/collect/MapMaker.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A builder of {@link ConcurrentMap} instances that can have keys or values automatically wrapped diff --git a/guava/src/com/google/common/collect/MapMakerInternalMap.java b/guava/src/com/google/common/collect/MapMakerInternalMap.java index c32bff9d96fe..d82fdd6d2547 100644 --- a/guava/src/com/google/common/collect/MapMakerInternalMap.java +++ b/guava/src/com/google/common/collect/MapMakerInternalMap.java @@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.concurrent.locks.ReentrantLock; import org.jspecify.annotations.NullUnmarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The concurrent hash map implementation built by {@link MapMaker}. diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java index e6c94d7162c8..d8f729ab4b56 100644 --- a/guava/src/com/google/common/collect/Maps.java +++ b/guava/src/com/google/common/collect/Maps.java @@ -75,8 +75,8 @@ import java.util.function.BinaryOperator; import java.util.function.Consumer; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Map} instances (including instances of {@link diff --git a/guava/src/com/google/common/collect/MinMaxPriorityQueue.java b/guava/src/com/google/common/collect/MinMaxPriorityQueue.java index 07b6c6dd9beb..d365ffb718a9 100644 --- a/guava/src/com/google/common/collect/MinMaxPriorityQueue.java +++ b/guava/src/com/google/common/collect/MinMaxPriorityQueue.java @@ -45,7 +45,7 @@ import java.util.NoSuchElementException; import java.util.PriorityQueue; import java.util.Queue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A double-ended priority queue, which provides constant-time access to both its least element and diff --git a/guava/src/com/google/common/collect/MoreCollectors.java b/guava/src/com/google/common/collect/MoreCollectors.java index 20ef8ed2d331..776195944aac 100644 --- a/guava/src/com/google/common/collect/MoreCollectors.java +++ b/guava/src/com/google/common/collect/MoreCollectors.java @@ -25,7 +25,7 @@ import java.util.NoSuchElementException; import java.util.Optional; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Collectors not present in {@code java.util.stream.Collectors} that are not otherwise associated diff --git a/guava/src/com/google/common/collect/Multimap.java b/guava/src/com/google/common/collect/Multimap.java index 99ef1b8fdc3f..3209a1b6df93 100644 --- a/guava/src/com/google/common/collect/Multimap.java +++ b/guava/src/com/google/common/collect/Multimap.java @@ -28,7 +28,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.function.BiConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection that maps keys to values, similar to {@link Map}, but in which each key may be diff --git a/guava/src/com/google/common/collect/MultimapBuilder.java b/guava/src/com/google/common/collect/MultimapBuilder.java index 0104cf4f8cb6..8f8da008042c 100644 --- a/guava/src/com/google/common/collect/MultimapBuilder.java +++ b/guava/src/com/google/common/collect/MultimapBuilder.java @@ -34,7 +34,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable builder for {@link Multimap} instances, letting you independently select the desired diff --git a/guava/src/com/google/common/collect/Multimaps.java b/guava/src/com/google/common/collect/Multimaps.java index 0da6017a264d..0e3ee937c669 100644 --- a/guava/src/com/google/common/collect/Multimaps.java +++ b/guava/src/com/google/common/collect/Multimaps.java @@ -56,7 +56,7 @@ import java.util.function.Consumer; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods acting on or generating a {@code Multimap}. diff --git a/guava/src/com/google/common/collect/Multiset.java b/guava/src/com/google/common/collect/Multiset.java index 03e1d6e27a2f..5caadf157017 100644 --- a/guava/src/com/google/common/collect/Multiset.java +++ b/guava/src/com/google/common/collect/Multiset.java @@ -29,7 +29,7 @@ import java.util.Spliterator; import java.util.function.Consumer; import java.util.function.ObjIntConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection that supports order-independent equality, like {@link Set}, but may have duplicate diff --git a/guava/src/com/google/common/collect/Multisets.java b/guava/src/com/google/common/collect/Multisets.java index b9df93cac8da..78e14c5067fe 100644 --- a/guava/src/com/google/common/collect/Multisets.java +++ b/guava/src/com/google/common/collect/Multisets.java @@ -47,7 +47,7 @@ import java.util.function.Supplier; import java.util.function.ToIntFunction; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static utility methods for creating and working with {@link Multiset} instances. diff --git a/guava/src/com/google/common/collect/MutableClassToInstanceMap.java b/guava/src/com/google/common/collect/MutableClassToInstanceMap.java index cac4d029bbf4..c8480e8ea264 100644 --- a/guava/src/com/google/common/collect/MutableClassToInstanceMap.java +++ b/guava/src/com/google/common/collect/MutableClassToInstanceMap.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.Set; import java.util.Spliterator; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A mutable class-to-instance map backed by an arbitrary user-provided map. See also {@link diff --git a/guava/src/com/google/common/collect/NaturalOrdering.java b/guava/src/com/google/common/collect/NaturalOrdering.java index 72721302d99a..8f148748e47b 100644 --- a/guava/src/com/google/common/collect/NaturalOrdering.java +++ b/guava/src/com/google/common/collect/NaturalOrdering.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that uses the natural order of the values. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/NullnessCasts.java b/guava/src/com/google/common/collect/NullnessCasts.java index 884ff51d628f..82bcc2dbeaef 100644 --- a/guava/src/com/google/common/collect/NullnessCasts.java +++ b/guava/src/com/google/common/collect/NullnessCasts.java @@ -15,7 +15,7 @@ package com.google.common.collect; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A utility method to perform unchecked casts to suppress errors produced by nullness analyses. */ @GwtCompatible diff --git a/guava/src/com/google/common/collect/NullsFirstOrdering.java b/guava/src/com/google/common/collect/NullsFirstOrdering.java index 4ee5122dd3d3..b13a55213633 100644 --- a/guava/src/com/google/common/collect/NullsFirstOrdering.java +++ b/guava/src/com/google/common/collect/NullsFirstOrdering.java @@ -18,8 +18,8 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** An ordering that treats {@code null} as less than all other values. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/NullsLastOrdering.java b/guava/src/com/google/common/collect/NullsLastOrdering.java index df4ac0710cb5..3d8c1e9e0ca0 100644 --- a/guava/src/com/google/common/collect/NullsLastOrdering.java +++ b/guava/src/com/google/common/collect/NullsLastOrdering.java @@ -18,8 +18,8 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** An ordering that treats {@code null} as greater than all other values. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/ObjectArrays.java b/guava/src/com/google/common/collect/ObjectArrays.java index c25ebc40bbb0..deba6ffa48e3 100644 --- a/guava/src/com/google/common/collect/ObjectArrays.java +++ b/guava/src/com/google/common/collect/ObjectArrays.java @@ -25,8 +25,8 @@ import java.lang.reflect.Array; import java.util.Arrays; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to object arrays. diff --git a/guava/src/com/google/common/collect/Ordering.java b/guava/src/com/google/common/collect/Ordering.java index f82839961cdf..7338ee85677a 100644 --- a/guava/src/com/google/common/collect/Ordering.java +++ b/guava/src/com/google/common/collect/Ordering.java @@ -43,8 +43,8 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A comparator, with additional methods to support common operations. This is an "enriched" version diff --git a/guava/src/com/google/common/collect/PeekingIterator.java b/guava/src/com/google/common/collect/PeekingIterator.java index bf1e10d9bdde..2c214c1ec809 100644 --- a/guava/src/com/google/common/collect/PeekingIterator.java +++ b/guava/src/com/google/common/collect/PeekingIterator.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.Iterator; import java.util.NoSuchElementException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that supports a one-element lookahead while iterating. diff --git a/guava/src/com/google/common/collect/Platform.java b/guava/src/com/google/common/collect/Platform.java index e87a4fee1fa2..dee8158afe65 100644 --- a/guava/src/com/google/common/collect/Platform.java +++ b/guava/src/com/google/common/collect/Platform.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Methods factored out so that they can be emulated differently in GWT. diff --git a/guava/src/com/google/common/collect/Queues.java b/guava/src/com/google/common/collect/Queues.java index b5631d75f3bf..11e1426e925e 100644 --- a/guava/src/com/google/common/collect/Queues.java +++ b/guava/src/com/google/common/collect/Queues.java @@ -35,7 +35,7 @@ import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Queue} and {@link Deque} instances. Also see this diff --git a/guava/src/com/google/common/collect/Range.java b/guava/src/com/google/common/collect/Range.java index 867d63aa0b29..ad6dfb0c4bf7 100644 --- a/guava/src/com/google/common/collect/Range.java +++ b/guava/src/com/google/common/collect/Range.java @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A range (or "interval") defines the boundaries around a contiguous span of values of some diff --git a/guava/src/com/google/common/collect/RangeMap.java b/guava/src/com/google/common/collect/RangeMap.java index d495a968e0d6..801bdf25e976 100644 --- a/guava/src/com/google/common/collect/RangeMap.java +++ b/guava/src/com/google/common/collect/RangeMap.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.function.BiFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A mapping from disjoint nonempty ranges to non-null values. Queries look up the value associated diff --git a/guava/src/com/google/common/collect/RangeSet.java b/guava/src/com/google/common/collect/RangeSet.java index bcbf4b9d5acb..fb53810b63cc 100644 --- a/guava/src/com/google/common/collect/RangeSet.java +++ b/guava/src/com/google/common/collect/RangeSet.java @@ -18,7 +18,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.NoSuchElementException; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A set comprising zero or more {@linkplain Range#isEmpty nonempty}, {@linkplain diff --git a/guava/src/com/google/common/collect/RegularContiguousSet.java b/guava/src/com/google/common/collect/RegularContiguousSet.java index 896b7960b16a..8732c4eef3d8 100644 --- a/guava/src/com/google/common/collect/RegularContiguousSet.java +++ b/guava/src/com/google/common/collect/RegularContiguousSet.java @@ -27,7 +27,7 @@ import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link ContiguousSet} that contains one or more elements. diff --git a/guava/src/com/google/common/collect/RegularImmutableAsList.java b/guava/src/com/google/common/collect/RegularImmutableAsList.java index ec490069df48..cfc2ea7c535b 100644 --- a/guava/src/com/google/common/collect/RegularImmutableAsList.java +++ b/guava/src/com/google/common/collect/RegularImmutableAsList.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@link ImmutableAsList} implementation specialized for when the delegate collection is already diff --git a/guava/src/com/google/common/collect/RegularImmutableBiMap.java b/guava/src/com/google/common/collect/RegularImmutableBiMap.java index 421377195c50..fbe2f7a4572a 100644 --- a/guava/src/com/google/common/collect/RegularImmutableBiMap.java +++ b/guava/src/com/google/common/collect/RegularImmutableBiMap.java @@ -38,7 +38,7 @@ import java.io.Serializable; import java.util.function.BiConsumer; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Bimap with zero or more mappings. diff --git a/guava/src/com/google/common/collect/RegularImmutableList.java b/guava/src/com/google/common/collect/RegularImmutableList.java index ada9a09aa60e..2d0fa1660f02 100644 --- a/guava/src/com/google/common/collect/RegularImmutableList.java +++ b/guava/src/com/google/common/collect/RegularImmutableList.java @@ -24,7 +24,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableList} backed by a simple array. diff --git a/guava/src/com/google/common/collect/RegularImmutableMap.java b/guava/src/com/google/common/collect/RegularImmutableMap.java index 068e54b1c9cb..955a394d3b7c 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMap.java +++ b/guava/src/com/google/common/collect/RegularImmutableMap.java @@ -31,7 +31,7 @@ import java.io.Serializable; import java.util.IdentityHashMap; import java.util.function.BiConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableMap} used for 0 entries and for 2+ entries. Additional diff --git a/guava/src/com/google/common/collect/RegularImmutableMultiset.java b/guava/src/com/google/common/collect/RegularImmutableMultiset.java index f0343ca0f906..98e3efd31806 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -26,7 +26,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.util.Arrays; import java.util.Collection; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableMultiset} with zero or more elements. diff --git a/guava/src/com/google/common/collect/RegularImmutableSet.java b/guava/src/com/google/common/collect/RegularImmutableSet.java index 0eecb26dd096..eb9fee950465 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSet.java +++ b/guava/src/com/google/common/collect/RegularImmutableSet.java @@ -24,7 +24,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableSet} with two or more elements. diff --git a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java index cafb92b815d8..7055c525ea5b 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java @@ -24,7 +24,7 @@ import com.google.common.primitives.Ints; import java.util.Comparator; import java.util.function.ObjIntConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable sorted multiset with one or more distinct elements. diff --git a/guava/src/com/google/common/collect/RegularImmutableSortedSet.java b/guava/src/com/google/common/collect/RegularImmutableSortedSet.java index b8ef3a190f95..04ae36ceaf59 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSortedSet.java +++ b/guava/src/com/google/common/collect/RegularImmutableSortedSet.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.Spliterator; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable sorted set with one or more elements. TODO(jlevy): Consider separate class for a diff --git a/guava/src/com/google/common/collect/RegularImmutableTable.java b/guava/src/com/google/common/collect/RegularImmutableTable.java index a992a1541f07..820bd100e09b 100644 --- a/guava/src/com/google/common/collect/RegularImmutableTable.java +++ b/guava/src/com/google/common/collect/RegularImmutableTable.java @@ -26,7 +26,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link ImmutableTable} holding an arbitrary number of cells. diff --git a/guava/src/com/google/common/collect/ReverseOrdering.java b/guava/src/com/google/common/collect/ReverseOrdering.java index 579b620b7287..310b9663a279 100644 --- a/guava/src/com/google/common/collect/ReverseOrdering.java +++ b/guava/src/com/google/common/collect/ReverseOrdering.java @@ -21,7 +21,7 @@ import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** An ordering that uses the reverse of a given order. */ @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/collect/RowSortedTable.java b/guava/src/com/google/common/collect/RowSortedTable.java index 0bd724a82d26..99e59b9edd41 100644 --- a/guava/src/com/google/common/collect/RowSortedTable.java +++ b/guava/src/com/google/common/collect/RowSortedTable.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Interface that extends {@code Table} and whose rows are sorted. diff --git a/guava/src/com/google/common/collect/Serialization.java b/guava/src/com/google/common/collect/Serialization.java index d9a11b612267..81035be120a9 100644 --- a/guava/src/com/google/common/collect/Serialization.java +++ b/guava/src/com/google/common/collect/Serialization.java @@ -24,7 +24,7 @@ import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods for serializing collection classes. diff --git a/guava/src/com/google/common/collect/SetMultimap.java b/guava/src/com/google/common/collect/SetMultimap.java index bb8e4b6efde0..4b21111f9959 100644 --- a/guava/src/com/google/common/collect/SetMultimap.java +++ b/guava/src/com/google/common/collect/SetMultimap.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code Multimap} that cannot hold duplicate key-value pairs. Adding a key-value pair that's diff --git a/guava/src/com/google/common/collect/Sets.java b/guava/src/com/google/common/collect/Sets.java index ffefd1086fee..e48f5e8d2974 100644 --- a/guava/src/com/google/common/collect/Sets.java +++ b/guava/src/com/google/common/collect/Sets.java @@ -55,8 +55,8 @@ import java.util.function.Consumer; import java.util.stream.Collector; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Set} instances. Also see this class's counterparts diff --git a/guava/src/com/google/common/collect/SingletonImmutableBiMap.java b/guava/src/com/google/common/collect/SingletonImmutableBiMap.java index 31165a6f8f57..e4fdb38f4d36 100644 --- a/guava/src/com/google/common/collect/SingletonImmutableBiMap.java +++ b/guava/src/com/google/common/collect/SingletonImmutableBiMap.java @@ -26,7 +26,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.RetainedWith; import java.util.function.BiConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableMap} with exactly one entry. diff --git a/guava/src/com/google/common/collect/SingletonImmutableSet.java b/guava/src/com/google/common/collect/SingletonImmutableSet.java index d3687d9ed61b..09894261d31e 100644 --- a/guava/src/com/google/common/collect/SingletonImmutableSet.java +++ b/guava/src/com/google/common/collect/SingletonImmutableSet.java @@ -22,7 +22,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link ImmutableSet} with exactly one element. diff --git a/guava/src/com/google/common/collect/SortedIterable.java b/guava/src/com/google/common/collect/SortedIterable.java index 515fd207ddb8..0b17fe6fa8c8 100644 --- a/guava/src/com/google/common/collect/SortedIterable.java +++ b/guava/src/com/google/common/collect/SortedIterable.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@code Iterable} whose elements are sorted relative to a {@code Comparator}, typically diff --git a/guava/src/com/google/common/collect/SortedIterables.java b/guava/src/com/google/common/collect/SortedIterables.java index 5b61bc9b643e..a1acb8f2811f 100644 --- a/guava/src/com/google/common/collect/SortedIterables.java +++ b/guava/src/com/google/common/collect/SortedIterables.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities for dealing with sorted collections of all types. diff --git a/guava/src/com/google/common/collect/SortedLists.java b/guava/src/com/google/common/collect/SortedLists.java index 45e93772b4a1..5ea430648869 100644 --- a/guava/src/com/google/common/collect/SortedLists.java +++ b/guava/src/com/google/common/collect/SortedLists.java @@ -24,7 +24,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static methods pertaining to sorted {@link List} instances. diff --git a/guava/src/com/google/common/collect/SortedMapDifference.java b/guava/src/com/google/common/collect/SortedMapDifference.java index 7019378e99ec..ba4fd80b779c 100644 --- a/guava/src/com/google/common/collect/SortedMapDifference.java +++ b/guava/src/com/google/common/collect/SortedMapDifference.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.SortedMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object representing the differences between two sorted maps. diff --git a/guava/src/com/google/common/collect/SortedMultiset.java b/guava/src/com/google/common/collect/SortedMultiset.java index 8054cbcbcd12..8042b36703fb 100644 --- a/guava/src/com/google/common/collect/SortedMultiset.java +++ b/guava/src/com/google/common/collect/SortedMultiset.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.NavigableSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Multiset} which maintains the ordering of its elements, according to either their diff --git a/guava/src/com/google/common/collect/SortedMultisetBridge.java b/guava/src/com/google/common/collect/SortedMultisetBridge.java index 336f59957e94..6c46c73fb195 100644 --- a/guava/src/com/google/common/collect/SortedMultisetBridge.java +++ b/guava/src/com/google/common/collect/SortedMultisetBridge.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Superinterface of {@link SortedMultiset} to introduce a bridge method for {@code elementSet()}, diff --git a/guava/src/com/google/common/collect/SortedMultisets.java b/guava/src/com/google/common/collect/SortedMultisets.java index cd306769b711..530b663be6cc 100644 --- a/guava/src/com/google/common/collect/SortedMultisets.java +++ b/guava/src/com/google/common/collect/SortedMultisets.java @@ -28,7 +28,7 @@ import java.util.NavigableSet; import java.util.NoSuchElementException; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static utility methods for creating and working with {@link SortedMultiset} instances. diff --git a/guava/src/com/google/common/collect/SortedSetMultimap.java b/guava/src/com/google/common/collect/SortedSetMultimap.java index d1d0345c7882..ab3f499910fc 100644 --- a/guava/src/com/google/common/collect/SortedSetMultimap.java +++ b/guava/src/com/google/common/collect/SortedSetMultimap.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code SetMultimap} whose set of values for a given key are kept sorted; that is, they comprise diff --git a/guava/src/com/google/common/collect/StandardRowSortedTable.java b/guava/src/com/google/common/collect/StandardRowSortedTable.java index 3f69e7fc7e48..3ae5ba24ee0c 100644 --- a/guava/src/com/google/common/collect/StandardRowSortedTable.java +++ b/guava/src/com/google/common/collect/StandardRowSortedTable.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Table} whose iteration ordering across row keys is sorted by their diff --git a/guava/src/com/google/common/collect/StandardTable.java b/guava/src/com/google/common/collect/StandardTable.java index 1c2d5dbbea99..9174530ab7b2 100644 --- a/guava/src/com/google/common/collect/StandardTable.java +++ b/guava/src/com/google/common/collect/StandardTable.java @@ -48,7 +48,7 @@ import java.util.Set; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link Table} implementation backed by a map that associates row keys with column key / value diff --git a/guava/src/com/google/common/collect/Streams.java b/guava/src/com/google/common/collect/Streams.java index 193eb47e1313..b59f0186c848 100644 --- a/guava/src/com/google/common/collect/Streams.java +++ b/guava/src/com/google/common/collect/Streams.java @@ -49,7 +49,7 @@ import java.util.stream.LongStream; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods related to {@code Stream} instances. diff --git a/guava/src/com/google/common/collect/Synchronized.java b/guava/src/com/google/common/collect/Synchronized.java index 16058881287a..95856e7f1975 100644 --- a/guava/src/com/google/common/collect/Synchronized.java +++ b/guava/src/com/google/common/collect/Synchronized.java @@ -49,8 +49,8 @@ import java.util.function.Predicate; import java.util.function.UnaryOperator; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * Synchronized collection views. The returned synchronized collection views are serializable if the diff --git a/guava/src/com/google/common/collect/Table.java b/guava/src/com/google/common/collect/Table.java index e3b1fd23b3a8..054ec519d282 100644 --- a/guava/src/com/google/common/collect/Table.java +++ b/guava/src/com/google/common/collect/Table.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A collection that associates an ordered pair of keys, called a row key and a column key, with a diff --git a/guava/src/com/google/common/collect/TableCollectors.java b/guava/src/com/google/common/collect/TableCollectors.java index acbb534b3bce..723a01a3d9bc 100644 --- a/guava/src/com/google/common/collect/TableCollectors.java +++ b/guava/src/com/google/common/collect/TableCollectors.java @@ -26,7 +26,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Collectors utilities for {@code common.collect.Table} internals. */ @GwtCompatible diff --git a/guava/src/com/google/common/collect/Tables.java b/guava/src/com/google/common/collect/Tables.java index 1a85f2b881e3..b724b5d3b952 100644 --- a/guava/src/com/google/common/collect/Tables.java +++ b/guava/src/com/google/common/collect/Tables.java @@ -37,7 +37,7 @@ import java.util.Spliterator; import java.util.function.BinaryOperator; import java.util.stream.Collector; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides static methods that involve a {@code Table}. diff --git a/guava/src/com/google/common/collect/TopKSelector.java b/guava/src/com/google/common/collect/TopKSelector.java index b2726d4854ba..fbdd53263793 100644 --- a/guava/src/com/google/common/collect/TopKSelector.java +++ b/guava/src/com/google/common/collect/TopKSelector.java @@ -32,7 +32,7 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An accumulator that selects the "top" {@code k} elements added to it, relative to a provided diff --git a/guava/src/com/google/common/collect/TransformedIterator.java b/guava/src/com/google/common/collect/TransformedIterator.java index a866c7c05061..6499e7d80b49 100644 --- a/guava/src/com/google/common/collect/TransformedIterator.java +++ b/guava/src/com/google/common/collect/TransformedIterator.java @@ -20,7 +20,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that transforms a backing iterator; for internal use. This avoids the object overhead diff --git a/guava/src/com/google/common/collect/TransformedListIterator.java b/guava/src/com/google/common/collect/TransformedListIterator.java index 0ebe3acacc8a..111588987ee5 100644 --- a/guava/src/com/google/common/collect/TransformedListIterator.java +++ b/guava/src/com/google/common/collect/TransformedListIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import java.util.ListIterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that transforms a backing list iterator; for internal use. This avoids the object diff --git a/guava/src/com/google/common/collect/TreeBasedTable.java b/guava/src/com/google/common/collect/TreeBasedTable.java index 38637a7c10ec..e6e533df6351 100644 --- a/guava/src/com/google/common/collect/TreeBasedTable.java +++ b/guava/src/com/google/common/collect/TreeBasedTable.java @@ -33,7 +33,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Table} whose row keys and column keys are ordered by their natural diff --git a/guava/src/com/google/common/collect/TreeMultimap.java b/guava/src/com/google/common/collect/TreeMultimap.java index d7b14a9930dc..89b106a1a316 100644 --- a/guava/src/com/google/common/collect/TreeMultimap.java +++ b/guava/src/com/google/common/collect/TreeMultimap.java @@ -33,7 +33,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Multimap} whose keys and values are ordered by their natural ordering or diff --git a/guava/src/com/google/common/collect/TreeMultiset.java b/guava/src/com/google/common/collect/TreeMultiset.java index f8f413e77fe9..49c30030b77a 100644 --- a/guava/src/com/google/common/collect/TreeMultiset.java +++ b/guava/src/com/google/common/collect/TreeMultiset.java @@ -39,7 +39,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.function.ObjIntConsumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A multiset which maintains the ordering of its elements, according to either their natural order diff --git a/guava/src/com/google/common/collect/TreeRangeMap.java b/guava/src/com/google/common/collect/TreeRangeMap.java index 11fb074cc79d..4665867ceccb 100644 --- a/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/guava/src/com/google/common/collect/TreeRangeMap.java @@ -40,7 +40,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.function.BiFunction; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@code RangeMap} based on a {@code TreeMap}, supporting all optional diff --git a/guava/src/com/google/common/collect/TreeRangeSet.java b/guava/src/com/google/common/collect/TreeRangeSet.java index 440816c6ecf7..2ee5b08ffa67 100644 --- a/guava/src/com/google/common/collect/TreeRangeSet.java +++ b/guava/src/com/google/common/collect/TreeRangeSet.java @@ -32,7 +32,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.TreeMap; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link RangeSet} backed by a {@link TreeMap}. diff --git a/guava/src/com/google/common/collect/TreeTraverser.java b/guava/src/com/google/common/collect/TreeTraverser.java index fb79d3d21bca..f77db53e16b0 100644 --- a/guava/src/com/google/common/collect/TreeTraverser.java +++ b/guava/src/com/google/common/collect/TreeTraverser.java @@ -27,7 +27,7 @@ import java.util.Iterator; import java.util.Queue; import java.util.function.Consumer; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Views elements of a type {@code T} as nodes in a tree, and provides methods to traverse the trees diff --git a/guava/src/com/google/common/collect/UnmodifiableIterator.java b/guava/src/com/google/common/collect/UnmodifiableIterator.java index d66e6fcbcab0..a159121a7b90 100644 --- a/guava/src/com/google/common/collect/UnmodifiableIterator.java +++ b/guava/src/com/google/common/collect/UnmodifiableIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotCall; import java.util.Iterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An iterator that does not support {@link #remove}. diff --git a/guava/src/com/google/common/collect/UnmodifiableListIterator.java b/guava/src/com/google/common/collect/UnmodifiableListIterator.java index f58a4f414ec2..2917d5914b60 100644 --- a/guava/src/com/google/common/collect/UnmodifiableListIterator.java +++ b/guava/src/com/google/common/collect/UnmodifiableListIterator.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.DoNotCall; import java.util.ListIterator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A list iterator that does not support {@link #remove}, {@link #add}, or {@link #set}. diff --git a/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java b/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java index 9fbef4d56287..ddf332487160 100644 --- a/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java +++ b/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java @@ -23,7 +23,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.util.Comparator; import java.util.NavigableSet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link Multisets#unmodifiableSortedMultiset(SortedMultiset)}, split out into diff --git a/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java b/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java index 63955c600822..8f9dddabe0d3 100644 --- a/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java +++ b/guava/src/com/google/common/escape/ArrayBasedCharEscaper.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link CharEscaper} that uses an array to quickly look up replacement characters for a given diff --git a/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java b/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java index 050c726d3ca5..d7b1e6b2a9c9 100644 --- a/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java +++ b/guava/src/com/google/common/escape/ArrayBasedUnicodeEscaper.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link UnicodeEscaper} that uses an array to quickly look up replacement characters for a given diff --git a/guava/src/com/google/common/escape/CharEscaper.java b/guava/src/com/google/common/escape/CharEscaper.java index a34789f83d17..8a90efd8ae3c 100644 --- a/guava/src/com/google/common/escape/CharEscaper.java +++ b/guava/src/com/google/common/escape/CharEscaper.java @@ -17,7 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object that converts literal text into a format safe for inclusion in a particular context diff --git a/guava/src/com/google/common/escape/CharEscaperBuilder.java b/guava/src/com/google/common/escape/CharEscaperBuilder.java index 650fd8a53ca1..3496d91366f2 100644 --- a/guava/src/com/google/common/escape/CharEscaperBuilder.java +++ b/guava/src/com/google/common/escape/CharEscaperBuilder.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Simple helper class to build a "sparse" array of objects based on the indexes that were added to diff --git a/guava/src/com/google/common/escape/Escapers.java b/guava/src/com/google/common/escape/Escapers.java index 51f47a17645a..c5f2bd026fdb 100644 --- a/guava/src/com/google/common/escape/Escapers.java +++ b/guava/src/com/google/common/escape/Escapers.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.HashMap; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@link Escaper} instances. diff --git a/guava/src/com/google/common/escape/UnicodeEscaper.java b/guava/src/com/google/common/escape/UnicodeEscaper.java index bfe66af95d69..725032964899 100644 --- a/guava/src/com/google/common/escape/UnicodeEscaper.java +++ b/guava/src/com/google/common/escape/UnicodeEscaper.java @@ -17,7 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@link Escaper} that converts literal text into a format safe for inclusion in a particular diff --git a/guava/src/com/google/common/eventbus/Subscriber.java b/guava/src/com/google/common/eventbus/Subscriber.java index d67f9362cba6..bd87333de9d8 100644 --- a/guava/src/com/google/common/eventbus/Subscriber.java +++ b/guava/src/com/google/common/eventbus/Subscriber.java @@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A subscriber method on a specific object, plus the executor that should be used for dispatching diff --git a/guava/src/com/google/common/eventbus/SubscriberRegistry.java b/guava/src/com/google/common/eventbus/SubscriberRegistry.java index ce59aa0cae3f..94bf471053f5 100644 --- a/guava/src/com/google/common/eventbus/SubscriberRegistry.java +++ b/guava/src/com/google/common/eventbus/SubscriberRegistry.java @@ -44,7 +44,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Registry of subscribers to a single event bus. diff --git a/guava/src/com/google/common/graph/AbstractBaseGraph.java b/guava/src/com/google/common/graph/AbstractBaseGraph.java index 356c104f4acf..9ce3838947b8 100644 --- a/guava/src/com/google/common/graph/AbstractBaseGraph.java +++ b/guava/src/com/google/common/graph/AbstractBaseGraph.java @@ -31,7 +31,7 @@ import com.google.common.primitives.Ints; import java.util.AbstractSet; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link BaseGraph}. diff --git a/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java b/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java index 16d6bc7a0af8..92b203872e5f 100644 --- a/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java +++ b/guava/src/com/google/common/graph/AbstractDirectedNetworkConnections.java @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A base implementation of {@link NetworkConnections} for directed networks. diff --git a/guava/src/com/google/common/graph/AbstractGraph.java b/guava/src/com/google/common/graph/AbstractGraph.java index 9d5d92aa3bbf..968c627bc5cc 100644 --- a/guava/src/com/google/common/graph/AbstractGraph.java +++ b/guava/src/com/google/common/graph/AbstractGraph.java @@ -17,7 +17,7 @@ package com.google.common.graph; import com.google.common.annotations.Beta; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link Graph}. It is recommended to extend this diff --git a/guava/src/com/google/common/graph/AbstractNetwork.java b/guava/src/com/google/common/graph/AbstractNetwork.java index 8e88a80ca500..e5713462be53 100644 --- a/guava/src/com/google/common/graph/AbstractNetwork.java +++ b/guava/src/com/google/common/graph/AbstractNetwork.java @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link Network}. It is recommended to extend diff --git a/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java b/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java index 884ccb16aa61..dc4ab842f5b2 100644 --- a/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java +++ b/guava/src/com/google/common/graph/AbstractUndirectedNetworkConnections.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A base implementation of {@link NetworkConnections} for undirected networks. diff --git a/guava/src/com/google/common/graph/AbstractValueGraph.java b/guava/src/com/google/common/graph/AbstractValueGraph.java index d8281d2e100d..30cabfbc949c 100644 --- a/guava/src/com/google/common/graph/AbstractValueGraph.java +++ b/guava/src/com/google/common/graph/AbstractValueGraph.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * This class provides a skeletal implementation of {@link ValueGraph}. It is recommended to extend diff --git a/guava/src/com/google/common/graph/DirectedGraphConnections.java b/guava/src/com/google/common/graph/DirectedGraphConnections.java index 9fec7989faee..43b69d137b0d 100644 --- a/guava/src/com/google/common/graph/DirectedGraphConnections.java +++ b/guava/src/com/google/common/graph/DirectedGraphConnections.java @@ -40,7 +40,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link GraphConnections} for directed graphs. diff --git a/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java b/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java index 9a3e1a7d9f4a..b21a63a48d99 100644 --- a/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java +++ b/guava/src/com/google/common/graph/DirectedMultiNetworkConnections.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An implementation of {@link NetworkConnections} for directed networks with parallel edges. diff --git a/guava/src/com/google/common/graph/EdgesConnecting.java b/guava/src/com/google/common/graph/EdgesConnecting.java index 1c4673544238..234c9bb3ee6c 100644 --- a/guava/src/com/google/common/graph/EdgesConnecting.java +++ b/guava/src/com/google/common/graph/EdgesConnecting.java @@ -23,7 +23,7 @@ import com.google.common.collect.UnmodifiableIterator; import java.util.AbstractSet; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to represent the set of edges connecting an (implicit) origin node to a target node. diff --git a/guava/src/com/google/common/graph/ElementOrder.java b/guava/src/com/google/common/graph/ElementOrder.java index dee03377153f..88562a3bda3f 100644 --- a/guava/src/com/google/common/graph/ElementOrder.java +++ b/guava/src/com/google/common/graph/ElementOrder.java @@ -28,7 +28,7 @@ import com.google.errorprone.annotations.Immutable; import java.util.Comparator; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Used to represent the order of elements in a data structure that supports different options for diff --git a/guava/src/com/google/common/graph/EndpointPair.java b/guava/src/com/google/common/graph/EndpointPair.java index 2015a7ad10b0..3bf575186525 100644 --- a/guava/src/com/google/common/graph/EndpointPair.java +++ b/guava/src/com/google/common/graph/EndpointPair.java @@ -24,7 +24,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; import com.google.errorprone.annotations.Immutable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable pair representing the two endpoints of an edge in a graph. The {@link EndpointPair} diff --git a/guava/src/com/google/common/graph/EndpointPairIterator.java b/guava/src/com/google/common/graph/EndpointPairIterator.java index b49e24bde5da..f9b563989bb9 100644 --- a/guava/src/com/google/common/graph/EndpointPairIterator.java +++ b/guava/src/com/google/common/graph/EndpointPairIterator.java @@ -24,7 +24,7 @@ import com.google.common.collect.Sets; import java.util.Iterator; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to facilitate the set returned by {@link Graph#edges()}. diff --git a/guava/src/com/google/common/graph/ForwardingNetwork.java b/guava/src/com/google/common/graph/ForwardingNetwork.java index 3de98513c9fc..c0fc3e637cec 100644 --- a/guava/src/com/google/common/graph/ForwardingNetwork.java +++ b/guava/src/com/google/common/graph/ForwardingNetwork.java @@ -18,7 +18,7 @@ import java.util.Optional; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to allow {@link Network} implementations to be backed by a provided delegate. This is not diff --git a/guava/src/com/google/common/graph/ForwardingValueGraph.java b/guava/src/com/google/common/graph/ForwardingValueGraph.java index 4c671ab4b1ff..a3af07044dba 100644 --- a/guava/src/com/google/common/graph/ForwardingValueGraph.java +++ b/guava/src/com/google/common/graph/ForwardingValueGraph.java @@ -18,7 +18,7 @@ import java.util.Optional; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A class to allow {@link ValueGraph} implementations to be backed by a provided delegate. This is diff --git a/guava/src/com/google/common/graph/Graph.java b/guava/src/com/google/common/graph/Graph.java index af07f3c30783..b9ebd5cd1a0c 100644 --- a/guava/src/com/google/common/graph/Graph.java +++ b/guava/src/com/google/common/graph/Graph.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.Collection; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An interface for the diff --git a/guava/src/com/google/common/hash/Murmur3_32HashFunction.java b/guava/src/com/google/common/hash/Murmur3_32HashFunction.java index 3ffcb5d4df8a..a40c2fbeb00e 100644 --- a/guava/src/com/google/common/hash/Murmur3_32HashFunction.java +++ b/guava/src/com/google/common/hash/Murmur3_32HashFunction.java @@ -39,7 +39,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * See MurmurHash3_x86_32 in Internet Media Type diff --git a/guava/src/com/google/common/net/PercentEscaper.java b/guava/src/com/google/common/net/PercentEscaper.java index d9fc726aec27..8e9cdc5e6c27 100644 --- a/guava/src/com/google/common/net/PercentEscaper.java +++ b/guava/src/com/google/common/net/PercentEscaper.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.escape.UnicodeEscaper; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@code UnicodeEscaper} that escapes some set of Java characters using a UTF-8 based percent diff --git a/guava/src/com/google/common/primitives/Booleans.java b/guava/src/com/google/common/primitives/Booleans.java index 770141bc1eec..4232a251f582 100644 --- a/guava/src/com/google/common/primitives/Booleans.java +++ b/guava/src/com/google/common/primitives/Booleans.java @@ -30,7 +30,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code boolean} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/Bytes.java b/guava/src/com/google/common/primitives/Bytes.java index ee5ce5bfef2d..871159dab7ee 100644 --- a/guava/src/com/google/common/primitives/Bytes.java +++ b/guava/src/com/google/common/primitives/Bytes.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code byte} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/Chars.java b/guava/src/com/google/common/primitives/Chars.java index fe94f55636af..d509de230d48 100644 --- a/guava/src/com/google/common/primitives/Chars.java +++ b/guava/src/com/google/common/primitives/Chars.java @@ -30,7 +30,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code char} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/Doubles.java b/guava/src/com/google/common/primitives/Doubles.java index cd7f26779768..1f889d871852 100644 --- a/guava/src/com/google/common/primitives/Doubles.java +++ b/guava/src/com/google/common/primitives/Doubles.java @@ -36,7 +36,7 @@ import java.util.RandomAccess; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code double} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/Floats.java b/guava/src/com/google/common/primitives/Floats.java index 455c31d7e200..bc70bd76e968 100644 --- a/guava/src/com/google/common/primitives/Floats.java +++ b/guava/src/com/google/common/primitives/Floats.java @@ -34,7 +34,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code float} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java index 14d942de1bdf..5bb66866c994 100644 --- a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java +++ b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java @@ -31,7 +31,7 @@ import java.util.Spliterators; import java.util.function.DoubleConsumer; import java.util.stream.DoubleStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable array of {@code double} values, with an API resembling {@link List}. diff --git a/guava/src/com/google/common/primitives/ImmutableIntArray.java b/guava/src/com/google/common/primitives/ImmutableIntArray.java index 475fc3667125..47d29563ccd0 100644 --- a/guava/src/com/google/common/primitives/ImmutableIntArray.java +++ b/guava/src/com/google/common/primitives/ImmutableIntArray.java @@ -31,7 +31,7 @@ import java.util.Spliterators; import java.util.function.IntConsumer; import java.util.stream.IntStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable array of {@code int} values, with an API resembling {@link List}. diff --git a/guava/src/com/google/common/primitives/ImmutableLongArray.java b/guava/src/com/google/common/primitives/ImmutableLongArray.java index 1aea943fbca1..7c124a08912d 100644 --- a/guava/src/com/google/common/primitives/ImmutableLongArray.java +++ b/guava/src/com/google/common/primitives/ImmutableLongArray.java @@ -31,7 +31,7 @@ import java.util.Spliterators; import java.util.function.LongConsumer; import java.util.stream.LongStream; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An immutable array of {@code long} values, with an API resembling {@link List}. diff --git a/guava/src/com/google/common/primitives/Ints.java b/guava/src/com/google/common/primitives/Ints.java index 4e085eb9bbec..9a524cbf8fe0 100644 --- a/guava/src/com/google/common/primitives/Ints.java +++ b/guava/src/com/google/common/primitives/Ints.java @@ -33,7 +33,7 @@ import java.util.RandomAccess; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code int} primitives, that are not already found in either diff --git a/guava/src/com/google/common/primitives/Longs.java b/guava/src/com/google/common/primitives/Longs.java index aa87da2eb568..243f968a662a 100644 --- a/guava/src/com/google/common/primitives/Longs.java +++ b/guava/src/com/google/common/primitives/Longs.java @@ -32,7 +32,7 @@ import java.util.RandomAccess; import java.util.Spliterator; import java.util.Spliterators; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code long} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/Shorts.java b/guava/src/com/google/common/primitives/Shorts.java index f4c192a958a8..8c9e0b19e463 100644 --- a/guava/src/com/google/common/primitives/Shorts.java +++ b/guava/src/com/google/common/primitives/Shorts.java @@ -31,7 +31,7 @@ import java.util.Comparator; import java.util.List; import java.util.RandomAccess; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to {@code short} primitives, that are not already found in diff --git a/guava/src/com/google/common/primitives/UnsignedInteger.java b/guava/src/com/google/common/primitives/UnsignedInteger.java index 3608c6d28676..0bc2eb467a74 100644 --- a/guava/src/com/google/common/primitives/UnsignedInteger.java +++ b/guava/src/com/google/common/primitives/UnsignedInteger.java @@ -24,7 +24,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.math.BigInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper class for unsigned {@code int} values, supporting arithmetic operations. diff --git a/guava/src/com/google/common/primitives/UnsignedLong.java b/guava/src/com/google/common/primitives/UnsignedLong.java index bb598cbddc4b..7e1c82815525 100644 --- a/guava/src/com/google/common/primitives/UnsignedLong.java +++ b/guava/src/com/google/common/primitives/UnsignedLong.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.Serializable; import java.math.BigInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A wrapper class for unsigned {@code long} values, supporting arithmetic operations. diff --git a/guava/src/com/google/common/reflect/AbstractInvocationHandler.java b/guava/src/com/google/common/reflect/AbstractInvocationHandler.java index da00442d302b..622596817bdd 100644 --- a/guava/src/com/google/common/reflect/AbstractInvocationHandler.java +++ b/guava/src/com/google/common/reflect/AbstractInvocationHandler.java @@ -18,7 +18,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract implementation of {@link InvocationHandler} that handles {@link Object#equals}, {@link diff --git a/guava/src/com/google/common/reflect/ClassPath.java b/guava/src/com/google/common/reflect/ClassPath.java index 3fac6111b905..34f9eb82ffbd 100644 --- a/guava/src/com/google/common/reflect/ClassPath.java +++ b/guava/src/com/google/common/reflect/ClassPath.java @@ -49,7 +49,7 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Scans the source of a {@link ClassLoader} and finds all loadable classes and resources. diff --git a/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java b/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java index 5c9cf6466605..18bce983963d 100644 --- a/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java +++ b/guava/src/com/google/common/reflect/ImmutableTypeToInstanceMap.java @@ -19,7 +19,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotCall; import java.util.Map; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A type-to-instance map backed by an {@link ImmutableMap}. See also {@link diff --git a/guava/src/com/google/common/reflect/Invokable.java b/guava/src/com/google/common/reflect/Invokable.java index d8f29f44f2d4..2ca4c25510a7 100644 --- a/guava/src/com/google/common/reflect/Invokable.java +++ b/guava/src/com/google/common/reflect/Invokable.java @@ -30,7 +30,7 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.Arrays; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around either a {@link Method} or a {@link Constructor}. Convenience API is provided to diff --git a/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java b/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java index 91bea50de7e1..3904ecd699ef 100644 --- a/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java +++ b/guava/src/com/google/common/reflect/MutableTypeToInstanceMap.java @@ -26,8 +26,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A mutable type-to-instance map. See also {@link ImmutableTypeToInstanceMap}. diff --git a/guava/src/com/google/common/reflect/Parameter.java b/guava/src/com/google/common/reflect/Parameter.java index 63afbac40378..1f35aa71f08d 100644 --- a/guava/src/com/google/common/reflect/Parameter.java +++ b/guava/src/com/google/common/reflect/Parameter.java @@ -22,7 +22,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.AnnotatedType; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Represents a method or constructor parameter. diff --git a/guava/src/com/google/common/reflect/TypeParameter.java b/guava/src/com/google/common/reflect/TypeParameter.java index 654c248256dc..0d04e847df88 100644 --- a/guava/src/com/google/common/reflect/TypeParameter.java +++ b/guava/src/com/google/common/reflect/TypeParameter.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Captures a free type variable that can be used in {@link TypeToken#where}. For example: diff --git a/guava/src/com/google/common/reflect/TypeResolver.java b/guava/src/com/google/common/reflect/TypeResolver.java index 0b854d935b84..139cdd5f934d 100644 --- a/guava/src/com/google/common/reflect/TypeResolver.java +++ b/guava/src/com/google/common/reflect/TypeResolver.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An object of this class encapsulates type mappings from type variables. Mappings are established diff --git a/guava/src/com/google/common/reflect/TypeToInstanceMap.java b/guava/src/com/google/common/reflect/TypeToInstanceMap.java index 1a4518e5436e..b1ffbadb52ec 100644 --- a/guava/src/com/google/common/reflect/TypeToInstanceMap.java +++ b/guava/src/com/google/common/reflect/TypeToInstanceMap.java @@ -17,8 +17,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotMock; import java.util.Map; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; /** * A map, each entry of which maps a {@link TypeToken} to an instance of that type. In addition to diff --git a/guava/src/com/google/common/reflect/TypeToken.java b/guava/src/com/google/common/reflect/TypeToken.java index 36a546f69ccd..77d613eb66f9 100644 --- a/guava/src/com/google/common/reflect/TypeToken.java +++ b/guava/src/com/google/common/reflect/TypeToken.java @@ -48,7 +48,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; /** * A {@link Type} with generics. diff --git a/guava/src/com/google/common/reflect/TypeVisitor.java b/guava/src/com/google/common/reflect/TypeVisitor.java index db3d4a71b527..3cff3f90f809 100644 --- a/guava/src/com/google/common/reflect/TypeVisitor.java +++ b/guava/src/com/google/common/reflect/TypeVisitor.java @@ -21,7 +21,7 @@ import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; import java.util.Set; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Based on what a {@link Type} is, dispatch it to the corresponding {@code visit*} method. By diff --git a/guava/src/com/google/common/reflect/Types.java b/guava/src/com/google/common/reflect/Types.java index d69da04cdc05..0e9885168472 100644 --- a/guava/src/com/google/common/reflect/Types.java +++ b/guava/src/com/google/common/reflect/Types.java @@ -44,7 +44,7 @@ import java.util.Collection; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities for working with {@link Type}. diff --git a/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java b/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java index 9c529d2ad0f9..c15f6cb658e2 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java +++ b/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java @@ -30,7 +30,7 @@ import com.google.j2objc.annotations.RetainedLocalRef; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementations of {@code Futures.catching*}. */ @GwtCompatible diff --git a/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/guava/src/com/google/common/util/concurrent/AbstractFuture.java index e24360f175c9..2d481d20cb23 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractFuture.java +++ b/guava/src/com/google/common/util/concurrent/AbstractFuture.java @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.concurrent.locks.LockSupport; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; import sun.misc.Unsafe; /** diff --git a/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java index e56043858842..60ec28ab87b9 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java @@ -21,7 +21,7 @@ import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.Callable; import java.util.concurrent.RunnableFuture; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract {@link ListeningExecutorService} implementation that creates {@link ListenableFuture} diff --git a/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java b/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java index b6f97c3e6b43..e12223c1b26c 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractScheduledService.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for services that can implement {@link #startUp} and {@link #shutDown} but while in diff --git a/guava/src/com/google/common/util/concurrent/AbstractService.java b/guava/src/com/google/common/util/concurrent/AbstractService.java index 833d641cd05a..32a07e622378 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractService.java @@ -38,7 +38,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for implementing services that can handle {@link #doStart} and {@link #doStop} diff --git a/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java b/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java index cf33227f06e2..5a078eb48901 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java +++ b/guava/src/com/google/common/util/concurrent/AbstractTransformFuture.java @@ -27,7 +27,7 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementations of {@code Futures.transform*}. */ @GwtCompatible diff --git a/guava/src/com/google/common/util/concurrent/AggregateFuture.java b/guava/src/com/google/common/util/concurrent/AggregateFuture.java index 1e351a3ca290..9647758bdc66 100644 --- a/guava/src/com/google/common/util/concurrent/AggregateFuture.java +++ b/guava/src/com/google/common/util/concurrent/AggregateFuture.java @@ -32,7 +32,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A future whose value is derived from a collection of input futures. diff --git a/guava/src/com/google/common/util/concurrent/AggregateFutureState.java b/guava/src/com/google/common/util/concurrent/AggregateFutureState.java index 92939b1c94a5..eca2e4f713fc 100644 --- a/guava/src/com/google/common/util/concurrent/AggregateFutureState.java +++ b/guava/src/com/google/common/util/concurrent/AggregateFutureState.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A helper which does some thread-safe operations for aggregate futures, which must be implemented diff --git a/guava/src/com/google/common/util/concurrent/AsyncCallable.java b/guava/src/com/google/common/util/concurrent/AsyncCallable.java index f6798cdf5b60..ce5dbba5f727 100644 --- a/guava/src/com/google/common/util/concurrent/AsyncCallable.java +++ b/guava/src/com/google/common/util/concurrent/AsyncCallable.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Computes a value, possibly asynchronously. For an example usage and more information, see {@link diff --git a/guava/src/com/google/common/util/concurrent/AsyncFunction.java b/guava/src/com/google/common/util/concurrent/AsyncFunction.java index 7ffa1b5af695..e926d81a022a 100644 --- a/guava/src/com/google/common/util/concurrent/AsyncFunction.java +++ b/guava/src/com/google/common/util/concurrent/AsyncFunction.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Transforms a value, possibly asynchronously. For an example usage and more information, see diff --git a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index ff95406eda06..1ee336973f82 100644 --- a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongBinaryOperator; import java.util.function.LongUnaryOperator; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A map containing {@code long} values that can be atomically updated. While writes to a diff --git a/guava/src/com/google/common/util/concurrent/Atomics.java b/guava/src/com/google/common/util/concurrent/Atomics.java index e49b0c1e7f1c..99098cb96763 100644 --- a/guava/src/com/google/common/util/concurrent/Atomics.java +++ b/guava/src/com/google/common/util/concurrent/Atomics.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtIncompatible; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReferenceArray; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to classes in the {@code java.util.concurrent.atomic} package. diff --git a/guava/src/com/google/common/util/concurrent/Callables.java b/guava/src/com/google/common/util/concurrent/Callables.java index a022a23a085c..756237020362 100644 --- a/guava/src/com/google/common/util/concurrent/Callables.java +++ b/guava/src/com/google/common/util/concurrent/Callables.java @@ -21,7 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; import java.util.concurrent.Callable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to the {@link Callable} interface. diff --git a/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/guava/src/com/google/common/util/concurrent/ClosingFuture.java index 5e907a6aa294..e34f5381ee32 100644 --- a/guava/src/com/google/common/util/concurrent/ClosingFuture.java +++ b/guava/src/com/google/common/util/concurrent/ClosingFuture.java @@ -58,7 +58,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A step in a pipeline of an asynchronous computation. When the last step in the computation is diff --git a/guava/src/com/google/common/util/concurrent/CollectionFuture.java b/guava/src/com/google/common/util/concurrent/CollectionFuture.java index 102fc9b4311f..3b32f0f0a47d 100644 --- a/guava/src/com/google/common/util/concurrent/CollectionFuture.java +++ b/guava/src/com/google/common/util/concurrent/CollectionFuture.java @@ -24,7 +24,7 @@ import com.google.j2objc.annotations.RetainedLocalRef; import java.util.Collections; import java.util.List; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Aggregate future that collects (stores) results of each future. */ @GwtCompatible(emulated = true) diff --git a/guava/src/com/google/common/util/concurrent/CombinedFuture.java b/guava/src/com/google/common/util/concurrent/CombinedFuture.java index 055db72c4926..3820200d730c 100644 --- a/guava/src/com/google/common/util/concurrent/CombinedFuture.java +++ b/guava/src/com/google/common/util/concurrent/CombinedFuture.java @@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Aggregate future that computes its value by calling a callable. */ @GwtCompatible diff --git a/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java b/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java index c55eac94a8c5..8cd223e3b669 100644 --- a/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java +++ b/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java @@ -41,7 +41,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * The {@code CycleDetectingLockFactory} creates {@link ReentrantLock} instances and {@link diff --git a/guava/src/com/google/common/util/concurrent/ExecutionError.java b/guava/src/com/google/common/util/concurrent/ExecutionError.java index 0f0dad01cbf0..9dc474af8786 100644 --- a/guava/src/com/google/common/util/concurrent/ExecutionError.java +++ b/guava/src/com/google/common/util/concurrent/ExecutionError.java @@ -15,7 +15,7 @@ package com.google.common.util.concurrent; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link Error} variant of {@link java.util.concurrent.ExecutionException}. As with {@code diff --git a/guava/src/com/google/common/util/concurrent/ExecutionList.java b/guava/src/com/google/common/util/concurrent/ExecutionList.java index 97330488ee1b..fbf2e4bcc16e 100644 --- a/guava/src/com/google/common/util/concurrent/ExecutionList.java +++ b/guava/src/com/google/common/util/concurrent/ExecutionList.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.concurrent.Executor; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A support class for {@code ListenableFuture} implementations to manage their listeners. An diff --git a/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java b/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java index adbc1517582b..6103e9c08a5a 100644 --- a/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java +++ b/guava/src/com/google/common/util/concurrent/ExecutionSequencer.java @@ -30,7 +30,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicReference; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Serializes execution of tasks, somewhat like an "asynchronous {@code synchronized} block." Each diff --git a/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java b/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java index 3cbb80cf7bbe..cfd3a2a489f5 100644 --- a/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java +++ b/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java @@ -23,7 +23,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A TimeLimiter implementation which actually does not attempt to limit time at all. This may be diff --git a/guava/src/com/google/common/util/concurrent/FluentFuture.java b/guava/src/com/google/common/util/concurrent/FluentFuture.java index 44c8de3c4f40..52c10d3f56be 100644 --- a/guava/src/com/google/common/util/concurrent/FluentFuture.java +++ b/guava/src/com/google/common/util/concurrent/FluentFuture.java @@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListenableFuture} that supports fluent chains of operations. For example: diff --git a/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java b/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java index e7162827c5bd..2cdf348d12d8 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingBlockingDeque.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.concurrent.BlockingDeque; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BlockingDeque} which forwards all its method calls to another {@code BlockingDeque}. diff --git a/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java b/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java index f4a17855a2d7..ae52c9626ddf 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingBlockingQueue.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link BlockingQueue} which forwards all its method calls to another {@link BlockingQueue}. diff --git a/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java b/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java index 6a6919343466..92a3a72fa233 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingExecutorService.java @@ -27,7 +27,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An executor service which forwards all its method calls to another executor service. Subclasses diff --git a/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java b/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java index 3fdb360faa09..52fc1b039dfa 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingFluentFuture.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link FluentFuture} that forwards all calls to a delegate. diff --git a/guava/src/com/google/common/util/concurrent/ForwardingFuture.java b/guava/src/com/google/common/util/concurrent/ForwardingFuture.java index 980363487087..b8ea27ba845c 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingFuture.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingFuture.java @@ -22,7 +22,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Future} which forwards all its method calls to another future. Subclasses should diff --git a/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java b/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java index 216c25c153fa..d204518bb048 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingListenableFuture.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Preconditions; import java.util.concurrent.Executor; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListenableFuture} which forwards all its method calls to another future. Subclasses diff --git a/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java b/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java index fdd205957a36..a362379426e6 100644 --- a/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/ForwardingListeningExecutorService.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.util.concurrent.Callable; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A listening executor service which forwards all its method calls to another listening executor diff --git a/guava/src/com/google/common/util/concurrent/FutureCallback.java b/guava/src/com/google/common/util/concurrent/FutureCallback.java index 3af949526eb0..35033faf8664 100644 --- a/guava/src/com/google/common/util/concurrent/FutureCallback.java +++ b/guava/src/com/google/common/util/concurrent/FutureCallback.java @@ -17,7 +17,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A callback for accepting the results of a {@link java.util.concurrent.Future} computation diff --git a/guava/src/com/google/common/util/concurrent/Futures.java b/guava/src/com/google/common/util/concurrent/Futures.java index 90a1af23e301..ce6139d0bb0c 100644 --- a/guava/src/com/google/common/util/concurrent/Futures.java +++ b/guava/src/com/google/common/util/concurrent/Futures.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Static utility methods pertaining to the {@link Future} interface. diff --git a/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java b/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java index 07a1d1871086..b706b230ef74 100644 --- a/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java +++ b/guava/src/com/google/common/util/concurrent/FuturesGetChecked.java @@ -35,7 +35,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Static methods used to implement {@link Futures#getChecked(Future, Class)}. */ @J2ktIncompatible diff --git a/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java b/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java index 863d97f9de8f..e21f556c266b 100644 --- a/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java +++ b/guava/src/com/google/common/util/concurrent/GwtFluentFutureCatchingSpecialization.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Hidden superclass of {@link FluentFuture} that provides us a place to declare special GWT diff --git a/guava/src/com/google/common/util/concurrent/ImmediateFuture.java b/guava/src/com/google/common/util/concurrent/ImmediateFuture.java index d5bf53def5a3..fd1aaed0f24a 100644 --- a/guava/src/com/google/common/util/concurrent/ImmediateFuture.java +++ b/guava/src/com/google/common/util/concurrent/ImmediateFuture.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Implementation of {@link Futures#immediateFuture}. */ @GwtCompatible diff --git a/guava/src/com/google/common/util/concurrent/InterruptibleTask.java b/guava/src/com/google/common/util/concurrent/InterruptibleTask.java index d16f3de482b2..a85abb2bc25e 100644 --- a/guava/src/com/google/common/util/concurrent/InterruptibleTask.java +++ b/guava/src/com/google/common/util/concurrent/InterruptibleTask.java @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.AbstractOwnableSynchronizer; import java.util.concurrent.locks.LockSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; @GwtCompatible(emulated = true) @ReflectionSupport(value = ReflectionSupport.Level.FULL) diff --git a/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java b/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java index 6d3557636fe6..611c91e6bf20 100644 --- a/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java +++ b/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java @@ -24,7 +24,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicBoolean; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities necessary for working with libraries that supply plain {@link Future} instances. Note diff --git a/guava/src/com/google/common/util/concurrent/LazyLogger.java b/guava/src/com/google/common/util/concurrent/LazyLogger.java index e0f2100139d7..0b79ff43d068 100644 --- a/guava/src/com/google/common/util/concurrent/LazyLogger.java +++ b/guava/src/com/google/common/util/concurrent/LazyLogger.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.logging.Logger; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A holder for a {@link Logger} that is initialized only when requested. */ @GwtCompatible diff --git a/guava/src/com/google/common/util/concurrent/ListenableFuture.java b/guava/src/com/google/common/util/concurrent/ListenableFuture.java index ba5c58820023..c3d84c6200f7 100644 --- a/guava/src/com/google/common/util/concurrent/ListenableFuture.java +++ b/guava/src/com/google/common/util/concurrent/ListenableFuture.java @@ -19,7 +19,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; import org.jspecify.annotations.NullMarked; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link Future} that accepts completion listeners. Each listener has an associated executor, and diff --git a/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java b/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java index 6b31f9ea887f..02bcd1c0745e 100644 --- a/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java +++ b/guava/src/com/google/common/util/concurrent/ListenableFutureTask.java @@ -26,7 +26,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link FutureTask} that also implements the {@link ListenableFuture} interface. Unlike {@code diff --git a/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java b/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java index cadf87910af3..73a1c2008d43 100644 --- a/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java +++ b/guava/src/com/google/common/util/concurrent/ListenableScheduledFuture.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import java.util.concurrent.ScheduledFuture; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Helper interface to implement both {@link ListenableFuture} and {@link ScheduledFuture}. diff --git a/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java b/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java index 7899800ee93d..16f9a90f4bfd 100644 --- a/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java @@ -29,7 +29,7 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An {@link ExecutorService} that returns {@link ListenableFuture} instances. To create an instance diff --git a/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java b/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java index e785a5842910..06507b038b7c 100644 --- a/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/ListeningScheduledExecutorService.java @@ -22,7 +22,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ScheduledExecutorService} that returns {@link ListenableFuture} instances from its diff --git a/guava/src/com/google/common/util/concurrent/Monitor.java b/guava/src/com/google/common/util/concurrent/Monitor.java index 8a4cd4618f6f..9ad9ae87f96b 100644 --- a/guava/src/com/google/common/util/concurrent/Monitor.java +++ b/guava/src/com/google/common/util/concurrent/Monitor.java @@ -27,7 +27,7 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.function.BooleanSupplier; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A synchronization abstraction supporting waiting on arbitrary boolean conditions. diff --git a/guava/src/com/google/common/util/concurrent/MoreExecutors.java b/guava/src/com/google/common/util/concurrent/MoreExecutors.java index f03de34c5e3e..596674333b6e 100644 --- a/guava/src/com/google/common/util/concurrent/MoreExecutors.java +++ b/guava/src/com/google/common/util/concurrent/MoreExecutors.java @@ -51,7 +51,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory and utility methods for {@link java.util.concurrent.Executor}, {@link ExecutorService}, diff --git a/guava/src/com/google/common/util/concurrent/NullnessCasts.java b/guava/src/com/google/common/util/concurrent/NullnessCasts.java index a0144374db46..7ef866d26f1e 100644 --- a/guava/src/com/google/common/util/concurrent/NullnessCasts.java +++ b/guava/src/com/google/common/util/concurrent/NullnessCasts.java @@ -15,7 +15,7 @@ package com.google.common.util.concurrent; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** A utility method to perform unchecked casts to suppress errors produced by nullness analyses. */ @GwtCompatible diff --git a/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java b/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java index da1ba5262a6b..d62a18ffa526 100644 --- a/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java +++ b/guava/src/com/google/common/util/concurrent/OverflowAvoidingLockSupport.java @@ -18,7 +18,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.util.concurrent.locks.LockSupport; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Works around an android bug, where parking for more than INT_MAX seconds can produce an abort diff --git a/guava/src/com/google/common/util/concurrent/Platform.java b/guava/src/com/google/common/util/concurrent/Platform.java index 2c025575297c..22bef2dbd0f1 100644 --- a/guava/src/com/google/common/util/concurrent/Platform.java +++ b/guava/src/com/google/common/util/concurrent/Platform.java @@ -18,7 +18,7 @@ import static java.lang.Thread.currentThread; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** Methods factored out so that they can be emulated differently in GWT. */ @GwtCompatible(emulated = true) diff --git a/guava/src/com/google/common/util/concurrent/RateLimiter.java b/guava/src/com/google/common/util/concurrent/RateLimiter.java index c20708692d7d..933a19c4054d 100644 --- a/guava/src/com/google/common/util/concurrent/RateLimiter.java +++ b/guava/src/com/google/common/util/concurrent/RateLimiter.java @@ -32,7 +32,7 @@ import java.time.Duration; import java.util.Locale; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A rate limiter. Conceptually, a rate limiter distributes permits at a configurable rate. Each diff --git a/guava/src/com/google/common/util/concurrent/SequentialExecutor.java b/guava/src/com/google/common/util/concurrent/SequentialExecutor.java index 8ae686c610a4..3bff3b628a26 100644 --- a/guava/src/com/google/common/util/concurrent/SequentialExecutor.java +++ b/guava/src/com/google/common/util/concurrent/SequentialExecutor.java @@ -32,7 +32,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.logging.Level; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Executor ensuring that all Runnables submitted are executed in order, using the provided diff --git a/guava/src/com/google/common/util/concurrent/SettableFuture.java b/guava/src/com/google/common/util/concurrent/SettableFuture.java index f4c9d4bbb2d1..cc0714ecc7c1 100644 --- a/guava/src/com/google/common/util/concurrent/SettableFuture.java +++ b/guava/src/com/google/common/util/concurrent/SettableFuture.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link ListenableFuture} whose result can be set by a {@link #set(Object)}, {@link diff --git a/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java b/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java index 5e90adde0bdf..c621007587cf 100644 --- a/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java +++ b/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java @@ -35,7 +35,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A TimeLimiter that runs method calls in the background using an {@link ExecutorService}. If the diff --git a/guava/src/com/google/common/util/concurrent/Striped.java b/guava/src/com/google/common/util/concurrent/Striped.java index 1ff9b90287e5..0ab7d43388db 100644 --- a/guava/src/com/google/common/util/concurrent/Striped.java +++ b/guava/src/com/google/common/util/concurrent/Striped.java @@ -41,7 +41,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A striped {@code Lock/Semaphore/ReadWriteLock}. This offers the underlying lock striping similar diff --git a/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java b/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java index 1fedee93377e..1241ed07457c 100644 --- a/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java +++ b/guava/src/com/google/common/util/concurrent/ThreadFactoryBuilder.java @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A ThreadFactory builder, providing any combination of these features: diff --git a/guava/src/com/google/common/util/concurrent/TimeLimiter.java b/guava/src/com/google/common/util/concurrent/TimeLimiter.java index 761f700b6be8..1e21c0f7ae7f 100644 --- a/guava/src/com/google/common/util/concurrent/TimeLimiter.java +++ b/guava/src/com/google/common/util/concurrent/TimeLimiter.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Imposes a time limit on method calls. diff --git a/guava/src/com/google/common/util/concurrent/TimeoutFuture.java b/guava/src/com/google/common/util/concurrent/TimeoutFuture.java index f2a7c0730209..b914a2fac915 100644 --- a/guava/src/com/google/common/util/concurrent/TimeoutFuture.java +++ b/guava/src/com/google/common/util/concurrent/TimeoutFuture.java @@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@code Futures#withTimeout}. diff --git a/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java b/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java index 8d1eeb37c11b..4549eda39940 100644 --- a/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java +++ b/guava/src/com/google/common/util/concurrent/TrustedListenableFutureTask.java @@ -21,7 +21,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.RunnableFuture; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * A {@link RunnableFuture} that also implements the {@link ListenableFuture} interface. diff --git a/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java b/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java index dfdafe81f63b..b450721a12bf 100644 --- a/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java +++ b/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java @@ -15,7 +15,7 @@ package com.google.common.util.concurrent; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unchecked variant of {@link java.util.concurrent.ExecutionException}. As with {@code diff --git a/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java b/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java index d11964f48dc6..375b712028ee 100644 --- a/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java +++ b/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java @@ -16,7 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Unchecked version of {@link java.util.concurrent.TimeoutException}. diff --git a/guava/src/com/google/common/util/concurrent/Uninterruptibles.java b/guava/src/com/google/common/util/concurrent/Uninterruptibles.java index 67465d0ef814..d013d4f014a1 100644 --- a/guava/src/com/google/common/util/concurrent/Uninterruptibles.java +++ b/guava/src/com/google/common/util/concurrent/Uninterruptibles.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * Utilities for treating interruptible operations as uninterruptible. In all cases, if a thread is diff --git a/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java b/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java index a48d7423330a..0bfcf66189ae 100644 --- a/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/WrappingExecutorService.java @@ -31,7 +31,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An abstract {@code ExecutorService} that allows subclasses to {@linkplain #wrapTask(Callable) diff --git a/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java b/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java index a403e98022e9..4df26ddc6280 100644 --- a/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/WrappingScheduledExecutorService.java @@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.checkerframework.checker.nullness.qual.Nullable; +import org.jspecify.annotations.Nullable; /** * An abstract {@code ScheduledExecutorService} that allows subclasses to {@linkplain