Now set_attribute returns the previous attribute value (#86)

slinkydeveloper · web-flow · commit 2e66f6a46f67 · 2020-10-12T13:45:58.000+02:00
remove_data renamed to take_data and now returns the previous data value

Signed-off-by: Francesco Guardiani &lt;francescoguard@gmail.com&gt;
diff --git a/src/event/attributes.rs b/src/event/attributes.rs
@@ -66,15 +66,20 @@ pub trait AttributesReader {
 /// Trait to set [CloudEvents Context attributes](https://github.com/cloudevents/spec/blob/master/spec.md#context-attributes).
 pub trait AttributesWriter {
     /// Set the [id](https://github.com/cloudevents/spec/blob/master/spec.md#id).
-    fn set_id(&mut self, id: impl Into<String>);
+    /// Returns the previous value.
+    fn set_id(&mut self, id: impl Into<String>) -> String;
     /// Set the [source](https://github.com/cloudevents/spec/blob/master/spec.md#source-1).
-    fn set_source(&mut self, source: impl Into<Url>);
+    /// Returns the previous value.
+    fn set_source(&mut self, source: impl Into<Url>) -> Url;
     /// Set the [type](https://github.com/cloudevents/spec/blob/master/spec.md#type).
-    fn set_type(&mut self, ty: impl Into<String>);
+    /// Returns the previous value.
+    fn set_type(&mut self, ty: impl Into<String>) -> String;
     /// Set the [subject](https://github.com/cloudevents/spec/blob/master/spec.md#subject).
-    fn set_subject(&mut self, subject: Option<impl Into<String>>);
+    /// Returns the previous value.
+    fn set_subject(&mut self, subject: Option<impl Into<String>>) -> Option<String>;
     /// Set the [time](https://github.com/cloudevents/spec/blob/master/spec.md#time).
-    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>);
+    /// Returns the previous value.
+    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) -> Option<DateTime<Utc>>;
 }
 
 pub(crate) trait AttributesConverter {
@@ -83,8 +88,9 @@ pub(crate) trait AttributesConverter {
 }
 
 pub(crate) trait DataAttributesWriter {
-    fn set_datacontenttype(&mut self, datacontenttype: Option<impl Into<String>>);
-    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>);
+    fn set_datacontenttype(&mut self, datacontenttype: Option<impl Into<String>>)
+        -> Option<String>;
+    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) -> Option<Url>;
 }
 
 #[derive(PartialEq, Debug, Clone, Copy)]
