move rawAnnotation to detail/TypeSystem.h

Summary: plan to share this method in materializing SerializableTypeSystem from TypeSystem

Reviewed By: pranavtbhat

Differential Revision: D79855966

fbshipit-source-id: 8f29b2053539ca2c3cb6a35a18a746485052ed7c

Author: thedavekwon

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

@@ -19,6 +19,7 @@
 #include <thrift/lib/cpp2/dynamic/SerializableRecord.h>
 #include <thrift/lib/cpp2/dynamic/TypeId.h>
 #include <thrift/lib/cpp2/dynamic/detail/Traits.h>
+#include <thrift/lib/cpp2/dynamic/detail/TypeSystem.h>
 #include <thrift/lib/thrift/gen-cpp2/type_system_types.h>
 
 #include <folly/CppAttributes.h>
@@ -499,11 +500,7 @@ class InvalidTypeError : public std::runtime_error {
   using std::runtime_error::runtime_error;
 };
 
-using AnnotationsMap = folly::F14FastMap<
-    Uri,
-    SerializableRecord,
-    detail::UriHeterogeneousHash,
-    std::equal_to<>>;
+using AnnotationsMap = detail::AnnotationsMap;
 
 namespace detail {
 

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

@@ -15,6 +15,7 @@
  */
 
 #include <thrift/lib/cpp2/dynamic/TypeSystemBuilder.h>
+#include <thrift/lib/cpp2/dynamic/detail/TypeSystem.h>
 
 #include <folly/Overload.h>
 #include <folly/container/F14Set.h>
@@ -459,20 +460,6 @@ void TypeSystemBuilder::tryEmplace(Uri uri, DefinitionEntry&& def) {
   }
 }
 
-namespace {
-
-using RawAnnotations = folly::F14FastMap<Uri, SerializableRecordUnion>;
-
-static RawAnnotations toRawAnnotations(const AnnotationsMap& annotations) {
-  RawAnnotations raw;
-  for (const auto& [uri, record] : annotations) {
-    raw.emplace(uri, SerializableRecord::toThrift(record));
-  }
-  return raw;
-}
-
-} // namespace
-
 /* static */ FieldIdentity TypeSystemBuilder::DefinitionHelper::Identity(
     std::int16_t id, std::string_view name) {
   return FieldIdentity{FieldId{id}, std::string(name)};
@@ -492,7 +479,7 @@ TypeSystemBuilder::DefinitionHelper::Field(
   if (customDefault.has_value()) {
     def.customDefaultValue() = SerializableRecord::toThrift(*customDefault);
   }
-  def.annotations() = toRawAnnotations(annotations);
+  def.annotations() = detail::toRawAnnotations(annotations);
   return def;
 }
 
@@ -504,7 +491,7 @@ TypeSystemBuilder::DefinitionHelper::Struct(
   SerializableStructDefinition def;
   def.fields() = fields;
   def.isSealed() = isSealed;
-  def.annotations() = toRawAnnotations(annotations);
+  def.annotations() = detail::toRawAnnotations(annotations);
   return def;
 }
 
@@ -516,7 +503,7 @@ TypeSystemBuilder::DefinitionHelper::Union(
   SerializableUnionDefinition def;
   def.fields() = fields;
   def.isSealed() = isSealed;
-  def.annotations() = toRawAnnotations(annotations);
+  def.annotations() = detail::toRawAnnotations(annotations);
   return def;
 }
 
@@ -528,10 +515,10 @@ TypeSystemBuilder::DefinitionHelper::Enum(
     SerializableEnumValueDefinition v;
     v.name() = name;
     v.datum() = value;
-    v.annotations() = toRawAnnotations(enumValueAnnotations);
+    v.annotations() = detail::toRawAnnotations(enumValueAnnotations);
     enumDef.values()->emplace_back(std::move(v));
   }
-  enumDef.annotations() = toRawAnnotations(annotations);
+  enumDef.annotations() = detail::toRawAnnotations(annotations);
   return enumDef;
 }
 
@@ -540,7 +527,7 @@ TypeSystemBuilder::DefinitionHelper::OpaqueAlias(
     TypeId targetType, const AnnotationsMap& annotations) {
   SerializableOpaqueAliasDefinition def;
   def.targetType() = targetType;
-  def.annotations() = toRawAnnotations(annotations);
+  def.annotations() = detail::toRawAnnotations(annotations);
   return def;
 }
 

third-party/thrift/src/thrift/lib/cpp2/dynamic/detail/TypeSystem.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <folly/container/F14Map.h>
+#include <thrift/lib/cpp2/dynamic/SerializableRecord.h>
+#include <thrift/lib/cpp2/dynamic/TypeId.h>
+
+namespace apache::thrift::type_system::detail {
+
+using RawAnnotations = folly::F14FastMap<
+    apache::thrift::type_system::Uri,
+    apache::thrift::type_system::SerializableRecordUnion>;
+
+using AnnotationsMap = folly::
+    F14FastMap<Uri, SerializableRecord, UriHeterogeneousHash, std::equal_to<>>;
+
+inline RawAnnotations toRawAnnotations(const AnnotationsMap& annotations) {
+  RawAnnotations raw;
+  for (const auto& [uri, record] : annotations) {
+    raw.emplace(uri, SerializableRecord::toThrift(record));
+  }
+  return raw;
+}
+} // namespace apache::thrift::type_system::detail