models: Store extra model representation fields (related to concrete …

…model) as YAML value
ndebuhr · Apr 2, 2021 · e8d89d9 · e8d89d9
1 parent 6367128
commit e8d89d9
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 35 deletions.
diff --git a/src/models/exclusive_gateway.rs b/src/models/exclusive_gateway.rs
@@ -130,8 +130,8 @@ impl AsModel for ExclusiveGateway {
         "ExclusiveGateway"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/gate.rs b/src/models/gate.rs
@@ -155,8 +155,8 @@ impl AsModel for Gate {
         "Gate"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/generator.rs b/src/models/generator.rs
@@ -143,8 +143,8 @@ impl AsModel for Generator {
         "Generator"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/load_balancer.rs b/src/models/load_balancer.rs
@@ -127,8 +127,8 @@ impl AsModel for LoadBalancer {
         "LoadBalancer"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/mod.rs b/src/models/mod.rs
@@ -25,7 +25,7 @@ pub use self::processor::Processor;
 pub use self::stochastic_gate::StochasticGate;
 pub use self::storage::Storage;
 
-pub use self::model_repr::ModelExtra;
+pub use self::model_repr::ModelRepr;
 
 #[derive(Debug, Clone)]
 pub struct ModelMessage {

diff --git a/src/models/model.rs b/src/models/model.rs
@@ -46,11 +46,11 @@ impl Clone for Box<dyn AsModel> {
 
 impl Serialize for Model {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let extra_fields: serde_json::Value = self.inner.serialize();
+        let extra_fields: serde_yaml::Value = self.inner.serialize();
         let mut model = serializer.serialize_map(None)?;
         model.serialize_entry("id", &self.id)?;
         model.serialize_entry("type", self.inner.get_type())?;
-        if let serde_json::Value::Object(map) = extra_fields {
+        if let serde_yaml::Value::Mapping(map) = extra_fields {
             for (key, value) in map.iter() {
                 model.serialize_entry(&key, &value)?;
             }
@@ -61,44 +61,43 @@ impl Serialize for Model {
 
 impl<'de> Deserialize<'de> for Model {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let model_extra = super::ModelExtra::deserialize(deserializer)?;
-        println!("New Model {:?}", model_extra);
+        let model_repr = super::ModelRepr::deserialize(deserializer)?;
         const VARIANTS: &'static [&'static str] = &[
             &"Generator", &"ExclusiveGateway", &"Processor", &"Storage"
         ];
-        match &model_extra.model_type[..] {
+        match &model_repr.model_type[..] {
             "Generator" => {
-                let generator = serde_json::from_value::<super::Generator>(model_extra.extra).map_err(de::Error::custom)?;
+                let generator = serde_yaml::from_value::<super::Generator>(model_repr.extra).map_err(de::Error::custom)?;
                 let model = Model::new(
-                    model_extra.id,
+                    model_repr.id,
                     Box::new(generator)
                 );
                 Ok(model)
             },
             "ExclusiveGateway" => {
-                if let Ok(exclusive_gateway) = serde_json::from_value::<super::ExclusiveGateway>(model_extra.extra) {
+                if let Ok(exclusive_gateway) = serde_yaml::from_value::<super::ExclusiveGateway>(model_repr.extra) {
                     Ok(Model::new(
-                        model_extra.id,
+                        model_repr.id,
                         Box::new(exclusive_gateway)
                     ))
                 } else {
                     Err(de::Error::invalid_value(Unexpected::Other("ExclusiveGateway"), &"ExclusiveGateway"))
                 }
             },
             "Processor" => {
-                if let Ok(processor) = serde_json::from_value::<super::Processor>(model_extra.extra) {
+                if let Ok(processor) = serde_yaml::from_value::<super::Processor>(model_repr.extra) {
                     Ok(Model::new(
-                        model_extra.id,
+                        model_repr.id,
                         Box::new(processor)
                     ))
                 } else {
                     Err(de::Error::invalid_value(Unexpected::Other("Processor"), &"Processor"))
                 }
             },
             "Storage" => {
-                if let Ok(storage) = serde_json::from_value::<super::Storage>(model_extra.extra) {
+                if let Ok(storage) = serde_yaml::from_value::<super::Storage>(model_repr.extra) {
                     Ok(Model::new(
-                        model_extra.id,
+                        model_repr.id,
                         Box::new(storage)
                     ))
                 } else {
@@ -151,8 +150,8 @@ pub trait AsModel: ModelClone {
     fn get_type(&self) -> &'static str {
         ""
     }
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::Value::Null
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::Value::Null
     }
     fn status(&self) -> String;
     fn events_ext(

diff --git a/src/models/model_repr.rs b/src/models/model_repr.rs
@@ -1,11 +1,10 @@
 use serde::{Serialize, Deserialize};
-use serde_json::Value;
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct ModelExtra {
+pub struct ModelRepr {
     pub id: String,
     #[serde(rename="type")]
     pub model_type: String,
     #[serde(flatten)]
-    pub extra: Value
+    pub extra: serde_yaml::Value
 }
diff --git a/src/models/parallel_gateway.rs b/src/models/parallel_gateway.rs
@@ -133,8 +133,8 @@ impl AsModel for ParallelGateway {
         "ParallelGateway"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/processor.rs b/src/models/processor.rs
@@ -167,8 +167,8 @@ impl AsModel for Processor {
         "Processor"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/stochastic_gate.rs b/src/models/stochastic_gate.rs
@@ -143,8 +143,8 @@ impl AsModel for StochasticGate {
         "StochasticGate"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {

diff --git a/src/models/storage.rs b/src/models/storage.rs
@@ -130,8 +130,8 @@ impl AsModel for Storage {
         "Storage"
     }
 
-    fn serialize(&self) -> serde_json::Value {
-        serde_json::to_value(self).unwrap_or(serde_json::Value::Null)
+    fn serialize(&self) -> serde_yaml::Value {
+        serde_yaml::to_value(self).unwrap_or(serde_yaml::Value::Null)
     }
 
     fn status(&self) -> String {