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 2fd79373d71f..889b42e94a5b 100644 --- a/guava/src/com/google/common/base/Converter.java +++ b/guava/src/com/google/common/base/Converter.java @@ -26,6 +26,7 @@ import java.io.Serializable; import java.util.Iterator; import javax.annotation.CheckForNull; + 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 48a616fd0784..042986809db2 100644 --- a/guava/src/com/google/common/base/Enums.java +++ b/guava/src/com/google/common/base/Enums.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.WeakHashMap; import javax.annotation.CheckForNull; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/base/PairwiseEquivalence.java b/guava/src/com/google/common/base/PairwiseEquivalence.java index f5c886f17b95..dff4c97de2df 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 4bd4170c0b8e..fb84519d1d34 100644 --- a/guava/src/com/google/common/base/Platform.java +++ b/guava/src/com/google/common/base/Platform.java @@ -22,6 +22,7 @@ import java.util.logging.Logger; import java.util.regex.Pattern; import javax.annotation.CheckForNull; + 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 102c6fac4865..ad7f3ba9738e 100644 --- a/guava/src/com/google/common/base/Strings.java +++ b/guava/src/com/google/common/base/Strings.java @@ -27,7 +27,6 @@ import org.checkerframework.checker.index.qual.IndexOrHigh; import org.checkerframework.checker.index.qual.NonNegative; 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/Verify.java b/guava/src/com/google/common/base/Verify.java index f54e8c0e0850..701f2edb2bb3 100644 --- a/guava/src/com/google/common/base/Verify.java +++ b/guava/src/com/google/common/base/Verify.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import javax.annotation.CheckForNull; + import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.dataflow.qual.AssertMethod; import org.checkerframework.dataflow.qual.Pure; diff --git a/guava/src/com/google/common/base/internal/Finalizer.java b/guava/src/com/google/common/base/internal/Finalizer.java index e1ef12b8d457..bd5c68308aa6 100644 --- a/guava/src/com/google/common/base/internal/Finalizer.java +++ b/guava/src/com/google/common/base/internal/Finalizer.java @@ -24,6 +24,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.CheckForNull; + 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 676936f0578e..9530ee65976c 100644 --- a/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSortedKeySortedSetMultimap.java @@ -21,6 +21,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; + 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 4795f02ce2df..df72f786829c 100644 --- a/guava/src/com/google/common/collect/ClassToInstanceMap.java +++ b/guava/src/com/google/common/collect/ClassToInstanceMap.java @@ -21,8 +21,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.util.Map; import javax.annotation.CheckForNull; -import org.checkerframework.checker.nullness.qual.NonNull; -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 9946f8cee5a9..71c13b43398c 100644 --- a/guava/src/com/google/common/collect/ComputationException.java +++ b/guava/src/com/google/common/collect/ComputationException.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtCompatible; import javax.annotation.CheckForNull; + 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 974f0b3c4f42..f735d187a686 100644 --- a/guava/src/com/google/common/collect/ExplicitOrdering.java +++ b/guava/src/com/google/common/collect/ExplicitOrdering.java @@ -20,6 +20,7 @@ import java.io.Serializable; import java.util.List; import javax.annotation.CheckForNull; + 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 836b8d37ad25..82bbe92332cc 100644 --- a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java +++ b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java @@ -20,6 +20,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.concurrent.ConcurrentMap; import javax.annotation.CheckForNull; + 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 44c1eae5186f..7f09c4c5769a 100644 --- a/guava/src/com/google/common/collect/Hashing.java +++ b/guava/src/com/google/common/collect/Hashing.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.primitives.Ints; import javax.annotation.CheckForNull; + 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 88abf258e61b..d1c016503bd0 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.NonNull; + import org.checkerframework.framework.qual.AnnotatedFor; /** diff --git a/guava/src/com/google/common/collect/ImmutableSet.java b/guava/src/com/google/common/collect/ImmutableSet.java index 62deb511c985..0a1e1b55c7ec 100644 --- a/guava/src/com/google/common/collect/ImmutableSet.java +++ b/guava/src/com/google/common/collect/ImmutableSet.java @@ -45,6 +45,7 @@ import java.util.function.Consumer; import java.util.stream.Collector; import javax.annotation.CheckForNull; + 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 5190a8835409..77bc50a154ba 100644 --- a/guava/src/com/google/common/collect/Iterables.java +++ b/guava/src/com/google/common/collect/Iterables.java @@ -41,7 +41,6 @@ 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.dataflow.qual.Pure; import org.checkerframework.framework.qual.AnnotatedFor; diff --git a/guava/src/com/google/common/collect/MapMaker.java b/guava/src/com/google/common/collect/MapMaker.java index aec06fada2d5..abd63da22b4c 100644 --- a/guava/src/com/google/common/collect/MapMaker.java +++ b/guava/src/com/google/common/collect/MapMaker.java @@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.annotation.CheckForNull; + 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 5050c04f96d6..e90235d63b32 100644 --- a/guava/src/com/google/common/collect/NaturalOrdering.java +++ b/guava/src/com/google/common/collect/NaturalOrdering.java @@ -22,6 +22,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; 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/RegularImmutableMultiset.java b/guava/src/com/google/common/collect/RegularImmutableMultiset.java index 2003304e0b8a..66e9db55cc72 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.Collection; 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/collect/RegularImmutableSortedMultiset.java b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java index 348f675fc88c..84698d430eae 100644 --- a/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/RegularImmutableSortedMultiset.java @@ -25,6 +25,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.signedness.qual.UnknownSignedness; diff --git a/guava/src/com/google/common/collect/SingletonImmutableSet.java b/guava/src/com/google/common/collect/SingletonImmutableSet.java index 807e09649190..2463c0544f2e 100644 --- a/guava/src/com/google/common/collect/SingletonImmutableSet.java +++ b/guava/src/com/google/common/collect/SingletonImmutableSet.java @@ -22,7 +22,6 @@ import com.google.common.base.Preconditions; 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 f1a77a2c984b..f43595070e2f 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.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/hash/AbstractByteHasher.java b/guava/src/com/google/common/hash/AbstractByteHasher.java index 4835e27bcc81..7d209756f0d4 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 59771676d070..222756d47b2a 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 com.google.j2objc.annotations.J2ObjCIncompatible; 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 1f12cbfe9f44..48b04ad5b386 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/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/PrimitiveSink.java b/guava/src/com/google/common/hash/PrimitiveSink.java index 0201a0eba1f8..7255ce652450 100644 --- a/guava/src/com/google/common/hash/PrimitiveSink.java +++ b/guava/src/com/google/common/hash/PrimitiveSink.java @@ -16,9 +16,6 @@ import com.google.common.annotations.Beta; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -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/math/BigIntegerMath.java b/guava/src/com/google/common/math/BigIntegerMath.java index 036b3b8dcbe0..6115bb367e26 100644 --- a/guava/src/com/google/common/math/BigIntegerMath.java +++ b/guava/src/com/google/common/math/BigIntegerMath.java @@ -34,7 +34,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 4100b9df8497..52e3f487d37c 100644 --- a/guava/src/com/google/common/math/Stats.java +++ b/guava/src/com/google/common/math/Stats.java @@ -37,6 +37,7 @@ import java.util.stream.IntStream; import java.util.stream.LongStream; import javax.annotation.CheckForNull; + import org.checkerframework.checker.signedness.qual.UnknownSignedness; import org.checkerframework.common.value.qual.MinLen; diff --git a/guava/src/com/google/common/primitives/UnsignedBytes.java b/guava/src/com/google/common/primitives/UnsignedBytes.java index 817d1e7e9f94..a5faba343012 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 9f8996be7e58..d3ca571b7f2b 100644 --- a/guava/src/com/google/common/primitives/UnsignedInteger.java +++ b/guava/src/com/google/common/primitives/UnsignedInteger.java @@ -25,6 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.math.BigInteger; import javax.annotation.CheckForNull; + 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 ccbfcb1089a0..e41c66263b7a 100644 --- a/guava/src/com/google/common/primitives/UnsignedInts.java +++ b/guava/src/com/google/common/primitives/UnsignedInts.java @@ -24,7 +24,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;