Migrate Nullable and NonNull annotations to AndroidX

Summary:
This diff migrates the usages Nullable and NonNull annotations to AndroidX instead of javax.

The purpose of this change is to bring consistency in the annotations used by the core of RN

Reviewed By: makovkastar

Differential Revision: D16054504

fbshipit-source-id: 21d888854da088d2a14615a90d4dc058e5286b91
This commit is contained in:
David Vacca
2019-07-11 16:23:29 -07:00
committed by Facebook Github Bot
parent 96318e438f
commit aa5edca0e2
253 changed files with 432 additions and 384 deletions
@@ -6,11 +6,11 @@
*/
package com.facebook.react.bridge;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* Java {@link HashMap} backed implementation of {@link ReadableMap} and {@link WritableMap}
@@ -81,52 +81,52 @@ public class JavaOnlyMap implements ReadableMap, WritableMap {
}
@Override
public boolean hasKey(@Nonnull String name) {
public boolean hasKey(@NonNull String name) {
return mBackingMap.containsKey(name);
}
@Override
public boolean isNull(@Nonnull String name) {
public boolean isNull(@NonNull String name) {
return mBackingMap.get(name) == null;
}
@Override
public boolean getBoolean(@Nonnull String name) {
public boolean getBoolean(@NonNull String name) {
return (Boolean) mBackingMap.get(name);
}
@Override
public double getDouble(@Nonnull String name) {
public double getDouble(@NonNull String name) {
return ((Number) mBackingMap.get(name)).doubleValue();
}
@Override
public int getInt(@Nonnull String name) {
public int getInt(@NonNull String name) {
return ((Number) mBackingMap.get(name)).intValue();
}
@Override
public String getString(@Nonnull String name) {
public String getString(@NonNull String name) {
return (String) mBackingMap.get(name);
}
@Override
public ReadableMap getMap(@Nonnull String name) {
public ReadableMap getMap(@NonNull String name) {
return (ReadableMap) mBackingMap.get(name);
}
@Override
public ReadableArray getArray(@Nonnull String name) {
public ReadableArray getArray(@NonNull String name) {
return (ReadableArray) mBackingMap.get(name);
}
@Override
public @Nonnull Dynamic getDynamic(@Nonnull String name) {
public @NonNull Dynamic getDynamic(@NonNull String name) {
return DynamicFromMap.create(this, name);
}
@Override
public @Nonnull ReadableType getType(@Nonnull String name) {
public @NonNull ReadableType getType(@NonNull String name) {
Object value = mBackingMap.get(name);
if (value == null) {
return ReadableType.Null;
@@ -149,12 +149,12 @@ public class JavaOnlyMap implements ReadableMap, WritableMap {
}
@Override
public @Nonnull Iterator<Map.Entry<String, Object>> getEntryIterator() {
public @NonNull Iterator<Map.Entry<String, Object>> getEntryIterator() {
return mBackingMap.entrySet().iterator();
}
@Override
public @Nonnull ReadableMapKeySetIterator keySetIterator() {
public @NonNull ReadableMapKeySetIterator keySetIterator() {
return new ReadableMapKeySetIterator() {
Iterator<Map.Entry<String, Object>> mIterator = mBackingMap.entrySet().iterator();
@@ -171,37 +171,37 @@ public class JavaOnlyMap implements ReadableMap, WritableMap {
}
@Override
public void putBoolean(@Nonnull String key, boolean value) {
public void putBoolean(@NonNull String key, boolean value) {
mBackingMap.put(key, value);
}
@Override
public void putDouble(@Nonnull String key, double value) {
public void putDouble(@NonNull String key, double value) {
mBackingMap.put(key, value);
}
@Override
public void putInt(@Nonnull String key, int value) {
public void putInt(@NonNull String key, int value) {
mBackingMap.put(key, new Double(value));
}
@Override
public void putString(@Nonnull String key, @Nullable String value) {
public void putString(@NonNull String key, @Nullable String value) {
mBackingMap.put(key, value);
}
@Override
public void putNull(@Nonnull String key) {
public void putNull(@NonNull String key) {
mBackingMap.put(key, null);
}
@Override
public void putMap(@Nonnull String key, @Nullable ReadableMap value) {
public void putMap(@NonNull String key, @Nullable ReadableMap value) {
mBackingMap.put(key, value);
}
@Override
public void merge(@Nonnull ReadableMap source) {
public void merge(@NonNull ReadableMap source) {
mBackingMap.putAll(((JavaOnlyMap) source).mBackingMap);
}
@@ -213,12 +213,12 @@ public class JavaOnlyMap implements ReadableMap, WritableMap {
}
@Override
public void putArray(@Nonnull String key, @Nullable ReadableArray value) {
public void putArray(@NonNull String key, @Nullable ReadableArray value) {
mBackingMap.put(key, value);
}
@Override
public @Nonnull HashMap<String, Object> toHashMap() {
public @NonNull HashMap<String, Object> toHashMap() {
return new HashMap<String, Object>(mBackingMap);
}