From 799beebdd07cd2aadd8b3de26a2421f77448e72e Mon Sep 17 00:00:00 2001 From: David Vacca Date: Mon, 9 Oct 2023 14:28:03 -0700 Subject: [PATCH] Fix lint warnings in JavaModuleWrapper (#39820) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39820 In this diff I'm fixing lint warnings in JavaModuleWrapper bypass-github-export-checks changelog: [internal] internal Reviewed By: cortinico Differential Revision: D49930344 fbshipit-source-id: e46908acaadce1bcca2ba1f65c8c9ec8d5fd9592 --- .../java/com/facebook/react/bridge/JavaModuleWrapper.java | 8 ++++---- .../main/java/com/facebook/react/bridge/NativeModule.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java index a931d834af0..9191a4f47c6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java @@ -33,7 +33,7 @@ import java.util.Set; @DoNotStrip class JavaModuleWrapper { @DoNotStrip - public class MethodDescriptor { + public static class MethodDescriptor { @DoNotStrip Method method; @DoNotStrip String signature; @DoNotStrip String name; @@ -50,7 +50,7 @@ class JavaModuleWrapper { mJSInstance = jsInstance; mModuleHolder = moduleHolder; mMethods = new ArrayList<>(); - mDescs = new ArrayList(); + mDescs = new ArrayList<>(); } @DoNotStrip @@ -94,7 +94,7 @@ class JavaModuleWrapper { new JavaMethodWrapper(this, targetMethod, annotation.isBlockingSynchronousMethod()); md.name = methodName; md.type = method.getType(); - if (md.type == BaseJavaModule.METHOD_TYPE_SYNC) { + if (BaseJavaModule.METHOD_TYPE_SYNC.equals(md.type)) { md.signature = method.getSignature(); md.method = targetMethod; } @@ -142,7 +142,7 @@ class JavaModuleWrapper { @DoNotStrip public void invoke(int methodId, ReadableNativeArray parameters) { - if (mMethods == null || methodId >= mMethods.size()) { + if (methodId >= mMethods.size()) { return; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java index cd2bb5addb7..1a98bfbd890 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java @@ -20,6 +20,8 @@ import javax.annotation.Nonnull; */ @DoNotStrip public interface NativeModule { + + @DeprecatedInNewArchitecture interface NativeMethod { void invoke(JSInstance jsInstance, ReadableArray parameters);