Feat/rust reqwest shallow object query param

bin/configs/rust-reqwest-object-query-param.yaml

@@ -0,0 +1,9 @@
+generatorName: rust
+outputDir: samples/client/others/rust/reqwest/object-query-param
+library: reqwest
+inputSpec: modules/openapi-generator/src/test/resources/3_0/objectQueryParam.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+validateSpec: "true"
+additionalProperties:
+  supportAsync: "false"
+  packageName: object-query-param-reqwest

modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache

@@ -155,7 +155,18 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration:
     {{/isArray}}
     {{^isArray}}
     {{^isNullable}}
+    {{#isModel}}
+    {{#isDeepObject}}
+      let params = crate::apis::parse_deep_object("{{{baseName}}}", &serde_json::to_value(param_value)?);
+    {{/isDeepObject}}
+    {{^isDeepObject}}
+    let params = crate::apis::parse_flat_object(&serde_json::to_value({{{vendorExtensions.x-rust-param-identifier}}})?);
+    {{/isDeepObject}}
+    req_builder = req_builder.query(&params);
+    {{/isModel}}
+    {{^isModel}}
     req_builder = req_builder.query(&[("{{{baseName}}}", &{{{vendorExtensions.x-rust-param-identifier}}}.to_string())]);
+    {{/isModel}}
     {{/isNullable}}
     {{#isNullable}}
     {{#isDeepObject}}
@@ -232,7 +243,8 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration:
         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)?)]);
+        let params = crate::apis::parse_flat_object(&serde_json::to_value(param_value)?);
+        req_builder = req_builder.query(&params);
         {{/isModel}}
         {{^isObject}}
         {{^isModel}}

modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache

@@ -105,6 +105,33 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
+pub fn parse_flat_object(value: &serde_json::Value) -> Vec<(String, String)> {
+    if let serde_json::Value::Object(object) = value {
+        let mut params = vec![];
+
+        for (key, value) in object {
+            match value {
+                serde_json::Value::Object(_) => {
+                    unreachable!(
+                        "This should never be reached, there's a bug on the codegen or the templates"
+                    )
+                }
+                serde_json::Value::Array(array) => {
+                    for (i, value) in array.iter().enumerate() {
+                        params.push((format!("{key}[{i}]"), value.to_string()));
+                    }
+                }
+                serde_json::Value::String(s) => params.push((key.to_string(), s.clone())),
+                _ => params.push((key.to_string(), value.to_string())),
+            }
+        }
+
+        return params;
+    }
+
+    unimplemented!("Only objects are supported")
+}
+
 pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String, String)> {
     if let serde_json::Value::Object(object) = value {
         let mut params = vec![];

modules/openapi-generator/src/test/resources/3_0/objectQueryParam.yaml

@@ -14,6 +14,7 @@ paths:
       parameters:
         - in: query
           name: pageQuery
+          required: true
           schema:
             type: object
             properties:
@@ -22,4 +23,68 @@ paths:
                 format: int32
               limit:
                 type: integer
-                format: int32
+                format: int32
+        - in: query
+          name: notRequired
+          required: false
+          schema:
+            type: object
+            properties:
+              foobar:
+                type: integer
+                format: int32
+
+        - in: query
+          name: pageQuerySchema
+          required: true
+          schema:
+            $ref: '#/components/schemas/Page'
+        - in: query
+          name: deep
+          required: true
+          schema:
+            type: object
+            required:
+              - foo
+              - bar
+            properties:
+              foo:
+                type: object
+                required:
+                  - baz
+                properties:
+                  baz:
+                    type: integer
+                    format: int32
+              bar:
+                type: integer
+                format: int32
+        - in: query
+          name: notRequiredDeep
+          required: false
+          schema:
+            type: object
+            properties:
+              foo:
+                type: object
+                properties:
+                  baz:
+                    type: integer
+                    format: int32
+              bar:
+                type: integer
+                format: int32
+      responses:
+        '200':
+          description: OK
+components:
+  schemas:
+    Page:
+      type: object
+      properties:
+        spage:
+          type: integer
+          format: int32
+        sperPage:
+          type: integer
+          format: int32

samples/client/others/rust/reqwest-regression-16119/src/apis/mod.rs

@@ -61,6 +61,33 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
+pub fn parse_flat_object(value: &serde_json::Value) -> Vec<(String, String)> {
+    if let serde_json::Value::Object(object) = value {
+        let mut params = vec![];
+
+        for (key, value) in object {
+            match value {
+                serde_json::Value::Object(_) => {
+                    unreachable!(
+                        "This should never be reached, there's a bug on the codegen or the templates"
+                    )
+                }
+                serde_json::Value::Array(array) => {
+                    for (i, value) in array.iter().enumerate() {
+                        params.push((format!("{key}[{i}]"), value.to_string()));
+                    }
+                }
+                serde_json::Value::String(s) => params.push((key.to_string(), s.clone())),
+                _ => params.push((key.to_string(), value.to_string())),
+            }
+        }
+
+        return params;
+    }
+
+    unimplemented!("Only objects are supported")
+}
+
 pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String, String)> {
     if let serde_json::Value::Object(object) = value {
         let mut params = vec![];

samples/client/others/rust/reqwest/api-with-ref-param/src/apis/mod.rs

@@ -61,6 +61,33 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
+pub fn parse_flat_object(value: &serde_json::Value) -> Vec<(String, String)> {
+    if let serde_json::Value::Object(object) = value {
+        let mut params = vec![];
+
+        for (key, value) in object {
+            match value {
+                serde_json::Value::Object(_) => {
+                    unreachable!(
+                        "This should never be reached, there's a bug on the codegen or the templates"
+                    )
+                }
+                serde_json::Value::Array(array) => {
+                    for (i, value) in array.iter().enumerate() {
+                        params.push((format!("{key}[{i}]"), value.to_string()));
+                    }
+                }
+                serde_json::Value::String(s) => params.push((key.to_string(), s.clone())),
+                _ => params.push((key.to_string(), value.to_string())),
+            }
+        }
+
+        return params;
+    }
+
+    unimplemented!("Only objects are supported")
+}
+
 pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String, String)> {
     if let serde_json::Value::Object(object) = value {
         let mut params = vec![];

samples/client/others/rust/reqwest/composed-oneof/src/apis/mod.rs

@@ -61,6 +61,33 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
+pub fn parse_flat_object(value: &serde_json::Value) -> Vec<(String, String)> {
+    if let serde_json::Value::Object(object) = value {
+        let mut params = vec![];
+
+        for (key, value) in object {
+            match value {
+                serde_json::Value::Object(_) => {
+                    unreachable!(
+                        "This should never be reached, there's a bug on the codegen or the templates"
+                    )
+                }
+                serde_json::Value::Array(array) => {
+                    for (i, value) in array.iter().enumerate() {
+                        params.push((format!("{key}[{i}]"), value.to_string()));
+                    }
+                }
+                serde_json::Value::String(s) => params.push((key.to_string(), s.clone())),
+                _ => params.push((key.to_string(), value.to_string())),
+            }
+        }
+
+        return params;
+    }
+
+    unimplemented!("Only objects are supported")
+}
+
 pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String, String)> {
     if let serde_json::Value::Object(object) = value {
         let mut params = vec![];

samples/client/others/rust/reqwest/emptyObject/src/apis/mod.rs

@@ -61,6 +61,33 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
+pub fn parse_flat_object(value: &serde_json::Value) -> Vec<(String, String)> {
+    if let serde_json::Value::Object(object) = value {
+        let mut params = vec![];
+
+        for (key, value) in object {
+            match value {
+                serde_json::Value::Object(_) => {
+                    unreachable!(
+                        "This should never be reached, there's a bug on the codegen or the templates"
+                    )
+                }
+                serde_json::Value::Array(array) => {
+                    for (i, value) in array.iter().enumerate() {
+                        params.push((format!("{key}[{i}]"), value.to_string()));
+                    }
+                }
+                serde_json::Value::String(s) => params.push((key.to_string(), s.clone())),
+                _ => params.push((key.to_string(), value.to_string())),
+            }
+        }
+
+        return params;
+    }
+
+    unimplemented!("Only objects are supported")
+}
+
 pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String, String)> {
     if let serde_json::Value::Object(object) = value {
         let mut params = vec![];

samples/client/others/rust/reqwest/object-query-param/.gitignore

@@ -0,0 +1,3 @@
+/target/
+**/*.rs.bk
+Cargo.lock

samples/client/others/rust/reqwest/object-query-param/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/others/rust/reqwest/object-query-param/.openapi-generator/FILES

@@ -0,0 +1,25 @@
+.gitignore
+.travis.yml
+Cargo.toml
+README.md
+docs/DefaultApi.md
+docs/ListDeepParameter.md
+docs/ListDeepParameterFoo.md
+docs/ListNotRequiredDeepParameter.md
+docs/ListNotRequiredDeepParameterFoo.md
+docs/ListNotRequiredParameter.md
+docs/ListPageQueryParameter.md
+docs/Page.md
+git_push.sh
+src/apis/configuration.rs
+src/apis/default_api.rs
+src/apis/mod.rs
+src/lib.rs
+src/models/list_deep_parameter.rs
+src/models/list_deep_parameter_foo.rs
+src/models/list_not_required_deep_parameter.rs
+src/models/list_not_required_deep_parameter_foo.rs
+src/models/list_not_required_parameter.rs
+src/models/list_page_query_parameter.rs
+src/models/mod.rs
+src/models/page.rs

samples/client/others/rust/reqwest/object-query-param/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.14.0-SNAPSHOT

samples/client/others/rust/reqwest/object-query-param/.travis.yml

@@ -0,0 +1 @@
+language: rust

samples/client/others/rust/reqwest/object-query-param/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "object-query-param-reqwest"
+version = "1.0.0"
+authors = ["OpenAPI Generator team and contributors"]
+description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)"
+license = "Apache-2.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "^1.0", features = ["derive"] }
+serde_json = "^1.0"
+serde_repr = "^0.1"
+url = "^2.5"
+reqwest = { version = "^0.12", default-features = false, features = ["json", "blocking", "multipart"] }