Revert D62903158: Hide dynamic versions of AnyPatch::patchIfTypeIs an…

…d AnyPatch::ensureAndPatch

Differential Revision:
D62903158

Original commit changeset: 8466e1f7dbed

Original Phabricator Diff: D62903158

fbshipit-source-id: c663c1169f0d410280d86de09928a7ac22957d52

thrift/lib/thrift/detail/AnyPatch.h

@@ -29,14 +29,6 @@
 
 namespace apache {
 namespace thrift {
-namespace protocol {
-namespace detail {
-
-struct PatchBadgeFactory;
-using Badge = folly::badge<PatchBadgeFactory>;
-
-} // namespace detail
-} // namespace protocol
 namespace op {
 namespace detail {
 
@@ -227,8 +219,7 @@ class AnyPatch : public BaseClearPatch<Patch, AnyPatch<Patch>> {
 
   // The provided type MUST match with the value type of patch stored in
   // provided patch as Thrift Any.
-  void patchIfTypeIs(
-      protocol::detail::Badge, type::Type type, type::AnyStruct patch) {
+  void patchIfTypeIs(type::Type type, type::AnyStruct patch) {
     if (!type.isValid()) {
       throwTypeNotValid(type);
     }
@@ -240,8 +231,7 @@ class AnyPatch : public BaseClearPatch<Patch, AnyPatch<Patch>> {
 
   // The provided type in ensureAny MUST match with the value type of patch
   // stored in provided patch as Thrift Any.
-  void ensureAndPatch(
-      protocol::detail::Badge, type::AnyStruct ensure, type::AnyStruct patch) {
+  void ensureAndPatch(type::AnyStruct ensure, type::AnyStruct patch) {
     throwIfInvalidOrUnsupportedAny(ensure);
     throwIfInvalidOrUnsupportedAny(patch);
     type::Type type = ensure.type().value();

thrift/lib/thrift/detail/DynamicPatch.cpp

@@ -932,7 +932,7 @@ op::AnyPatch DiffVisitorBase::diffAny(
     anySubPatch.data() =
         *serializeObject<CompactProtocolWriter>(subPatch.toObject());
     anySubPatch.type() = detail::toPatchType(*src.type());
-    patch.patchIfTypeIs(badge, *src.type(), std::move(anySubPatch));
+    patch.patchIfTypeIs(*src.type(), std::move(anySubPatch));
   }
 
   return patch;