Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

nullable annotations to ReadableMap, WritableMap, ReadableArray, Writable. (#23329)

Browse Source 
Summary:
Kotlin is getting traction and more developers write RN native modules in it. This PR adds nullable annotations to help with Kotlin null inference and improve developer experience. Also it'll help checking code quality using lint.

I skimmed through JavaOnlyMap.java, JavaOnlyArray.java, ReadableNativeArray.java, ReadableNativeMap.java, WritableNativeArray.java and WritableNativeMap.java to infer nullability.

This is breaking change to Kotlin code.

[Android] [Changed] - Add nullable annotations to ReadableMap, WritableMap, ReadableArray, Writable.
Pull Request resolved: https://github.com/facebook/react-native/pull/23329

Differential Revision: D14002571

Pulled By: cpojer

fbshipit-source-id: 899d8b3b0a5dad43e8300e6c4ea4208cca0f01a9
This commit is contained in:
Dulmandakh
2019-02-08 04:08:37 -08:00
committed by Facebook Github Bot
parent d002d30325
commit b640b6faf7
10 changed files with 114 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+17 -15
View File
@@ -13,6 +13,8 @@ import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.react.config.ReactFeatureFlags;
import java.util.HashMap;
import java.util.Iterator;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
@@ -66,7 +68,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native String[] importKeys();
private native Object[] importValues();
private HashMap<String,ReadableType> getLocalTypeMap() {
private @Nonnull HashMap<String,ReadableType> getLocalTypeMap() {
// Fast and non-blocking return for common case
if (mLocalTypeMap != null) {
return mLocalTypeMap;
@@ -93,7 +95,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native Object[] importTypes();
@Override
public boolean hasKey(String name) {
public boolean hasKey(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return hasKeyNative(name);
@@ -103,7 +105,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native boolean hasKeyNative(String name);
@Override
public boolean isNull(String name) {
public boolean isNull(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return isNullNative(name);
@@ -113,9 +115,9 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
}
throw new NoSuchKeyException(name);
}
private native boolean isNullNative(String name);
private native boolean isNullNative(@Nonnull String name);
private Object getValue(String name) {
private @Nonnull Object getValue(@Nonnull String name) {
if (hasKey(name) && !(isNull(name))) {
return Assertions.assertNotNull(getLocalMap().get(name));
}
@@ -150,7 +152,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
}
@Override
public boolean getBoolean(String name) {
public boolean getBoolean(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getBooleanNative(name);
@@ -160,7 +162,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native boolean getBooleanNative(String name);
@Override
public double getDouble(String name) {
public double getDouble(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getDoubleNative(name);
@@ -170,7 +172,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native double getDoubleNative(String name);
@Override
public int getInt(String name) {
public int getInt(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getIntNative(name);
@@ -182,7 +184,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native int getIntNative(String name);
@Override
public @Nullable String getString(String name) {
public @Nullable String getString(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getStringNative(name);
@@ -192,7 +194,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native String getStringNative(String name);
@Override
public @Nullable ReadableArray getArray(String name) {
public @Nullable ReadableArray getArray(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getArrayNative(name);
@@ -202,7 +204,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native ReadableNativeArray getArrayNative(String name);
@Override
public @Nullable ReadableNativeMap getMap(String name) {
public @Nullable ReadableNativeMap getMap(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getMapNative(name);
@@ -212,7 +214,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native ReadableNativeMap getMapNative(String name);
@Override
public ReadableType getType(String name) {
public @Nonnull ReadableType getType(@Nonnull String name) {
if (ReactFeatureFlags.useMapNativeAccessor) {
mJniCallCounter++;
return getTypeNative(name);
@@ -225,17 +227,17 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
private native ReadableType getTypeNative(String name);
@Override
public Dynamic getDynamic(String name) {
public @Nonnull Dynamic getDynamic(@Nonnull String name) {
return DynamicFromMap.create(this, name);
}
@Override
public ReadableMapKeySetIterator keySetIterator() {
public @Nonnull ReadableMapKeySetIterator keySetIterator() {
return new ReadableNativeMapKeySetIterator(this);
}
@Override
public HashMap<String, Object> toHashMap() {
public @Nonnull HashMap<String, Object> toHashMap() {
if (ReactFeatureFlags.useMapNativeAccessor) {
ReadableMapKeySetIterator iterator = keySetIterator();
HashMap<String, Object> hashMap = new HashMap<>();