Skip to content
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

Ignore type name domain when serializing Any #148

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ignore type name domain when serializing Any #148

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
62 changes: 29 additions & 33 deletions prost-reflect/src/dynamic/serde/ser/wkt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use crate::{
dynamic::{
get_type_url_message_name,
serde::{
case::snake_case_to_camel_case, check_duration, check_timestamp, is_well_known_type,
SerializeOptions,
Expand Down Expand Up @@ -58,40 +59,35 @@
{
let raw: prost_types::Any = msg.transcode_to().map_err(decode_to_ser_err)?;

if let Some(message_name) = raw.type_url.strip_prefix("type.googleapis.com/") {
let message_desc = msg
.descriptor()
.parent_pool()
.get_message_by_name(message_name)
.ok_or_else(|| Error::custom(format!("message '{}' not found", message_name)))?;

let mut payload_message = DynamicMessage::new(message_desc);
payload_message
.merge(raw.value.as_ref())
.map_err(decode_to_ser_err)?;

if is_well_known_type(message_name) {
let mut map = serializer.serialize_map(Some(2))?;
map.serialize_entry("@type", &raw.type_url)?;
map.serialize_entry(
"value",
&SerializeWrapper {
value: &payload_message,
options,
},
)?;
map.end()
} else {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("@type", &raw.type_url)?;
serialize_dynamic_message_fields(&mut map, &payload_message, options)?;
map.end()
}
let message_name = get_type_url_message_name(&raw.type_url).map_err(Error::custom)?;

let message_desc = msg
.descriptor()
.parent_pool()
.get_message_by_name(message_name)
.ok_or_else(|| Error::custom(format!("message '{}' not found", message_name)))?;

let mut payload_message = DynamicMessage::new(message_desc);
payload_message
.merge(raw.value.as_ref())
.map_err(decode_to_ser_err)?;

Check warning on line 73 in prost-reflect/src/dynamic/serde/ser/wkt.rs

View check run for this annotation

Codecov / codecov/patch

prost-reflect/src/dynamic/serde/ser/wkt.rs#L73 

Added line #L73 was not covered by tests

if is_well_known_type(message_name) {
let mut map = serializer.serialize_map(Some(2))?;
map.serialize_entry("@type", &raw.type_url)?;
map.serialize_entry(
"value",
&SerializeWrapper {
value: &payload_message,
options,

Check warning on line 82 in prost-reflect/src/dynamic/serde/ser/wkt.rs

View check run for this annotation

Codecov / codecov/patch

prost-reflect/src/dynamic/serde/ser/wkt.rs#L81-L82 

Added lines #L81 - L82 were not covered by tests
},
)?;
map.end()
} else {
Err(Error::custom(format!(
"unsupported type url '{}'",
raw.type_url
)))
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("@type", &raw.type_url)?;
serialize_dynamic_message_fields(&mut map, &payload_message, options)?;
map.end()
}
}

Expand Down