Skip to content

Add convenience functions for reading UMessage fields #242

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
merged 1 commit into from
Mar 12, 2025
Merged

Add convenience functions for reading UMessage fields #242

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
28 changes: 14 additions & 14 deletions src/cloudevents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,38 +238,38 @@ impl TryFrom<UMessage> for CloudEvent {
//
// Returns an error if the given message does not contain the necessary information for creating a CloudEvent.
fn try_from(message: UMessage) -> Result<Self, Self::Error> {
let Some(attributes) = message.attributes.as_ref() else {
if message.attributes.as_ref().is_none() {
return Err(UMessageError::AttributesValidationError(
UAttributesError::ValidationError("message has no attributes".to_string()),
));
};
let mut event = CloudEvent::new();
event.spec_version = CLOUDEVENTS_SPEC_VERSION.into();
if let Some(id) = attributes.id.as_ref() {
if let Some(id) = message.id() {
event.set_id(id);
} else {
return Err(UMessageError::AttributesValidationError(
UAttributesError::ValidationError("message has no id".to_string()),
));
}
if let Ok(message_type) = attributes.type_.enum_value() {
if let Some(message_type) = message.type_() {
event.set_type(message_type);
} else {
return Err(UMessageError::AttributesValidationError(
UAttributesError::ValidationError("message has no type".to_string()),
));
}
if let Some(source) = attributes.source.as_ref() {
if let Some(source) = message.source() {
event.set_source(source);
} else {
return Err(UMessageError::AttributesValidationError(
UAttributesError::ValidationError("message has no source address".to_string()),
));
}
if let Some(sink) = attributes.sink.as_ref() {
if let Some(sink) = message.sink() {
event.set_sink(sink);
}
if let Ok(priority) = attributes.priority.enum_value() {
if let Some(priority) = message.priority() {
if priority != UPriority::UPRIORITY_UNSPECIFIED {
event.set_priority(priority);
}
Expand All @@ -278,26 +278,26 @@ impl TryFrom<UMessage> for CloudEvent {
UAttributesError::ValidationError("message has unsupported priority".to_string()),
));
}
if let Some(ttl) = attributes.ttl {
if let Some(ttl) = message.ttl() {
event.set_ttl(ttl)?;
}
if let Some(token) = attributes.token.as_ref() {
if let Some(token) = message.token() {
event.set_token(token);
}
if let Some(plevel) = attributes.permission_level {
if let Some(plevel) = message.permission_level() {
event.set_permission_level(plevel)?;
}
if let Some(reqid) = attributes.reqid.as_ref() {
if let Some(reqid) = message.request_id() {
event.set_request_id(reqid);
}
if let Some(commstatus) = attributes.commstatus.as_ref() {
event.set_commstatus(commstatus.enum_value_or_default());
if let Some(commstatus) = message.commstatus() {
event.set_commstatus(commstatus);
}
if let Some(traceparent) = attributes.traceparent.as_ref() {
if let Some(traceparent) = message.traceparent() {
event.set_traceparent(traceparent);
}
let payload_format = message.payload_format().unwrap_or_default();
if let Some(payload) = message.payload {
let payload_format = attributes.payload_format.enum_value_or_default();
event.set_payload_format(payload_format);
match payload_format {
UPayloadFormat::UPAYLOAD_FORMAT_PROTOBUF
Expand Down
15 changes: 6 additions & 9 deletions src/communication/default_notifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,12 @@ mod tests {
let Ok(payload) = message.extract_protobuf::<StringValue>() else {
return false;
};
let Some(attribs) = message.attributes.as_ref() else {
return false;
};
attribs.is_notification()
&& attribs.id.get_or_default() == &expected_message_id
&& attribs.source.get_or_default() == &expected_source
&& attribs.sink.get_or_default() == &expected_sink
&& attribs.ttl == Some(10_000)
&& attribs.priority.enum_value_or_default() == UPriority::UPRIORITY_CS2
message.is_notification()
&& message.id_unchecked() == &expected_message_id
&& message.source_unchecked() == &expected_source
&& message.sink_unchecked() == &expected_sink
&& message.ttl_unchecked() == 10_000
&& message.priority_unchecked() == UPriority::UPRIORITY_CS2
&& payload.value == *"Hello"
})
.return_const(Ok(()));
Expand Down
13 changes: 4 additions & 9 deletions src/communication/default_pubsub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ mod tests {

use mockall::Sequence;
use protobuf::well_known_types::wrappers::StringValue;
use protobuf::Enum;
use usubscription::{MockUSubscription, SubscriptionResponse, SubscriptionStatus};

use crate::{
Expand Down Expand Up @@ -505,9 +504,7 @@ mod tests {
transport
.expect_do_send()
.once()
.withf(move |msg| {
msg.attributes.get_or_default().id.get_or_default() == &expected_message_id
})
.withf(move |msg| msg.id_unchecked() == &expected_message_id)
.returning(|_msg| {
Err(UStatus::fail_with_code(
UCode::UNAVAILABLE,
Expand Down Expand Up @@ -541,11 +538,9 @@ mod tests {
};
payload.value == *"Hello"
&& message.is_publish()
&& message.attributes.as_ref().is_some_and(|attribs| {
attribs.id.as_ref() == Some(&expected_message_id)
&& attribs.priority.value() == UPriority::UPRIORITY_CS3.value()
&& attribs.ttl == Some(5_000)
})
&& message.id_unchecked() == &expected_message_id
&& message.priority_unchecked() == UPriority::UPRIORITY_CS3
&& message.ttl_unchecked() == 5_000
})
.returning(|_msg| Ok(()));

Expand Down
19 changes: 6 additions & 13 deletions src/communication/in_memory_rpc_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ mod tests {

use super::*;

use protobuf::{well_known_types::wrappers::StringValue, Enum};
use protobuf::well_known_types::wrappers::StringValue;
use tokio::{join, sync::Notify};

use crate::{utransport::MockTransport, StaticUriProvider, UMessageBuilder, UPriority, UUri};
Expand Down Expand Up @@ -398,12 +398,10 @@ mod tests {
.expect_do_send()
.once()
.withf(move |request_message| {
request_message.attributes.as_ref().is_some_and(|attribs| {
attribs.id.as_ref() == Some(&expected_message_id)
&& attribs.priority.value() == UPriority::UPRIORITY_CS6.value()
&& attribs.ttl == Some(5_000)
&& attribs.token == Some("my_token".to_string())
})
request_message.id_unchecked() == &expected_message_id
&& request_message.priority_unchecked() == UPriority::UPRIORITY_CS6
&& request_message.ttl_unchecked() == 5_000
&& request_message.token() == Some(&String::from("my_token"))
})
.returning(move |_request_message| {
request_sent_clone.notify_one();
Expand Down Expand Up @@ -486,12 +484,7 @@ mod tests {
mock_transport
.expect_do_send()
.once()
.withf(move |request_message| {
request_message
.attributes
.as_ref()
.is_some_and(|attribs| attribs.id.as_ref() == Some(&expected_message_id))
})
.withf(move |request_message| request_message.id_unchecked() == &expected_message_id)
.returning(move |_request_message| {
first_request_sent_clone.notify_one();
Ok(())
Expand Down
53 changes: 9 additions & 44 deletions src/communication/in_memory_rpc_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,22 +444,12 @@ mod tests {
if !response_message.is_response() {
return false;
}
if response_message
.attributes
.get_or_default()
.reqid
.get_or_default()
!= &request_id
{
if response_message.request_id_unchecked() != &request_id {
return false;
}
let error: UStatus = response_message.extract_protobuf().unwrap();
error.get_code() == UCode::INVALID_ARGUMENT
&& response_message
.attributes
.get_or_default()
.commstatus
.is_some_and(|v| v.enum_value_or_default() == error.get_code())
&& response_message.commstatus_unchecked() == error.get_code()
})
.returning(move |_msg| {
notify_clone.notify_one();
Expand Down Expand Up @@ -588,16 +578,9 @@ mod tests {
msg.value == *"Hello World"
&& response_message.is_response()
&& response_message
.attributes
.get_or_default()
.commstatus
.map_or(true, |v| v.enum_value_or_default() == UCode::OK)
&& response_message
.attributes
.get_or_default()
.reqid
.get_or_default()
== &message_id_clone
.commstatus()
.is_none_or(|code| code == UCode::OK)
&& response_message.request_id_unchecked() == &message_id_clone
})
.returning(move |_msg| {
notify_clone.notify_one();
Expand Down Expand Up @@ -646,17 +629,8 @@ mod tests {
let error: UStatus = response_message.extract_protobuf().unwrap();
error.get_code() == UCode::NOT_FOUND
&& response_message.is_response()
&& response_message
.attributes
.get_or_default()
.commstatus
.is_some_and(|v| v.enum_value_or_default() == error.get_code())
&& response_message
.attributes
.get_or_default()
.reqid
.get_or_default()
== &message_id_clone
&& response_message.commstatus_unchecked() == error.get_code()
&& response_message.request_id_unchecked() == &message_id_clone
})
.returning(move |_msg| {
notify_clone.notify_one();
Expand Down Expand Up @@ -717,17 +691,8 @@ mod tests {
let error: UStatus = response_message.extract_protobuf().unwrap();
error.get_code() == UCode::DEADLINE_EXCEEDED
&& response_message.is_response()
&& response_message
.attributes
.get_or_default()
.commstatus
.is_some_and(|v| v.enum_value_or_default() == error.get_code())
&& response_message
.attributes
.get_or_default()
.reqid
.get_or_default()
== &message_id_clone
&& response_message.commstatus_unchecked() == error.get_code()
&& response_message.request_id_unchecked() == &message_id_clone
})
.returning(move |_msg| {
notify_clone.notify_one();
Expand Down
Loading