From 282127d6e0d8b3ca894bb4658ce6fcb7d6c2a8f1 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@meta.com>
Date: Mon, 12 Feb 2024 15:38:15 -0800
Subject: [PATCH] Fix lints in FabricUIManager (#42970)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/42970

Fix lints in FabricUIManager

changelog: [internal] internal

Reviewed By: cortinico

Differential Revision: D53636010

fbshipit-source-id: caab6821377b1bde11d2bed9cc2ef13283b8185f
---
 .../com/facebook/react/fabric/Binding.java    | 25 +++++++++----------
 .../react/fabric/FabricUIManager.java         | 10 ++++----
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
index 7a6da825c687df..8490c1f4b4cfee 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
@@ -17,10 +17,9 @@
 
 public interface Binding {
 
-  public void startSurface(
-      int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps);
+  void startSurface(int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps);
 
-  public void startSurfaceWithConstraints(
+  void startSurfaceWithConstraints(
       int surfaceId,
       String moduleName,
       NativeMap initialProps,
@@ -33,11 +32,11 @@ public void startSurfaceWithConstraints(
       boolean isRTL,
       boolean doLeftAndRightSwapInRTL);
 
-  public void stopSurface(int surfaceId);
+  void stopSurface(int surfaceId);
 
-  public void setPixelDensity(float pointScaleFactor);
+  void setPixelDensity(float pointScaleFactor);
 
-  public void setConstraints(
+  void setConstraints(
       int surfaceId,
       float minWidth,
       float maxWidth,
@@ -48,13 +47,13 @@ public void setConstraints(
       boolean isRTL,
       boolean doLeftAndRightSwapInRTL);
 
-  public void driveCxxAnimations();
+  void driveCxxAnimations();
 
-  public void reportMount(int surfaceId);
+  void reportMount(int surfaceId);
 
-  public ReadableNativeMap getInspectorDataForInstance(EventEmitterWrapper eventEmitterWrapper);
+  ReadableNativeMap getInspectorDataForInstance(EventEmitterWrapper eventEmitterWrapper);
 
-  public void register(
+  void register(
       @NonNull RuntimeExecutor runtimeExecutor,
       @NonNull RuntimeScheduler runtimeScheduler,
       @NonNull FabricUIManager fabricUIManager,
@@ -62,9 +61,9 @@ public void register(
       @NonNull ComponentFactory componentFactory,
       @NonNull ReactNativeConfig reactNativeConfig);
 
-  public void unregister();
+  void unregister();
 
-  public void registerSurface(SurfaceHandlerBinding surfaceHandler);
+  void registerSurface(SurfaceHandlerBinding surfaceHandler);
 
-  public void unregisterSurface(SurfaceHandlerBinding surfaceHandler);
+  void unregisterSurface(SurfaceHandlerBinding surfaceHandler);
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 81ca19f7e8a346..88fd76d15a0c49 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -675,12 +675,11 @@ public int getSurfaceId() {
             return View.NO_ID;
           }
 
+          @NonNull
           @Override
           public String toString() {
             String propsString =
-                IS_DEVELOPMENT_ENVIRONMENT
-                    ? (props != null ? props.toHashMap().toString() : "<null>")
-                    : "<hidden>";
+                IS_DEVELOPMENT_ENVIRONMENT ? props.toHashMap().toString() : "<hidden>";
             return String.format("SYNC UPDATE PROPS [%d]: %s", reactTag, propsString);
           }
         };
@@ -972,7 +971,7 @@ private void addViewCommandMountItem(final DispatchCommandMountItem mountItem) {
   }
 
   private void postChoreographerCallbackIfNecessary() {
-    if (ReactFeatureFlags.enableOnDemandReactChoreographer == false) {
+    if (!ReactFeatureFlags.enableOnDemandReactChoreographer) {
       return;
     }
 
@@ -1159,6 +1158,7 @@ public int getSurfaceId() {
             return View.NO_ID;
           }
 
+          @NonNull
           @Override
           public String toString() {
             return "CLEAR_JS_RESPONDER";
@@ -1245,7 +1245,7 @@ public void run() {
                     }
 
                     // Collect surface IDs for all the mount items
-                    List<Integer> surfaceIds = new ArrayList();
+                    List<Integer> surfaceIds = new ArrayList<>();
                     for (MountItem mountItem : mountItems) {
                       if (mountItem != null && !surfaceIds.contains(mountItem.getSurfaceId())) {
                         surfaceIds.add(mountItem.getSurfaceId());