Remove CxxModule 2/2 C++ part (#54045)

Summary:
Pull Request resolved: #54045

Changelog: [General][Breaking] Remove CxxModule 2/2 C++ part

Reviewed By: mdvacca

Differential Revision: D83808891

fbshipit-source-id: 6c5bd696465fa5b1de98c799cd3f18cdb45d2774

Author: christophpurrer

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

@@ -680,19 +680,6 @@ public final class com/facebook/react/bridge/CxxCallbackImpl : com/facebook/jni/
 	public fun invoke ([Ljava/lang/Object;)V
 }
 
-public class com/facebook/react/bridge/CxxModuleWrapper : com/facebook/react/bridge/CxxModuleWrapperBase {
-	protected fun <init> (Lcom/facebook/jni/HybridData;)V
-}
-
-public class com/facebook/react/bridge/CxxModuleWrapperBase : com/facebook/react/bridge/NativeModule {
-	protected fun <init> (Lcom/facebook/jni/HybridData;)V
-	public fun canOverrideExistingModule ()Z
-	public fun getName ()Ljava/lang/String;
-	public fun initialize ()V
-	public fun invalidate ()V
-	protected final fun resetModule (Lcom/facebook/jni/HybridData;)V
-}
-
 public final class com/facebook/react/bridge/DefaultJSExceptionHandler : com/facebook/react/bridge/JSExceptionHandler {
 	public fun <init> ()V
 	public fun handleException (Ljava/lang/Exception;)V

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

@@ -192,10 +192,7 @@ void CatalystInstanceImpl::initializeBridge(
   // stack.
 
   moduleRegistry_ = std::make_shared<ModuleRegistry>(buildNativeModuleList(
-      std::weak_ptr<Instance>(instance_),
-      javaModules,
-      {},
-      moduleMessageQueue_));
+      std::weak_ptr<Instance>(instance_), javaModules, moduleMessageQueue_));
 
   instance_->initializeBridge(
       std::make_unique<InstanceCallbackImpl>(callback),
@@ -211,10 +208,7 @@ void CatalystInstanceImpl::extendNativeModules(
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
         javaModules) {
   moduleRegistry_->registerModules(buildNativeModuleList(
-      std::weak_ptr<Instance>(instance_),
-      javaModules,
-      {},
-      moduleMessageQueue_));
+      std::weak_ptr<Instance>(instance_), javaModules, moduleMessageQueue_));
 }
 
 void CatalystInstanceImpl::jniSetSourceURL(const std::string& sourceURL) {

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

@@ -7,10 +7,6 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
-#include <cxxreact/CxxModule.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook::react {
@@ -19,24 +15,4 @@ struct JNativeModule : jni::JavaClass<JNativeModule> {
   constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/bridge/NativeModule;";
 };
 
-/**
- * The C++ part of a CxxModuleWrapper is not a unique class, but it
- * must extend this base class.
- */
-class CxxModuleWrapperBase : public jni::HybridClass<CxxModuleWrapperBase, JNativeModule> {
- public:
-  constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/bridge/CxxModuleWrapperBase;";
-
-  static void registerNatives()
-  {
-    registerHybrid({makeNativeMethod("getName", CxxModuleWrapperBase::getName)});
-  }
-
-  // JNI method
-  virtual std::string getName() = 0;
-
-  // Called by ModuleRegistryBuilder
-  virtual std::unique_ptr<xplat::module::CxxModule> getModule() = 0;
-};
-
 } // namespace facebook::react

packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -9,7 +9,6 @@
 
 #include <glog/logging.h>
 
-#include <cxxreact/CxxModule.h>
 #include <cxxreact/CxxNativeModule.h>
 #include <cxxreact/Instance.h>
 #include <cxxreact/JsArgumentHelpers.h>

packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h

@@ -24,30 +24,13 @@ std::string ModuleHolder::getName() const {
 
 xplat::module::CxxModule::Provider ModuleHolder::getProvider(
     const std::string& moduleName) const {
-  return [self = jni::make_global(self()), moduleName] {
-    static auto getModule =
-        ModuleHolder::javaClassStatic()->getMethod<JNativeModule::javaobject()>(
-            "getModule");
-    // This is the call which uses the lazy Java Provider to instantiate the
-    // Java CxxModuleWrapper which contains the CxxModule.
-    auto module = getModule(self);
-
-    CHECK(module->isInstanceOf(CxxModuleWrapperBase::javaClassStatic()))
-        << "NativeModule '" << moduleName << "' isn't a C++ module";
-
-    auto cxxModule =
-        jni::static_ref_cast<CxxModuleWrapperBase::javaobject>(module);
-    // Then, we grab the CxxModule from the wrapper, which is no longer needed.
-    return cxxModule->cthis()->getModule();
-  };
+  return [self = jni::make_global(self()), moduleName] { return nullptr; };
 }
 
 std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
         javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue) {
   std::vector<std::unique_ptr<NativeModule>> modules;
   if (javaModules) {
@@ -57,17 +40,6 @@ std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
               winstance, jm, moduleMessageQueue));
     }
   }
-  if (cxxModules) {
-    for (const auto& cm : *cxxModules) {
-      std::string moduleName = cm->getName();
-      modules.emplace_back(
-          std::make_unique<CxxNativeModule>(
-              winstance,
-              moduleName,
-              cm->getProvider(moduleName),
-              moduleMessageQueue));
-    }
-  }
   return modules;
 }
 

packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h

@@ -11,7 +11,7 @@
 #include <cxxreact/ModuleRegistry.h>
 #include <fbjni/fbjni.h>
 
-#include "CxxModuleWrapper.h"
+#include "CxxModuleWrapperBase.h"
 #include "JavaModuleWrapper.h"
 
 #ifndef RCT_REMOVE_LEGACY_ARCH
@@ -33,7 +33,6 @@ class [[deprecated("This API will be removed along with the legacy architecture.
 std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue);
 } // namespace facebook::react
 

packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp

@@ -11,7 +11,6 @@
 #include <fbjni/fbjni.h>
 
 #include "CatalystInstanceImpl.h"
-#include "CxxModuleWrapperBase.h"
 #include "InspectorNetworkRequestListener.h"
 #include "JavaScriptExecutorHolder.h"
 #include "ReactInstanceManagerInspectorTarget.h"
@@ -42,7 +41,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     CatalystInstanceImpl::registerNatives();
 #pragma clang diagnostic pop
 #endif
-    CxxModuleWrapperBase::registerNatives();
     ReactInstanceManagerInspectorTarget::registerNatives();
     InspectorNetworkRequestListener::registerNatives();
   });