@DeprecatedInNewArchitecture -> @deprecated (#52399)

Summary:
Pull Request resolved: #52399

I'm raising the deprecation warnings for those methods that are using legacy arch.
Previously the `DeprecatedInNewArchitecture` was not generating warnings for user in their builds, while now the Kotlin's/Java's `DeprecatedInNewArchitecture` it will.

Changelog:
[Android] [Changed] - Introduce more deprecation warnings for Legacy Arch classes

Reviewed By: mdvacca

Differential Revision: D77736713

Author: cortinico

packages/react-native-test-library/android/src/main/java/com/facebook/react/osslibraryexample/OSSLibraryExamplePackage.kt

@@ -12,7 +12,9 @@ import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 
+@Suppress("DEPRECATION")
 public class OSSLibraryExamplePackage : ReactPackage {
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
       listOf(NativeSampleModule(reactContext))
 

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -353,7 +353,7 @@ public abstract class com/facebook/react/ReactNativeHost {
 }
 
 public abstract interface class com/facebook/react/ReactPackage {
-	public abstract fun createNativeModules (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
+	public fun createNativeModules (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
 	public abstract fun createViewManagers (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
 	public fun getModule (Ljava/lang/String;Lcom/facebook/react/bridge/ReactApplicationContext;)Lcom/facebook/react/bridge/NativeModule;
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt

@@ -22,6 +22,7 @@ import javax.inject.Provider
 /** Abstract class that supports lazy loading of NativeModules by default. */
 public abstract class BaseReactPackage : ReactPackage {
 
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
     throw UnsupportedOperationException(
         "createNativeModules method is not supported. Use getModule() method instead.")

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.kt

@@ -112,6 +112,7 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList
    * simply have a different mechanism for storing a `ReactNativeHost`, e.g. as a static field
    * somewhere.
    */
+  @Suppress("DEPRECATION")
   protected val reactNativeHost: ReactNativeHost
     get() = (application as ReactApplication).reactNativeHost
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.kt

@@ -92,6 +92,8 @@ public abstract class LazyReactPackage : ReactPackage {
    * @param reactContext react application context that can be used to create modules
    * @return A [List]<[NativeModule]> to register
    */
+  @Suppress("DEPRECATION")
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
       buildList {
         for (holder in getNativeModules(reactContext)) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -18,20 +18,22 @@
 import android.view.Window;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.interfaces.fabric.ReactSurface;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.core.PermissionListener;
 import com.facebook.react.views.view.WindowUtilKt;
 import com.facebook.systrace.Systrace;
+import java.util.Objects;
 
 /**
  * Delegate class for {@link ReactActivity}. You can subclass this to provide custom implementations
  * for e.g. {@link #getReactNativeHost()}, if your Application class doesn't implement {@link
  * ReactApplication}.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactActivityDelegate {
 
   private final @Nullable Activity mActivity;
@@ -86,8 +88,11 @@ public ReactActivityDelegate(
    * ReactApplication#getReactNativeHost()}. Override this method if your application class does not
    * implement {@code ReactApplication} or you simply have a different mechanism for storing a
    * {@code ReactNativeHost}, e.g. as a static field somewhere.
+   *
+   * @deprecated "Do not access {@link ReactNativeHost} directly. This class is going away in the
+   *     New Architecture. You should access {@link ReactHost} instead."
    */
-  @DeprecatedInNewArchitecture(message = "Use getReactHost()")
+  @Deprecated
   protected ReactNativeHost getReactNativeHost() {
     return ((ReactApplication) getPlainActivity().getApplication()).getReactNativeHost();
   }
@@ -107,16 +112,21 @@ protected ReactNativeHost getReactNativeHost() {
     return mReactDelegate;
   }
 
-  @DeprecatedInNewArchitecture(message = "Use getReactHost()")
+  /**
+   * @deprecated @deprecated "Do not access {@link ReactInstanceManager} directly. This class is
+   *     going away in the New Architecture. You should access {@link ReactHost} instead."
+   * @noinspection deprecation
+   */
   public ReactInstanceManager getReactInstanceManager() {
-    return mReactDelegate.getReactInstanceManager();
+    return Objects.requireNonNull(mReactDelegate).getReactInstanceManager();
   }
 
+  @Nullable
   public String getMainComponentName() {
     return mMainComponentName;
   }
 
-  public void onCreate(Bundle savedInstanceState) {
+  public void onCreate(@Nullable Bundle savedInstanceState) {
     Systrace.traceSection(
         Systrace.TRACE_TAG_REACT,
         "ReactActivityDelegate.onCreate::init",
@@ -147,6 +157,7 @@ public void onCreate(Bundle savedInstanceState) {
                     launchOptions,
                     isFabricEnabled()) {
                   @Override
+                  @Nullable
                   protected ReactRootView createRootView() {
                     ReactRootView rootView = ReactActivityDelegate.this.createRootView();
                     if (rootView == null) {
@@ -163,30 +174,28 @@ protected ReactRootView createRootView() {
   }
 
   protected void loadApp(String appKey) {
-    mReactDelegate.loadApp(appKey);
+    Objects.requireNonNull(mReactDelegate).loadApp(appKey);
     getPlainActivity().setContentView(mReactDelegate.getReactRootView());
   }
 
   public void setReactSurface(ReactSurface reactSurface) {
-    mReactDelegate.setReactSurface(reactSurface);
+    Objects.requireNonNull(mReactDelegate).setReactSurface(reactSurface);
   }
 
   public void setReactRootView(ReactRootView reactRootView) {
-    mReactDelegate.setReactRootView(reactRootView);
+    Objects.requireNonNull(mReactDelegate).setReactRootView(reactRootView);
   }
 
   public void onUserLeaveHint() {
-    if (mReactDelegate != null) {
-      mReactDelegate.onUserLeaveHint();
-    }
+    Objects.requireNonNull(mReactDelegate).onUserLeaveHint();
   }
 
   public void onPause() {
-    mReactDelegate.onHostPause();
+    Objects.requireNonNull(mReactDelegate).onHostPause();
   }
 
   public void onResume() {
-    mReactDelegate.onHostResume();
+    Objects.requireNonNull(mReactDelegate).onHostResume();
 
     if (mPermissionsCallback != null) {
       mPermissionsCallback.invoke();
@@ -195,43 +204,43 @@ public void onResume() {
   }
 
   public void onDestroy() {
-    mReactDelegate.onHostDestroy();
+    Objects.requireNonNull(mReactDelegate).onHostDestroy();
   }
 
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    mReactDelegate.onActivityResult(requestCode, resultCode, data, true);
+  public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+    Objects.requireNonNull(mReactDelegate).onActivityResult(requestCode, resultCode, data, true);
   }
 
   public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return mReactDelegate.onKeyDown(keyCode, event);
+    return Objects.requireNonNull(mReactDelegate).onKeyDown(keyCode, event);
   }
 
   public boolean onKeyUp(int keyCode, KeyEvent event) {
-    return mReactDelegate.shouldShowDevMenuOrReload(keyCode, event);
+    return Objects.requireNonNull(mReactDelegate).shouldShowDevMenuOrReload(keyCode, event);
   }
 
   public boolean onKeyLongPress(int keyCode, KeyEvent event) {
-    return mReactDelegate.onKeyLongPress(keyCode);
+    return Objects.requireNonNull(mReactDelegate).onKeyLongPress(keyCode);
   }
 
   public boolean onBackPressed() {
-    return mReactDelegate.onBackPressed();
+    return Objects.requireNonNull(mReactDelegate).onBackPressed();
   }
 
   public boolean onNewIntent(Intent intent) {
-    return mReactDelegate.onNewIntent(intent);
+    return Objects.requireNonNull(mReactDelegate).onNewIntent(intent);
   }
 
   public void onWindowFocusChanged(boolean hasFocus) {
-    mReactDelegate.onWindowFocusChanged(hasFocus);
+    Objects.requireNonNull(mReactDelegate).onWindowFocusChanged(hasFocus);
   }
 
   public void onConfigurationChanged(Configuration newConfig) {
-    mReactDelegate.onConfigurationChanged(newConfig);
+    Objects.requireNonNull(mReactDelegate).onConfigurationChanged(newConfig);
   }
 
   public void requestPermissions(
-      String[] permissions, int requestCode, PermissionListener listener) {
+      String[] permissions, int requestCode, @Nullable PermissionListener listener) {
     mPermissionListener = listener;
     getPlainActivity().requestPermissions(permissions, requestCode);
   }
@@ -267,7 +276,7 @@ protected ReactActivity getReactActivity() {
    * context will no longer be valid.
    */
   public @Nullable ReactContext getCurrentReactContext() {
-    return mReactDelegate.getCurrentReactContext();
+    return Objects.requireNonNull(mReactDelegate).getCurrentReactContext();
   }
 
   /**

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.kt

@@ -10,6 +10,10 @@ package com.facebook.react
 /** Interface that represents an instance of a React Native application */
 public interface ReactApplication {
   /** Get the default [ReactNativeHost] for this app. */
+  @Suppress("DEPRECATION")
+  @Deprecated(
+      "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
+      ReplaceWith("reactHost"))
   public val reactNativeHost: ReactNativeHost
 
   /**

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt

@@ -14,7 +14,6 @@ import android.os.Bundle
 import android.view.KeyEvent
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
 import com.facebook.react.devsupport.DoubleTapReloadRecognizer
 import com.facebook.react.devsupport.ReleaseDevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
@@ -26,12 +25,17 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
  * A delegate for handling React Application support. This delegate is unaware whether it is used in
  * an [Activity] or a [android.app.Fragment].
  */
+@Suppress("DEPRECATION")
 public open class ReactDelegate {
   private val activity: Activity
   private var internalReactRootView: ReactRootView? = null
   private val mainComponentName: String?
   private var launchOptions: Bundle?
   private var doubleTapReloadRecognizer: DoubleTapReloadRecognizer?
+
+  @Deprecated(
+      "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
+      ReplaceWith("reactHost"))
   private var reactNativeHost: ReactNativeHost? = null
   public var reactHost: ReactHost? = null
     private set
@@ -380,7 +384,8 @@ public open class ReactDelegate {
     return false
   }
 
-  @DeprecatedInNewArchitecture(message = "Use reactHost")
+  @Deprecated(
+      "Do not access [ReactInstanceManager] directly. This class is going away in the New Architecture. You should use [ReactHost] instead.")
   public fun getReactInstanceManager(): ReactInstanceManager {
     val nonNullReactNativeHost =
         checkNotNull(reactNativeHost) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.kt

@@ -58,6 +58,10 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity {
    * method if your application class does not implement `ReactApplication` or you simply have a
    * different mechanism for storing a `ReactNativeHost`, e.g. as a static field somewhere.
    */
+  @Suppress("DEPRECATION")
+  @Deprecated(
+      "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
+      ReplaceWith("reactHost"))
   protected open val reactNativeHost: ReactNativeHost?
     get() = (activity?.application as ReactApplication?)?.reactNativeHost
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java

@@ -10,6 +10,7 @@
 import android.app.Application;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
@@ -18,7 +19,6 @@
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.common.SurfaceDelegateFactory;
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.common.annotations.internal.LegacyArchitecture;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
@@ -32,12 +32,12 @@
 /**
  * Simple class that holds an instance of {@link ReactInstanceManager}. This can be used in your
  * {@link Application class} (see {@link ReactApplication}), or as a static field.
+ *
+ * @deprecated This class will be replaced by com.facebook.react.ReactHost in the New Architecture.
  */
-@DeprecatedInNewArchitecture(
-    message =
-        "This class will be replaced by com.facebook.react.ReactHost in the new architecture of"
-            + " React Native.")
+@Deprecated
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class ReactNativeHost {
 
   static {