Merge pull request #876 from uklotzde/clock-serde

clock: Hide serde support behind feature flag `with-serde`

2 files changed, 8 insertions, 6 deletions

diff --git a/crates/core/thin_edge_json/src/alarm.rs b/crates/core/thin_edge_json/src/alarm.rs
index 35614f75..668a24b5 100644
--- a/crates/core/thin_edge_json/src/alarm.rs
+++ b/crates/core/thin_edge_json/src/alarm.rs
@@ -1,7 +1,7 @@
 use std::convert::{TryFrom, TryInto};
 
+use clock::Timestamp;
 use serde::Deserialize;
-use time::OffsetDateTime;
 
 /// In-memory representation of ThinEdge JSON alarm.
 #[derive(Debug, Deserialize, PartialEq)]
@@ -23,9 +23,10 @@ pub enum AlarmSeverity {
 #[derive(Debug, Deserialize, PartialEq)]
 pub struct ThinEdgeAlarmData {
     pub message: Option<String>,
+
     #[serde(default)]
-    #[serde(deserialize_with = "clock::deserialize_iso8601_timestamp")]
-    pub time: Option<OffsetDateTime>,
+    #[serde(with = "clock::serde::rfc3339::option")]
+    pub time: Option<Timestamp>,
 }
 
 #[derive(thiserror::Error, Debug)]
diff --git a/crates/core/thin_edge_json/src/event.rs b/crates/core/thin_edge_json/src/event.rs
index fa58fdbc..cee60967 100644
--- a/crates/core/thin_edge_json/src/event.rs
+++ b/crates/core/thin_edge_json/src/event.rs
@@ -1,5 +1,5 @@
+use clock::Timestamp;
 use serde::Deserialize;
-use time::OffsetDateTime;
 
 use self::error::ThinEdgeJsonDeserializerError;
 
@@ -14,9 +14,10 @@ pub struct ThinEdgeEvent {
 #[derive(Debug, Deserialize, PartialEq)]
 pub struct ThinEdgeEventData {
     pub message: Option<String>,
+
     #[serde(default)]
-    #[serde(deserialize_with = "clock::deserialize_iso8601_timestamp")]
-    pub time: Option<OffsetDateTime>,
+    #[serde(with = "clock::serde::rfc3339::option")]
+    pub time: Option<Timestamp>,
 }
 
 pub mod error {