deprecate hasConstants from ReactModuleInfo (#39459)

Summary: ## Changelog [Android][Deprecated] - ReactModuleInfo constructor with getConstants arg is deprecated introducing a new constructor that doesn't use getConstants and updating the internal codebase to use it. deprecated the old one since it's been copypasta'd a lot in oss. Reviewed By: cortinico Differential Revision: D49262824
facebook · Sep 16, 2023 · d7b4870 · d7b4870
1 parent 4919741
commit d7b4870
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 17 deletions.
diff --git a/...ve/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java b/...ve/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java
@@ -79,7 +79,6 @@ public Map<String, ReactModuleInfo> getReactModuleInfos() {
                       moduleClass.getName(),
                       reactModule.canOverrideExistingModule(),
                       reactModule.needsEagerInit(),
-                      reactModule.hasConstants(),
                       reactModule.isCxxModule(),
                       false));
 

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -114,7 +114,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
                 moduleClass.getName(),
                 reactModule.canOverrideExistingModule(),
                 reactModule.needsEagerInit(),
-                reactModule.hasConstants(),
                 reactModule.isCxxModule(),
                 TurboModule.class.isAssignableFrom(moduleClass)));
       }

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
@@ -73,7 +73,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
                 moduleClass.getName(),
                 reactModule.canOverrideExistingModule(),
                 reactModule.needsEagerInit(),
-                reactModule.hasConstants(),
                 reactModule.isCxxModule(),
                 TurboModule.class.isAssignableFrom(moduleClass)));
       }

diff --git a/...ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java b/...ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java
@@ -108,15 +108,13 @@ protected ReactPackageTurboModuleManagerDelegate(
                       moduleClass.getName(),
                       reactModule.canOverrideExistingModule(),
                       true,
-                      reactModule.hasConstants(),
                       reactModule.isCxxModule(),
                       TurboModule.class.isAssignableFrom(moduleClass))
                   : new ReactModuleInfo(
                       moduleName,
                       moduleClass.getName(),
                       module.canOverrideExistingModule(),
                       true,
-                      true,
                       CxxModuleWrapper.class.isAssignableFrom(moduleClass),
                       TurboModule.class.isAssignableFrom(moduleClass));
 

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java
@@ -71,7 +71,6 @@ public ModuleHolder(NativeModule nativeModule) {
             nativeModule.getClass().getSimpleName(),
             nativeModule.canOverrideExistingModule(),
             true,
-            true,
             CxxModuleWrapper.class.isAssignableFrom(nativeModule.getClass()),
             TurboModule.class.isAssignableFrom(nativeModule.getClass()));
 

diff --git a/...ct-native/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java b/...ct-native/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.java
@@ -25,7 +25,6 @@ public ReactModuleInfo(
       String className,
       boolean canOverrideExistingModule,
       boolean needsEagerInit,
-      boolean hasConstants,
       boolean isCxxModule,
       boolean isTurboModule) {
     mName = name;
@@ -36,6 +35,22 @@ public ReactModuleInfo(
     mIsTurboModule = isTurboModule;
   }
 
+  /**
+   * @deprecated use {@link ReactModuleInfo#ReactModuleInfo(String, String, boolean, boolean,
+   *     boolean, boolean)}
+   */
+  @Deprecated
+  public ReactModuleInfo(
+      String name,
+      String className,
+      boolean canOverrideExistingModule,
+      boolean needsEagerInit,
+      boolean hasConstants,
+      boolean isCxxModule,
+      boolean isTurboModule) {
+    this(name, className, canOverrideExistingModule, needsEagerInit, isCxxModule, isTurboModule);
+  }
+
   public String name() {
     return mName;
   }

diff --git a/...tAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java b/...tAndroid/src/main/java/com/facebook/react/module/processing/ReactModuleSpecProcessor.java
@@ -228,8 +228,6 @@ private CodeBlock getCodeBlockForReactModuleInfos(List<String> nativeModules)
                 .append(", ")
                 .append(reactModule.needsEagerInit())
                 .append(", ")
-                .append(hasConstants)
-                .append(", ")
                 .append(reactModule.isCxxModule())
                 .append(", ")
                 .append(isTurboModule)

diff --git a/.../react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java
@@ -97,7 +97,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
                   moduleClass.getName(),
                   reactModule.canOverrideExistingModule(),
                   reactModule.needsEagerInit(),
-                  reactModule.hasConstants(),
                   reactModule.isCxxModule(),
                   TurboModule.class.isAssignableFrom(moduleClass)));
         }

diff --git a/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
@@ -283,7 +283,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
       final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
       for (Class<? extends NativeModule> moduleClass : moduleList) {
         ReactModule reactModule = moduleClass.getAnnotation(ReactModule.class);
-
         if (reactModule != null) {
           reactModuleInfoMap.put(
               reactModule.name(),
@@ -292,12 +291,10 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
                   moduleClass.getName(),
                   reactModule.canOverrideExistingModule(),
                   reactModule.needsEagerInit(),
-                  reactModule.hasConstants(),
                   reactModule.isCxxModule(),
                   TurboModule.class.isAssignableFrom(moduleClass)));
         }
       }
-
       return () -> reactModuleInfoMap;
     } catch (InstantiationException e) {
       throw new RuntimeException(

diff --git a/...ges/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/...ges/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -102,7 +102,6 @@ public Map<String, ReactModuleInfo> getReactModuleInfos() {
                                 "SampleTurboModule",
                                 false, // canOverrideExistingModule
                                 false, // needsEagerInit
-                                true, // hasConstants
                                 false, // isCxxModule
                                 true // isTurboModule
                                 ));
@@ -114,7 +113,6 @@ public Map<String, ReactModuleInfo> getReactModuleInfos() {
                                 "SampleLegacyModule",
                                 false, // canOverrideExistingModule
                                 false, // needsEagerInit
-                                true, // hasConstants
                                 false, // isCxxModule
                                 false // isTurboModule
                                 ));

diff --git a/...rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.kt b/...rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.kt
@@ -90,7 +90,6 @@ class RNTesterReactHostDelegate internal constructor(context: Context) : ReactHo
                               "SampleTurboModule",
                               false, // canOverrideExistingModule
                               false, // needsEagerInit
-                              true, // hasConstants
                               false, // isCxxModule
                               true // isTurboModule
                               ),
@@ -100,7 +99,6 @@ class RNTesterReactHostDelegate internal constructor(context: Context) : ReactHo
                               "SampleLegacyModule",
                               false, // canOverrideExistingModule
                               false, // needsEagerInit
-                              true, // hasConstants
                               false, // isCxxModule
                               false // isTurboModule
                               ),