Fix deserialization error with tagged types. (#18)

eclipse-basyx · Jun 5, 2023 · bc1f22c · bc1f22c
1 parent f7a0039
commit bc1f22c
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "basyx-rs"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
     "Daniel Hillen <daniel.hillen@iese.fraunhofer.de>",
     "Andreas Schmidt <andreas.schmidt@iese.fraunhofer.de>",

diff --git a/src/submodel_element/annotated_relationship_element.rs b/src/submodel_element/annotated_relationship_element.rs
@@ -10,7 +10,6 @@ use crate::{Extension, Qualifier, Reference};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct AnnotatedRelationshipElement {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub extensions: Option<Vec<Extension>>,

diff --git a/src/submodel_element/basic_event_element.rs b/src/submodel_element/basic_event_element.rs
@@ -12,7 +12,6 @@ use crate::{qualifier::Qualifier, reference::Reference, Extension};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct BasicEventElement {
     // Referable
     // HasExtension

diff --git a/src/submodel_element/blob.rs b/src/submodel_element/blob.rs
@@ -9,7 +9,6 @@ use crate::{Extension, Qualifier, Reference};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct Blob {
     // Referable
     // HasExtension

diff --git a/src/submodel_element/capability.rs b/src/submodel_element/capability.rs
@@ -9,7 +9,6 @@ use crate::{Extension, Qualifier, Reference};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct Capability {
     // Referable
     // HasExtension

diff --git a/src/submodel_element/data_element.rs b/src/submodel_element/data_element.rs
@@ -9,7 +9,6 @@ use crate::{Extension, Qualifier, Reference};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct DataElement {
     // Referable
     // HasExtension

diff --git a/src/submodel_element/file.rs b/src/submodel_element/file.rs
@@ -10,7 +10,6 @@ use crate::{qualifier::Qualifier, reference::Reference, Extension};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct File {
     // Referable
     // HasExtension

diff --git a/src/submodel_element/mod.rs b/src/submodel_element/mod.rs
@@ -121,6 +121,7 @@ mod tests {
                 }"#;
 
         let ut: SubmodelElement = serde_json::from_str(input).unwrap();
+        //let ut_enum: SubmodelElement = SubmodelElement::Property(ut);
 
         let mut prop = Property::new(DataTypeDefXsd::XsInteger);
         prop.semantic_id = Some(Reference::new(

diff --git a/src/submodel_element/property.rs b/src/submodel_element/property.rs
@@ -13,7 +13,6 @@ use serde::{Deserialize, Serialize};
 // use super::ValueType;
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct Property {
     // Referable
     // HasExtension

diff --git a/src/submodel_element/submodel_element_collection.rs b/src/submodel_element/submodel_element_collection.rs
@@ -10,7 +10,6 @@ use crate::{qualifier::Qualifier, reference::Reference, Extension};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
-#[serde(tag = "modelType")]
 pub struct SubmodelElementCollection {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub extensions: Option<Vec<Extension>>,