renamed to AmqpBinding

Signed-off-by: minghuaw <[email protected]>

Author: minghuaw

src/binding/fe2o3_amqp/deserializer.rs

@@ -13,10 +13,10 @@ use crate::{
 
 use super::{
     constants::{prefixed, DATACONTENTTYPE},
-    AmqpCloudEvent, ATTRIBUTE_PREFIX,
+    AmqpBinding, ATTRIBUTE_PREFIX,
 };
 
-impl BinaryDeserializer for AmqpCloudEvent {
+impl BinaryDeserializer for AmqpBinding {
     fn deserialize_binary<R: Sized, V: BinarySerializer<R>>(
         mut self,
         mut serializer: V,
@@ -74,7 +74,7 @@ impl BinaryDeserializer for AmqpCloudEvent {
     }
 }
 
-impl StructuredDeserializer for AmqpCloudEvent {
+impl StructuredDeserializer for AmqpBinding {
     fn deserialize_structured<R: Sized, V: StructuredSerializer<R>>(
         self,
         serializer: V,
@@ -89,7 +89,7 @@ impl StructuredDeserializer for AmqpCloudEvent {
     }
 }
 
-impl MessageDeserializer for AmqpCloudEvent {
+impl MessageDeserializer for AmqpBinding {
     fn encoding(&self) -> Encoding {
         match self
             .content_type

src/binding/fe2o3_amqp/mod.rs

@@ -8,7 +8,7 @@ use fe2o3_amqp_lib::types::messaging::{ApplicationProperties, Body, Message, Pro
 use fe2o3_amqp_lib::types::primitives::{Binary, SimpleValue, Symbol, Timestamp, Value};
 
 use crate::event::{AttributeValue, ExtensionValue};
-use crate::message::{BinaryDeserializer, Error, MessageAttributeValue};
+use crate::message::{BinaryDeserializer, Error, MessageAttributeValue, StructuredDeserializer};
 use crate::Event;
 
 use self::constants::{
@@ -37,13 +37,13 @@ pub type Extensions = HashMap<String, ExtensionValue>;
 /// message property field. If the value is prefixed with the CloudEvents media type
 /// application/cloudevents, indicating the use of a known event format, the receiver uses
 /// structured mode, otherwise it defaults to binary mode.
-pub struct AmqpCloudEvent {
+pub struct AmqpBinding {
     content_type: Option<Symbol>,
     application_properties: Option<ApplicationProperties>,
     body: AmqpBody,
 }
 
-impl AmqpCloudEvent {
+impl AmqpBinding {
     fn new() -> Self {
         Self {
             content_type: None,
@@ -55,10 +55,14 @@ impl AmqpCloudEvent {
     pub fn from_binary_event(event: Event) -> Result<Self, Error> {
         BinaryDeserializer::deserialize_binary(event, Self::new())
     }
+
+    pub fn from_structured_event(event: Event) -> Result<Self, Error> {
+        StructuredDeserializer::deserialize_structured(event, Self::new())
+    }
 }
 
-impl From<AmqpCloudEvent> for AmqpMessage {
-    fn from(event: AmqpCloudEvent) -> Self {
+impl From<AmqpBinding> for AmqpMessage {
+    fn from(event: AmqpBinding) -> Self {
         let mut properties = Properties::default();
         properties.content_type = event.content_type;
         Message {
@@ -73,7 +77,7 @@ impl From<AmqpCloudEvent> for AmqpMessage {
     }
 }
 
-impl From<AmqpMessage> for AmqpCloudEvent {
+impl From<AmqpMessage> for AmqpBinding {
     fn from(message: AmqpMessage) -> Self {
         let content_type = message.properties.map(|p| p.content_type).flatten();
         Self {

src/binding/fe2o3_amqp/serializer.rs

@@ -9,9 +9,9 @@ use crate::{
 };
 
 use super::constants::DATACONTENTTYPE;
-use super::{AmqpBody, AmqpCloudEvent, ATTRIBUTE_PREFIX};
+use super::{AmqpBody, AmqpBinding, ATTRIBUTE_PREFIX};
 
-impl BinarySerializer<AmqpCloudEvent> for AmqpCloudEvent {
+impl BinarySerializer<AmqpBinding> for AmqpBinding {
     fn set_spec_version(mut self, spec_version: SpecVersion) -> crate::message::Result<Self> {
         let key = String::from("cloudEvents:specversion");
         let value = String::from(spec_version.as_str());
@@ -79,7 +79,7 @@ impl BinarySerializer<AmqpCloudEvent> for AmqpCloudEvent {
     }
 }
 
-impl StructuredSerializer<AmqpCloudEvent> for AmqpCloudEvent {
+impl StructuredSerializer<AmqpBinding> for AmqpBinding {
     fn set_structured_event(mut self, bytes: Vec<u8>) -> crate::message::Result<Self> {
         self.content_type = Some(Symbol::from("application/cloudevents+json; charset=utf-8"));
         self.body = AmqpBody::Data(AmqpData(Binary::from(bytes)));