From eccf4b02007d4388eb7e1ab59e9a9a6dff16e872 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 10 May 2025 22:30:50 -0700 Subject: [PATCH] [rust] distinguish model and object --- .../resources/rust/reqwest-trait/api.mustache | 16 ++++++++++++---- .../src/main/resources/rust/reqwest/api.mustache | 16 ++++++++++++---- .../reqwest-trait/petstore/src/apis/pet_api.rs | 2 +- .../src/apis/pet_api.rs | 2 +- .../src/apis/pet_api.rs | 2 +- .../reqwest/petstore-async/src/apis/pet_api.rs | 2 +- .../petstore-avoid-box/src/apis/pet_api.rs | 2 +- .../petstore-awsv4signature/src/apis/pet_api.rs | 2 +- .../src/apis/pet_api.rs | 2 +- .../rust/reqwest/petstore/src/apis/pet_api.rs | 2 +- 10 files changed, 32 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest-trait/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest-trait/api.mustache index e86f6442757..ae7ea7d4e99 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest-trait/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest-trait/api.mustache @@ -217,16 +217,21 @@ impl {{classname}} for {{classname}}Client { {{/isDeepObject}} {{^isDeepObject}} {{#isObject}} - {{^isModel}} + if let Some(ref param_value) = {{{paramName}}} { + local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &serde_json::to_value(param_value)?)]); + }; + {{/isObject}} + {{#isModel}} if let Some(ref param_value) = {{{paramName}}} { local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &serde_json::to_value(param_value)?)]); }; {{/isModel}} - {{/isObject}} {{^isObject}} + {{^isModel}} if let Some(ref param_value) = {{{paramName}}} { local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", ¶m_value.to_string())]); }; + {{/isModel}} {{/isObject}} {{/isDeepObject}} {{/isNullable}} @@ -260,12 +265,15 @@ impl {{classname}} for {{classname}}Client { {{/isDeepObject}} {{^isDeepObject}} {{#isObject}} - {{^isModel}} + local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &serde_json::to_value(param_value)?)]); + {{/isObject}} + {{#isModel}} local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &serde_json::to_value(param_value)?)]); {{/isModel}} - {{/isObject}} {{^isObject}} + {{^isModel}} local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", ¶m_value.to_string())]); + {{/isModel}} {{/isObject}} {{/isDeepObject}} } diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache index 987a691b4f7..e28ca3eb05c 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache @@ -180,17 +180,22 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/isDeepObject}} {{^isDeepObject}} {{#isObject}} - {{^isModel}} + if let Some(ref param_value) = {{{vendorExtensions.x-rust-param-identifier}}} { + req_builder = req_builder.query(&[("{{{baseName}}}", &serde_json::to_string(param_value)?)]); + }; + {{/isObject}} + {{#isModel}} if let Some(ref param_value) = {{{vendorExtensions.x-rust-param-identifier}}} { req_builder = req_builder.query(&[("{{{baseName}}}", &serde_json::to_string(param_value)?)]); }; {{/isModel}} - {{/isObject}} {{/isDeepObject}} {{^isObject}} + {{^isModel}} if let Some(ref param_value) = {{{vendorExtensions.x-rust-param-identifier}}} { req_builder = req_builder.query(&[("{{{baseName}}}", ¶m_value.to_string())]); }; + {{/isModel}} {{/isObject}} {{/isNullable}} {{/isArray}} @@ -224,12 +229,15 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/isDeepObject}} {{^isDeepObject}} {{#isObject}} - {{^isModel}} + req_builder = req_builder.query(&[("{{{baseName}}}", &serde_json::to_string(param_value)?)]); + {{/isObject}} + {{#isModel}} req_builder = req_builder.query(&[("{{{baseName}}}", &serde_json::to_string(param_value)?)]); {{/isModel}} - {{/isObject}} {{^isObject}} + {{^isModel}} req_builder = req_builder.query(&[("{{{baseName}}}", ¶m_value.to_string())]); + {{/isModel}} {{/isObject}} {{/isDeepObject}} {{/isArray}} diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/pet_api.rs index 2d98e504da5..c15fbe2cd61 100644 --- a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/pet_api.rs @@ -350,7 +350,7 @@ impl PetApi for PetApiClient { let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); if let Some(ref param_value) = page { - local_var_req_builder = local_var_req_builder.query(&[("page", ¶m_value.to_string())]); + local_var_req_builder = local_var_req_builder.query(&[("page", &serde_json::to_value(param_value)?)]); } if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs index bc0ad904237..587f5639381 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs @@ -461,7 +461,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str); if let Some(ref param_value) = params.page { - req_builder = req_builder.query(&[("page", ¶m_value.to_string())]); + req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]); } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/apis/pet_api.rs index cb157eb4c13..b7e3167dc5d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/apis/pet_api.rs @@ -466,7 +466,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str); if let Some(ref param_value) = params.page { - req_builder = req_builder.query(&[("page", ¶m_value.to_string())]); + req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]); } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs index bc0ad904237..587f5639381 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs @@ -461,7 +461,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str); if let Some(ref param_value) = params.page { - req_builder = req_builder.query(&[("page", ¶m_value.to_string())]); + req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]); } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs index bc0ad904237..587f5639381 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs @@ -461,7 +461,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str); if let Some(ref param_value) = params.page { - req_builder = req_builder.query(&[("page", ¶m_value.to_string())]); + req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]); } if let Some(ref user_agent) = configuration.user_agent { req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs index 3390794b31c..bbb32324718 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs @@ -426,7 +426,7 @@ pub fn pets_post(configuration: &configuration::Configuration, page: Option