From 42a7777f2accc6818e1efbebabf8034f705c1ad6 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@meta.com>
Date: Thu, 24 Aug 2023 16:52:01 -0700
Subject: [PATCH] EZ cleanup of TurboReactPackage (#39139)

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

EZ cleanup of TurboReactPackage

changelog: [internal] internal

Reviewed By: cortinico

Differential Revision: D48588377

fbshipit-source-id: 5645acad938a4ebf84b81818dd0a915cc86a2682
---
 .../com/facebook/react/TurboReactPackage.java | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
index 88eb2357b72..67d4b05b4b2 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
@@ -7,7 +7,6 @@
 
 package com.facebook.react;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ModuleHolder;
 import com.facebook.react.bridge.ModuleSpec;
@@ -39,9 +38,8 @@ public abstract class TurboReactPackage implements ReactPackage {
    * The API needed for TurboModules. Given a module name, it returns an instance of {@link
    * NativeModule} for the name
    *
-   * @param name
-   * @param reactContext
-   * @return
+   * @param name name of the Native Module
+   * @param reactContext {@link ReactApplicationContext} context for this
    */
   public abstract @Nullable NativeModule getModule(
       String name, final ReactApplicationContext reactContext);
@@ -60,13 +58,10 @@ public abstract class TurboReactPackage implements ReactPackage {
     final Set<Map.Entry<String, ReactModuleInfo>> entrySet =
         getReactModuleInfoProvider().getReactModuleInfos().entrySet();
     final Iterator<Map.Entry<String, ReactModuleInfo>> entrySetIterator = entrySet.iterator();
-    return new Iterable<ModuleHolder>() {
-      @NonNull
-      @Override
-      // This should ideally be an IteratorConvertor, but we don't have any internal library for it
-      public Iterator<ModuleHolder> iterator() {
-        return new Iterator<ModuleHolder>() {
-          Map.Entry<String, ReactModuleInfo> nextEntry = null;
+    // This should ideally be an IteratorConvertor, but we don't have any internal library for it
+    return () ->
+        new Iterator<ModuleHolder>() {
+          @Nullable Map.Entry<String, ReactModuleInfo> nextEntry = null;
 
           private void findNext() {
             while (entrySetIterator.hasNext()) {
@@ -118,8 +113,6 @@ public abstract class TurboReactPackage implements ReactPackage {
             throw new UnsupportedOperationException("Cannot remove native modules from the list");
           }
         };
-      }
-    };
   }
 
   /**