@@ -169,35 +175,35 @@ impl AttributesReader for Attributes {
 }
 
 impl AttributesWriter for Attributes {
-    fn set_id(&mut self, id: impl Into<String>) {
+    fn set_id(&mut self, id: impl Into<String>) -> String {
         match self {
             Attributes::V03(a) => a.set_id(id),
             Attributes::V10(a) => a.set_id(id),
         }
     }
 
-    fn set_source(&mut self, source: impl Into<Url>) {
+    fn set_source(&mut self, source: impl Into<Url>) -> Url {
         match self {
             Attributes::V03(a) => a.set_source(source),
             Attributes::V10(a) => a.set_source(source),
         }
     }
 
-    fn set_type(&mut self, ty: impl Into<String>) {
+    fn set_type(&mut self, ty: impl Into<String>) -> String {
         match self {
             Attributes::V03(a) => a.set_type(ty),
             Attributes::V10(a) => a.set_type(ty),
         }
     }
 
-    fn set_subject(&mut self, subject: Option<impl Into<String>>) {
+    fn set_subject(&mut self, subject: Option<impl Into<String>>) -> Option<String> {
         match self {
             Attributes::V03(a) => a.set_subject(subject),
             Attributes::V10(a) => a.set_subject(subject),
         }
     }
 
-    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) {
+    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) -> Option<DateTime<Utc>> {
         match self {
             Attributes::V03(a) => a.set_time(time),
             Attributes::V10(a) => a.set_time(time),
@@ -206,14 +212,17 @@ impl AttributesWriter for Attributes {
 }
 
 impl DataAttributesWriter for Attributes {
-    fn set_datacontenttype(&mut self, datacontenttype: Option<impl Into<String>>) {
+    fn set_datacontenttype(
+        &mut self,
+        datacontenttype: Option<impl Into<String>>,
+    ) -> Option<String> {
         match self {
             Attributes::V03(a) => a.set_datacontenttype(datacontenttype),
             Attributes::V10(a) => a.set_datacontenttype(datacontenttype),
         }
     }
 
-    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) {
+    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) -> Option<Url> {
         match self {
             Attributes::V03(a) => a.set_dataschema(dataschema),
             Attributes::V10(a) => a.set_dataschema(dataschema),
diff --git a/src/event/event.rs b/src/event/event.rs
@@ -54,11 +54,11 @@ impl AttributesReader for Event {
 
 #[delegate(self.attributes)]
 impl AttributesWriter for Event {
-    fn set_id(&mut self, id: impl Into<String>);
-    fn set_source(&mut self, source: impl Into<Url>);
-    fn set_type(&mut self, ty: impl Into<String>);
-    fn set_subject(&mut self, subject: Option<impl Into<String>>);
-    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>);
+    fn set_id(&mut self, id: impl Into<String>) -> String;
+    fn set_source(&mut self, source: impl Into<Url>) -> Url;
+    fn set_type(&mut self, ty: impl Into<String>) -> String;
+    fn set_subject(&mut self, subject: Option<impl Into<String>>) -> Option<String>;
+    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) -> Option<DateTime<Utc>>;
 }
 
 impl Default for Event {
@@ -93,11 +93,24 @@ impl Event {
         self.extensions.iter().map(|(k, v)| (k.as_str(), v))
     }
 
-    /// Remove `data`, `dataschema` and `datacontenttype` from this `Event`
-    pub fn remove_data(&mut self) {
-        self.data = None;
-        self.attributes.set_dataschema(None as Option<Url>);
-        self.attributes.set_datacontenttype(None as Option<String>);
+    /// Take (`datacontenttype`, `dataschema`, `data`) from this event, leaving these fields empty
+    ///
+    /// ```
+    /// use cloudevents::Event;
+    /// use serde_json::json;
+    /// use std::convert::Into;
+    ///
+    /// let mut e = Event::default();
+    /// e.write_data("application/json", json!({}));
+    ///
+    /// let (datacontenttype, dataschema, data) = e.take_data();
+    /// ```
+    pub fn take_data(&mut self) -> (Option<String>, Option<Url>, Option<Data>) {
+        (
+            self.attributes.set_datacontenttype(None as Option<String>),
+            self.attributes.set_dataschema(None as Option<Url>),
+            self.data.take(),
+        )
     }
 
     /// Write `data` into this `Event` with the specified `datacontenttype`.
@@ -219,7 +232,7 @@ mod tests {
     }
 
     #[test]
-    fn remove_data() {
+    fn take_data() {
         let mut e = Event::default();
         e.write_data(
             "application/json",
@@ -228,13 +241,22 @@ mod tests {
             }),
         );
 
-        e.remove_data();
+        let _d = e.take_data();
 
         assert!(e.try_get_data::<serde_json::Value>().unwrap().is_none());
         assert!(e.get_dataschema().is_none());
         assert!(e.get_datacontenttype().is_none());
     }
 
+    #[test]
+    fn set_id() {
+        let mut e = Event::default();
+        e.set_id("001");
+
+        assert_eq!(e.set_id("002"), String::from("001"));
+        assert_eq!(e.get_id(), "002")
+    }
+
     #[test]
     fn iter() {
         let mut e = Event::default();
diff --git a/src/event/v03/attributes.rs b/src/event/v03/attributes.rs
@@ -122,34 +122,37 @@ impl AttributesReader for Attributes {
 }
 
 impl AttributesWriter for Attributes {
-    fn set_id(&mut self, id: impl Into<String>) {
-        self.id = id.into()
+    fn set_id(&mut self, id: impl Into<String>) -> String {
+        std::mem::replace(&mut self.id, id.into())
     }
 
-    fn set_source(&mut self, source: impl Into<Url>) {
-        self.source = source.into()
+    fn set_source(&mut self, source: impl Into<Url>) -> Url {
+        std::mem::replace(&mut self.source, source.into())
     }
 
-    fn set_type(&mut self, ty: impl Into<String>) {
-        self.ty = ty.into()
+    fn set_type(&mut self, ty: impl Into<String>) -> String {
+        std::mem::replace(&mut self.ty, ty.into())
     }
 
-    fn set_subject(&mut self, subject: Option<impl Into<String>>) {
-        self.subject = subject.map(Into::into)
+    fn set_subject(&mut self, subject: Option<impl Into<String>>) -> Option<String> {
+        std::mem::replace(&mut self.subject, subject.map(Into::into))
     }
 
-    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) {
-        self.time = time.map(Into::into)
+    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) -> Option<DateTime<Utc>> {
+        std::mem::replace(&mut self.time, time.map(Into::into))
     }
 }
 
 impl DataAttributesWriter for Attributes {
-    fn set_datacontenttype(&mut self, datacontenttype: Option<impl Into<String>>) {
-        self.datacontenttype = datacontenttype.map(Into::into)
+    fn set_datacontenttype(
+        &mut self,
+        datacontenttype: Option<impl Into<String>>,
+    ) -> Option<String> {
+        std::mem::replace(&mut self.datacontenttype, datacontenttype.map(Into::into))
     }
 
-    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) {
-        self.schemaurl = dataschema.map(Into::into)
+    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) -> Option<Url> {
+        std::mem::replace(&mut self.schemaurl, dataschema.map(Into::into))
     }
 }
 
diff --git a/src/event/v10/attributes.rs b/src/event/v10/attributes.rs
@@ -122,34 +122,37 @@ impl AttributesReader for Attributes {
 }
 
 impl AttributesWriter for Attributes {
-    fn set_id(&mut self, id: impl Into<String>) {
-        self.id = id.into()
+    fn set_id(&mut self, id: impl Into<String>) -> String {
+        std::mem::replace(&mut self.id, id.into())
     }
 
-    fn set_source(&mut self, source: impl Into<Url>) {
-        self.source = source.into()
+    fn set_source(&mut self, source: impl Into<Url>) -> Url {
+        std::mem::replace(&mut self.source, source.into())
     }
 
-    fn set_type(&mut self, ty: impl Into<String>) {
-        self.ty = ty.into()
+    fn set_type(&mut self, ty: impl Into<String>) -> String {
+        std::mem::replace(&mut self.ty, ty.into())
     }
 
-    fn set_subject(&mut self, subject: Option<impl Into<String>>) {
-        self.subject = subject.map(Into::into)
+    fn set_subject(&mut self, subject: Option<impl Into<String>>) -> Option<String> {
+        std::mem::replace(&mut self.subject, subject.map(Into::into))
     }
 
-    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) {
-        self.time = time.map(Into::into)
+    fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) -> Option<DateTime<Utc>> {
+        std::mem::replace(&mut self.time, time.map(Into::into))
     }
 }
 
 impl DataAttributesWriter for Attributes {
-    fn set_datacontenttype(&mut self, datacontenttype: Option<impl Into<String>>) {
-        self.datacontenttype = datacontenttype.map(Into::into)
+    fn set_datacontenttype(
+        &mut self,
+        datacontenttype: Option<impl Into<String>>,
+    ) -> Option<String> {
+        std::mem::replace(&mut self.datacontenttype, datacontenttype.map(Into::into))
     }
 
-    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) {
-        self.dataschema = dataschema.map(Into::into)
+    fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) -> Option<Url> {
+        std::mem::replace(&mut self.dataschema, dataschema.map(Into::into))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -122,34 +122,37 @@ impl AttributesReader for Attributes {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`impl AttributesWriter for Attributes {`
`125`		`- fn set_id(&mut self, id: impl Into<String>) {`
`126`		`- self.id = id.into()`
	`125`	`+ fn set_id(&mut self, id: impl Into<String>) -> String {`
	`126`	`+ std::mem::replace(&mut self.id, id.into())`
`127`	`127`	`}`
`128`	`128`
`129`		`- fn set_source(&mut self, source: impl Into<Url>) {`
`130`		`- self.source = source.into()`
	`129`	`+ fn set_source(&mut self, source: impl Into<Url>) -> Url {`
	`130`	`+ std::mem::replace(&mut self.source, source.into())`
`131`	`131`	`}`
`132`	`132`
`133`		`- fn set_type(&mut self, ty: impl Into<String>) {`
`134`		`- self.ty = ty.into()`
	`133`	`+ fn set_type(&mut self, ty: impl Into<String>) -> String {`
	`134`	`+ std::mem::replace(&mut self.ty, ty.into())`
`135`	`135`	`}`
`136`	`136`
`137`		`- fn set_subject(&mut self, subject: Option<impl Into<String>>) {`
`138`		`- self.subject = subject.map(Into::into)`
	`137`	`+ fn set_subject(&mut self, subject: Option<impl Into<String>>) -> Option<String> {`
	`138`	`+ std::mem::replace(&mut self.subject, subject.map(Into::into))`
`139`	`139`	`}`
`140`	`140`
`141`		`- fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) {`
`142`		`- self.time = time.map(Into::into)`
	`141`	`+ fn set_time(&mut self, time: Option<impl Into<DateTime<Utc>>>) -> Option<DateTime<Utc>> {`
	`142`	`+ std::mem::replace(&mut self.time, time.map(Into::into))`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`impl DataAttributesWriter for Attributes {`
`147`		`- fn set_datacontenttype(&mut self, datacontenttype: Option<impl Into<String>>) {`
`148`		`- self.datacontenttype = datacontenttype.map(Into::into)`
	`147`	`+ fn set_datacontenttype(`
	`148`	`+ &mut self,`
	`149`	`+ datacontenttype: Option<impl Into<String>>,`
	`150`	`+ ) -> Option<String> {`
	`151`	`+ std::mem::replace(&mut self.datacontenttype, datacontenttype.map(Into::into))`
`149`	`152`	`}`
`150`	`153`
`151`		`- fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) {`
`152`		`- self.schemaurl = dataschema.map(Into::into)`
	`154`	`+ fn set_dataschema(&mut self, dataschema: Option<impl Into<Url>>) -> Option<Url> {`
	`155`	`+ std::mem::replace(&mut self.schemaurl, dataschema.map(Into::into))`
`153`	`156`	`}`
`154`	`157`	`}`
`155`	`158`