fbcode/common/hs/thrift/exactprint/tests/fbthrift-tests/adapter/src/module.thrift (+8 more)

Summary: Feedback/questions? Ping aristidisp.

Reviewed By: vitaut

Differential Revision: D80322225

fbshipit-source-id: 38e74d7822d540581cfd1a04aca9441861016875

Author: aristidisp

exactprint/tests/fbthrift-tests/adapter/src/module.thrift

@@ -32,15 +32,19 @@ include "thrift/annotation/rust.thrift"
 @thrift.Experimental
 package "facebook.com/thrift/test"
 
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter2'}
 @cpp.Adapter{name = '::my::Adapter2'}
 @rust.Adapter{name = "::my::Adapter2"}
 typedef set<string> (py.adapter = 'my.Adapter2') SetWithAdapter
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = '::my::Adapter1'}
 @rust.Adapter{name = "::my::Adapter1"}
 typedef string (py.adapter = 'my.Adapter1') StringWithAdapter
+@thrift.AllowLegacyTypedefUri
 typedef list<StringWithAdapter> ListWithElemAdapter
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter2'}
 @cpp.Adapter{name = '::my::Adapter2'}
 @rust.Adapter{name = "::my::Adapter2"}
@@ -63,13 +67,16 @@ struct MyAnnotation {
   2: Color color = Color.RED;
 }
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::my::Adapter1"}
 @rust.Adapter{name = "::my::Adapter1"}
 @MyAnnotation{signature = "MyI64", color = Color.GREEN}
 typedef i64 MyI64
 
+@thrift.AllowLegacyTypedefUri
 typedef MyI64 DoubleTypedefI64
 
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = '::my::Adapter1'}
 @rust.Adapter{name = "::my::Adapter1"}
@@ -142,6 +149,7 @@ union Baz {
   9: MyI64 longField;
 }
 
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = '::my::Adapter1'}
 @rust.Adapter{name = "::my::Adapter1"}
@@ -209,17 +217,20 @@ struct TerseAdaptedFields {
   3: set<i32> set_field;
 }
 
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter2'}
 @cpp.Adapter{name = '::my::Adapter2'}
 typedef Bar (py.adapter = 'my.Adapter2') StructWithAdapter
 
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter2'}
 @cpp.Adapter{name = '::my::Adapter2'}
 typedef Baz (py.adapter = 'my.Adapter2') UnionWithAdapter
 
 struct B {
   1: AdaptedA a;
 }
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::my::Adapter"}
 typedef A AdaptedA
 struct A {}
@@ -265,37 +276,49 @@ const string var5 = "50";
 @Config{path = "baz2"}
 const MyStruct var6 = MyStruct{field = 60, set_string = ["30", "40"]};
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::AdaptTestMsAdapter"}
 typedef i64 DurationMs
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef bool AdaptedBool
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef byte AdaptedByte
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef i16 AdaptedShort
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef i32 AdaptedInteger
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef i64 AdaptedLong
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef double AdaptedDouble
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef string AdaptedString
 
+@thrift.AllowLegacyTypedefUri
 typedef AdaptedBool DoubleTypedefBool
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{name = "::folly::IOBuf"}
 typedef binary IOBuf
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::CustomProtocolAdapter"}
 typedef IOBuf CustomProtocolType
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{
   name = "::apache::thrift::IndirectionAdapter<::apache::thrift::test::IndirectionString>",
 }
@@ -329,6 +352,7 @@ enum ThriftAdaptedEnum {
   Zero = 0,
   One = 1,
 }
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{
   name = "::apache::thrift::StaticCastAdapter<::apache::thrift::test::basic::AdaptedEnum, ::apache::thrift::test::basic::ThriftAdaptedEnum>",
 }
@@ -383,6 +407,7 @@ struct AdaptedStruct {
   1: i64 data;
 }
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef AdaptedStruct AdaptedTypedef
 
@@ -391,6 +416,7 @@ struct DirectlyAdaptedStruct {
   1: i64 data;
 }
 
