Remove jsi package from fabric android

Summary: Refactor of packages of RN Android

Reviewed By: JoshuaGross

Differential Revision: D15457141

fbshipit-source-id: a291f7e1ca8e0be3e93daf9c34161c8f1fdbafac

ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK

@@ -4,6 +4,7 @@ rn_android_library(
     name = "fabric",
     srcs = glob([
         "*.java",
+        "events/**/*.java",
         "jsi/*.java",
         "mounting/**/*.java",
     ]),
@@ -28,7 +29,7 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/fabric/jsi/jni:jni"),
+        react_native_target("java/com/facebook/react/fabric/jni:jni"),
         react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),

ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
 import com.facebook.jni.HybridData;
@@ -12,8 +12,7 @@ import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.queue.MessageQueueThread;
-import com.facebook.react.fabric.ReactNativeConfig;
-import com.facebook.react.fabric.FabricUIManager;
+import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.uimanager.PixelUtil;
 
 @DoNotStrip

ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentFactoryDelegate.java

@@ -1,11 +1,10 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
-import com.facebook.react.fabric.jsi.FabricSoLoader;
 
 @DoNotStrip
 public class ComponentFactoryDelegate {

ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java

@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java

@@ -6,13 +6,9 @@ import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.queue.MessageQueueThread;
-import com.facebook.react.fabric.jsi.Binding;
-import com.facebook.react.fabric.jsi.ComponentFactoryDelegate;
-import com.facebook.react.fabric.jsi.ComponentRegistry;
-import com.facebook.react.fabric.jsi.EventBeatManager;
-import com.facebook.react.fabric.jsi.EventEmitterWrapper;
-import com.facebook.react.fabric.jsi.FabricSoLoader;
-import com.facebook.react.fabric.jsi.StateWrapperImpl;
+import com.facebook.react.fabric.events.EventBeatManager;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.fabric.events.FabricEventEmitter;
 import com.facebook.react.fabric.mounting.ContextBasedViewPool;
 import com.facebook.react.fabric.mounting.LayoutMetricsConversions;
 import com.facebook.react.fabric.mounting.MountingManager;

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricSoLoader.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric;
 
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -35,10 +35,9 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.fabric.jsi.Binding;
-import com.facebook.react.fabric.jsi.EventBeatManager;
-import com.facebook.react.fabric.jsi.EventEmitterWrapper;
-import com.facebook.react.fabric.jsi.FabricSoLoader;
+import com.facebook.react.fabric.events.EventBeatManager;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
+import com.facebook.react.fabric.events.FabricEventEmitter;
 import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.fabric.mounting.mountitems.BatchMountItem;
 import com.facebook.react.fabric.mounting.mountitems.CreateMountItem;

ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
 import com.facebook.jni.HybridData;

ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventBeatManager.java

@@ -4,15 +4,14 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric.events;
 
 import android.annotation.SuppressLint;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.fabric.FabricSoLoader;
 import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
-import com.facebook.react.fabric.jsi.FabricSoLoader;
 
 /**
  * Class that acts as a proxy between the list of EventBeats registered in C++ and the Android side.

ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.facebook.react.fabric.jsi;
+package com.facebook.react.fabric.events;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;
@@ -13,7 +13,7 @@ import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.fabric.jsi.FabricSoLoader;
+import com.facebook.react.fabric.FabricSoLoader;
 
 /**
  * This class holds reference to the C++ EventEmitter object. Instances of this class are created on

ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.java

@@ -4,7 +4,7 @@
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.facebook.react.fabric;
+package com.facebook.react.fabric.events;
 
 import static com.facebook.react.uimanager.events.TouchesHelper.CHANGED_TOUCHES_KEY;
 import static com.facebook.react.uimanager.events.TouchesHelper.TARGET_KEY;
@@ -19,6 +19,7 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.systrace.Systrace;
 import java.util.HashSet;

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h

@@ -21,8 +21,8 @@ class Instance;
 
 class Binding : public jni::HybridClass<Binding>, public SchedulerDelegate {
  public:
-  constexpr static const char *const kJavaDescriptor =
-      "Lcom/facebook/react/fabric/jsi/Binding;";
+  constexpr static const char* const kJavaDescriptor =
+      "Lcom/facebook/react/fabric/Binding;";
 
   static void registerNatives();
 

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h

@@ -23,7 +23,7 @@ class ComponentFactoryDelegate
     : public jni::HybridClass<ComponentFactoryDelegate> {
  public:
   constexpr static const char* const kJavaDescriptor =
-      "Lcom/facebook/react/fabric/jsi/ComponentFactoryDelegate;";
+      "Lcom/facebook/react/fabric/ComponentFactoryDelegate;";
 
   static void registerNatives();
 

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h

@@ -21,7 +21,7 @@ class Instance;
 class EventBeatManager : public jni::HybridClass<EventBeatManager> {
  public:
   constexpr static const char* const kJavaDescriptor =
-      "Lcom/facebook/react/fabric/jsi/EventBeatManager;";
+      "Lcom/facebook/react/fabric/events/EventBeatManager;";
 
   static void registerNatives();
 

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h

@@ -16,7 +16,7 @@ class Instance;
 class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
  public:
   constexpr static const char* const kJavaDescriptor =
-      "Lcom/facebook/react/fabric/jsi/EventEmitterWrapper;";
+      "Lcom/facebook/react/fabric/events/EventEmitterWrapper;";
 
   static void registerNatives();
 

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h

@@ -16,7 +16,7 @@ class Instance;
 class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
  public:
   constexpr static const char* const kJavaDescriptor =
-      "Lcom/facebook/react/fabric/jsi/StateWrapperImpl;";
+      "Lcom/facebook/react/fabric/StateWrapperImpl;";
 
   static void registerNatives();
 

ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java

@@ -20,7 +20,7 @@ import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.fabric.jsi.EventEmitterWrapper;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.ReactStylesDiffMap;

ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateEventEmitterMountItem.java

@@ -6,7 +6,7 @@
  */
 package com.facebook.react.fabric.mounting.mountitems;
 
-import com.facebook.react.fabric.jsi.EventEmitterWrapper;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
 
 public class UpdateEventEmitterMountItem implements MountItem {