From 45e414fb3afbe55ea9f696a9721b35522c246c3e Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Mon, 6 Oct 2025 03:45:49 -0400 Subject: [PATCH 1/2] Remove unused import --- guava/src/com/google/common/base/Absent.java | 2 -- guava/src/com/google/common/base/CaseFormat.java | 1 - guava/src/com/google/common/base/CommonPattern.java | 1 - guava/src/com/google/common/base/Converter.java | 3 +-- guava/src/com/google/common/base/Enums.java | 2 +- guava/src/com/google/common/base/MoreObjects.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 | 3 +-- guava/src/com/google/common/base/Preconditions.java | 3 +-- guava/src/com/google/common/base/Strings.java | 2 -- guava/src/com/google/common/base/Throwables.java | 1 - guava/src/com/google/common/base/Verify.java | 2 +- guava/src/com/google/common/base/internal/Finalizer.java | 2 +- guava/src/com/google/common/cache/LongAdder.java | 1 - .../common/collect/AbstractSortedKeySortedSetMultimap.java | 2 +- guava/src/com/google/common/collect/ClassToInstanceMap.java | 2 +- .../src/com/google/common/collect/ComputationException.java | 2 +- guava/src/com/google/common/collect/ExplicitOrdering.java | 2 +- .../com/google/common/collect/ForwardingConcurrentMap.java | 2 +- guava/src/com/google/common/collect/Hashing.java | 2 +- .../google/common/collect/ImmutableClassToInstanceMap.java | 2 +- guava/src/com/google/common/collect/ImmutableEnumSet.java | 1 - guava/src/com/google/common/collect/ImmutableMap.java | 2 -- guava/src/com/google/common/collect/ImmutableSet.java | 2 +- guava/src/com/google/common/collect/Iterables.java | 1 - guava/src/com/google/common/collect/LinkedHashMultimap.java | 1 - guava/src/com/google/common/collect/MapMaker.java | 3 +-- guava/src/com/google/common/collect/NaturalOrdering.java | 2 +- .../com/google/common/collect/RegularImmutableMultiset.java | 2 +- .../common/collect/RegularImmutableSortedMultiset.java | 2 +- .../src/com/google/common/collect/SingletonImmutableSet.java | 3 +-- guava/src/com/google/common/collect/TreeMultimap.java | 2 +- guava/src/com/google/common/collect/TreeRangeMap.java | 1 - guava/src/com/google/common/hash/AbstractByteHasher.java | 1 - guava/src/com/google/common/hash/AbstractHashFunction.java | 1 - .../google/common/hash/AbstractNonStreamingHashFunction.java | 1 - guava/src/com/google/common/hash/ChecksumHashFunction.java | 1 - guava/src/com/google/common/hash/FarmHashFingerprint64.java | 2 -- guava/src/com/google/common/hash/HashCode.java | 5 ----- guava/src/com/google/common/hash/Hashing.java | 2 -- guava/src/com/google/common/hash/HashingInputStream.java | 1 - .../src/com/google/common/hash/Murmur3_128HashFunction.java | 1 - guava/src/com/google/common/hash/Murmur3_32HashFunction.java | 1 - guava/src/com/google/common/hash/PrimitiveSink.java | 1 - guava/src/com/google/common/hash/SipHashFunction.java | 1 - guava/src/com/google/common/io/AppendableWriter.java | 1 - guava/src/com/google/common/io/BaseEncoding.java | 1 - guava/src/com/google/common/io/FileBackedOutputStream.java | 1 - guava/src/com/google/common/io/MoreFiles.java | 1 - guava/src/com/google/common/io/MultiInputStream.java | 1 - guava/src/com/google/common/io/MultiReader.java | 1 - guava/src/com/google/common/math/BigIntegerMath.java | 1 - guava/src/com/google/common/math/Stats.java | 2 +- guava/src/com/google/common/net/PercentEscaper.java | 1 - guava/src/com/google/common/primitives/Booleans.java | 1 - guava/src/com/google/common/primitives/Bytes.java | 1 - guava/src/com/google/common/primitives/Chars.java | 3 --- 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 -- .../src/com/google/common/primitives/ImmutableIntArray.java | 1 - .../src/com/google/common/primitives/ImmutableLongArray.java | 1 - guava/src/com/google/common/primitives/Ints.java | 1 - guava/src/com/google/common/primitives/Longs.java | 1 - guava/src/com/google/common/primitives/Shorts.java | 1 - guava/src/com/google/common/primitives/UnsignedBytes.java | 1 - guava/src/com/google/common/primitives/UnsignedInteger.java | 4 +--- guava/src/com/google/common/primitives/UnsignedInts.java | 1 - guava/src/com/google/common/primitives/UnsignedLong.java | 1 - 70 files changed, 23 insertions(+), 93 deletions(-) diff --git a/guava/src/com/google/common/base/Absent.java b/guava/src/com/google/common/base/Absent.java index b880c34cca9e..b0950315395f 100644 --- a/guava/src/com/google/common/base/Absent.java +++ b/guava/src/com/google/common/base/Absent.java @@ -21,8 +21,6 @@ import java.util.Set; import javax.annotation.CheckForNull; import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.nullness.qual.RequiresNonNull; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/base/CaseFormat.java b/guava/src/com/google/common/base/CaseFormat.java index 4a2bc40973cd..bb7ae37ad17b 100644 --- a/guava/src/com/google/common/base/CaseFormat.java +++ b/guava/src/com/google/common/base/CaseFormat.java @@ -23,7 +23,6 @@ import org.checkerframework.checker.index.qual.GTENegativeOne; import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.LTEqLengthOf; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.ArrayLen; diff --git a/guava/src/com/google/common/base/CommonPattern.java b/guava/src/com/google/common/base/CommonPattern.java index 734ebae4696b..5b6caf3570cc 100644 --- a/guava/src/com/google/common/base/CommonPattern.java +++ b/guava/src/com/google/common/base/CommonPattern.java @@ -15,7 +15,6 @@ package com.google.common.base; import com.google.common.annotations.GwtCompatible; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/base/Converter.java b/guava/src/com/google/common/base/Converter.java index bfac3a4eac7d..bbf56a6fc7bf 100644 --- a/guava/src/com/google/common/base/Converter.java +++ b/guava/src/com/google/common/base/Converter.java @@ -27,8 +27,7 @@ import java.io.Serializable; import java.util.Iterator; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.nullness.qual.PolyNull; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; /** diff --git a/guava/src/com/google/common/base/Enums.java b/guava/src/com/google/common/base/Enums.java index 319132a8bcaa..67a4d1e7cc8c 100644 --- a/guava/src/com/google/common/base/Enums.java +++ b/guava/src/com/google/common/base/Enums.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.WeakHashMap; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/base/MoreObjects.java b/guava/src/com/google/common/base/MoreObjects.java index 865a9366ec17..16e12bb50729 100644 --- a/guava/src/com/google/common/base/MoreObjects.java +++ b/guava/src/com/google/common/base/MoreObjects.java @@ -26,8 +26,6 @@ import java.util.OptionalInt; import java.util.OptionalLong; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.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/Optional.java b/guava/src/com/google/common/base/Optional.java index 8700b4977b55..11b09f59155d 100644 --- a/guava/src/com/google/common/base/Optional.java +++ b/guava/src/com/google/common/base/Optional.java @@ -24,8 +24,6 @@ import java.util.Set; import javax.annotation.CheckForNull; import org.checkerframework.checker.nullness.qual.NonNull; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.nullness.qual.PolyNull; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.framework.qual.AnnotatedFor; import org.checkerframework.framework.qual.Covariant; diff --git a/guava/src/com/google/common/base/PairwiseEquivalence.java b/guava/src/com/google/common/base/PairwiseEquivalence.java index ac24f82aa6fd..99e0f398c949 100644 --- a/guava/src/com/google/common/base/PairwiseEquivalence.java +++ b/guava/src/com/google/common/base/PairwiseEquivalence.java @@ -18,7 +18,7 @@ import java.io.Serializable; import java.util.Iterator; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; @GwtCompatible(serializable = true) diff --git a/guava/src/com/google/common/base/Platform.java b/guava/src/com/google/common/base/Platform.java index e6601d5db7dc..4a69d9bb0786 100644 --- a/guava/src/com/google/common/base/Platform.java +++ b/guava/src/com/google/common/base/Platform.java @@ -22,8 +22,7 @@ import java.util.logging.Logger; import java.util.regex.Pattern; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/base/Preconditions.java b/guava/src/com/google/common/base/Preconditions.java index 9f9e6e176ca4..1aded434f6dc 100644 --- a/guava/src/com/google/common/base/Preconditions.java +++ b/guava/src/com/google/common/base/Preconditions.java @@ -18,10 +18,9 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import java.util.logging.Logger; + import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/base/Strings.java b/guava/src/com/google/common/base/Strings.java index 7ac3abf8f2cd..ad7f3ba9738e 100644 --- a/guava/src/com/google/common/base/Strings.java +++ b/guava/src/com/google/common/base/Strings.java @@ -26,9 +26,7 @@ import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf; import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.framework.qual.EnsuresQualifierIf; /** * Static utility methods pertaining to {@code String} or {@code CharSequence} instances. diff --git a/guava/src/com/google/common/base/Throwables.java b/guava/src/com/google/common/base/Throwables.java index 6ef11eed0f52..1f266a38faa8 100644 --- a/guava/src/com/google/common/base/Throwables.java +++ b/guava/src/com/google/common/base/Throwables.java @@ -34,7 +34,6 @@ import java.util.List; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.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 3e99cd8f395c..cbc2dfd0f9fb 100644 --- a/guava/src/com/google/common/base/Verify.java +++ b/guava/src/com/google/common/base/Verify.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.NonNull; + import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/guava/src/com/google/common/base/internal/Finalizer.java b/guava/src/com/google/common/base/internal/Finalizer.java index 574d49526506..b4ae0cddf4c2 100644 --- a/guava/src/com/google/common/base/internal/Finalizer.java +++ b/guava/src/com/google/common/base/internal/Finalizer.java @@ -24,7 +24,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/cache/LongAdder.java b/guava/src/com/google/common/cache/LongAdder.java index e296b8f3747d..7bca94836533 100644 --- a/guava/src/com/google/common/cache/LongAdder.java +++ b/guava/src/com/google/common/cache/LongAdder.java @@ -17,7 +17,6 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLong; -import org.checkerframework.common.value.qual.PolyValue; /** * One or more variables that together maintain an initially zero {@code long} sum. When updates diff --git a/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java b/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java index c2a0d06bd96b..9530ee65976c 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.KeyFor; + import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/guava/src/com/google/common/collect/ClassToInstanceMap.java b/guava/src/com/google/common/collect/ClassToInstanceMap.java index 870e3cb7f47f..3039ae5b47e9 100644 --- a/guava/src/com/google/common/collect/ClassToInstanceMap.java +++ b/guava/src/com/google/common/collect/ClassToInstanceMap.java @@ -21,7 +21,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.Map; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/collect/ComputationException.java b/guava/src/com/google/common/collect/ComputationException.java index 1e0cc9ff100c..71c13b43398c 100644 --- a/guava/src/com/google/common/collect/ComputationException.java +++ b/guava/src/com/google/common/collect/ComputationException.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/collect/ExplicitOrdering.java b/guava/src/com/google/common/collect/ExplicitOrdering.java index 8f6454b6c01d..f735d187a686 100644 --- a/guava/src/com/google/common/collect/ExplicitOrdering.java +++ b/guava/src/com/google/common/collect/ExplicitOrdering.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.List; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java index e3dc0ee2e259..82bbe92332cc 100644 --- a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java +++ b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java @@ -20,7 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.concurrent.ConcurrentMap; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/Hashing.java b/guava/src/com/google/common/collect/Hashing.java index 7421b40ba0b4..7f09c4c5769a 100644 --- a/guava/src/com/google/common/collect/Hashing.java +++ b/guava/src/com/google/common/collect/Hashing.java @@ -19,7 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.primitives.Ints; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java b/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java index 7ca083704284..b02fb966a9a0 100644 --- a/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java +++ b/guava/src/com/google/common/collect/ImmutableClassToInstanceMap.java @@ -26,7 +26,7 @@ import java.io.Serializable; import java.util.Map; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/collect/ImmutableEnumSet.java b/guava/src/com/google/common/collect/ImmutableEnumSet.java index eee1bf09a3dc..3fb8f8fcdf3a 100644 --- a/guava/src/com/google/common/collect/ImmutableEnumSet.java +++ b/guava/src/com/google/common/collect/ImmutableEnumSet.java @@ -25,7 +25,6 @@ import java.util.function.Consumer; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java index f827546e1a1c..0fa07ef7ecdd 100644 --- a/guava/src/com/google/common/collect/ImmutableMap.java +++ b/guava/src/com/google/common/collect/ImmutableMap.java @@ -53,8 +53,6 @@ import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.nullness.qual.KeyFor; -import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.PolyNull; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/collect/ImmutableSet.java b/guava/src/com/google/common/collect/ImmutableSet.java index ad804eea3b61..c13394a85e06 100644 --- a/guava/src/com/google/common/collect/ImmutableSet.java +++ b/guava/src/com/google/common/collect/ImmutableSet.java @@ -42,7 +42,7 @@ import java.util.function.Consumer; import java.util.stream.Collector; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.NonNull; + import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; diff --git a/guava/src/com/google/common/collect/Iterables.java b/guava/src/com/google/common/collect/Iterables.java index 2ec4c614a5ce..dbd2a9fa6447 100644 --- a/guava/src/com/google/common/collect/Iterables.java +++ b/guava/src/com/google/common/collect/Iterables.java @@ -41,7 +41,6 @@ import java.util.stream.Stream; import javax.annotation.CheckForNull; import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.nullness.qual.PolyNull; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/LinkedHashMultimap.java b/guava/src/com/google/common/collect/LinkedHashMultimap.java index 66eafbeaea0a..ae83790a9adf 100644 --- a/guava/src/com/google/common/collect/LinkedHashMultimap.java +++ b/guava/src/com/google/common/collect/LinkedHashMultimap.java @@ -43,7 +43,6 @@ import java.util.function.Consumer; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.KeyFor; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.SideEffectFree; diff --git a/guava/src/com/google/common/collect/MapMaker.java b/guava/src/com/google/common/collect/MapMaker.java index 7f68df0aee19..7633f2202540 100644 --- a/guava/src/com/google/common/collect/MapMaker.java +++ b/guava/src/com/google/common/collect/MapMaker.java @@ -31,8 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.MonotonicNonNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/collect/NaturalOrdering.java b/guava/src/com/google/common/collect/NaturalOrdering.java index 20af68fae52f..d362eaa9dd4f 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 java.io.Serializable; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.MonotonicNonNull; + import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/RegularImmutableMultiset.java b/guava/src/com/google/common/collect/RegularImmutableMultiset.java index 7408f5ec9f7c..730e50feee83 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.Collection; import javax.annotation.CheckForNull; -import org.checkerframework.checker.index.qual.NonNegative; + import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java index cdb7e7151aa2..be119da7ed21 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java @@ -24,7 +24,7 @@ import java.util.Comparator; import java.util.function.ObjIntConsumer; import javax.annotation.CheckForNull; -import org.checkerframework.checker.index.qual.NonNegative; + import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/collect/SingletonImmutableSet.java b/guava/src/com/google/common/collect/SingletonImmutableSet.java index 50bdde7afcfd..9075339bd1a7 100644 --- a/guava/src/com/google/common/collect/SingletonImmutableSet.java +++ b/guava/src/com/google/common/collect/SingletonImmutableSet.java @@ -18,10 +18,9 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Preconditions; -import com.google.errorprone.annotations.concurrent.LazyInit; + import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/TreeMultimap.java b/guava/src/com/google/common/collect/TreeMultimap.java index 1451bfdac995..61864e1faf15 100644 --- a/guava/src/com/google/common/collect/TreeMultimap.java +++ b/guava/src/com/google/common/collect/TreeMultimap.java @@ -31,7 +31,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.checkerframework.checker.nullness.qual.KeyFor; + import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.dataflow.qual.SideEffectFree; diff --git a/guava/src/com/google/common/collect/TreeRangeMap.java b/guava/src/com/google/common/collect/TreeRangeMap.java index bde057238026..5a56c9f60125 100644 --- a/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/guava/src/com/google/common/collect/TreeRangeMap.java @@ -41,7 +41,6 @@ import java.util.function.BiFunction; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.KeyFor; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/hash/AbstractByteHasher.java b/guava/src/com/google/common/hash/AbstractByteHasher.java index 9ac0acd6da0a..a9f8047fca34 100644 --- a/guava/src/com/google/common/hash/AbstractByteHasher.java +++ b/guava/src/com/google/common/hash/AbstractByteHasher.java @@ -26,7 +26,6 @@ import java.nio.ByteOrder; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.common.value.qual.ArrayLen; import org.checkerframework.common.value.qual.IntRange; /** diff --git a/guava/src/com/google/common/hash/AbstractHashFunction.java b/guava/src/com/google/common/hash/AbstractHashFunction.java index 245f25dd0e00..c888868385a2 100644 --- a/guava/src/com/google/common/hash/AbstractHashFunction.java +++ b/guava/src/com/google/common/hash/AbstractHashFunction.java @@ -19,7 +19,6 @@ import com.google.errorprone.annotations.Immutable; import org.checkerframework.checker.index.qual.LTLengthOf; -import org.checkerframework.checker.index.qual.LengthOf; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.common.value.qual.MinLen; import java.nio.ByteBuffer; diff --git a/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java b/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java index 19a44a3bb11b..3f1e0c51ccf9 100644 --- a/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java +++ b/guava/src/com/google/common/hash/AbstractNonStreamingHashFunction.java @@ -22,7 +22,6 @@ import java.nio.charset.Charset; import java.util.Arrays; import org.checkerframework.checker.index.qual.LTLengthOf; -import org.checkerframework.checker.index.qual.LengthOf; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/hash/ChecksumHashFunction.java b/guava/src/com/google/common/hash/ChecksumHashFunction.java index e6e48002f4dc..7fd45ce95d13 100644 --- a/guava/src/com/google/common/hash/ChecksumHashFunction.java +++ b/guava/src/com/google/common/hash/ChecksumHashFunction.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.errorprone.annotations.Immutable; -import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; diff --git a/guava/src/com/google/common/hash/FarmHashFingerprint64.java b/guava/src/com/google/common/hash/FarmHashFingerprint64.java index 25aa488b4dd6..60b6871b2c12 100644 --- a/guava/src/com/google/common/hash/FarmHashFingerprint64.java +++ b/guava/src/com/google/common/hash/FarmHashFingerprint64.java @@ -21,9 +21,7 @@ import com.google.common.annotations.VisibleForTesting; import org.checkerframework.checker.index.qual.LTLengthOf; -import org.checkerframework.checker.index.qual.LengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.common.value.qual.ArrayLenRange; import org.checkerframework.common.value.qual.IntRange; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/hash/HashCode.java b/guava/src/com/google/common/hash/HashCode.java index d8e6fd470529..5c1a2d80de90 100644 --- a/guava/src/com/google/common/hash/HashCode.java +++ b/guava/src/com/google/common/hash/HashCode.java @@ -25,13 +25,8 @@ import java.io.Serializable; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.LTLengthOf; -import org.checkerframework.checker.index.qual.LengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.index.qual.SameLen; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; -import org.checkerframework.common.value.qual.ArrayLenRange; -import org.checkerframework.common.value.qual.IntRange; import org.checkerframework.common.value.qual.MinLen; /** diff --git a/guava/src/com/google/common/hash/Hashing.java b/guava/src/com/google/common/hash/Hashing.java index 5c0d6789c978..540bb91d5c82 100644 --- a/guava/src/com/google/common/hash/Hashing.java +++ b/guava/src/com/google/common/hash/Hashing.java @@ -31,10 +31,8 @@ import javax.crypto.spec.SecretKeySpec; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.IntRange; -import org.checkerframework.common.value.qual.MinLen; /** * Static methods to obtain {@link HashFunction} instances, and other static hashing-related diff --git a/guava/src/com/google/common/hash/HashingInputStream.java b/guava/src/com/google/common/hash/HashingInputStream.java index c4fe7737b25e..f7ef6cf8ef0d 100644 --- a/guava/src/com/google/common/hash/HashingInputStream.java +++ b/guava/src/com/google/common/hash/HashingInputStream.java @@ -18,7 +18,6 @@ import com.google.common.annotations.Beta; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; import java.io.FilterInputStream; import java.io.IOException; diff --git a/guava/src/com/google/common/hash/Murmur3_128HashFunction.java b/guava/src/com/google/common/hash/Murmur3_128HashFunction.java index 724fec48334c..9ca450932cfb 100644 --- a/guava/src/com/google/common/hash/Murmur3_128HashFunction.java +++ b/guava/src/com/google/common/hash/Murmur3_128HashFunction.java @@ -33,7 +33,6 @@ import java.nio.ByteOrder; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; /** diff --git a/guava/src/com/google/common/hash/Murmur3_32HashFunction.java b/guava/src/com/google/common/hash/Murmur3_32HashFunction.java index 3386ddc7d70a..59b4fda0555e 100644 --- a/guava/src/com/google/common/hash/Murmur3_32HashFunction.java +++ b/guava/src/com/google/common/hash/Murmur3_32HashFunction.java @@ -42,7 +42,6 @@ import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/hash/PrimitiveSink.java b/guava/src/com/google/common/hash/PrimitiveSink.java index 1606edbbf885..044d5af290e4 100644 --- a/guava/src/com/google/common/hash/PrimitiveSink.java +++ b/guava/src/com/google/common/hash/PrimitiveSink.java @@ -16,7 +16,6 @@ import com.google.common.annotations.Beta; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import org.checkerframework.checker.index.qual.LTEqLengthOf; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/hash/SipHashFunction.java b/guava/src/com/google/common/hash/SipHashFunction.java index ab94b0cf0191..faa2c7fbdc5c 100644 --- a/guava/src/com/google/common/hash/SipHashFunction.java +++ b/guava/src/com/google/common/hash/SipHashFunction.java @@ -26,7 +26,6 @@ import java.nio.ByteBuffer; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.UnknownSignedness; /** diff --git a/guava/src/com/google/common/io/AppendableWriter.java b/guava/src/com/google/common/io/AppendableWriter.java index 1e0c0ec9ad11..68714b178f43 100644 --- a/guava/src/com/google/common/io/AppendableWriter.java +++ b/guava/src/com/google/common/io/AppendableWriter.java @@ -25,7 +25,6 @@ import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; /** * Writer that places all output on an {@link Appendable} target. If the target is {@link Flushable} diff --git a/guava/src/com/google/common/io/BaseEncoding.java b/guava/src/com/google/common/io/BaseEncoding.java index 01f58a29d32a..422fe5fb7d27 100644 --- a/guava/src/com/google/common/io/BaseEncoding.java +++ b/guava/src/com/google/common/io/BaseEncoding.java @@ -42,7 +42,6 @@ import org.checkerframework.checker.index.qual.LTEqLengthOf; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.PolySigned; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.ArrayLen; diff --git a/guava/src/com/google/common/io/FileBackedOutputStream.java b/guava/src/com/google/common/io/FileBackedOutputStream.java index 422b3c2132e0..59b4e6275d06 100644 --- a/guava/src/com/google/common/io/FileBackedOutputStream.java +++ b/guava/src/com/google/common/io/FileBackedOutputStream.java @@ -32,7 +32,6 @@ import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.PolySigned; /** diff --git a/guava/src/com/google/common/io/MoreFiles.java b/guava/src/com/google/common/io/MoreFiles.java index d52e0b8301e6..28b052bb1df7 100644 --- a/guava/src/com/google/common/io/MoreFiles.java +++ b/guava/src/com/google/common/io/MoreFiles.java @@ -57,7 +57,6 @@ import java.util.stream.Stream; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; /** * Static utilities for use with {@link Path} instances, intended to complement {@link Files}. diff --git a/guava/src/com/google/common/io/MultiInputStream.java b/guava/src/com/google/common/io/MultiInputStream.java index ee684ef260d0..e0fe8954b48e 100644 --- a/guava/src/com/google/common/io/MultiInputStream.java +++ b/guava/src/com/google/common/io/MultiInputStream.java @@ -26,7 +26,6 @@ import org.checkerframework.checker.index.qual.LTEqLengthOf; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; /** * An {@link InputStream} that concatenates multiple substreams. At most one stream will be open at diff --git a/guava/src/com/google/common/io/MultiReader.java b/guava/src/com/google/common/io/MultiReader.java index d74b801c19eb..d1219e3e5de8 100644 --- a/guava/src/com/google/common/io/MultiReader.java +++ b/guava/src/com/google/common/io/MultiReader.java @@ -27,7 +27,6 @@ import org.checkerframework.checker.index.qual.LTEqLengthOf; import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; /** * A {@link Reader} that concatenates multiple readers. diff --git a/guava/src/com/google/common/math/BigIntegerMath.java b/guava/src/com/google/common/math/BigIntegerMath.java index c4d0823a9181..ac7f97c46e77 100644 --- a/guava/src/com/google/common/math/BigIntegerMath.java +++ b/guava/src/com/google/common/math/BigIntegerMath.java @@ -37,7 +37,6 @@ import org.checkerframework.checker.index.qual.LTLengthOf; import org.checkerframework.checker.index.qual.LessThan; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.index.qual.Positive; /** * A class for arithmetic on values of type {@code BigInteger}. diff --git a/guava/src/com/google/common/math/Stats.java b/guava/src/com/google/common/math/Stats.java index f1647481247d..9103339162b6 100644 --- a/guava/src/com/google/common/math/Stats.java +++ b/guava/src/com/google/common/math/Stats.java @@ -37,7 +37,7 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/net/PercentEscaper.java b/guava/src/com/google/common/net/PercentEscaper.java index 2d06b5bb0a1a..67e77a6f33e2 100644 --- a/guava/src/com/google/common/net/PercentEscaper.java +++ b/guava/src/com/google/common/net/PercentEscaper.java @@ -20,7 +20,6 @@ import com.google.common.escape.UnicodeEscaper; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.IndexOrHigh; -import org.checkerframework.checker.index.qual.NonNegative; /** * 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 3ea13c9103aa..80be9713d6fe 100644 --- a/guava/src/com/google/common/primitives/Booleans.java +++ b/guava/src/com/google/common/primitives/Booleans.java @@ -40,7 +40,6 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/primitives/Bytes.java b/guava/src/com/google/common/primitives/Bytes.java index 4079eae3c3a1..7f3cd192f494 100644 --- a/guava/src/com/google/common/primitives/Bytes.java +++ b/guava/src/com/google/common/primitives/Bytes.java @@ -38,7 +38,6 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.PolySigned; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/primitives/Chars.java b/guava/src/com/google/common/primitives/Chars.java index d7154f447bd2..9d773a569c1c 100644 --- a/guava/src/com/google/common/primitives/Chars.java +++ b/guava/src/com/google/common/primitives/Chars.java @@ -41,15 +41,12 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.SignednessGlb; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.checker.signedness.qual.Unsigned; import org.checkerframework.common.value.qual.IntRange; import org.checkerframework.common.value.qual.MinLen; import org.checkerframework.framework.qual.AnnotatedFor; -import org.checkerframework.framework.qual.CFComment; /** * 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 a9af81b38025..f02bd43303ba 100644 --- a/guava/src/com/google/common/primitives/Doubles.java +++ b/guava/src/com/google/common/primitives/Doubles.java @@ -47,8 +47,6 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.MinLen; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/primitives/Floats.java b/guava/src/com/google/common/primitives/Floats.java index 146fd575ae67..a40bf479b6cd 100644 --- a/guava/src/com/google/common/primitives/Floats.java +++ b/guava/src/com/google/common/primitives/Floats.java @@ -45,8 +45,6 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.MinLen; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java index aeed1095e7e2..9d04e78735da 100644 --- a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java +++ b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java @@ -45,8 +45,6 @@ import org.checkerframework.checker.index.qual.LessThan; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.SameLen; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/primitives/ImmutableIntArray.java b/guava/src/com/google/common/primitives/ImmutableIntArray.java index 95fa420a958e..af5a1401b49e 100644 --- a/guava/src/com/google/common/primitives/ImmutableIntArray.java +++ b/guava/src/com/google/common/primitives/ImmutableIntArray.java @@ -45,7 +45,6 @@ import org.checkerframework.checker.index.qual.LessThan; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.SameLen; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; diff --git a/guava/src/com/google/common/primitives/ImmutableLongArray.java b/guava/src/com/google/common/primitives/ImmutableLongArray.java index 941a4ca5dc62..a5eb5603ca64 100644 --- a/guava/src/com/google/common/primitives/ImmutableLongArray.java +++ b/guava/src/com/google/common/primitives/ImmutableLongArray.java @@ -45,7 +45,6 @@ import org.checkerframework.checker.index.qual.LessThan; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.SameLen; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.dataflow.qual.Pure; diff --git a/guava/src/com/google/common/primitives/Ints.java b/guava/src/com/google/common/primitives/Ints.java index bd4a49b7c8a8..9daba53ff86a 100644 --- a/guava/src/com/google/common/primitives/Ints.java +++ b/guava/src/com/google/common/primitives/Ints.java @@ -45,7 +45,6 @@ import org.checkerframework.checker.index.qual.PolyLowerBound; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.IntRange; diff --git a/guava/src/com/google/common/primitives/Longs.java b/guava/src/com/google/common/primitives/Longs.java index 2bfc3f7bb570..20e91868ab1b 100644 --- a/guava/src/com/google/common/primitives/Longs.java +++ b/guava/src/com/google/common/primitives/Longs.java @@ -43,7 +43,6 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.IntRange; diff --git a/guava/src/com/google/common/primitives/Shorts.java b/guava/src/com/google/common/primitives/Shorts.java index 9370fcebeec6..0daa3a230f80 100644 --- a/guava/src/com/google/common/primitives/Shorts.java +++ b/guava/src/com/google/common/primitives/Shorts.java @@ -42,7 +42,6 @@ import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.index.qual.SubstringIndexFor; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.IntRange; diff --git a/guava/src/com/google/common/primitives/UnsignedBytes.java b/guava/src/com/google/common/primitives/UnsignedBytes.java index 0db9995e4856..c140535c08a7 100644 --- a/guava/src/com/google/common/primitives/UnsignedBytes.java +++ b/guava/src/com/google/common/primitives/UnsignedBytes.java @@ -28,7 +28,6 @@ import java.util.Comparator; import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.signedness.qual.PolySigned; import org.checkerframework.checker.signedness.qual.SignedPositive; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/primitives/UnsignedInteger.java b/guava/src/com/google/common/primitives/UnsignedInteger.java index 96fc1cbaefbc..d2f176da465a 100644 --- a/guava/src/com/google/common/primitives/UnsignedInteger.java +++ b/guava/src/com/google/common/primitives/UnsignedInteger.java @@ -24,9 +24,7 @@ import com.google.common.annotations.GwtIncompatible; import java.math.BigInteger; import javax.annotation.CheckForNull; -import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.index.qual.Positive; -import org.checkerframework.checker.nullness.qual.Nullable; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.IntRange; import org.checkerframework.common.value.qual.PolyValue; diff --git a/guava/src/com/google/common/primitives/UnsignedInts.java b/guava/src/com/google/common/primitives/UnsignedInts.java index 95faca193b2b..f2eafdc1e4ce 100644 --- a/guava/src/com/google/common/primitives/UnsignedInts.java +++ b/guava/src/com/google/common/primitives/UnsignedInts.java @@ -25,7 +25,6 @@ import java.util.Comparator; import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.index.qual.Positive; import org.checkerframework.checker.signedness.qual.PolySigned; import org.checkerframework.checker.signedness.qual.SignedPositive; import org.checkerframework.checker.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/primitives/UnsignedLong.java b/guava/src/com/google/common/primitives/UnsignedLong.java index edcc662c564d..3581ec359927 100644 --- a/guava/src/com/google/common/primitives/UnsignedLong.java +++ b/guava/src/com/google/common/primitives/UnsignedLong.java @@ -23,7 +23,6 @@ import java.math.BigInteger; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.signedness.qual.Signed; import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.checker.signedness.qual.Unsigned; From 9cfc27c1f05d051f661bc5007397ec2647cb2016 Mon Sep 17 00:00:00 2001 From: Aosen Xiong Date: Mon, 6 Oct 2025 03:48:46 -0400 Subject: [PATCH 2/2] keep Google's import --- guava/src/com/google/common/base/Preconditions.java | 2 +- guava/src/com/google/common/collect/SingletonImmutableSet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guava/src/com/google/common/base/Preconditions.java b/guava/src/com/google/common/base/Preconditions.java index 1aded434f6dc..25b980f6ec5e 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 java.util.logging.Logger; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/guava/src/com/google/common/collect/SingletonImmutableSet.java b/guava/src/com/google/common/collect/SingletonImmutableSet.java index 9075339bd1a7..66f51782d6a1 100644 --- a/guava/src/com/google/common/collect/SingletonImmutableSet.java +++ b/guava/src/com/google/common/collect/SingletonImmutableSet.java @@ -18,7 +18,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.base.Preconditions; - +import com.google.errorprone.annotations.concurrent.LazyInit; import javax.annotation.CheckForNull; import org.checkerframework.checker.index.qual.NonNegative; import org.checkerframework.checker.signedness.qual.UnknownSignedness;