Skip to content

Commit 80b76fa

Browse files
committed
Expunge more nulls in serialization
Signed-off-by: Sergey "Shnatsel" Davidoff <[email protected]>
1 parent 448d132 commit 80b76fa

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

cyclonedx-bom/src/specs/v1_5/component_data.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ impl FromXml for DataContents {
404404
/// https://cyclonedx.org/docs/1.5/json/#components_items_modelCard_modelParameters_datasets_items_oneOf_i0_graphics
405405
#[derive(Debug, Deserialize, Serialize, PartialEq)]
406406
pub(crate) struct GraphicsCollection {
407+
#[serde(skip_serializing_if = "Option::is_none")]
407408
pub(crate) description: Option<String>,
409+
#[serde(skip_serializing_if = "Option::is_none")]
408410
pub(crate) collection: Option<Collection>,
409411
}
410412

cyclonedx-bom/src/specs/v1_5/modelcard.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ impl FromXml for ModelParameters {
366366
#[derive(Debug, Deserialize, Serialize, PartialEq)]
367367
#[serde(rename_all = "camelCase")]
368368
pub(crate) struct ModelParametersApproach {
369-
#[serde(rename = "type")]
369+
#[serde(rename = "type", skip_serializing_if = "Option::is_none")]
370370
pub(crate) approach_type: Option<String>,
371371
}
372372

@@ -584,7 +584,9 @@ impl FromXml for Dataset {
584584
#[derive(Debug, Deserialize, Serialize, PartialEq)]
585585
#[serde(rename_all = "camelCase")]
586586
pub(crate) struct QuantitativeAnalysis {
587+
#[serde(skip_serializing_if = "Option::is_none")]
587588
pub(crate) performance_metrics: Option<PerformanceMetrics>,
589+
#[serde(skip_serializing_if = "Option::is_none")]
588590
pub(crate) graphics: Option<GraphicsCollection>,
589591
}
590592

0 commit comments

Comments
 (0)