From 6506f7a6804e455dbb1b467585414628393ac1bb Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 26 Jan 2021 17:03:49 -0800
Subject: [PATCH] Remove @Nullable annotation from ArrayList element types

Summary: Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D26051159

fbshipit-source-id: 54315dc505a4fb4e595847902caf501b4ecd77e2
---
 .../GeneratePropsJavaPojo/serializePojo.js    | 18 +++------
 .../GeneratePropsJavaPojo-test.js.snap        | 39 +++++++++----------
 2 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
index a105cccf4c7..5e87cf72fb5 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
@@ -122,8 +122,7 @@ function toJavaType(
             return 'Boolean';
           }
           case 'StringTypeAnnotation': {
-            importNullable();
-            return '@Nullable String';
+            return 'String';
           }
           case 'DoubleTypeAnnotation': {
             return 'Double';
@@ -140,8 +139,7 @@ function toJavaType(
            */
           // TODO: Make StringEnums type-safe in Pojos
           case 'StringEnumTypeAnnotation': {
-            importNullable();
-            return '@Nullable String';
+            return 'String';
           }
 
           /**
@@ -157,26 +155,22 @@ function toJavaType(
           case 'ReservedPropTypeAnnotation': {
             switch (elementType.name) {
               case 'ColorPrimitive':
-                importNullable();
-                return '@Nullable Integer';
+                return 'Integer';
 
               // TODO: Make ImageSourcePrimitive type-safe
               case 'ImageSourcePrimitive':
-                importNullable();
                 importReadableMap();
-                return '@Nullable ReadableMap';
+                return 'ReadableMap';
 
               // TODO: Make PointPrimitive type-safe
               case 'PointPrimitive':
-                importNullable();
                 importReadableMap();
-                return '@Nullable ReadableMap';
+                return 'ReadableMap';
 
               // TODO: Make EdgeInsetsPrimitive type-safe
               case 'EdgeInsetsPrimitive':
-                importNullable();
                 importReadableMap();
-                return '@Nullable ReadableMap';
+                return 'ReadableMap';
               default:
                 (elementType.name: empty);
                 throw new Error(
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
index d2647e05abd..33378e01366 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
@@ -93,23 +93,22 @@ public class ArrayPropsNativeComponentPropsArrayOfArrayOfObjectElementElement {
 
 package com.facebook.react.viewmanagers.Slider;
 
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import java.util.ArrayList;
 
 public class ArrayPropsNativeComponentProps {
-  private ArrayList<@Nullable String> mNames;
+  private ArrayList<String> mNames;
   private ArrayList<Boolean> mDisableds;
   private ArrayList<Integer> mProgress;
   private ArrayList<Float> mRadii;
-  private ArrayList<@Nullable Integer> mColors;
-  private ArrayList<@Nullable ReadableMap> mSrcs;
-  private ArrayList<@Nullable ReadableMap> mPoints;
-  private ArrayList<@Nullable String> mSizes;
+  private ArrayList<Integer> mColors;
+  private ArrayList<ReadableMap> mSrcs;
+  private ArrayList<ReadableMap> mPoints;
+  private ArrayList<String> mSizes;
   private ArrayList<ArrayPropsNativeComponentPropsObjectElement> mObject;
   private ArrayList<ArrayPropsNativeComponentPropsArrayElement> mArray;
   private ArrayList<ArrayList<ArrayPropsNativeComponentPropsArrayOfArrayOfObjectElementElement>> mArrayOfArrayOfObject;
-  public ArrayList<@Nullable String> getNames() {
+  public ArrayList<String> getNames() {
     return mNames;
   }
   public ArrayList<Boolean> getDisableds() {
@@ -121,16 +120,16 @@ public class ArrayPropsNativeComponentProps {
   public ArrayList<Float> getRadii() {
     return mRadii;
   }
-  public ArrayList<@Nullable Integer> getColors() {
+  public ArrayList<Integer> getColors() {
     return mColors;
   }
-  public ArrayList<@Nullable ReadableMap> getSrcs() {
+  public ArrayList<ReadableMap> getSrcs() {
     return mSrcs;
   }
-  public ArrayList<@Nullable ReadableMap> getPoints() {
+  public ArrayList<ReadableMap> getPoints() {
     return mPoints;
   }
-  public ArrayList<@Nullable String> getSizes() {
+  public ArrayList<String> getSizes() {
     return mSizes;
   }
   public ArrayList<ArrayPropsNativeComponentPropsObjectElement> getObject() {
@@ -160,21 +159,20 @@ Map {
 
 package com.facebook.react.viewmanagers.Slider;
 
-import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableMap;
 import java.util.ArrayList;
 
 public class ArrayPropsNativeComponentPropsNativePrimitivesElement {
-  private ArrayList<@Nullable Integer> mColors;
-  private ArrayList<@Nullable ReadableMap> mSrcs;
-  private ArrayList<@Nullable ReadableMap> mPoints;
-  public ArrayList<@Nullable Integer> getColors() {
+  private ArrayList<Integer> mColors;
+  private ArrayList<ReadableMap> mSrcs;
+  private ArrayList<ReadableMap> mPoints;
+  public ArrayList<Integer> getColors() {
     return mColors;
   }
-  public ArrayList<@Nullable ReadableMap> getSrcs() {
+  public ArrayList<ReadableMap> getSrcs() {
     return mSrcs;
   }
-  public ArrayList<@Nullable ReadableMap> getPoints() {
+  public ArrayList<ReadableMap> getPoints() {
     return mPoints;
   }
 }
@@ -658,12 +656,11 @@ Map {
 
 package com.facebook.react.viewmanagers.ObjectPropsNativeComponent;
 
-import androidx.annotation.Nullable;
 import java.util.ArrayList;
 
 public class ObjectPropsPropsObjectPropObjectArrayProp {
-  private ArrayList<@Nullable String> mArray;
-  public ArrayList<@Nullable String> getArray() {
+  private ArrayList<String> mArray;
+  public ArrayList<String> getArray() {
     return mArray;
   }
 }