Delete cel::common_internal::DataInterface

PiperOrigin-RevId: 728771855

Author: jcking

common/BUILD

@@ -601,7 +601,6 @@ cc_library(
         "//base:attributes",
         "//base/internal:message_wrapper",
         "//common/internal:arena_string",
-        "//common/internal:data_interface",
         "//common/internal:reference_count",
         "//common/internal:shared_byte_string",
         "//eval/internal:cel_value_equal",

common/internal/BUILD

@@ -33,25 +33,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "data_interface",
-    hdrs = ["data_interface.h"],
-    deps = [
-        "//common:native_type",
-        "@com_google_absl//absl/base:core_headers",
-    ],
-)
-
-cc_test(
-    name = "data_interface_test",
-    srcs = ["data_interface_test.cc"],
-    deps = [
-        ":data_interface",
-        "//common:native_type",
-        "//internal:testing",
-    ],
-)
-
 cc_library(
     name = "reference_count",
     srcs = ["reference_count.cc"],

common/internal/data_interface.h

@@ -19,12 +19,13 @@
 #define THIRD_PARTY_CEL_CPP_COMMON_VALUES_CUSTOM_VALUE_INTERFACE_H_
 
 #include <string>
+#include <type_traits>
 
 #include "absl/base/nullability.h"
 #include "absl/status/status.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"
-#include "common/internal/data_interface.h"
+#include "common/native_type.h"
 #include "common/value_kind.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/descriptor.h"
@@ -34,9 +35,15 @@ namespace cel {
 
 class Value;
 
-class CustomValueInterface : public common_internal::DataInterface {
+class CustomValueInterface {
  public:
-  using DataInterface::DataInterface;
+  CustomValueInterface(const CustomValueInterface&) = delete;
+  CustomValueInterface(CustomValueInterface&&) = delete;
+
+  virtual ~CustomValueInterface() = default;
+
+  CustomValueInterface& operator=(const CustomValueInterface&) = delete;
+  CustomValueInterface& operator=(CustomValueInterface&&) = delete;
 
   virtual ValueKind kind() const = 0;
 
@@ -74,6 +81,32 @@ class CustomValueInterface : public common_internal::DataInterface {
       absl::Nonnull<google::protobuf::MessageFactory*> message_factory,
       absl::Nonnull<google::protobuf::Arena*> arena,
       absl::Nonnull<Value*> result) const = 0;
+
+ protected:
+  CustomValueInterface() = default;
+
+ private:
+  friend struct NativeTypeTraits<CustomValueInterface>;
+
+  virtual NativeTypeId GetNativeTypeId() const = 0;
+};
+
+template <>
+struct NativeTypeTraits<CustomValueInterface> final {
+  static NativeTypeId Id(const CustomValueInterface& custom_value_interface) {
+    return custom_value_interface.GetNativeTypeId();
+  }
+};
+
+template <typename T>
+struct NativeTypeTraits<
+    T, std::enable_if_t<std::conjunction_v<
+           std::is_base_of<CustomValueInterface, T>,
+           std::negation<std::is_same<T, CustomValueInterface>>>>>
+    final {
+  static NativeTypeId Id(const CustomValueInterface& custom_value_interface) {
+    return NativeTypeTraits<CustomValueInterface>::Id(custom_value_interface);
+  }
 };
 
 }  // namespace cel