From 3b6b039e8540922a82aa09be9b4c04e244dd4486 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH] Make JavaPoet JavaSpec Generator handle
 NullableTypeAnnotation

Summary: Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24030728

fbshipit-source-id: b79f7dfa7304bfddc6333c641eadcaa55c0cb7a0
---
 .../codegen/generator/SchemaJsonParser.java   | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
index 0b44b62826..68c7d839f0 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
@@ -93,14 +93,18 @@ public final class SchemaJsonParser {
   }
 
   // Parse type information from a JSON "typeAnnotation" node.
-  private Type parseTypeAnnotation(final TypeId typeId, final JsonObject typeAnnotation) {
-    final String type = typeAnnotation.get("type").getAsString();
-    // TODO (T71824250): Support NullableTypeAnnotation in the schema instead of a field here.
-    final boolean nullable =
-        typeAnnotation.has("nullable") ? typeAnnotation.get("nullable").getAsBoolean() : false;
-
+  private Type parseTypeAnnotation(final TypeId typeId, final JsonObject originalTypeAnnotation) {
+    JsonObject typeAnnotation = originalTypeAnnotation;
+    String type = typeAnnotation.get("type").getAsString();
+    boolean nullable = false;
     Type parsedType = null;
 
+    if (type.equals(NullableType.TYPE_NAME)) {
+      nullable = true;
+      typeAnnotation = typeAnnotation.get("typeAnnotation").getAsJsonObject();
+      type = typeAnnotation.get("type").getAsString();
+    }
+
     switch (type) {
       case AliasType.TYPE_NAME:
         parsedType = parseAliasTypeAnnotation(typeId, typeAnnotation);
@@ -178,10 +182,9 @@ public final class SchemaJsonParser {
     properties.forEach(
         p -> {
           final JsonObject node = p.getAsJsonObject();
-          final String name = node.has("name") ? node.get("name").getAsString() : null;
+          final String name = node.get("name").getAsString();
           final JsonObject typeAnnotation = node.getAsJsonObject("typeAnnotation");
-          // TODO (T71845349): "optional" field shouldn't be part of the Function's typeAnnotation.
-          final boolean optional = typeAnnotation.get("optional").getAsBoolean();
+          final boolean optional = node.get("optional").getAsBoolean();
           final TypeId propertyTypeId =
               TypeId.expandOf(typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name));
           collectedPropertiesBuilder.add(
@@ -214,28 +217,21 @@ public final class SchemaJsonParser {
 
     ImmutableList.Builder<FunctionType.ArgumentType> paramsList = new ImmutableList.Builder<>();
 
-    // TODO (T71846321): Some functions are missing params specification.
-    if (params != null) {
-      for (int i = 0; i < params.size(); i++) {
-        final JsonElement p = params.get(i);
-        final JsonObject node = p.getAsJsonObject();
-        final String name = node.has("name") ? node.get("name").getAsString() : ("Arg" + i);
-        paramsList.add(
-            FunctionType.createArgument(
-                name,
-                parseTypeAnnotation(
-                    TypeId.expandOf(
-                        typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name)),
-                    node.getAsJsonObject("typeAnnotation"))));
-      }
+    for (int i = 0; i < params.size(); i++) {
+      final JsonElement p = params.get(i);
+      final JsonObject node = p.getAsJsonObject();
+      final String name = node.get("name").getAsString();
+      paramsList.add(
+          FunctionType.createArgument(
+              name,
+              parseTypeAnnotation(
+                  TypeId.expandOf(typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name)),
+                  node.getAsJsonObject("typeAnnotation"))));
     }
 
-    // TODO (T71846321): Some functions are missing a return type.
     final JsonObject returnTypeAnnotation = typeAnnotation.getAsJsonObject("returnTypeAnnotation");
     final Type returnType =
-        returnTypeAnnotation != null
-            ? parseTypeAnnotation(TypeId.expandOf(typeId, "ReturnType"), returnTypeAnnotation)
-            : VoidType.VOID;
+        parseTypeAnnotation(TypeId.expandOf(typeId, "ReturnType"), returnTypeAnnotation);
 
     return new FunctionType(typeId, paramsList.build(), returnType);
   }
@@ -247,18 +243,12 @@ public final class SchemaJsonParser {
     properties.forEach(
         p -> {
           final JsonObject node = p.getAsJsonObject();
-          final String name = node.has("name") ? node.get("name").getAsString() : null;
+          final String name = node.get("name").getAsString();
           final boolean optional = node.get("optional").getAsBoolean();
           final JsonObject propertyTypeAnnotation = node.getAsJsonObject("typeAnnotation");
           final TypeId propertyTypeId =
               TypeId.expandOf(typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name));
-
-          // TODO (T67898313): Some object properties are missing typeAnnotation.
-          final Type propertyType =
-              propertyTypeAnnotation != null
-                  ? parseTypeAnnotation(propertyTypeId, propertyTypeAnnotation)
-                  : new AnyType(propertyTypeId);
-
+          final Type propertyType = parseTypeAnnotation(propertyTypeId, propertyTypeAnnotation);
           propertiesList.add(new ObjectType.Property(name, propertyType, optional));
         });