Fix JSON export for max-redirs, retry and retry-interval

This commit is contained in:
Fabrice Reix 2023-12-08 14:17:28 +01:00 committed by hurl-bot
parent 6498bd3449
commit 29453534bb
No known key found for this signature in database
GPG Key ID: 1283A2B4A0DCAF8D

View File

@ -295,13 +295,13 @@ impl ToJson for EntryOption {
OptionKind::Insecure(value) => value.to_json(), OptionKind::Insecure(value) => value.to_json(),
OptionKind::IpV4(value) => value.to_json(), OptionKind::IpV4(value) => value.to_json(),
OptionKind::IpV6(value) => value.to_json(), OptionKind::IpV6(value) => value.to_json(),
OptionKind::MaxRedirect(value) => JValue::Number(value.to_string()), OptionKind::MaxRedirect(value) => value.to_json(),
OptionKind::Output(filename) => JValue::String(filename.value.clone()), OptionKind::Output(filename) => JValue::String(filename.value.clone()),
OptionKind::PathAsIs(value) => value.to_json(), OptionKind::PathAsIs(value) => value.to_json(),
OptionKind::Proxy(value) => JValue::String(value.to_string()), OptionKind::Proxy(value) => JValue::String(value.to_string()),
OptionKind::Resolve(value) => JValue::String(value.to_string()), OptionKind::Resolve(value) => JValue::String(value.to_string()),
OptionKind::Retry(value) => JValue::Number(value.to_string()), OptionKind::Retry(value) => value.to_json(),
OptionKind::RetryInterval(value) => JValue::Number(value.to_string()), OptionKind::RetryInterval(value) => value.to_json(),
OptionKind::Skip(value) => value.to_json(), OptionKind::Skip(value) => value.to_json(),
OptionKind::Variable(value) => { OptionKind::Variable(value) => {
JValue::String(format!("{}={}", value.name, value.value)) JValue::String(format!("{}={}", value.name, value.value))
@ -333,6 +333,25 @@ impl ToJson for NaturalOption {
} }
} }
impl ToJson for RetryOption {
fn to_json(&self) -> JValue {
match self {
RetryOption::Literal(value) => value.to_json(),
RetryOption::Expression(expr) => expr.to_json(),
}
}
}
impl ToJson for Retry {
fn to_json(&self) -> JValue {
match self {
Retry::None => JValue::Number("0".to_string()),
Retry::Finite(value) => JValue::Number(value.to_string()),
Retry::Infinite => JValue::Number("-1".to_string()),
}
}
}
impl ToJson for Capture { impl ToJson for Capture {
fn to_json(&self) -> JValue { fn to_json(&self) -> JValue {
let mut attributes = vec![ let mut attributes = vec![