Skip to content

Commit 1c19916

Browse files
jckingcopybara-github
authored andcommitted
Migrate remaining well known type handling and remove deadcode
PiperOrigin-RevId: 689126721
1 parent b03438a commit 1c19916

45 files changed

Lines changed: 612 additions & 4189 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

common/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,6 @@ cc_library(
652652
"//extensions/protobuf:memory_manager",
653653
"//extensions/protobuf/internal:map_reflection",
654654
"//extensions/protobuf/internal:qualify",
655-
"//extensions/protobuf/internal:struct_lite",
656655
"//internal:casts",
657656
"//internal:deserialize",
658657
"//internal:json",

common/legacy_value.cc

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
#include "eval/public/structs/legacy_type_adapter.h"
5959
#include "eval/public/structs/legacy_type_info_apis.h"
6060
#include "eval/public/structs/proto_message_type_adapter.h"
61-
#include "extensions/protobuf/internal/struct_lite.h"
6261
#include "extensions/protobuf/memory_manager.h"
62+
#include "internal/json.h"
6363
#include "internal/status_macros.h"
6464
#include "internal/time.h"
6565
#include "internal/well_known_types.h"
@@ -268,9 +268,7 @@ absl::Status cel_common_internal_LegacyListValue_SerializeTo(
268268
google::protobuf::ListValue message;
269269
google::protobuf::Arena arena;
270270
CEL_ASSIGN_OR_RETURN(auto array, CelListToJsonArray(&arena, AsCelList(impl)));
271-
CEL_RETURN_IF_ERROR(
272-
extensions::protobuf_internal::GeneratedListValueProtoFromJson(array,
273-
message));
271+
CEL_RETURN_IF_ERROR(internal::NativeJsonListToProtoJsonList(array, &message));
274272
if (!message.SerializePartialToCord(&serialized_value)) {
275273
return absl::UnknownError("failed to serialize google.protobuf.ListValue");
276274
}
@@ -559,9 +557,7 @@ absl::Status cel_common_internal_LegacyMapValue_SerializeTo(
559557
google::protobuf::Struct message;
560558
google::protobuf::Arena arena;
561559
CEL_ASSIGN_OR_RETURN(auto object, CelMapToJsonObject(&arena, AsCelMap(impl)));
562-
CEL_RETURN_IF_ERROR(
563-
extensions::protobuf_internal::GeneratedStructProtoFromJson(object,
564-
message));
560+
CEL_RETURN_IF_ERROR(internal::NativeJsonMapToProtoJsonMap(object, &message));
565561
if (!message.SerializePartialToCord(&serialized_value)) {
566562
return absl::UnknownError("failed to serialize google.protobuf.Struct");
567563
}

eval/public/structs/BUILD

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@ cc_library(
5656
],
5757
deps = [
5858
":protobuf_value_factory",
59-
"//common:any",
6059
"//eval/public:cel_value",
6160
"//eval/testutil:test_message_cc_proto",
62-
"//extensions/protobuf/internal:any",
63-
"//extensions/protobuf/internal:duration",
64-
"//extensions/protobuf/internal:struct",
65-
"//extensions/protobuf/internal:timestamp",
66-
"//extensions/protobuf/internal:wrappers",
6761
"//internal:overflow",
6862
"//internal:proto_time_encoding",
63+
"//internal:status_macros",
6964
"//internal:time",
65+
"//internal:well_known_types",
7066
"@com_google_absl//absl/base:core_headers",
71-
"@com_google_absl//absl/container:flat_hash_map",
67+
"@com_google_absl//absl/base:nullability",
68+
"@com_google_absl//absl/functional:overload",
69+
"@com_google_absl//absl/log:absl_check",
7270
"@com_google_absl//absl/status",
71+
"@com_google_absl//absl/status:statusor",
7372
"@com_google_absl//absl/strings",
7473
"@com_google_absl//absl/strings:cord",
7574
"@com_google_absl//absl/synchronization",
7675
"@com_google_absl//absl/time",
7776
"@com_google_absl//absl/types:optional",
77+
"@com_google_absl//absl/types:variant",
7878
"@com_google_protobuf//:protobuf",
7979
],
8080
)

0 commit comments

Comments
 (0)