Migrate nullability annotations to javax.annotation

This replaces usages of `android.annotation.NonNull`, `android.annotation.Nullable`, `androidx.annotation.NonNull` and `androidx.annotation.Nullable` with `javax.annotation.Nonnull` and `javax.annotation.Nullable`.
MGaetan89 · Nov 23, 2024 · e36f7ad · e36f7ad
1 parent fd2cc93
commit e36f7ad
Show file tree

Hide file tree

Showing 82 changed files with 395 additions and 395 deletions.
diff --git a/...ndroidx_test/src/test/java/org/robolectric/integrationtests/axt/ActivityScenarioTest.java b/...ndroidx_test/src/test/java/org/robolectric/integrationtests/axt/ActivityScenarioTest.java
@@ -12,8 +12,6 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.R;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
@@ -25,6 +23,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -123,10 +123,10 @@ public int getIntValue() {
 
   public static class CustomAppComponentFactory extends AppComponentFactory {
 
-    @NonNull
+    @Nonnull
     @Override
     public Activity instantiateActivity(
-        @NonNull ClassLoader cl, @NonNull String className, @Nullable Intent intent)
+        @Nonnull ClassLoader cl, @Nonnull String className, @Nullable Intent intent)
         throws ClassNotFoundException, IllegalAccessException, InstantiationException {
       if (className.contains(ActivityWithCustomConstructor.class.getName())) {
         return new ActivityWithCustomConstructor(100);

diff --git a/...ts/androidx_test/src/test/java/org/robolectric/integrationtests/axt/CryptoObjectTest.java b/...ts/androidx_test/src/test/java/org/robolectric/integrationtests/axt/CryptoObjectTest.java
@@ -2,13 +2,13 @@
 
 import static org.junit.Assert.fail;
 
-import androidx.annotation.NonNull;
 import androidx.biometric.BiometricPrompt;
 import androidx.biometric.BiometricPrompt.PromptInfo;
 import androidx.fragment.app.FragmentActivity;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.Executor;
+import javax.annotation.Nonnull;
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import org.junit.Before;
@@ -40,11 +40,11 @@ public void execute(Runnable command) {}
             },
             new BiometricPrompt.AuthenticationCallback() {
               @Override
-              public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {}
+              public void onAuthenticationError(int errorCode, @Nonnull CharSequence errString) {}
 
               @Override
               public void onAuthenticationSucceeded(
-                  @NonNull BiometricPrompt.AuthenticationResult result) {}
+                  @Nonnull BiometricPrompt.AuthenticationResult result) {}
 
               @Override
               public void onAuthenticationFailed() {}

diff --git a/integration_tests/nativegraphics/src/test/java/org/robolectric/shadows/ColorUtils.java b/integration_tests/nativegraphics/src/test/java/org/robolectric/shadows/ColorUtils.java
@@ -19,10 +19,10 @@
 import static org.junit.Assert.fail;
 
 import android.graphics.Color;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import java.util.function.Function;
 import java.util.function.IntUnaryOperator;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public final class ColorUtils {
   public static void verifyColor(int expected, int observed) {
@@ -41,7 +41,7 @@ public static void verifyColor(int expected, int observed, int tolerance) {
    * @param observed Observed color.
    * @param tolerance Per-channel tolerance by which the color can mismatch.
    */
-  public static void verifyColor(@NonNull String s, int expected, int observed, int tolerance) {
+  public static void verifyColor(@Nonnull String s, int expected, int observed, int tolerance) {
     s +=
         " expected 0x"
             + Integer.toHexString(expected)
@@ -66,7 +66,7 @@ public static void verifyColor(@NonNull String s, int expected, int observed, in
    * @param tolerance Per-channel tolerance by which the color can mismatch.
    */
   public static void verifyColor(
-      @NonNull String msg, Color expected, Color observed, float tolerance) {
+      @Nonnull String msg, Color expected, Color observed, float tolerance) {
     if (!expected.getColorSpace().equals(observed.getColorSpace())) {
       fail(
           "Cannot compare Colors with different color spaces! expected: "
@@ -90,7 +90,7 @@ public static void verifyColor(
   }
 
   private static void buildErrorString(
-      @NonNull String s,
+      @Nonnull String s,
       @Nullable String red,
       @Nullable String green,
       @Nullable String blue,

diff --git a/...gration_tests/nativegraphics/src/test/java/org/robolectric/shadows/DrawableTestUtils.java b/...gration_tests/nativegraphics/src/test/java/org/robolectric/shadows/DrawableTestUtils.java
@@ -32,12 +32,12 @@
 import android.util.Log;
 import android.util.Xml;
 import androidx.annotation.IntegerRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.google.common.base.MoreObjects;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.junit.Assert;
 import org.robolectric.RuntimeEnvironment;
 import org.xmlpull.v1.XmlPullParser;
@@ -256,8 +256,8 @@ public static int getPixel(Drawable d, int x, int y) {
    * referred from the resource id, plus optionally {@code extras}, and "_golden"
    */
   static void saveAutoNamedVectorDrawableIntoPNG(
-      @NonNull Context context,
-      @NonNull Bitmap bitmap,
+      @Nonnull Context context,
+      @Nonnull Bitmap bitmap,
       @IntegerRes int resId,
       @Nullable String extras)
       throws IOException {
@@ -274,7 +274,7 @@ static void saveAutoNamedVectorDrawableIntoPNG(
 
   /** Save a {@code bitmap} to the {@code fileFullName} plus "_golden". */
   static void saveVectorDrawableIntoPNG(
-      @NonNull Bitmap bitmap, @NonNull String outputFolder, @NonNull String fileFullName)
+      @Nonnull Bitmap bitmap, @Nonnull String outputFolder, @Nonnull String fileFullName)
       throws IOException {
     // Save the image to the disk.
     FileOutputStream out = null;

diff --git a/.../nativegraphics/src/test/java/org/robolectric/shadows/ShadowNativeVectorDrawableTest.java b/.../nativegraphics/src/test/java/org/robolectric/shadows/ShadowNativeVectorDrawableTest.java
@@ -41,10 +41,10 @@
 import android.graphics.drawable.VectorDrawable;
 import android.util.AttributeSet;
 import android.util.Xml;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.IOException;
+import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowAccessibilityServiceTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowAccessibilityServiceTest.java
@@ -17,12 +17,12 @@
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityWindowInfo;
-import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nonnull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -139,7 +139,7 @@ public void takeScreenshot_byDefault_immediatelyReturnsSuccessfully() {
     TakeScreenshotCallback takeScreenshotCallback =
         new TakeScreenshotCallback() {
           @Override
-          public void onSuccess(@NonNull ScreenshotResult screenshotResult) {
+          public void onSuccess(@Nonnull ScreenshotResult screenshotResult) {
             screenshotResultAtomicReference.set(screenshotResult);
           }
 
@@ -164,7 +164,7 @@ public void takeScreenshot_afterSettingErrorCode_returnsErrorCode() {
     TakeScreenshotCallback takeScreenshotCallback =
         new TakeScreenshotCallback() {
           @Override
-          public void onSuccess(@NonNull ScreenshotResult screenshotResult) {}
+          public void onSuccess(@Nonnull ScreenshotResult screenshotResult) {}
 
           @Override
           public void onFailure(int errorCode) {
@@ -188,7 +188,7 @@ public void takeScreenshot_afterUnsettingErrorCode_immediatelyReturnsSuccessfull
     TakeScreenshotCallback takeScreenshotCallback =
         new TakeScreenshotCallback() {
           @Override
-          public void onSuccess(@NonNull ScreenshotResult screenshotResult) {
+          public void onSuccess(@Nonnull ScreenshotResult screenshotResult) {
             screenshotResultAtomicReference.set(screenshotResult);
           }
 

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowBackupManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowBackupManagerTest.java
@@ -13,7 +13,6 @@
 import android.app.backup.RestoreObserver;
 import android.app.backup.RestoreSession;
 import android.app.backup.RestoreSet;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
@@ -22,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowCaptioningManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowCaptioningManagerTest.java
@@ -13,10 +13,10 @@
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 import android.view.accessibility.CaptioningManager.CaptioningChangeListener;
-import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Locale;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
@@ -55,7 +55,7 @@ public void onEnabledChanged(boolean enabled) {
     }
 
     @Override
-    public void onUserStyleChanged(@NonNull CaptionStyle userStyle) {
+    public void onUserStyleChanged(@Nonnull CaptionStyle userStyle) {
       captionStyle = userStyle;
     }
 

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowDistanceMeasurementManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowDistanceMeasurementManagerTest.java
@@ -14,13 +14,13 @@
 import android.bluetooth.le.DistanceMeasurementResult;
 import android.bluetooth.le.DistanceMeasurementSession;
 import android.content.Context;
-import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
+import javax.annotation.Nonnull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,7 +53,7 @@ public class ShadowDistanceMeasurementManagerTest {
   private final Object distanceMeasurementSessionCallback =
       new DistanceMeasurementSession.Callback() {
         @Override
-        public void onStarted(@NonNull DistanceMeasurementSession session) {
+        public void onStarted(@Nonnull DistanceMeasurementSession session) {
           startedDistanceMeasurementSession = session;
         }
 
@@ -63,13 +63,13 @@ public void onStartFail(int reason) {
         }
 
         @Override
-        public void onStopped(@NonNull DistanceMeasurementSession session, int reason) {
+        public void onStopped(@Nonnull DistanceMeasurementSession session, int reason) {
           onStoppedReason = reason;
         }
 
         @Override
         public void onResult(
-            @NonNull BluetoothDevice device, @NonNull DistanceMeasurementResult result) {
+            @Nonnull BluetoothDevice device, @Nonnull DistanceMeasurementResult result) {
           distanceMeasurementResults.add(result);
         }
       };

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowIconTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowIconTest.java
@@ -13,9 +13,9 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import javax.annotation.Nullable;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowUsbDeviceConnectionTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowUsbDeviceConnectionTest.java
@@ -14,12 +14,12 @@
 import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowUsbRequestTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowUsbRequestTest.java
@@ -15,10 +15,10 @@
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbRequest;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.nio.ByteBuffer;
+import javax.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowViewGroupTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowViewGroupTest.java
@@ -24,11 +24,11 @@
 import android.view.animation.LayoutAnimationController;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import javax.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowWindowManagerGlobalTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowWindowManagerGlobalTest.java
@@ -17,14 +17,14 @@
 import android.window.BackEvent;
 import android.window.OnBackAnimationCallback;
 import android.window.OnBackInvokedDispatcher;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -252,12 +252,12 @@ private static final class TestBackAnimationCallback implements OnBackAnimationC
     public boolean onBackCancelledCalled = false;
 
     @Override
-    public void onBackStarted(@NonNull BackEvent backEvent) {
+    public void onBackStarted(@Nonnull BackEvent backEvent) {
       onBackStarted = backEvent;
     }
 
     @Override
-    public void onBackProgressed(@NonNull BackEvent backEvent) {
+    public void onBackProgressed(@Nonnull BackEvent backEvent) {
       onBackProgressed.add(backEvent);
     }