Replace usages of deprecated class TurboReactPackage (facebook#41197)

Summary: Pull Request resolved: facebook#41197 As part of facebook#40775 we marked TurboReactPackage as DeprecatedInNewArchitecture introducing the new class BaseReactPackage. In this diff I'm replacing usages of TurboReactPackage by BaseReactPackage to make sure new usages of BaseReactPackage work as expected. changelog: [internal] internal Reviewed By: arushikesarwani94 Differential Revision: D50611382 fbshipit-source-id: 867c5949463cb5537960a346099e687379baeb73
luluwu2032 · Oct 26, 2023 · dffd9d2 · dffd9d2
1 parent 93f6970
commit dffd9d2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
@@ -62,13 +62,13 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
        *
        * <p>TODO: T45627020
        */
-      if (reactPackage instanceof TurboReactPackage) {
-        TurboReactPackage turboReactPackage = (TurboReactPackage) reactPackage;
-        ReactModuleInfoProvider moduleInfoProvider = turboReactPackage.getReactModuleInfoProvider();
+      if (reactPackage instanceof BaseReactPackage) {
+        BaseReactPackage baseReactPackage = (BaseReactPackage) reactPackage;
+        ReactModuleInfoProvider moduleInfoProvider = baseReactPackage.getReactModuleInfoProvider();
         Map<String, ReactModuleInfo> moduleInfos = moduleInfoProvider.getReactModuleInfos();
 
         for (final String moduleName : moduleInfos.keySet()) {
-          moduleMap.put(moduleName, turboReactPackage.getModule(moduleName, reactContext));
+          moduleMap.put(moduleName, baseReactPackage.getModule(moduleName, reactContext));
         }
 
         continue;

diff --git a/...-native/ReactAndroid/src/main/java/com/facebook/react/LazyTurboModuleManagerDelegate.java b/...-native/ReactAndroid/src/main/java/com/facebook/react/LazyTurboModuleManagerDelegate.java
@@ -47,10 +47,11 @@ public TurboModule getModule(String moduleName) {
      * the cases)
      */
     for (ReactPackage reactPackage : mPackages) {
-      if (reactPackage instanceof TurboReactPackage) {
-        TurboReactPackage turboPkg = (TurboReactPackage) reactPackage;
+      if (reactPackage instanceof BaseReactPackage) {
+        BaseReactPackage baseReactPackage = (BaseReactPackage) reactPackage;
         try {
-          TurboModule nativeModule = (TurboModule) turboPkg.getModule(moduleName, mReactContext);
+          TurboModule nativeModule =
+              (TurboModule) baseReactPackage.getModule(moduleName, mReactContext);
           if (nativeModule != null) {
             return nativeModule;
           }

diff --git a/...act-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java b/...act-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.java
@@ -34,9 +34,9 @@ public void processPackage(ReactPackage reactPackage) {
     if (reactPackage instanceof LazyReactPackage) {
       moduleHolders =
           ((LazyReactPackage) reactPackage).getNativeModuleIterator(mReactApplicationContext);
-    } else if (reactPackage instanceof TurboReactPackage) {
+    } else if (reactPackage instanceof BaseReactPackage) {
       moduleHolders =
-          ((TurboReactPackage) reactPackage).getNativeModuleIterator(mReactApplicationContext);
+          ((BaseReactPackage) reactPackage).getNativeModuleIterator(mReactApplicationContext);
     } else {
       moduleHolders =
           ReactPackageHelper.getNativeModuleIterator(

diff --git a/...ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java b/...ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java
@@ -54,13 +54,13 @@ protected ReactPackageTurboModuleManagerDelegate(
     super();
     final ReactApplicationContext applicationContext = reactApplicationContext;
     for (ReactPackage reactPackage : packages) {
-      if (reactPackage instanceof TurboReactPackage) {
-        final TurboReactPackage turboPkg = (TurboReactPackage) reactPackage;
+      if (reactPackage instanceof BaseReactPackage) {
+        final BaseReactPackage baseReactPackage = (BaseReactPackage) reactPackage;
         final ModuleProvider moduleProvider =
-            moduleName -> turboPkg.getModule(moduleName, applicationContext);
+            moduleName -> baseReactPackage.getModule(moduleName, applicationContext);
         mModuleProviders.add(moduleProvider);
         mPackageModuleInfos.put(
-            moduleProvider, turboPkg.getReactModuleInfoProvider().getReactModuleInfos());
+            moduleProvider, baseReactPackage.getReactModuleInfoProvider().getReactModuleInfos());
         continue;
       }