Use same annotationsMap in TypeSystemBuilder

Summary: This is strictly better and it makes sense to share same annotations type with TypeSystem

Reviewed By: pranavtbhat

Differential Revision: D79855446

fbshipit-source-id: 0a54e0fc1ddac3f0c12c5d03da0d1ba866b6b8e2

Author: thedavekwon

third-party/thrift/src/thrift/lib/cpp2/dynamic/TypeSystemBuilder.cpp

@@ -463,8 +463,7 @@ namespace {
 
 using RawAnnotations = folly::F14FastMap<Uri, SerializableRecordUnion>;
 
-static RawAnnotations toRawAnnotations(
-    const TypeSystemBuilder::DefinitionHelper::Annotations& annotations) {
+static RawAnnotations toRawAnnotations(const AnnotationsMap& annotations) {
   RawAnnotations raw;
   for (const auto& [uri, record] : annotations) {
     raw.emplace(uri, SerializableRecord::toThrift(record));
@@ -485,7 +484,7 @@ TypeSystemBuilder::DefinitionHelper::Field(
     PresenceQualifier presence,
     TypeId type,
     std::optional<SerializableRecord> customDefault,
-    const Annotations& annotations) {
+    const AnnotationsMap& annotations) {
   SerializableFieldDefinition def;
   def.identity() = std::move(identity);
   def.presence() = presence;
@@ -501,7 +500,7 @@ TypeSystemBuilder::DefinitionHelper::Field(
 TypeSystemBuilder::DefinitionHelper::Struct(
     std::vector<SerializableFieldDefinition> fields,
     bool isSealed,
-    const Annotations& annotations) {
+    const AnnotationsMap& annotations) {
   SerializableStructDefinition def;
   def.fields() = fields;
   def.isSealed() = isSealed;
@@ -513,7 +512,7 @@ TypeSystemBuilder::DefinitionHelper::Struct(
 TypeSystemBuilder::DefinitionHelper::Union(
     std::vector<SerializableFieldDefinition> fields,
     bool isSealed,
-    const Annotations& annotations) {
+    const AnnotationsMap& annotations) {
   SerializableUnionDefinition def;
   def.fields() = fields;
   def.isSealed() = isSealed;
@@ -523,7 +522,7 @@ TypeSystemBuilder::DefinitionHelper::Union(
 
 /* static */ SerializableEnumDefinition
 TypeSystemBuilder::DefinitionHelper::Enum(
-    const std::vector<EnumValue>& values, const Annotations& annotations) {
+    const std::vector<EnumValue>& values, const AnnotationsMap& annotations) {
   SerializableEnumDefinition enumDef;
   for (auto& [name, value, enumValueAnnotations] : values) {
     SerializableEnumValueDefinition v;
@@ -538,7 +537,7 @@ TypeSystemBuilder::DefinitionHelper::Enum(
 
 /* static */ SerializableOpaqueAliasDefinition
 TypeSystemBuilder::DefinitionHelper::OpaqueAlias(
-    TypeId targetType, const Annotations& annotations) {
+    TypeId targetType, const AnnotationsMap& annotations) {
   SerializableOpaqueAliasDefinition def;
   def.targetType() = targetType;
   def.annotations() = toRawAnnotations(annotations);

third-party/thrift/src/thrift/lib/cpp2/dynamic/TypeSystemBuilder.h

@@ -127,8 +127,6 @@ class TypeSystemBuilder {
     static constexpr inline PresenceQualifier AlwaysPresent =
         PresenceQualifier::UNQUALIFIED;
 
-    using Annotations = folly::F14FastMap<Uri, SerializableRecord>;
-
     /**
      * Creates the identity a field for use in a struct or union definition.
      *
@@ -144,15 +142,15 @@ class TypeSystemBuilder {
         PresenceQualifier presence,
         TypeId type,
         std::optional<SerializableRecord> customDefault = std::nullopt,
-        const Annotations& annotations = {});
+        const AnnotationsMap& annotations = {});
 
     /**
      * Defines a Thrift struct, which is a collection of fields.
      */
     static SerializableStructDefinition Struct(
         std::vector<SerializableFieldDefinition> fields,
         bool isSealed = false,
-        const Annotations& annotations = {});
+        const AnnotationsMap& annotations = {});
 
     /**
      * Defines a Thrift union, which is a collection of fields. At most one
@@ -161,15 +159,15 @@ class TypeSystemBuilder {
     static SerializableUnionDefinition Union(
         std::vector<SerializableFieldDefinition> fields,
         bool isSealed = false,
-        const Annotations& annotations = {});
+        const AnnotationsMap& annotations = {});
 
     struct EnumValue {
       std::string name;
       std::int32_t value;
-      Annotations annotations;
+      AnnotationsMap annotations;
 
       EnumValue(std::string n, std::int32_t v) : name{std::move(n)}, value{v} {}
-      EnumValue(std::string n, std::int32_t v, Annotations m)
+      EnumValue(std::string n, std::int32_t v, AnnotationsMap m)
           : name{std::move(n)}, value{v}, annotations(std::move(m)) {}
     };
 
@@ -179,7 +177,7 @@ class TypeSystemBuilder {
      */
     static SerializableEnumDefinition Enum(
         const std::vector<EnumValue>& values,
-        const Annotations& annotations = {});
+        const AnnotationsMap& annotations = {});
 
     /**
      * Defines a Thrift opaque alias, which is a distinct user-defined type
@@ -188,7 +186,7 @@ class TypeSystemBuilder {
      * The target type must not be a user-defined type.
      */
     static SerializableOpaqueAliasDefinition OpaqueAlias(
-        TypeId targetType, const Annotations& annotations = {});
+        TypeId targetType, const AnnotationsMap& annotations = {});
 
     /**
      * Optional information about the source IDL files from which a definition

third-party/thrift/src/thrift/lib/cpp2/dynamic/test/TypeSystemTest.cpp

@@ -319,7 +319,7 @@ TEST(TypeSystemTest, Annotations) {
       def::Struct({def::Field(
           def::Identity(1, "field1"), def::Optional, TypeIds::I32)}));
 
-  folly::F14FastMap<Uri, SerializableRecord> annots = {
+  AnnotationsMap annots = {
       {"meta.com/thrift/test/MyAnnot",
        {SerializableRecord::FieldSet(
            {{FieldId(1), SerializableRecord::Int32(42)}})}}};
@@ -412,7 +412,7 @@ TEST(TypeSystemTest, Annotations) {
 TEST(TypeSystemTest, WrongAnnotationTypeUri) {
   TypeSystemBuilder builder;
 
-  folly::F14FastMap<Uri, SerializableRecord> annots = {
+  AnnotationsMap annots = {
       {"meta.com/thrift/test/MyAnnot",
        {SerializableRecord::FieldSet(
            {{FieldId(1), SerializableRecord::Int32(42)}})}}};
@@ -444,7 +444,7 @@ TEST(TypeSystemTest, WrongAnnotationTypeValue) {
   TypeSystemBuilder builder;
 
   // Value is not a FieldSetDatum.
-  folly::F14FastMap<Uri, SerializableRecord> annots = {
+  AnnotationsMap annots = {
       {"meta.com/thrift/test/MyAnnot", {SerializableRecord::Int32(42)}}};
 
   // @MyAnnot{field1=42}
@@ -473,7 +473,7 @@ TEST(TypeSystemTest, WrongAnnotationTypeValue) {
 TEST(TypeSystemTest, MissingAnnotationType) {
   TypeSystemBuilder builder;
 
-  folly::F14FastMap<Uri, SerializableRecord> annots = {
+  AnnotationsMap annots = {
       {"meta.com/thrift/test/MyAnnot",
        {SerializableRecord::FieldSet(
            {{FieldId(1), SerializableRecord::Int32(42)}})}}};