Simplify MapBuffer constructor (#49492)

Summary:
Pull Request resolved: #49492

Was looking at more places we could be using `HybridClassBase`, and figured out how to simplify ReadableMapBuffer constructors to remove the need for explicit soloading.

Changelog: [Android][Removed] `RuntimeExecutor` and `RuntimeScheduler` constructors are now private, `MapBufferSoLoader` was removed as no longer required.

Reviewed By: cortinico

Differential Revision: D69776110

fbshipit-source-id: 11eac4c59897a02283e021ac1457ef8299b6f480

Author: javache

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

@@ -1291,8 +1291,6 @@ public final class com/facebook/react/bridge/ReactMarkerConstants : java/lang/En
 	public static final field JAVASCRIPT_EXECUTOR_FACTORY_INJECT_START Lcom/facebook/react/bridge/ReactMarkerConstants;
 	public static final field LOAD_REACT_NATIVE_FABRIC_SO_FILE_END Lcom/facebook/react/bridge/ReactMarkerConstants;
 	public static final field LOAD_REACT_NATIVE_FABRIC_SO_FILE_START Lcom/facebook/react/bridge/ReactMarkerConstants;
-	public static final field LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END Lcom/facebook/react/bridge/ReactMarkerConstants;
-	public static final field LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START Lcom/facebook/react/bridge/ReactMarkerConstants;
 	public static final field LOAD_REACT_NATIVE_SO_FILE_END Lcom/facebook/react/bridge/ReactMarkerConstants;
 	public static final field LOAD_REACT_NATIVE_SO_FILE_START Lcom/facebook/react/bridge/ReactMarkerConstants;
 	public static final field NATIVE_MODULE_INITIALIZE_END Lcom/facebook/react/bridge/ReactMarkerConstants;
@@ -1487,12 +1485,10 @@ public final class com/facebook/react/bridge/RetryableMountingLayerException : j
 	public fun <init> (Ljava/lang/Throwable;)V
 }
 