+@thrift.AllowLegacyTypedefUri
 typedef DirectlyAdaptedStruct TypedefOfDirect
 
 struct StructFieldAdaptedStruct {
@@ -408,6 +434,7 @@ struct CircularStruct {
   @cpp.Ref{type = cpp.RefType.Unique}
   1: optional AdaptedCircularAdaptee field;
 }
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{
   name = "::apache::thrift::test::MemberAccessAdapter",
   adaptedType = "::apache::thrift::test::TaggedWrapper<CircularAdaptee, CircularStruct>",
@@ -463,6 +490,7 @@ struct ApplyAdapter {}
 @ApplyAdapter
 struct TransitiveAdapted {}
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::CountingAdapter<true, int>"}
 typedef i64 CountingInt
 struct CountingStruct {
@@ -515,19 +543,29 @@ const MoveOnly nested_adapted = {"ptr": {}};
 const list<AdaptedByte> container_of_adapted = [1, 2, 3];
 
 // The following were automatically generated and may benefit from renaming.
+@thrift.AllowLegacyTypedefUri
 typedef FooWithAdapter (py.adapter = "my.Adapter1") FooWithAdapter_9317
+@thrift.AllowLegacyTypedefUri
 typedef ListWithElemAdapter_withAdapter (
   py.adapter = "my.Adapter2",
 ) ListWithElemAdapter_withAdapter_2312
+@thrift.AllowLegacyTypedefUri
 typedef MyI32 (py.adapter = "my.Adapter1") MyI32_4873
+@thrift.AllowLegacyTypedefUri
 typedef StringWithAdapter (py.adapter = "my.Adapter2") StringWithAdapter_7208
 
 // The following were automatically generated and may benefit from renaming.
+@thrift.AllowLegacyTypedefUri
 typedef Baz (py.adapter = "my.Adapter1") Baz_7352
+@thrift.AllowLegacyTypedefUri
 typedef Foo (py.adapter = "my.Adapter1") Foo_3943
+@thrift.AllowLegacyTypedefUri
 typedef Foo (py.adapter = "::my.Adapter1") Foo_6868
+@thrift.AllowLegacyTypedefUri
 typedef binary (py.adapter = "my.Adapter1") binary_5673
+@thrift.AllowLegacyTypedefUri
 typedef i32 (py.adapter = "my.Adapter1") i32_5137
+@thrift.AllowLegacyTypedefUri
 typedef map<string, ListWithElemAdapter_withAdapter_2312> (
   py.adapter = "my.Adapter3",
 ) map_string_ListWithElemAdapter_withAdapter_8454

exactprint/tests/fbthrift-tests/basic-structured-annotations/src/module.thrift

@@ -54,13 +54,16 @@ struct structured_annotation_nested {
   2: structured_annotation_with_default nest;
 }
 
+@thrift.AllowLegacyTypedefUri
 @structured_annotation_with_default
 typedef string annotated_with_default_string
 
+@thrift.AllowLegacyTypedefUri
 @structured_annotation_inline{count = 1}
 @structured_annotation_with_default{name = 'abc'}
 typedef string annotated_inline_string
 
+@thrift.AllowLegacyTypedefUri
 @structured_annotation_inline{count = 2}
 typedef i64 annotated_inline_i64
 

exactprint/tests/fbthrift-tests/basic/src/module.thrift

@@ -46,6 +46,7 @@ enum MyEnum {
   MyValue2 = 1,
 }
 
+@thrift.AllowLegacyTypedefUri
 typedef MyEnum MyEnumAlias
 
 struct MyStruct {
@@ -70,6 +71,7 @@ struct Containers {
 }
 
 struct MyDataItem {}
+@thrift.AllowLegacyTypedefUri
 typedef MyDataItem MyDataItemAlias
 
 union MyUnion {

exactprint/tests/fbthrift-tests/encode/src/module.thrift

@@ -28,6 +28,7 @@ struct Foo {
   1: i32 field;
 }
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::apache::thrift::test::TemplatedTestAdapter"}
 typedef Foo AdaptedFoo
 

exactprint/tests/fbthrift-tests/python_capi/src/containers.thrift

@@ -19,6 +19,7 @@
  */
 
 include "thrift/annotation/cpp.thrift"
+include "thrift/annotation/thrift.thrift"
 
 cpp_include "<deque>"
 cpp_include "<unordered_map>"
@@ -31,15 +32,19 @@ cpp_include "<thrift/test/python_capi/indirection.h>"
 
 package "test.dev/fixtures/python_capi"
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{name = "folly::IOBuf"}
 typedef binary IOBuf
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{template = "folly::small_vector"}
 typedef list<IOBuf> small_vector_iobuf
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{template = "folly::fbvector"}
 typedef list<string> fbvector_string
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{template = "folly::fbvector"}
 typedef list<fbvector_string> fbvector_fbvector_string
 
@@ -107,13 +112,15 @@ struct TWrapped {
   1: string fieldA;
   2: binary fieldB;
 }
+@thrift.AllowLegacyTypedefUri
 typedef list<TWrapped> ListOfWrapped
 
 // Should not be marshaled
 struct IndirectionA {
   1: ListOfWrapped lst;
 }
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{template = "std::vector"}
 typedef list<TWrapped> VecOfWrapped
 
@@ -122,6 +129,7 @@ struct IndirectionB {
   1: VecOfWrapped lst;
 }
 
+@thrift.AllowLegacyTypedefUri
 typedef ListOfWrapped ListOfWrappedAlias
 
 // Should also not be marshaled

exactprint/tests/fbthrift-tests/python_capi/src/module.thrift

@@ -38,8 +38,10 @@ cpp_include "thrift/lib/cpp2/util/ManagedStringView.h"
 
 package "test.dev/fixtures/python_capi"
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{name = "uint64_t"}
 typedef i64 uint64
+@thrift.AllowLegacyTypedefUri
 typedef uint64 ui64
 
 enum MyEnum {
@@ -90,9 +92,12 @@ struct StringPair {
 @cpp.Name{value = "VapidStruct"}
 struct EmptyStruct {}
 
+@thrift.AllowLegacyTypedefUri
 typedef byte signed_byte
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{name = "folly::IOBuf"}
 typedef binary IOBuf
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{name = "std::unique_ptr<folly::IOBuf>"}
 typedef binary IOBufPtr
 
@@ -149,6 +154,7 @@ struct ListStruct {
   8: list<list<list<signed_byte>>> voxels;
   9: list<IOBufPtr> buf_ptrs;
 } (cpp.noncopyable)
+@thrift.AllowLegacyTypedefUri
 typedef ListStruct ListAlias
 
 @cpp.EnableCustomTypeOrdering

exactprint/tests/fbthrift-tests/terse_write/src/terse_write.thrift

@@ -123,6 +123,7 @@ struct FieldLevelTerseStruct {
   30: MyUnion union_field;
 }
 
+@thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = "::my::Adapter"}
 typedef i32 MyInteger

exactprint/tests/fbthrift-tests/types/src/included.thrift

@@ -21,7 +21,10 @@
 package "apache.org/thrift/fixtures/types"
 
 include "thrift/annotation/cpp.thrift"
+include "thrift/annotation/thrift.thrift"
 
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{template = "std::unordered_map"}
 typedef map<i32, string> SomeMap
+@thrift.AllowLegacyTypedefUri
 typedef list<SomeMap> SomeListOfTypeMap

exactprint/tests/fbthrift-tests/types/src/module.thrift

@@ -25,6 +25,7 @@ include "thrift/annotation/thrift.thrift"
 
 package "apache.org/thrift/fixtures/types"
 
+@thrift.AllowLegacyTypedefUri
 typedef binary TBinary
 
 struct empty_struct {}
@@ -236,7 +237,9 @@ struct AllocatorAware2 {
   2: optional i32 box_field;
 } (cpp.allocator = "some_allocator")
 
+@thrift.AllowLegacyTypedefUri
 typedef i32 IntTypedef
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{name = "std::uint32_t"}
 typedef IntTypedef UintTypedef
 
@@ -251,17 +254,26 @@ struct StructWithDoubleUnderscores {
 }
 
 // The following were automatically generated and may benefit from renaming.
+@thrift.AllowLegacyTypedefUri
 typedef included.SomeListOfTypeMap (
   noop_annotation = "1",
 ) SomeListOfTypeMap_2468
+@thrift.AllowLegacyTypedefUri
 typedef TBinary (noop_annotation = "1") TBinary_8623
+@thrift.AllowLegacyTypedefUri
 typedef i32 (cpp.use_allocator = "1") i32_9314
+@thrift.AllowLegacyTypedefUri
 typedef list<i32> (cpp.use_allocator = "1") list_i32_9187
+@thrift.AllowLegacyTypedefUri
 typedef map<i32, i32> (cpp.use_allocator = "1") map_i32_i32_9565
+@thrift.AllowLegacyTypedefUri
 @rust.Type{name = "sorted_vector_map::SortedVectorMap"}
 typedef map<i32, string> map_i32_string_1261
+@thrift.AllowLegacyTypedefUri
 typedef set<i32> (cpp.use_allocator = "1") set_i32_7070
+@thrift.AllowLegacyTypedefUri
 @cpp.Type{template = "folly::sorted_vector_set"}
 @rust.Type{name = "sorted_vector_map::SortedVectorSet"}
 typedef set<i32> set_i32_7194
+@thrift.AllowLegacyTypedefUri
 typedef string (cpp.use_allocator = "1") string_5252