Skip to content

Commit 2cc8c5e

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Migrate from Checker Framework annotations to JSpecify annotations.
This is the next step toward [using JSpecify in Guava](jspecify/jspecify#239 (comment)). RELNOTES=Migrated from Checker Framework annotations to JSpecify annotations. PiperOrigin-RevId: 708707163
1 parent 04bf030 commit 2cc8c5e

File tree

1,317 files changed

+1356
-1356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,317 files changed

+1356
-1356
lines changed

android/guava-testlib/src/com/google/common/collect/testing/AbstractCollectionTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.errorprone.annotations.CanIgnoreReturnValue;
2121
import java.util.Collection;
2222
import org.jspecify.annotations.NullMarked;
23-
import org.checkerframework.checker.nullness.qual.Nullable;
23+
import org.jspecify.annotations.Nullable;
2424
import org.junit.Ignore;
2525

2626
/**

android/guava-testlib/src/com/google/common/collect/testing/AbstractContainerTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Collection;
2929
import java.util.List;
3030
import org.jspecify.annotations.NullMarked;
31-
import org.checkerframework.checker.nullness.qual.Nullable;
31+
import org.jspecify.annotations.Nullable;
3232
import org.junit.Ignore;
3333

3434
/**

android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import java.util.Set;
3636
import java.util.Stack;
3737
import org.jspecify.annotations.NullMarked;
38-
import org.checkerframework.checker.nullness.qual.Nullable;
38+
import org.jspecify.annotations.Nullable;
3939

4040
/**
4141
* Most of the logic for {@link IteratorTester} and {@link ListIteratorTester}.

android/guava-testlib/src/com/google/common/collect/testing/AbstractMapTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Map;
2828
import java.util.Map.Entry;
2929
import org.jspecify.annotations.NullMarked;
30-
import org.checkerframework.checker.nullness.qual.Nullable;
30+
import org.jspecify.annotations.Nullable;
3131
import org.junit.Ignore;
3232

3333
/**

android/guava-testlib/src/com/google/common/collect/testing/AbstractTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.annotations.J2ktIncompatible;
2222
import junit.framework.TestCase;
2323
import org.jspecify.annotations.NullMarked;
24-
import org.checkerframework.checker.nullness.qual.Nullable;
24+
import org.jspecify.annotations.Nullable;
2525

2626
/**
2727
* This abstract base class for testers allows the framework to inject needed information after

android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.common.annotations.GwtCompatible;
2020
import java.io.Serializable;
21-
import org.checkerframework.checker.nullness.qual.Nullable;
21+
import org.jspecify.annotations.Nullable;
2222

2323
/**
2424
* Simple base class to verify that we handle generics correctly.

android/guava-testlib/src/com/google/common/collect/testing/DerivedCollectionGenerators.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.SortedMap;
3535
import java.util.SortedSet;
3636
import org.jspecify.annotations.NullMarked;
37-
import org.checkerframework.checker.nullness.qual.Nullable;
37+
import org.jspecify.annotations.Nullable;
3838

3939
/**
4040
* Derived suite generators, split out of the suite builders so that they are available to GWT.

android/guava-testlib/src/com/google/common/collect/testing/FeatureSpecificTestSuiteBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import junit.framework.Test;
4343
import junit.framework.TestCase;
4444
import junit.framework.TestSuite;
45-
import org.checkerframework.checker.nullness.qual.Nullable;
45+
import org.jspecify.annotations.Nullable;
4646

4747
/**
4848
* Creates, based on your criteria, a JUnit test suite that exhaustively tests the object generated

android/guava-testlib/src/com/google/common/collect/testing/Helpers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import java.util.Map.Entry;
4646
import java.util.Set;
4747
import org.jspecify.annotations.NullMarked;
48-
import org.checkerframework.checker.nullness.qual.Nullable;
48+
import org.jspecify.annotations.Nullable;
4949

5050
@GwtCompatible(emulated = true)
5151
@NullMarked

android/guava-testlib/src/com/google/common/collect/testing/IteratorTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Collections;
2121
import java.util.Iterator;
2222
import org.jspecify.annotations.NullMarked;
23-
import org.checkerframework.checker.nullness.qual.Nullable;
23+
import org.jspecify.annotations.Nullable;
2424

2525
/**
2626
* A utility for testing an Iterator implementation by comparing its behavior to that of a "known

0 commit comments

Comments
 (0)