Skip to content

Commit 77edec0

Browse files
wing328wing328
authored
Revert "[Rust] Support formParams and fix list-params." (#1732)
* Revert "Disable rust-reqwest petstore test" This reverts commit 9e1cce2. * Revert "Fix various CI issues (#1722)" This reverts commit 77270a0. * Revert "[Rust] Support formParams and fix list-params. (#1678)" This reverts commit 4a494b4.
1 parent 9e1cce2 commit 77edec0

File tree

6 files changed

+36
-77
lines changed

6 files changed

+36
-77
lines changed

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl {{{classname}}}Client {
2121
pub trait {{{classname}}} {
2222
{{#operations}}
2323
{{#operation}}
24-
fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isListContainer}}Vec<{{/isListContainer}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#isListContainer}}>{{/isListContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
24+
fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
2525
{{/operation}}
2626
{{/operations}}
2727
}
@@ -30,23 +30,16 @@ pub trait {{{classname}}} {
3030
impl {{{classname}}} for {{{classname}}}Client {
3131
{{#operations}}
3232
{{#operation}}
33-
fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isListContainer}}Vec<{{/isListContainer}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#isListContainer}}>{{/isListContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
33+
fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
3434
let configuration: &configuration::Configuration = self.configuration.borrow();
3535
let client = &configuration.client;
3636
37-
{{#hasFormParams}}
38-
let form = [
39-
{{#formParams}}
40-
("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string()),
41-
{{/formParams}}
42-
];
43-
{{/hasFormParams}}
4437
let query_string = {
4538
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
46-
{{#queryParams}}
39+
{{#queryParams}}
4740
query.append_pair("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string());
48-
{{/queryParams}}
49-
{{#hasAuthMethods}}{{#authMethods}}{{#isApiKey}}{{#isKeyInQuery}}
41+
{{/queryParams}}
42+
{{#hasAuthMethods}}{{#authMethods}}{{#isApiKey}}{{#isKeyInQuery}}
5043
if let Some(ref apikey) = configuration.api_key {
5144
let key = apikey.key.clone();
5245
let val = match apikey.prefix {
@@ -55,7 +48,7 @@ impl {{{classname}}} for {{{classname}}}Client {
5548
};
5649
query.append_pair("{{{keyParamName}}}".to_owned(), val);
5750
}
58-
{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/hasAuthMethods}}
51+
{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/hasAuthMethods}}
5952
query.finish()
6053
};
6154
let uri_str = format!("{}{{{path}}}?{}", configuration.base_path, query_string{{#pathParams}}, {{{baseName}}}={{{paramName}}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{/pathParams}});
@@ -103,10 +96,6 @@ impl {{{classname}}} for {{{classname}}}Client {
10396
{{/bodyParams}}
10497
{{/hasBodyParam}}
10598

106-
{{#hasFormParams}}
107-
req_builder = req_builder.form(&form);
108-
{{/hasFormParams}}
109-
11099
// send request
111100
let req = req_builder.build()?;
112101

‎samples/client/petstore/rust-reqwest/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0-SNAPSHOT
1+
3.3.4-SNAPSHOT

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

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ impl PetApiClient {
3030
pub trait PetApi {
3131
fn add_pet(&self, pet: ::models::Pet) -> Result<(), Error>;
3232
fn delete_pet(&self, pet_id: i64, api_key: &str) -> Result<(), Error>;
33-
fn find_pets_by_status(&self, status: Vec<Vec<String>>) -> Result<Vec<::models::Pet>, Error>;
34-
fn find_pets_by_tags(&self, tags: Vec<Vec<String>>) -> Result<Vec<::models::Pet>, Error>;
33+
fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<::models::Pet>, Error>;
34+
fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<::models::Pet>, Error>;
3535
fn get_pet_by_id(&self, pet_id: i64) -> Result<::models::Pet, Error>;
3636
fn update_pet(&self, pet: ::models::Pet) -> Result<(), Error>;
3737
fn update_pet_with_form(&self, pet_id: i64, name: &str, status: &str) -> Result<(), Error>;
@@ -46,7 +46,7 @@ impl PetApi for PetApiClient {
4646

4747
let query_string = {
4848
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
49-
49+
5050
query.finish()
5151
};
5252
let uri_str = format!("{}/pet?{}", configuration.base_path, query_string);
@@ -65,7 +65,6 @@ impl PetApi for PetApiClient {
6565

6666
req_builder = req_builder.json(&pet);
6767

68-
6968
// send request
7069
let req = req_builder.build()?;
7170

@@ -79,7 +78,7 @@ impl PetApi for PetApiClient {
7978

8079
let query_string = {
8180
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
82-
81+
8382
query.finish()
8483
};
8584
let uri_str = format!("{}/pet/{petId}?{}", configuration.base_path, query_string, petId=pet_id);
@@ -98,22 +97,21 @@ impl PetApi for PetApiClient {
9897
};
9998

10099

101-
102100
// send request
103101
let req = req_builder.build()?;
104102

105103
client.execute(req)?.error_for_status()?;
106104
Ok(())
107105
}
108106

109-
fn find_pets_by_status(&self, status: Vec<Vec<String>>) -> Result<Vec<::models::Pet>, Error> {
107+
fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<::models::Pet>, Error> {
110108
let configuration: &configuration::Configuration = self.configuration.borrow();
111109
let client = &configuration.client;
112110

113111
let query_string = {
114112
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
115113
query.append_pair("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string());
116-
114+
117115
query.finish()
118116
};
119117
let uri_str = format!("{}/pet/findByStatus?{}", configuration.base_path, query_string);
@@ -131,21 +129,20 @@ impl PetApi for PetApiClient {
131129
};
132130

133131

134-
135132
// send request
136133
let req = req_builder.build()?;
137134

138135
Ok(client.execute(req)?.error_for_status()?.json()?)
139136
}
140137

141-
fn find_pets_by_tags(&self, tags: Vec<Vec<String>>) -> Result<Vec<::models::Pet>, Error> {
138+
fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<::models::Pet>, Error> {
142139
let configuration: &configuration::Configuration = self.configuration.borrow();
143140
let client = &configuration.client;
144141

145142
let query_string = {
146143
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
147144
query.append_pair("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string());
148-
145+
149146
query.finish()
150147
};
151148
let uri_str = format!("{}/pet/findByTags?{}", configuration.base_path, query_string);
@@ -163,7 +160,6 @@ impl PetApi for PetApiClient {
163160
};
164161

165162

166-
167163
// send request
168164
let req = req_builder.build()?;
169165

@@ -176,7 +172,7 @@ impl PetApi for PetApiClient {
176172

177173
let query_string = {
178174
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
179-
175+
180176
query.finish()
181177
};
182178
let uri_str = format!("{}/pet/{petId}?{}", configuration.base_path, query_string, petId=pet_id);
@@ -200,7 +196,6 @@ impl PetApi for PetApiClient {
200196

201197

202198

203-
204199
// send request
205200
let req = req_builder.build()?;
206201

@@ -213,7 +208,7 @@ impl PetApi for PetApiClient {
213208

214209
let query_string = {
215210
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
216-
211+
217212
query.finish()
218213
};
219214
let uri_str = format!("{}/pet?{}", configuration.base_path, query_string);
@@ -232,7 +227,6 @@ impl PetApi for PetApiClient {
232227

233228
req_builder = req_builder.json(&pet);
234229

235-
236230
// send request
237231
let req = req_builder.build()?;
238232

@@ -244,13 +238,9 @@ impl PetApi for PetApiClient {
244238
let configuration: &configuration::Configuration = self.configuration.borrow();
245239
let client = &configuration.client;
246240

247-
let form = [
248-
("name", &name.to_string()),
249-
("status", &status.to_string()),
250-
];
251241
let query_string = {
252242
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
253-
243+
254244
query.finish()
255245
};
256246
let uri_str = format!("{}/pet/{petId}?{}", configuration.base_path, query_string, petId=pet_id);
@@ -268,8 +258,6 @@ impl PetApi for PetApiClient {
268258
};
269259

270260

271-
req_builder = req_builder.form(&form);
272-
273261
// send request
274262
let req = req_builder.build()?;
275263

@@ -281,13 +269,9 @@ impl PetApi for PetApiClient {
281269
let configuration: &configuration::Configuration = self.configuration.borrow();
282270
let client = &configuration.client;
283271

284-
let form = [
285-
("additionalMetadata", &additional_metadata.to_string()),
286-
("file", &file.to_string()),
287-
];
288272
let query_string = {
289273
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
290-
274+
291275
query.finish()
292276
};
293277
let uri_str = format!("{}/pet/{petId}/uploadImage?{}", configuration.base_path, query_string, petId=pet_id);
@@ -305,8 +289,6 @@ impl PetApi for PetApiClient {
305289
};
306290

307291

308-
req_builder = req_builder.form(&form);
309-
310292
// send request
311293
let req = req_builder.build()?;
312294

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl StoreApi for StoreApiClient {
4242

4343
let query_string = {
4444
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
45-
45+
4646
query.finish()
4747
};
4848
let uri_str = format!("{}/store/order/{orderId}?{}", configuration.base_path, query_string, orderId=order_id);
@@ -56,7 +56,6 @@ impl StoreApi for StoreApiClient {
5656

5757

5858

59-
6059
// send request
6160
let req = req_builder.build()?;
6261

@@ -70,7 +69,7 @@ impl StoreApi for StoreApiClient {
7069

7170
let query_string = {
7271
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
73-
72+
7473
query.finish()
7574
};
7675
let uri_str = format!("{}/store/inventory?{}", configuration.base_path, query_string);
@@ -94,7 +93,6 @@ impl StoreApi for StoreApiClient {
9493

9594

9695

97-
9896
// send request
9997
let req = req_builder.build()?;
10098

@@ -107,7 +105,7 @@ impl StoreApi for StoreApiClient {
107105

108106
let query_string = {
109107
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
110-
108+
111109
query.finish()
112110
};
113111
let uri_str = format!("{}/store/order/{orderId}?{}", configuration.base_path, query_string, orderId=order_id);
@@ -121,7 +119,6 @@ impl StoreApi for StoreApiClient {
121119

122120

123121

124-
125122
// send request
126123
let req = req_builder.build()?;
127124

@@ -134,7 +131,7 @@ impl StoreApi for StoreApiClient {
134131

135132
let query_string = {
136133
let mut query = ::url::form_urlencoded::Serializer::new(String::new());
137-
134+
138135
query.finish()
139136
};
140137
let uri_str = format!("{}/store/order?{}", configuration.base_path, query_string);
@@ -149,7 +146,6 @@ impl StoreApi for StoreApiClient {
149146

150147
req_builder = req_builder.json(&order);
151148

152-
153149
// send request
154150
let req = req_builder.build()?;
155151

0 commit comments

Comments
 (0)