From 974b3e03ccfac9ed857499475df8205289674a8a Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Fri, 26 Dec 2025 11:27:18 -0800 Subject: [PATCH] update httpmock generation to support 0.8 --- cargo-progenitor/tests/test_cmd.rs | 5 +- progenitor-impl/src/httpmock.rs | 22 +- .../tests/output/src/buildomat_httpmock.rs | 21 +- .../tests/output/src/nexus_httpmock.rs | 1197 +++-------------- .../output/src/param_overrides_httpmock.rs | 14 +- 5 files changed, 179 insertions(+), 1080 deletions(-) diff --git a/cargo-progenitor/tests/test_cmd.rs b/cargo-progenitor/tests/test_cmd.rs index 101bbae0..cb0f955f 100644 --- a/cargo-progenitor/tests/test_cmd.rs +++ b/cargo-progenitor/tests/test_cmd.rs @@ -1,11 +1,8 @@ // Copyright 2025 Oxide Computer Company -use assert_cmd::Command; - #[test] fn test_help() { - Command::cargo_bin("cargo-progenitor") - .unwrap() + assert_cmd::cargo::cargo_bin_cmd!() .arg("progenitor") .arg("--help") .assert() diff --git a/progenitor-impl/src/httpmock.rs b/progenitor-impl/src/httpmock.rs index 1e7f9745..ed56fbf6 100644 --- a/progenitor-impl/src/httpmock.rs +++ b/progenitor-impl/src/httpmock.rs @@ -208,15 +208,7 @@ impl Generator { value.to_string(), )) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| { - qs.iter().find( - |(key, _)| key == #api_name) - }) - .is_none() - })) + Self(self.0.query_param_missing(#api_name)) } }, ), @@ -229,16 +221,7 @@ impl Generator { value.to_string() )) } else { - Self(self.0.matches(|req| { - req.headers - .as_ref() - .and_then(|hs| { - hs.iter().find( - |(key, _)| key == #api_name - ) - }) - .is_none() - })) + Self(self.0.header_missing(#api_name)) } }, ), @@ -247,7 +230,6 @@ impl Generator { true, quote! { Self(self.0.json_body_obj(value)) - }, ), OperationParameterType::RawBody => match body_content_type { diff --git a/progenitor-impl/tests/output/src/buildomat_httpmock.rs b/progenitor-impl/tests/output/src/buildomat_httpmock.rs index 90d4ee35..2ebdac0b 100644 --- a/progenitor-impl/tests/output/src/buildomat_httpmock.rs +++ b/progenitor-impl/tests/output/src/buildomat_httpmock.rs @@ -210,12 +210,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("minseq", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "minseq")) - .is_none() - })) + Self(self.0.query_param_missing("minseq")) } } } @@ -763,12 +758,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("id", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "id")) - .is_none() - })) + Self(self.0.query_param_missing("id")) } } } @@ -814,12 +804,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.header("accept-language", value.to_string())) } else { - Self(self.0.matches(|req| { - req.headers - .as_ref() - .and_then(|hs| hs.iter().find(|(key, _)| key == "accept-language")) - .is_none() - })) + Self(self.0.header_missing("accept-language")) } } } diff --git a/progenitor-impl/tests/output/src/nexus_httpmock.rs b/progenitor-impl/tests/output/src/nexus_httpmock.rs index d92ff0ec..80969004 100644 --- a/progenitor-impl/tests/output/src/nexus_httpmock.rs +++ b/progenitor-impl/tests/output/src/nexus_httpmock.rs @@ -829,12 +829,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -845,12 +840,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -861,12 +851,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -1249,12 +1234,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -1265,12 +1245,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -1281,12 +1256,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -1722,12 +1692,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -1738,12 +1703,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -1754,12 +1714,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -2124,12 +2079,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -2140,12 +2090,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -2156,12 +2101,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -2496,12 +2436,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("end_time", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "end_time")) - .is_none() - })) + Self(self.0.query_param_missing("end_time")) } } @@ -2512,12 +2447,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -2528,12 +2458,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -2544,12 +2469,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("start_time", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "start_time")) - .is_none() - })) + Self(self.0.query_param_missing("start_time")) } } } @@ -2631,12 +2551,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -2647,12 +2562,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -2663,12 +2573,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -2980,12 +2885,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -2996,12 +2896,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -3012,12 +2907,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -3343,12 +3233,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -3359,12 +3244,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -3375,12 +3255,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -3828,12 +3703,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -3844,12 +3714,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -3860,12 +3725,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -4419,12 +4279,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("from_start", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "from_start")) - .is_none() - })) + Self(self.0.query_param_missing("from_start")) } } @@ -4435,12 +4290,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("max_bytes", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "max_bytes")) - .is_none() - })) + Self(self.0.query_param_missing("max_bytes")) } } @@ -4451,12 +4301,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("most_recent", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "most_recent")) - .is_none() - })) + Self(self.0.query_param_missing("most_recent")) } } } @@ -4917,12 +4762,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -4933,12 +4773,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -4949,12 +4784,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -5266,12 +5096,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -5282,12 +5107,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -5298,12 +5118,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -5885,12 +5700,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -5901,12 +5711,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -5917,12 +5722,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -6395,12 +6195,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -6411,12 +6206,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -6427,12 +6217,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -6935,12 +6720,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -6951,12 +6731,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -6967,12 +6742,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -7446,12 +7216,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -7462,12 +7227,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -7478,12 +7238,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -7663,12 +7418,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -7679,12 +7429,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } } @@ -7865,12 +7610,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -7881,12 +7621,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -7897,12 +7632,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -7968,12 +7698,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -7984,12 +7709,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -8000,12 +7720,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -8430,12 +8145,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -8446,12 +8156,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -8462,12 +8167,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -8709,12 +8409,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -8725,12 +8420,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -8741,12 +8431,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -8812,12 +8497,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -8828,12 +8508,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -8844,12 +8519,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -8976,12 +8646,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -8992,12 +8657,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -9008,12 +8668,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -9149,12 +8804,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -9165,12 +8815,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -9181,12 +8826,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -9252,12 +8892,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -9268,12 +8903,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -9284,12 +8914,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -9529,12 +9154,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -9545,12 +9165,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -9561,12 +9176,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -9879,12 +9489,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -9895,12 +9500,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } } @@ -10152,12 +9752,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -10168,12 +9763,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } } @@ -10356,12 +9946,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("end_time", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "end_time")) - .is_none() - })) + Self(self.0.query_param_missing("end_time")) } } @@ -10376,12 +9961,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -10392,12 +9972,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -10408,12 +9983,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("start_time", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "start_time")) - .is_none() - })) + Self(self.0.query_param_missing("start_time")) } } } @@ -10593,12 +10163,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -10609,12 +10174,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -10625,12 +10185,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -10756,12 +10311,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -10772,12 +10322,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -10788,12 +10333,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -11040,12 +10580,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -11056,12 +10591,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -11072,12 +10602,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -11622,12 +11147,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -11638,12 +11158,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -11654,12 +11169,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -11798,12 +11308,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -11814,12 +11319,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -11830,12 +11330,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -11961,12 +11456,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -11977,12 +11467,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } } @@ -12048,12 +11533,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -12064,12 +11544,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -12080,12 +11555,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -12151,12 +11621,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -12167,12 +11632,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12183,12 +11643,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -12199,12 +11654,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } @@ -12215,12 +11665,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -12286,12 +11731,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12370,12 +11810,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12386,12 +11821,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -12462,12 +11892,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12478,12 +11903,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -12544,12 +11964,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -12560,12 +11975,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12576,12 +11986,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -12592,12 +11997,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } @@ -12608,12 +12008,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -12679,12 +12074,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12763,12 +12153,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12779,12 +12164,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -12855,12 +12235,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12871,12 +12246,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -12943,12 +12313,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -12959,12 +12324,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -12975,12 +12335,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -12991,12 +12346,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } @@ -13007,12 +12357,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -13087,12 +12432,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13103,12 +12443,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } @@ -13187,12 +12522,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13203,12 +12533,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } @@ -13284,12 +12609,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13300,12 +12620,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } @@ -13381,12 +12696,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13397,12 +12707,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -13477,12 +12782,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("from_start", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "from_start")) - .is_none() - })) + Self(self.0.query_param_missing("from_start")) } } @@ -13493,12 +12793,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("max_bytes", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "max_bytes")) - .is_none() - })) + Self(self.0.query_param_missing("max_bytes")) } } @@ -13509,12 +12804,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("most_recent", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "most_recent")) - .is_none() - })) + Self(self.0.query_param_missing("most_recent")) } } @@ -13525,12 +12815,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13541,12 +12826,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -13619,12 +12899,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13635,12 +12910,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -13691,12 +12961,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13707,12 +12972,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -13784,12 +13044,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -13800,12 +13055,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("project", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "project")) - .is_none() - })) + Self(self.0.query_param_missing("project")) } } } @@ -13871,12 +13121,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -13887,12 +13132,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -13903,12 +13143,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -14343,12 +13578,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -14359,12 +13589,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -14375,12 +13600,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -14391,12 +13611,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -14530,12 +13745,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } } @@ -14606,12 +13816,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -14686,12 +13891,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } } @@ -14758,12 +13958,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } } @@ -14835,12 +14030,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("organization", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "organization")) - .is_none() - })) + Self(self.0.query_param_missing("organization")) } } @@ -14910,12 +14100,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -14926,12 +14111,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -14942,12 +14122,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -15013,12 +14188,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -15029,12 +14199,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -15045,12 +14210,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } @@ -15339,12 +14499,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("limit", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "limit")) - .is_none() - })) + Self(self.0.query_param_missing("limit")) } } @@ -15355,12 +14510,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("page_token", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "page_token")) - .is_none() - })) + Self(self.0.query_param_missing("page_token")) } } @@ -15371,12 +14521,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("sort_by", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "sort_by")) - .is_none() - })) + Self(self.0.query_param_missing("sort_by")) } } } diff --git a/progenitor-impl/tests/output/src/param_overrides_httpmock.rs b/progenitor-impl/tests/output/src/param_overrides_httpmock.rs index 42ce2fdd..ab3aef72 100644 --- a/progenitor-impl/tests/output/src/param_overrides_httpmock.rs +++ b/progenitor-impl/tests/output/src/param_overrides_httpmock.rs @@ -25,12 +25,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("key", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "key")) - .is_none() - })) + Self(self.0.query_param_missing("key")) } } @@ -41,12 +36,7 @@ pub mod operations { if let Some(value) = value.into() { Self(self.0.query_param("uniqueKey", value.to_string())) } else { - Self(self.0.matches(|req| { - req.query_params - .as_ref() - .and_then(|qs| qs.iter().find(|(key, _)| key == "uniqueKey")) - .is_none() - })) + Self(self.0.query_param_missing("uniqueKey")) } } }