Skip to content

Commit 16b825e

Browse files
andershausdingandershausding
committed
[Rust] fix: do not use locationSuffix if useSingleRequestParameter feature is enabled
1 parent 0ae23f8 commit 16b825e

21 files changed

Lines changed: 141 additions & 141 deletions

File tree

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ public void postProcessParameter(CodegenParameter parameter) {
656656
locationSuffix = "form_";
657657
}
658658
if (this.useSingleRequestParameter) {
659-
inFunctionIdentifier = "params." + locationSuffix + parameter.paramName;
659+
inFunctionIdentifier = "params." + parameter.paramName;
660660
} else {
661661
if (parameter.paramName.startsWith("r#")) {
662662
inFunctionIdentifier = "p_" + locationSuffix + parameter.paramName.substring(2);

‎samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/fake_api.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ pub enum TestNullableRequiredParamError {
5050
///
5151
pub async fn test_nullable_required_param(configuration: &configuration::Configuration, params: TestNullableRequiredParamParams) -> Result<ResponseContent<TestNullableRequiredParamSuccess>, Error<TestNullableRequiredParamError>> {
5252

53-
let uri_str = format!("{}/fake/user/{user_name}", configuration.base_path, user_name=crate::apis::urlencode(params.path_user_name));
53+
let uri_str = format!("{}/fake/user/{user_name}", configuration.base_path, user_name=crate::apis::urlencode(params.user_name));
5454
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
5555

56-
if let Some(ref param_value) = params.query_content {
56+
if let Some(ref param_value) = params.content {
5757
req_builder = req_builder.query(&[("content", &param_value.to_string())]);
5858
}
59-
req_builder = req_builder.query(&[("anyType", &params.query_any_type.to_string())]);
59+
req_builder = req_builder.query(&[("anyType", &params.any_type.to_string())]);
6060
if let Some(ref user_agent) = configuration.user_agent {
6161
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
6262
}
63-
match params.header_dummy_required_nullable_param {
63+
match params.dummy_required_nullable_param {
6464
Some(param_value) => { req_builder = req_builder.header("dummy_required_nullable_param", param_value.to_string()); },
6565
None => { req_builder = req_builder.header("dummy_required_nullable_param", ""); },
6666
}
67-
if let Some(param_value) = params.header_uppercase {
67+
if let Some(param_value) = params.uppercase {
6868
req_builder = req_builder.header("UPPERCASE", param_value.to_string());
6969
}
7070

‎samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ pub async fn add_pet(configuration: &configuration::Configuration, params: AddPe
269269
if let Some(ref token) = configuration.oauth_access_token {
270270
req_builder = req_builder.bearer_auth(token.to_owned());
271271
};
272-
req_builder = req_builder.json(&params.body_pet);
272+
req_builder = req_builder.json(&params.pet);
273273

274274
let req = req_builder.build()?;
275275
let resp = configuration.client.execute(req).await?;
@@ -290,13 +290,13 @@ pub async fn add_pet(configuration: &configuration::Configuration, params: AddPe
290290
///
291291
pub async fn delete_pet(configuration: &configuration::Configuration, params: DeletePetParams) -> Result<ResponseContent<DeletePetSuccess>, Error<DeletePetError>> {
292292

293-
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=params.path_pet_id);
293+
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=params.pet_id);
294294
let mut req_builder = configuration.client.request(reqwest::Method::DELETE, &uri_str);
295295

296296
if let Some(ref user_agent) = configuration.user_agent {
297297
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
298298
}
299-
if let Some(param_value) = params.header_api_key {
299+
if let Some(param_value) = params.api_key {
300300
req_builder = req_builder.header("api_key", param_value.to_string());
301301
}
302302
if let Some(ref token) = configuration.oauth_access_token {
@@ -326,10 +326,10 @@ pub async fn find_pets_by_status(configuration: &configuration::Configuration, p
326326
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
327327

328328
req_builder = match "csv" {
329-
"multi" => req_builder.query(&params.query_status.into_iter().map(|p| ("status".to_owned(), p.to_string())).collect::<Vec<(std::string::String, std::string::String)>>()),
330-
_ => req_builder.query(&[("status", &params.query_status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]),
329+
"multi" => req_builder.query(&params.status.into_iter().map(|p| ("status".to_owned(), p.to_string())).collect::<Vec<(std::string::String, std::string::String)>>()),
330+
_ => req_builder.query(&[("status", &params.status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]),
331331
};
332-
if let Some(ref param_value) = params.query_r#type {
332+
if let Some(ref param_value) = params.r#type {
333333
req_builder = match "csv" {
334334
"multi" => req_builder.query(&param_value.into_iter().map(|p| ("type".to_owned(), p.to_string())).collect::<Vec<(std::string::String, std::string::String)>>()),
335335
_ => req_builder.query(&[("type", &param_value.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]),
@@ -365,8 +365,8 @@ pub async fn find_pets_by_tags(configuration: &configuration::Configuration, par
365365
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
366366

367367
req_builder = match "csv" {
368-
"multi" => req_builder.query(&params.query_tags.into_iter().map(|p| ("tags".to_owned(), p.to_string())).collect::<Vec<(std::string::String, std::string::String)>>()),
369-
_ => req_builder.query(&[("tags", &params.query_tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]),
368+
"multi" => req_builder.query(&params.tags.into_iter().map(|p| ("tags".to_owned(), p.to_string())).collect::<Vec<(std::string::String, std::string::String)>>()),
369+
_ => req_builder.query(&[("tags", &params.tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]),
370370
};
371371
if let Some(ref user_agent) = configuration.user_agent {
372372
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
@@ -394,7 +394,7 @@ pub async fn find_pets_by_tags(configuration: &configuration::Configuration, par
394394
/// Returns a single pet
395395
pub async fn get_pet_by_id(configuration: &configuration::Configuration, params: GetPetByIdParams) -> Result<ResponseContent<GetPetByIdSuccess>, Error<GetPetByIdError>> {
396396

397-
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=params.path_pet_id);
397+
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=params.pet_id);
398398
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
399399

400400
if let Some(ref user_agent) = configuration.user_agent {
@@ -431,7 +431,7 @@ pub async fn pets_explode_post(configuration: &configuration::Configuration, par
431431
let uri_str = format!("{}/pets/explode", configuration.base_path);
432432
let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
433433

434-
if let Some(ref param_value) = params.query_page_explode {
434+
if let Some(ref param_value) = params.page_explode {
435435
req_builder = req_builder.query(&param_value);
436436
}
437437
if let Some(ref user_agent) = configuration.user_agent {
@@ -460,7 +460,7 @@ pub async fn pets_post(configuration: &configuration::Configuration, params: Pet
460460
let uri_str = format!("{}/pets", configuration.base_path);
461461
let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
462462

463-
if let Some(ref param_value) = params.query_page {
463+
if let Some(ref param_value) = params.page {
464464
req_builder = req_builder.query(&[("page", &serde_json::to_string(param_value)?)]);
465465
}
466466
if let Some(ref user_agent) = configuration.user_agent {
@@ -495,7 +495,7 @@ pub async fn update_pet(configuration: &configuration::Configuration, params: Up
495495
if let Some(ref token) = configuration.oauth_access_token {
496496
req_builder = req_builder.bearer_auth(token.to_owned());
497497
};
498-
req_builder = req_builder.json(&params.body_pet);
498+
req_builder = req_builder.json(&params.pet);
499499

500500
let req = req_builder.build()?;
501501
let resp = configuration.client.execute(req).await?;
@@ -516,7 +516,7 @@ pub async fn update_pet(configuration: &configuration::Configuration, params: Up
516516
///
517517
pub async fn update_pet_with_form(configuration: &configuration::Configuration, params: UpdatePetWithFormParams) -> Result<ResponseContent<UpdatePetWithFormSuccess>, Error<UpdatePetWithFormError>> {
518518

519-
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=params.path_pet_id);
519+
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=params.pet_id);
520520
let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
521521

522522
if let Some(ref user_agent) = configuration.user_agent {
@@ -526,10 +526,10 @@ pub async fn update_pet_with_form(configuration: &configuration::Configuration,
526526
req_builder = req_builder.bearer_auth(token.to_owned());
527527
};
528528
let mut multipart_form_params = std::collections::HashMap::new();
529-
if let Some(param_value) = params.form_name {
529+
if let Some(param_value) = params.name {
530530
multipart_form_params.insert("name", param_value.to_string());
531531
}
532-
if let Some(param_value) = params.form_status {
532+
if let Some(param_value) = params.status {
533533
multipart_form_params.insert("status", param_value.to_string());
534534
}
535535
req_builder = req_builder.form(&multipart_form_params);
@@ -553,7 +553,7 @@ pub async fn update_pet_with_form(configuration: &configuration::Configuration,
553553
///
554554
pub async fn upload_file(configuration: &configuration::Configuration, params: UploadFileParams) -> Result<ResponseContent<UploadFileSuccess>, Error<UploadFileError>> {
555555

556-
let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=params.path_pet_id);
556+
let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=params.pet_id);
557557
let mut req_builder = configuration.client.request(reqwest::Method::POST, &uri_str);
558558

559559
if let Some(ref user_agent) = configuration.user_agent {
@@ -563,7 +563,7 @@ pub async fn upload_file(configuration: &configuration::Configuration, params: U
563563
req_builder = req_builder.bearer_auth(token.to_owned());
564564
};
565565
let mut multipart_form = reqwest::multipart::Form::new();
566-
if let Some(param_value) = params.form_additional_metadata {
566+
if let Some(param_value) = params.additional_metadata {
567567
multipart_form = multipart_form.text("additionalMetadata", param_value.to_string());
568568
}
569569
// TODO: support file upload for 'file' parameter

‎samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub enum PlaceOrderError {
104104
/// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
105105
pub async fn delete_order(configuration: &configuration::Configuration, params: DeleteOrderParams) -> Result<ResponseContent<DeleteOrderSuccess>, Error<DeleteOrderError>> {
106106

107-
let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(params.path_order_id));
107+
let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(params.order_id));
108108
let mut req_builder = configuration.client.request(reqwest::Method::DELETE, &uri_str);
109109

110110
if let Some(ref user_agent) = configuration.user_agent {
@@ -164,7 +164,7 @@ pub async fn get_inventory(configuration: &configuration::Configuration) -> Resu
164164
/// For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions
165165
pub async fn get_order_by_id(configuration: &configuration::Configuration, params: GetOrderByIdParams) -> Result<ResponseContent<GetOrderByIdSuccess>, Error<GetOrderByIdError>> {
166166

167-
let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=params.path_order_id);
167+
let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=params.order_id);
168168
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
169169

170170
if let Some(ref user_agent) = configuration.user_agent {
@@ -196,7 +196,7 @@ pub async fn place_order(configuration: &configuration::Configuration, params: P
196196
if let Some(ref user_agent) = configuration.user_agent {
197197
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
198198
}
199-
req_builder = req_builder.json(&params.body_order);
199+
req_builder = req_builder.json(&params.order);
200200

201201
let req = req_builder.build()?;
202202
let resp = configuration.client.execute(req).await?;

‎samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/testing_api.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pub async fn tests_all_of_with_one_model_get(configuration: &configuration::Conf
7575
if let Some(ref user_agent) = configuration.user_agent {
7676
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
7777
}
78-
req_builder = req_builder.json(&params.body_person);
78+
req_builder = req_builder.json(&params.person);
7979

8080
let req = req_builder.build()?;
8181
let resp = configuration.client.execute(req).await?;

‎samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ pub async fn create_user(configuration: &configuration::Configuration, params: C
211211
};
212212
req_builder = req_builder.header("api_key", value);
213213
};
214-
req_builder = req_builder.json(&params.body_user);
214+
req_builder = req_builder.json(&params.user);
215215

216216
let req = req_builder.build()?;
217217
let resp = configuration.client.execute(req).await?;
@@ -246,7 +246,7 @@ pub async fn create_users_with_array_input(configuration: &configuration::Config
246246
};
247247
req_builder = req_builder.header("api_key", value);
248248
};
249-
req_builder = req_builder.json(&params.body_user);
249+
req_builder = req_builder.json(&params.user);
250250

251251
let req = req_builder.build()?;
252252
let resp = configuration.client.execute(req).await?;
@@ -281,7 +281,7 @@ pub async fn create_users_with_list_input(configuration: &configuration::Configu
281281
};
282282
req_builder = req_builder.header("api_key", value);
283283
};
284-
req_builder = req_builder.json(&params.body_user);
284+
req_builder = req_builder.json(&params.user);
285285

286286
let req = req_builder.build()?;
287287
let resp = configuration.client.execute(req).await?;
@@ -302,7 +302,7 @@ pub async fn create_users_with_list_input(configuration: &configuration::Configu
302302
/// This can only be done by the logged in user.
303303
pub async fn delete_user(configuration: &configuration::Configuration, params: DeleteUserParams) -> Result<ResponseContent<DeleteUserSuccess>, Error<DeleteUserError>> {
304304

305-
let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(params.path_username));
305+
let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(params.username));
306306
let mut req_builder = configuration.client.request(reqwest::Method::DELETE, &uri_str);
307307

308308
if let Some(ref user_agent) = configuration.user_agent {
@@ -336,7 +336,7 @@ pub async fn delete_user(configuration: &configuration::Configuration, params: D
336336
///
337337
pub async fn get_user_by_name(configuration: &configuration::Configuration, params: GetUserByNameParams) -> Result<ResponseContent<GetUserByNameSuccess>, Error<GetUserByNameError>> {
338338

339-
let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(params.path_username));
339+
let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(params.username));
340340
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
341341

342342
if let Some(ref user_agent) = configuration.user_agent {
@@ -365,8 +365,8 @@ pub async fn login_user(configuration: &configuration::Configuration, params: Lo
365365
let uri_str = format!("{}/user/login", configuration.base_path);
366366
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
367367

368-
req_builder = req_builder.query(&[("username", &params.query_username.to_string())]);
369-
req_builder = req_builder.query(&[("password", &params.query_password.to_string())]);
368+
req_builder = req_builder.query(&[("username", &params.username.to_string())]);
369+
req_builder = req_builder.query(&[("password", &params.password.to_string())]);
370370
if let Some(ref user_agent) = configuration.user_agent {
371371
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
372372
}
@@ -424,7 +424,7 @@ pub async fn logout_user(configuration: &configuration::Configuration) -> Result
424424
/// This can only be done by the logged in user.
425425
pub async fn update_user(configuration: &configuration::Configuration, params: UpdateUserParams) -> Result<ResponseContent<UpdateUserSuccess>, Error<UpdateUserError>> {
426426

427-
let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(params.path_username));
427+
let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(params.username));
428428
let mut req_builder = configuration.client.request(reqwest::Method::PUT, &uri_str);
429429

430430
if let Some(ref user_agent) = configuration.user_agent {
@@ -438,7 +438,7 @@ pub async fn update_user(configuration: &configuration::Configuration, params: U
438438
};
439439
req_builder = req_builder.header("api_key", value);
440440
};
441-
req_builder = req_builder.json(&params.body_user);
441+
req_builder = req_builder.json(&params.user);
442442

443443
let req = req_builder.build()?;
444444
let resp = configuration.client.execute(req).await?;

‎samples/client/petstore/rust/reqwest/petstore-async-tokensource/src/apis/fake_api.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ pub enum TestNullableRequiredParamError {
5050
///
5151
pub async fn test_nullable_required_param(configuration: &configuration::Configuration, params: TestNullableRequiredParamParams) -> Result<ResponseContent<TestNullableRequiredParamSuccess>, Error<TestNullableRequiredParamError>> {
5252

53-
let uri_str = format!("{}/fake/user/{user_name}", configuration.base_path, user_name=crate::apis::urlencode(params.path_user_name));
53+
let uri_str = format!("{}/fake/user/{user_name}", configuration.base_path, user_name=crate::apis::urlencode(params.user_name));
5454
let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
5555

56-
if let Some(ref param_value) = params.query_content {
56+
if let Some(ref param_value) = params.content {
5757
req_builder = req_builder.query(&[("content", &param_value.to_string())]);
5858
}
59-
req_builder = req_builder.query(&[("anyType", &params.query_any_type.to_string())]);
59+
req_builder = req_builder.query(&[("anyType", &params.any_type.to_string())]);
6060
if let Some(ref user_agent) = configuration.user_agent {
6161
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
6262
}
63-
match params.header_dummy_required_nullable_param {
63+
match params.dummy_required_nullable_param {
6464
Some(param_value) => { req_builder = req_builder.header("dummy_required_nullable_param", param_value.to_string()); },
6565
None => { req_builder = req_builder.header("dummy_required_nullable_param", ""); },
6666
}
67-
if let Some(param_value) = params.header_uppercase {
67+
if let Some(param_value) = params.uppercase {
6868
req_builder = req_builder.header("UPPERCASE", param_value.to_string());
6969
}
7070

0 commit comments

Comments
 (0)