Skip to content

Fixed the data structure for OpenApi 3 #54

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the data structure for OpenApi 3 #54

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
16 changes: 8 additions & 8 deletions src/v3_0/components.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ use crate::v3_0::{
use serde::{Deserialize, Serialize};
use std::collections::BTreeMap;

#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
pub struct Ref {
#[serde(rename = "$ref")]
pub ref_path: String,
}

#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
#[serde(untagged)]
pub enum ObjectOrReference<T> {
Ref(Ref),
Object(T),
Ref {
#[serde(rename = "$ref")]
ref_path: String,
},
}

#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
#[serde(untagged)]
pub enum BooleanObjectOrReference<T> {
Ref(Ref),
Boolean(bool),
Object(T),
Ref {
#[serde(rename = "$ref")]
ref_path: String,
},
}

/// Holds a set of reusable objects for different aspects of the OAS.
Expand Down
7 changes: 4 additions & 3 deletions src/v3_0/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use crate::v3_0::extension::Extensions;
use serde::{Deserialize, Serialize};
use serde_yaml::Value;
use std::collections::{BTreeMap, HashMap};
use url::Url;

Expand Down Expand Up @@ -441,16 +442,16 @@ pub struct Schema {

#[serde(skip_serializing_if = "Option::is_none")]
#[serde(rename = "enum")]
pub enum_values: Option<Vec<String>>,
pub enum_values: Option<Vec<Value>>,

#[serde(skip_serializing_if = "Option::is_none")]
pub required: Option<Vec<String>>,

#[serde(skip_serializing_if = "Option::is_none")]
pub items: Option<Box<Schema>>,
pub items: Option<Box<ObjectOrReference<Schema>>>,

#[serde(skip_serializing_if = "Option::is_none")]
pub properties: Option<BTreeMap<String, Schema>>,
pub properties: Option<BTreeMap<String, ObjectOrReference<Schema>>>,

#[serde(skip_serializing_if = "Option::is_none", rename = "readOnly")]
pub read_only: Option<bool>,
Expand Down