Skip to content

Migrate remaining well known type handling and remove deadcode #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Oct 23, 2024
Merged

Migrate remaining well known type handling and remove deadcode #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,6 @@ cc_library(
"//extensions/protobuf:memory_manager",
"//extensions/protobuf/internal:map_reflection",
"//extensions/protobuf/internal:qualify",
"//extensions/protobuf/internal:struct_lite",
"//internal:casts",
"//internal:deserialize",
"//internal:json",
Expand Down
10 changes: 3 additions & 7 deletions common/legacy_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
#include "eval/public/structs/legacy_type_adapter.h"
#include "eval/public/structs/legacy_type_info_apis.h"
#include "eval/public/structs/proto_message_type_adapter.h"
#include "extensions/protobuf/internal/struct_lite.h"
#include "extensions/protobuf/memory_manager.h"
#include "internal/json.h"
#include "internal/status_macros.h"
#include "internal/time.h"
#include "internal/well_known_types.h"
Expand Down Expand Up @@ -268,9 +268,7 @@ absl::Status cel_common_internal_LegacyListValue_SerializeTo(
google::protobuf::ListValue message;
google::protobuf::Arena arena;
CEL_ASSIGN_OR_RETURN(auto array, CelListToJsonArray(&arena, AsCelList(impl)));
CEL_RETURN_IF_ERROR(
extensions::protobuf_internal::GeneratedListValueProtoFromJson(array,
message));
CEL_RETURN_IF_ERROR(internal::NativeJsonListToProtoJsonList(array, &message));
if (!message.SerializePartialToCord(&serialized_value)) {
return absl::UnknownError("failed to serialize google.protobuf.ListValue");
}
Expand Down Expand Up @@ -559,9 +557,7 @@ absl::Status cel_common_internal_LegacyMapValue_SerializeTo(
google::protobuf::Struct message;
google::protobuf::Arena arena;
CEL_ASSIGN_OR_RETURN(auto object, CelMapToJsonObject(&arena, AsCelMap(impl)));
CEL_RETURN_IF_ERROR(
extensions::protobuf_internal::GeneratedStructProtoFromJson(object,
message));
CEL_RETURN_IF_ERROR(internal::NativeJsonMapToProtoJsonMap(object, &message));
if (!message.SerializePartialToCord(&serialized_value)) {
return absl::UnknownError("failed to serialize google.protobuf.Struct");
}
Expand Down
14 changes: 7 additions & 7 deletions eval/public/structs/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@ cc_library(
],
deps = [
":protobuf_value_factory",
"//common:any",
"//eval/public:cel_value",
"//eval/testutil:test_message_cc_proto",
"//extensions/protobuf/internal:any",
"//extensions/protobuf/internal:duration",
"//extensions/protobuf/internal:struct",
"//extensions/protobuf/internal:timestamp",
"//extensions/protobuf/internal:wrappers",
"//internal:overflow",
"//internal:proto_time_encoding",
"//internal:status_macros",
"//internal:time",
"//internal:well_known_types",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/base:nullability",
"@com_google_absl//absl/functional:overload",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:cord",
"@com_google_absl//absl/synchronization",
"@com_google_absl//absl/time",
"@com_google_absl//absl/types:optional",
"@com_google_absl//absl/types:variant",
"@com_google_protobuf//:protobuf",
],
)
Expand Down
Loading