[rust] distinguish model and object

aminya · aminya · commit eccf4b02007d · 2025-05-10T22:30:50.000-07:00
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
@@ -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)?)]);
         };
-        {{/isModel}}
         {{/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}}
+        {{^isModel}}
         if let Some(ref param_value) = {{{paramName}}} {
             local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &param_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)?)]);
-            {{/isModel}}
             {{/isObject}}
+            {{#isModel}}
+            local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &serde_json::to_value(param_value)?)]);
+            {{/isModel}}
             {{^isObject}}
+            {{^isModel}}
             local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &param_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
@@ -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)?)]);
     };
-    {{/isModel}}
     {{/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}}
     {{/isDeepObject}}
     {{^isObject}}
+    {{^isModel}}
     if let Some(ref param_value) = {{{vendorExtensions.x-rust-param-identifier}}} {
         req_builder = req_builder.query(&[("{{{baseName}}}", &param_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)?)]);
-        {{/isModel}}
         {{/isObject}}
+        {{#isModel}}
+        req_builder = req_builder.query(&[("{{{baseName}}}", &serde_json::to_string(param_value)?)]);
+        {{/isModel}}
         {{^isObject}}
+        {{^isModel}}
         req_builder = req_builder.query(&[("{{{baseName}}}", &param_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
@@ -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", &param_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
@@ -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", &param_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
@@ -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", &param_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
@@ -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", &param_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
@@ -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", &param_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
@@ -426,7 +426,7 @@ pub fn pets_post(configuration: &configuration::Configuration, page: Option<mode
     let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
 
     if let Some(ref param_value) = p_page {
-        req_builder = req_builder.query(&[("page", &param_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-model-name-prefix/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-model-name-prefix/src/apis/pet_api.rs
@@ -361,7 +361,7 @@ pub fn pets_post(configuration: &configuration::Configuration, page: Option<mode
     let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
 
     if let Some(ref param_value) = p_page {
-        req_builder = req_builder.query(&[("page", &param_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/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs
@@ -361,7 +361,7 @@ pub fn pets_post(configuration: &configuration::Configuration, page: Option<mode
     let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
 
     if let Some(ref param_value) = p_page {
-        req_builder = req_builder.query(&[("page", &param_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());

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ impl PetApi for PetApiClient {`
`350`	`350`	`let mut local_var_req_builder = local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str());`
`351`	`351`
`352`	`352`	`if let Some(ref param_value) = page {`
`353`		`- local_var_req_builder = local_var_req_builder.query(&[("page", &param_value.to_string())]);`
	`353`	`+ local_var_req_builder = local_var_req_builder.query(&[("page", &serde_json::to_value(param_value)?)]);`
`354`	`354`	`}`
`355`	`355`	`if let Some(ref local_var_user_agent) = local_var_configuration.user_agent {`
`356`	`356`	`local_var_req_builder = local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone());`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet`
`461`	`461`	`let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);`
`462`	`462`
`463`	`463`	`if let Some(ref param_value) = params.page {`
`464`		`- req_builder = req_builder.query(&[("page", &param_value.to_string())]);`
	`464`	`+ req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]);`
`465`	`465`	`}`
`466`	`466`	`if let Some(ref user_agent) = configuration.user_agent {`
`467`	`467`	`req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet`
`466`	`466`	`let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);`
`467`	`467`
`468`	`468`	`if let Some(ref param_value) = params.page {`
`469`		`- req_builder = req_builder.query(&[("page", &param_value.to_string())]);`
	`469`	`+ req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]);`
`470`	`470`	`}`
`471`	`471`	`if let Some(ref user_agent) = configuration.user_agent {`
`472`	`472`	`req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ pub fn pets_post(configuration: &configuration::Configuration, page: Option<mode`
`426`	`426`	`let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);`
`427`	`427`
`428`	`428`	`if let Some(ref param_value) = p_page {`
`429`		`- req_builder = req_builder.query(&[("page", &param_value.to_string())]);`
	`429`	`+ req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]);`
`430`	`430`	`}`
`431`	`431`	`if let Some(ref user_agent) = configuration.user_agent {`
`432`	`432`	`req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ pub fn pets_post(configuration: &configuration::Configuration, page: Option<mode`
`361`	`361`	`let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);`
`362`	`362`
`363`	`363`	`if let Some(ref param_value) = p_page {`
`364`		`- req_builder = req_builder.query(&[("page", &param_value.to_string())]);`
	`364`	`+ req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]);`
`365`	`365`	`}`
`366`	`366`	`if let Some(ref user_agent) = configuration.user_agent {`
`367`	`367`	`req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());`