Kotlinify NativeMethodCallInvokerHolderImpl (#43809)

Summary: Pull Request resolved: #43809 Changelog: [Internal] As part of the Sustainability Week (see [post](https://fb.workplace.com/groups/251759413609061/permalink/742797531171911/)). Reviewed By: rshest Differential Revision: D55687786 fbshipit-source-id: 45eb656e066348ee4b26d7c4b92db642361c7598
facebook · Apr 8, 2024 · 3a15af7 · 3a15af7
1 parent 90296be
commit 3a15af7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -3906,7 +3906,7 @@ public abstract interface class com/facebook/react/touch/ReactInterceptingViewGr
 public final class com/facebook/react/turbomodule/core/CallInvokerHolderImpl : com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder {
 }
 
-public class com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl : com/facebook/react/turbomodule/core/interfaces/NativeMethodCallInvokerHolder {
+public final class com/facebook/react/turbomodule/core/NativeMethodCallInvokerHolderImpl : com/facebook/react/turbomodule/core/interfaces/NativeMethodCallInvokerHolder {
 }
 
 public abstract interface class com/facebook/react/turbomodule/core/interfaces/CallInvokerHolder {

diff --git a/...re/NativeMethodCallInvokerHolderImpl.java → ...core/NativeMethodCallInvokerHolderImpl.kt b/...re/NativeMethodCallInvokerHolderImpl.java → ...core/NativeMethodCallInvokerHolderImpl.kt
@@ -5,32 +5,27 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.turbomodule.core;
+package com.facebook.react.turbomodule.core
 
-import com.facebook.infer.annotation.Nullsafe;
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.common.annotations.FrameworkAPI;
-import com.facebook.react.internal.turbomodule.core.NativeModuleSoLoader;
-import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder;
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.common.annotations.FrameworkAPI
+import com.facebook.react.internal.turbomodule.core.NativeModuleSoLoader
+import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder
 
 /**
  * NativeMethodCallInvokerHolder is created at a different time/place (i.e: in CatalystInstance)
  * than TurboModuleManager. Therefore, we need to wrap NativeMethodCallInvokerHolder within a hybrid
  * class so that we may pass it from CatalystInstance, through Java, to
  * TurboModuleManager::initHybrid.
  */
-@Nullsafe(Nullsafe.Mode.LOCAL)
 @FrameworkAPI
-public class NativeMethodCallInvokerHolderImpl implements NativeMethodCallInvokerHolder {
-
-  @DoNotStrip private final HybridData mHybridData;
-
-  static {
-    NativeModuleSoLoader.maybeLoadSoLibrary();
-  }
-
-  private NativeMethodCallInvokerHolderImpl(HybridData hd) {
-    mHybridData = hd;
+public class NativeMethodCallInvokerHolderImpl
+private constructor(@field:DoNotStrip private val mHybridData: HybridData) :
+    NativeMethodCallInvokerHolder {
+  private companion object {
+    init {
+      NativeModuleSoLoader.maybeLoadSoLibrary()
+    }
   }
 }