Skip to content

Fix WidgetTime oneOf ordering to resolve deserialization ambiguity #1137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
api-clients-generation-pipeline wants to merge 1 commit into from
Closed

Fix WidgetTime oneOf ordering to resolve deserialization ambiguity #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25656,9 +25656,9 @@ components:
WidgetTime:
description: Time setting for the widget.
oneOf:
- $ref: '#/components/schemas/WidgetLegacyLiveSpan'
- $ref: '#/components/schemas/WidgetNewLiveSpan'
- $ref: '#/components/schemas/WidgetNewFixedSpan'
- $ref: '#/components/schemas/WidgetLegacyLiveSpan'
WidgetTimeWindows:
description: Define a time window.
enum:
Expand Down
8 changes: 4 additions & 4 deletions src/datadogV1/model/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ pub mod model_widget;
pub use self::model_widget::Widget;
pub mod model_alert_graph_widget_definition;
pub use self::model_alert_graph_widget_definition::AlertGraphWidgetDefinition;
pub mod model_widget_legacy_live_span;
pub use self::model_widget_legacy_live_span::WidgetLegacyLiveSpan;
pub mod model_widget_live_span;
pub use self::model_widget_live_span::WidgetLiveSpan;
pub mod model_widget_new_live_span;
pub use self::model_widget_new_live_span::WidgetNewLiveSpan;
pub mod model_widget_new_live_span_type;
Expand All @@ -114,6 +110,10 @@ pub mod model_widget_new_fixed_span;
pub use self::model_widget_new_fixed_span::WidgetNewFixedSpan;
pub mod model_widget_new_fixed_span_type;
pub use self::model_widget_new_fixed_span_type::WidgetNewFixedSpanType;
pub mod model_widget_legacy_live_span;
pub use self::model_widget_legacy_live_span::WidgetLegacyLiveSpan;
pub mod model_widget_live_span;
pub use self::model_widget_live_span::WidgetLiveSpan;
pub mod model_widget_time;
pub use self::model_widget_time::WidgetTime;
pub mod model_widget_text_align;
Expand Down
16 changes: 8 additions & 8 deletions src/datadogV1/model/model_widget_time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use serde::{Deserialize, Deserializer, Serialize};
#[derive(Clone, Debug, PartialEq, Serialize)]
#[serde(untagged)]
pub enum WidgetTime {
WidgetLegacyLiveSpan(Box<crate::datadogV1::model::WidgetLegacyLiveSpan>),
WidgetNewLiveSpan(Box<crate::datadogV1::model::WidgetNewLiveSpan>),
WidgetNewFixedSpan(Box<crate::datadogV1::model::WidgetNewFixedSpan>),
WidgetLegacyLiveSpan(Box<crate::datadogV1::model::WidgetLegacyLiveSpan>),
UnparsedObject(crate::datadog::UnparsedObject),
}

Expand All @@ -20,13 +20,6 @@ impl<'de> Deserialize<'de> for WidgetTime {
D: Deserializer<'de>,
{
let value: serde_json::Value = Deserialize::deserialize(deserializer)?;
if let Ok(_v) = serde_json::from_value::<Box<crate::datadogV1::model::WidgetLegacyLiveSpan>>(
value.clone(),
) {
if !_v._unparsed {
return Ok(WidgetTime::WidgetLegacyLiveSpan(_v));
}
}
if let Ok(_v) =
serde_json::from_value::<Box<crate::datadogV1::model::WidgetNewLiveSpan>>(value.clone())
{
Expand All @@ -41,6 +34,13 @@ impl<'de> Deserialize<'de> for WidgetTime {
return Ok(WidgetTime::WidgetNewFixedSpan(_v));
}
}
if let Ok(_v) = serde_json::from_value::<Box<crate::datadogV1::model::WidgetLegacyLiveSpan>>(
value.clone(),
) {
if !_v._unparsed {
return Ok(WidgetTime::WidgetLegacyLiveSpan(_v));
}
}

return Ok(WidgetTime::UnparsedObject(crate::datadog::UnparsedObject {
value,
Expand Down