From b1385ef6635a43828ce4f199bb8f97b28162e8e3 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 28 Jul 2023 06:08:53 -0700 Subject: [PATCH] Use labmda and remove lint warnings (#38296) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38296 Use labmda and remove lint warnings changelog: [internal] internal Reviewed By: RSNara Differential Revision: D47374731 fbshipit-source-id: cb66330d81de9548a33010af977f7807ac360530 --- .../react/BridgelessReactPackage.java | 7 +- .../react/shell/MainReactPackage.java | 154 +++--------------- 2 files changed, 20 insertions(+), 141 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BridgelessReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BridgelessReactPackage.java index 14d361b0499..7989ce8aacc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BridgelessReactPackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BridgelessReactPackage.java @@ -101,12 +101,7 @@ public class BridgelessReactPackage extends TurboReactPackage { TurboModule.class.isAssignableFrom(moduleClass))); } } - return new ReactModuleInfoProvider() { - @Override - public Map getReactModuleInfos() { - return reactModuleInfoMap; - } - }; + return () -> reactModuleInfoMap; } catch (InstantiationException e) { throw new RuntimeException( "No ReactModuleInfoProvider for CoreModulesPackage$$ReactModuleInfoProvider", e); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java index aa3d187e275..da406d8bedb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java @@ -7,6 +7,7 @@ package com.facebook.react.shell; +import android.annotation.SuppressLint; import androidx.annotation.Nullable; import com.facebook.react.TurboReactPackage; import com.facebook.react.ViewManagerOnDemandReactPackage; @@ -187,153 +188,41 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn } /** @return a map of view managers that should be registered with {@link UIManagerModule} */ + @SuppressLint("VisibleForTests") public Map getViewManagersMap() { if (mViewManagers == null) { Map viewManagers = new HashMap<>(); - appendMap( - viewManagers, - ReactDrawerLayoutManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactDrawerLayoutManager(); - } - }); + appendMap(viewManagers, ReactDrawerLayoutManager.REACT_CLASS, ReactDrawerLayoutManager::new); appendMap( viewManagers, ReactHorizontalScrollViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactHorizontalScrollViewManager(); - } - }); + ReactHorizontalScrollViewManager::new); appendMap( viewManagers, ReactHorizontalScrollContainerViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactHorizontalScrollContainerViewManager(); - } - }); + ReactHorizontalScrollContainerViewManager::new); appendMap( - viewManagers, - ReactProgressBarViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactProgressBarViewManager(); - } - }); + viewManagers, ReactProgressBarViewManager.REACT_CLASS, ReactProgressBarViewManager::new); + appendMap(viewManagers, ReactScrollViewManager.REACT_CLASS, ReactScrollViewManager::new); + appendMap(viewManagers, ReactSwitchManager.REACT_CLASS, ReactSwitchManager::new); appendMap( - viewManagers, - ReactScrollViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactScrollViewManager(); - } - }); - appendMap( - viewManagers, - ReactSwitchManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactSwitchManager(); - } - }); - appendMap( - viewManagers, - SwipeRefreshLayoutManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new SwipeRefreshLayoutManager(); - } - }); + viewManagers, SwipeRefreshLayoutManager.REACT_CLASS, SwipeRefreshLayoutManager::new); appendMap( viewManagers, FrescoBasedReactTextInlineImageViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new FrescoBasedReactTextInlineImageViewManager(); - } - }); + FrescoBasedReactTextInlineImageViewManager::new); + appendMap(viewManagers, ReactImageManager.REACT_CLASS, ReactImageManager::new); + appendMap(viewManagers, ReactModalHostManager.REACT_CLASS, ReactModalHostManager::new); + appendMap(viewManagers, ReactRawTextManager.REACT_CLASS, ReactRawTextManager::new); + appendMap(viewManagers, ReactTextInputManager.REACT_CLASS, ReactTextInputManager::new); + appendMap(viewManagers, ReactTextViewManager.REACT_CLASS, ReactTextViewManager::new); + appendMap(viewManagers, ReactViewManager.REACT_CLASS, ReactViewManager::new); appendMap( - viewManagers, - ReactImageManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactImageManager(); - } - }); - appendMap( - viewManagers, - ReactModalHostManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactModalHostManager(); - } - }); - appendMap( - viewManagers, - ReactRawTextManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactRawTextManager(); - } - }); - appendMap( - viewManagers, - ReactTextInputManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactTextInputManager(); - } - }); - appendMap( - viewManagers, - ReactTextViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactTextViewManager(); - } - }); - appendMap( - viewManagers, - ReactViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactViewManager(); - } - }); - appendMap( - viewManagers, - ReactVirtualTextViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactVirtualTextViewManager(); - } - }); + viewManagers, ReactVirtualTextViewManager.REACT_CLASS, ReactVirtualTextViewManager::new); appendMap( viewManagers, ReactUnimplementedViewManager.REACT_CLASS, - new Provider() { - @Override - public NativeModule get() { - return new ReactUnimplementedViewManager(); - } - }); + ReactUnimplementedViewManager::new); mViewManagers = viewManagers; } return mViewManagers; @@ -407,12 +296,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn TurboModule.class.isAssignableFrom(moduleClass))); } - return new ReactModuleInfoProvider() { - @Override - public Map getReactModuleInfos() { - return reactModuleInfoMap; - } - }; + return () -> reactModuleInfoMap; } catch (InstantiationException e) { throw new RuntimeException( "No ReactModuleInfoProvider for CoreModulesPackage$$ReactModuleInfoProvider", e);