-public final class com/facebook/react/bridge/RuntimeExecutor {
-	public fun <init> (Lcom/facebook/jni/HybridData;)V
+public final class com/facebook/react/bridge/RuntimeExecutor : com/facebook/jni/HybridClassBase {
 }
 
-public final class com/facebook/react/bridge/RuntimeScheduler {
-	public fun <init> (Lcom/facebook/jni/HybridData;)V
+public final class com/facebook/react/bridge/RuntimeScheduler : com/facebook/jni/HybridClassBase {
 }
 
 public final class com/facebook/react/bridge/SoftAssertions {
@@ -1898,12 +1894,7 @@ public abstract interface class com/facebook/react/common/mapbuffer/MapBuffer$En
 	public abstract fun getType ()Lcom/facebook/react/common/mapbuffer/MapBuffer$DataType;
 }
 
-public final class com/facebook/react/common/mapbuffer/MapBufferSoLoader {
-	public static final field INSTANCE Lcom/facebook/react/common/mapbuffer/MapBufferSoLoader;
-	public static final fun staticInit ()V
-}
-
-public final class com/facebook/react/common/mapbuffer/ReadableMapBuffer : com/facebook/react/common/mapbuffer/MapBuffer {
+public final class com/facebook/react/common/mapbuffer/ReadableMapBuffer : com/facebook/jni/HybridClassBase, com/facebook/react/common/mapbuffer/MapBuffer {
 	public static final field Companion Lcom/facebook/react/common/mapbuffer/ReadableMapBuffer$Companion;
 	public fun contains (I)Z
 	public fun entryAt (I)Lcom/facebook/react/common/mapbuffer/MapBuffer$Entry;

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

@@ -124,9 +124,7 @@ public enum ReactMarkerConstants {
   REACT_BRIDGE_LOADING_START,
   REACT_BRIDGE_LOADING_END,
   REACT_BRIDGELESS_LOADING_START,
-  REACT_BRIDGELESS_LOADING_END,
-  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START,
-  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END;
+  REACT_BRIDGELESS_LOADING_END;
 
   private boolean mHasMatchingNameMarker;
 

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

@@ -7,8 +7,8 @@
 
 package com.facebook.react.bridge
 
-import com.facebook.jni.HybridData
+import com.facebook.jni.HybridClassBase
 import com.facebook.proguard.annotations.DoNotStrip
 
 /** A Kotlin holder for a C++ RuntimeExecutor. */
-public class RuntimeExecutor(@DoNotStrip private val mHybridData: HybridData)
+@DoNotStrip public class RuntimeExecutor @DoNotStrip private constructor() : HybridClassBase()

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

@@ -7,8 +7,8 @@
 
 package com.facebook.react.bridge
 
-import com.facebook.jni.HybridData
+import com.facebook.jni.HybridClassBase
 import com.facebook.proguard.annotations.DoNotStrip
 
 /** A Kotlin holder for a C++ RuntimeScheduler. */
-public class RuntimeScheduler(@DoNotStrip private val mHybridData: HybridData)
+@DoNotStrip public class RuntimeScheduler @DoNotStrip private constructor() : HybridClassBase()

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBufferSoLoader.kt

@@ -7,7 +7,7 @@
 
 package com.facebook.react.common.mapbuffer
 
-import com.facebook.jni.HybridData
+import com.facebook.jni.HybridClassBase
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.common.annotations.StableReactNativeAPI
 import com.facebook.react.common.mapbuffer.MapBuffer.Companion.KEY_RANGE
@@ -25,42 +25,25 @@ import javax.annotation.concurrent.NotThreadSafe
 @StableReactNativeAPI
 @NotThreadSafe
 @DoNotStrip
-public class ReadableMapBuffer : MapBuffer {
-
-  // Hybrid data must be kept in the `mHybridData` field for fbjni to work
-  @field:DoNotStrip private val mHybridData: HybridData?
+public class ReadableMapBuffer
+@DoNotStrip
+private constructor(
+    // Byte data of the mapBuffer
+    private val buffer: ByteBuffer,
+    // Offset to the start of the MapBuffer
+    private val offsetToMapBuffer: Int
+) : HybridClassBase(), MapBuffer {
 
-  // Byte data of the mapBuffer
-  private val buffer: ByteBuffer
-  // Offset to the start of the MapBuffer
-  private val offsetToMapBuffer: Int
   // Amount of items serialized on the ByteBuffer
   override var count: Int = 0
     private set
 
-  @DoNotStrip
-  private constructor(hybridData: HybridData) {
-    mHybridData = hybridData
-    buffer = importByteBuffer()
-    offsetToMapBuffer = 0
-    readHeader()
-  }
-
-  private constructor(buffer: ByteBuffer) {
-    mHybridData = null
-    this.buffer = buffer
-    offsetToMapBuffer = 0
+  init {
     readHeader()
   }
 
-  private constructor(buffer: ByteBuffer, offset: Int) {
-    mHybridData = null
-    this.buffer = buffer.duplicate().apply { position(offset) }
-    offsetToMapBuffer = offset
-    readHeader()
-  }
-
-  private external fun importByteBuffer(): ByteBuffer
+  private fun cloneWithOffset(offset: Int) =
+      ReadableMapBuffer(buffer.duplicate().apply { position(offset) }, offset)
 
   private fun readHeader() {
     // byte order
@@ -146,7 +129,7 @@ public class ReadableMapBuffer : MapBuffer {
 
   private fun readMapBufferValue(position: Int): ReadableMapBuffer {
     val offset = offsetForDynamicData + buffer.getInt(position)
-    return ReadableMapBuffer(buffer, offset + Int.SIZE_BYTES)
+    return cloneWithOffset(offset + Int.SIZE_BYTES)
   }
 
   private fun readMapBufferListValue(position: Int): List<ReadableMapBuffer> {
@@ -158,7 +141,7 @@ public class ReadableMapBuffer : MapBuffer {
     while (curLen < sizeMapBufferList) {
       val sizeMapBuffer = buffer.getInt(offset + curLen)
       curLen = curLen + Int.SIZE_BYTES
-      readMapBufferList.add(ReadableMapBuffer(buffer, offset + curLen))
+      readMapBufferList.add(cloneWithOffset(offset + curLen))
       curLen = curLen + sizeMapBuffer
     }
     return readMapBufferList
@@ -335,9 +318,5 @@ public class ReadableMapBuffer : MapBuffer {
 
     // 4 bytes = 2 (key) + 2 (type)
     private const val VALUE_OFFSET = 4
-
-    init {
-      MapBufferSoLoader.staticInit()
-    }
   }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt

@@ -191,10 +191,4 @@ public class WritableMapBuffer : MapBuffer {
   @Suppress("UNUSED")
   /** JNI hook for MapBuffer to retrieve sorted values from this class. */
   private fun getValues(): Array<Any> = Array(values.size()) { values.valueAt(it) }
-
-  private companion object {
-    init {
-      MapBufferSoLoader.staticInit()
-    }
-  }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt

@@ -13,7 +13,6 @@ import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.NativeMap
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.bridge.RuntimeScheduler
-import com.facebook.react.common.mapbuffer.MapBufferSoLoader
 import com.facebook.react.fabric.events.EventBeatManager
 import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity
 
@@ -102,7 +101,6 @@ internal class FabricUIManagerBinding : HybridClassBase() {
   private companion object {
     init {
       FabricSoLoader.staticInit()
-      MapBufferSoLoader.staticInit()
     }
   }
 }

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

@@ -9,13 +9,6 @@
 
 namespace facebook::react {
 
-void JReadableMapBuffer::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "importByteBuffer", JReadableMapBuffer::importByteBuffer),
-  });
-}
-
 jni::local_ref<jni::JByteBuffer> JReadableMapBuffer::importByteBuffer() {
   // TODO T83483191: Reevaluate what's the best approach here (allocateDirect vs
   // DirectByteBuffer).
@@ -29,7 +22,10 @@ std::vector<uint8_t> JReadableMapBuffer::data() const {
 
 jni::local_ref<JReadableMapBuffer::jhybridobject>
 JReadableMapBuffer::createWithContents(MapBuffer&& map) {
-  return newObjectCxxArgs(std::move(map));
+  auto cxxPart = std::make_unique<JReadableMapBuffer>(std::move(map));
+  auto javaPart = newObjectJavaArgs(cxxPart->importByteBuffer(), 0);
+  setNativePointer(javaPart, std::move(cxxPart));
+  return javaPart;
 }
 
 JReadableMapBuffer::JReadableMapBuffer(MapBuffer&& map)

packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp

@@ -20,18 +20,16 @@ class JReadableMapBuffer : public jni::HybridClass<JReadableMapBuffer> {
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/common/mapbuffer/ReadableMapBuffer;";
 
-  static void registerNatives();
-
   static jni::local_ref<JReadableMapBuffer::jhybridobject> createWithContents(
       MapBuffer&& map);
 
   explicit JReadableMapBuffer(MapBuffer&& map);
 
-  jni::local_ref<jni::JByteBuffer> importByteBuffer();
-
   std::vector<uint8_t> data() const;
 
  private:
+  jni::local_ref<jni::JByteBuffer> importByteBuffer();
+
   std::vector<uint8_t> serializedData_;
 };