Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .changepacks/changepack_log_84xWDkggRCpzbU8VFUDhZ.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"Cargo.toml":"Patch"},"note":"Support integer format, sea-orm default","date":"2026-02-18T12:19:24.863588800Z"}
1 change: 1 addition & 0 deletions .changepacks/changepack_log_istCnj_YAWHCFG2Y4WmgK.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"Cargo.toml":"Patch"},"note":"Support char","date":"2026-02-18T13:50:20.581242600Z"}
1 change: 1 addition & 0 deletions .changepacks/changepack_log_wLkPH1ixjpQHBc8JeR-Ur.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"changes":{"Cargo.toml":"Patch"},"note":"Support uuid format","date":"2026-02-18T14:16:15.606465600Z"}
178 changes: 174 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 2 additions & 52 deletions crates/vespera_core/src/openapi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub struct License {
}

/// API information
#[derive(Debug, Clone, Serialize, Deserialize)]
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Info {
/// API title
Expand Down Expand Up @@ -192,18 +192,6 @@ impl OpenApi {
}
}
}

/// Merge from a JSON string. Returns error if parsing fails.
///
/// # Errors
///
/// Returns a `serde_json::Error` when `json_str` is not valid JSON or does not
/// deserialize into an `OpenApi` document.
pub fn merge_from_str(&mut self, json_str: &str) -> Result<(), serde_json::Error> {
let other: Self = serde_json::from_str(json_str)?;
self.merge(other);
Ok(())
}
}

#[cfg(test)]
Expand Down Expand Up @@ -245,16 +233,7 @@ mod tests {
responses: BTreeMap::new(),
security: None,
}),
post: None,
put: None,
delete: None,
patch: None,
options: None,
head: None,
trace: None,
parameters: None,
summary: None,
description: None,
..Default::default()
}
}

Expand Down Expand Up @@ -469,35 +448,6 @@ mod tests {
assert_eq!(base.tags.as_ref().unwrap().len(), 1);
}

#[test]
fn test_merge_from_str() {
let mut base = create_base_openapi();
base.paths
.insert("/users".to_string(), create_path_item("Get users"));

let other_json = r#"{
"openapi": "3.1.0",
"info": { "title": "Other API", "version": "2.0.0" },
"paths": {
"/posts": { "get": { "summary": "Get posts", "responses": {} } }
}
}"#;

let result = base.merge_from_str(other_json);
assert!(result.is_ok());
assert!(base.paths.contains_key("/users"));
assert!(base.paths.contains_key("/posts"));
}

#[test]
fn test_merge_from_str_invalid_json() {
let mut base = create_base_openapi();
let invalid_json = "{ invalid json }";

let result = base.merge_from_str(invalid_json);
assert!(result.is_err());
}

#[test]
fn test_merge_empty_other() {
let mut base = create_base_openapi();
Expand Down
Loading