From e6e5822d0769475dd694600c782fa82dacff0b11 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 23 Feb 2024 15:27:17 -0800 Subject: [PATCH] Mark classes of package uimanager as @Nullsafe Summary: All these classes are NullSafe, let's mark them as NullSafe(Local) to ensure lint detect errors in the future bypass-github-export-checks changelog: [internal] internal Reviewed By: rshest Differential Revision: D54027183 fbshipit-source-id: b87e3931642abaa22b84fd48f0504f36e9c3621f --- .../react/uimanager/ReactInvalidPropertyException.java | 3 +++ .../src/main/java/com/facebook/react/uimanager/ReactRoot.java | 2 ++ .../facebook/react/uimanager/ReactRootViewTagGenerator.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java index f574371ae30..63bdc3fa637 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java @@ -7,6 +7,9 @@ package com.facebook.react.uimanager; +import com.facebook.infer.annotation.Nullsafe; + +@Nullsafe(Nullsafe.Mode.LOCAL) public class ReactInvalidPropertyException extends RuntimeException { public ReactInvalidPropertyException(String property, String value, String expectedValues) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java index 20a89f746bf..49430b70d1d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java @@ -10,10 +10,12 @@ package com.facebook.react.uimanager; import android.os.Bundle; import android.view.ViewGroup; import androidx.annotation.Nullable; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.react.uimanager.common.UIManagerType; import java.util.concurrent.atomic.AtomicInteger; /** Interface for the root native view of a React native application */ +@Nullsafe(Nullsafe.Mode.LOCAL) public interface ReactRoot { /** This constant represents that ReactRoot hasn't started yet or it has been destroyed. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java index 90d9ac63ad7..6c128e202ec 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRootViewTagGenerator.java @@ -7,7 +7,10 @@ package com.facebook.react.uimanager; +import com.facebook.infer.annotation.Nullsafe; + /** Incremental counter for React Root View tag. */ +@Nullsafe(Nullsafe.Mode.LOCAL) public class ReactRootViewTagGenerator { // Keep in sync with ReactIOSTagHandles JS module - see that file for an explanation on why the