Migrate Nullable and NonNull annotations to AndroidX

Summary:
This diff migrates the usages Nullable and NonNull annotations to AndroidX instead of javax.

The purpose of this change is to bring consistency in the annotations used by the core of RN

Reviewed By: makovkastar

Differential Revision: D16054504

fbshipit-source-id: 21d888854da088d2a14615a90d4dc058e5286b91

ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK

@@ -6,7 +6,6 @@ rn_android_library(
     is_androidx = True,
     manifest = "AndroidManifest.xml",
     provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
         react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
@@ -16,6 +15,7 @@ rn_android_library(
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
@@ -46,6 +46,7 @@ rn_android_library(
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),

ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDeltaClient.java

@@ -8,13 +8,13 @@ package com.facebook.react.devsupport;
 
 import android.util.JsonReader;
 import android.util.Pair;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.NativeDeltaClient;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.TreeMap;
-import javax.annotation.Nullable;
 import okhttp3.Headers;
 import okio.BufferedSource;
 

ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java

@@ -8,6 +8,7 @@ package com.facebook.react.devsupport;
 
 import android.util.Log;
 import android.util.Pair;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.NativeDeltaClient;
@@ -19,7 +20,6 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Headers;

ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java

@@ -17,11 +17,11 @@ import android.os.Build;
 import android.provider.Settings;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
-import javax.annotation.Nullable;
 
 /**
  * Helper class for controlling overlay view with FPS and JS FPS info that gets added directly

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java

@@ -16,6 +16,7 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.widget.PopupWindow;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.R;
 import com.facebook.react.bridge.UiThreadUtil;
@@ -23,7 +24,6 @@ import com.facebook.react.common.ReactConstants;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Locale;
-import javax.annotation.Nullable;
 
 /** Controller to display loading messages on top of the screen. All methods are thread safe. */
 public class DevLoadingViewController {

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

@@ -11,6 +11,7 @@ import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.widget.Toast;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
@@ -35,7 +36,6 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.ConnectionPool;

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java

@@ -7,12 +7,12 @@
 package com.facebook.react.devsupport;
 
 import android.content.Context;
+import androidx.annotation.Nullable;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.packagerconnection.RequestHandler;
 import java.lang.reflect.Constructor;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * A simple factory that creates instances of {@link DevSupportManager} implementations. Uses

ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java

@@ -6,6 +6,7 @@
  */
 package com.facebook.react.devsupport;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -16,7 +17,6 @@ import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import java.io.File;
-import javax.annotation.Nullable;
 
 /**
  * A dummy implementation of {@link DevSupportManager} to be used in production mode where

ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java

@@ -8,6 +8,7 @@ package com.facebook.react.devsupport;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Inspector;
 import java.io.IOException;
@@ -15,7 +16,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java

@@ -6,13 +6,13 @@
  */
 package com.facebook.react.devsupport;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
 import java.io.File;
-import javax.annotation.Nullable;
 
 // This module is being called only by Java via the static method "captureHeap" that
 // requires it to alreay be initialized, thus we eagerly initialize this module

ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java

@@ -9,6 +9,7 @@ package com.facebook.react.devsupport;
 import android.util.JsonReader;
 import android.util.JsonToken;
 import android.util.JsonWriter;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.JavascriptException;
@@ -19,7 +20,6 @@ import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java

@@ -7,6 +7,7 @@ package com.facebook.react.devsupport;
 
 import android.util.Pair;
 import android.view.View;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -14,7 +15,6 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 @ReactModule(name = JSDevSupport.MODULE_NAME)
 public class JSDevSupport extends ReactContextBaseJavaModule {

ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java

@@ -7,9 +7,9 @@
 package com.facebook.react.devsupport;
 
 import android.app.Activity;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.NativeDeltaClient;
-import javax.annotation.Nullable;
 
 /**
  * Interface used by {@link DevSupportManager} for accessing some fields and methods of {@link

ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java

@@ -24,6 +24,7 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
@@ -32,7 +33,6 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.devsupport.RedBoxHandler.ReportCompletedListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.StackFrame;
-import javax.annotation.Nullable;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java

@@ -6,6 +6,7 @@
  */
 package com.facebook.react.devsupport;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
@@ -14,7 +15,6 @@ import com.facebook.react.devsupport.interfaces.StackFrame;
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java

@@ -8,12 +8,12 @@ package com.facebook.react.devsupport;
 
 import android.os.Handler;
 import android.os.Looper;
+import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JavaJSExecutor;
 import java.util.HashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
 
 /** Executes JS remotely via the react nodejs server as a proxy to a browser on the host machine. */
 public class WebsocketJavaScriptExecutor implements JavaJSExecutor {

ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java

@@ -6,8 +6,8 @@
  */
 package com.facebook.react.devsupport.interfaces;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.NativeDeltaClient;
-import javax.annotation.Nullable;
 
 public interface DevBundleDownloadListener {
   void onSuccess(@Nullable NativeDeltaClient nativeDeltaClient);

ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java

@@ -6,12 +6,12 @@
  */
 package com.facebook.react.devsupport.interfaces;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import java.io.File;
-import javax.annotation.Nullable;
 
 /**
  * Interface for accessing and interacting with development features. In dev mode, use the