Skip to content

Commit 1c0cb7f

Browse files
wing328wing328
committed
fix syntax
1 parent bc24e5e commit 1c0cb7f

File tree

4 files changed

+126
-147
lines changed

4 files changed

+126
-147
lines changed

‎modules/swagger-codegen/src/main/resources/ruby/api.mustache‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ class {{classname}}
4444
# header parameters
4545
headers = {}
4646

47-
_header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}';
48-
if (_header_accept != '') {
49-
headerParams['Accept'] = _header_accept;
50-
}
51-
_header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}];
52-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
53-
47+
_header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}'
48+
if _header_accept != ''
49+
headerParams['Accept'] = _header_accept
50+
end
51+
_header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}]
52+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
5453

5554
{{#headerParams}}{{#optional}}headers[:'{{{baseName}}}'] = options[:'{{{paramName}}}'] if options[:'{{{paramName}}}']{{/optional}}{{/headerParams}}
5655
{{#headerParams}}{{^optional}}headers[:'{{{baseName}}}'] = {{{paramName}}}{{/optional}}{{/headerParams}}

‎samples/client/petstore/ruby/lib/pet_api.rb‎

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ def self.updatePet (body, opts={})
3535
# header parameters
3636
headers = {}
3737

38-
_header_accept = 'application/json, application/xml';
39-
if (_header_accept != '') {
40-
headerParams['Accept'] = _header_accept;
41-
}
42-
_header_content_type = [('application/json','application/xml',);
43-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
44-
38+
_header_accept = 'application/json, application/xml'
39+
if _header_accept != ''
40+
headerParams['Accept'] = _header_accept
41+
end
42+
_header_content_type = ['application/json', 'application/xml', ]
43+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
4544

4645

4746

@@ -104,13 +103,12 @@ def self.addPet (body, opts={})
104103
# header parameters
105104
headers = {}
106105

107-
_header_accept = 'application/json, application/xml';
108-
if (_header_accept != '') {
109-
headerParams['Accept'] = _header_accept;
110-
}
111-
_header_content_type = [('application/json','application/xml',);
112-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
113-
106+
_header_accept = 'application/json, application/xml'
107+
if _header_accept != ''
108+
headerParams['Accept'] = _header_accept
109+
end
110+
_header_content_type = ['application/json', 'application/xml', ]
111+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
114112

115113

116114

@@ -173,13 +171,12 @@ def self.findPetsByStatus (status, opts={})
173171
# header parameters
174172
headers = {}
175173

176-
_header_accept = 'application/json, application/xml';
177-
if (_header_accept != '') {
178-
headerParams['Accept'] = _header_accept;
179-
}
180-
_header_content_type = [();
181-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
182-
174+
_header_accept = 'application/json, application/xml'
175+
if _header_accept != ''
176+
headerParams['Accept'] = _header_accept
177+
end
178+
_header_content_type = []
179+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
183180

184181

185182

@@ -224,13 +221,12 @@ def self.findPetsByTags (tags, opts={})
224221
# header parameters
225222
headers = {}
226223

227-
_header_accept = 'application/json, application/xml';
228-
if (_header_accept != '') {
229-
headerParams['Accept'] = _header_accept;
230-
}
231-
_header_content_type = [();
232-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
233-
224+
_header_accept = 'application/json, application/xml'
225+
if _header_accept != ''
226+
headerParams['Accept'] = _header_accept
227+
end
228+
_header_content_type = []
229+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
234230

235231

236232

@@ -276,13 +272,12 @@ def self.getPetById (pet_id, opts={})
276272
# header parameters
277273
headers = {}
278274

279-
_header_accept = 'application/json, application/xml';
280-
if (_header_accept != '') {
281-
headerParams['Accept'] = _header_accept;
282-
}
283-
_header_content_type = [();
284-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
285-
275+
_header_accept = 'application/json, application/xml'
276+
if _header_accept != ''
277+
headerParams['Accept'] = _header_accept
278+
end
279+
_header_content_type = []
280+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
286281

287282

288283

@@ -331,13 +326,12 @@ def self.updatePetWithForm (pet_id, name, status, opts={})
331326
# header parameters
332327
headers = {}
333328

334-
_header_accept = 'application/json, application/xml';
335-
if (_header_accept != '') {
336-
headerParams['Accept'] = _header_accept;
337-
}
338-
_header_content_type = [('application/x-www-form-urlencoded',);
339-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
340-
329+
_header_accept = 'application/json, application/xml'
330+
if _header_accept != ''
331+
headerParams['Accept'] = _header_accept
332+
end
333+
_header_content_type = ['application/x-www-form-urlencoded', ]
334+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
341335

342336

343337

@@ -385,13 +379,12 @@ def self.deletePet (api_key, pet_id, opts={})
385379
# header parameters
386380
headers = {}
387381

388-
_header_accept = 'application/json, application/xml';
389-
if (_header_accept != '') {
390-
headerParams['Accept'] = _header_accept;
391-
}
392-
_header_content_type = [();
393-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
394-
382+
_header_accept = 'application/json, application/xml'
383+
if _header_accept != ''
384+
headerParams['Accept'] = _header_accept
385+
end
386+
_header_content_type = []
387+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
395388

396389

397390
headers[:'api_key'] = api_key
@@ -439,13 +432,12 @@ def self.uploadFile (pet_id, additional_metadata, file, opts={})
439432
# header parameters
440433
headers = {}
441434

442-
_header_accept = 'application/json, application/xml';
443-
if (_header_accept != '') {
444-
headerParams['Accept'] = _header_accept;
445-
}
446-
_header_content_type = [('multipart/form-data',);
447-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
448-
435+
_header_accept = 'application/json, application/xml'
436+
if _header_accept != ''
437+
headerParams['Accept'] = _header_accept
438+
end
439+
_header_content_type = ['multipart/form-data', ]
440+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
449441

450442

451443

‎samples/client/petstore/ruby/lib/store_api.rb‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@ def self.getInventory (opts={})
3333
# header parameters
3434
headers = {}
3535

36-
_header_accept = 'application/json, application/xml';
37-
if (_header_accept != '') {
38-
headerParams['Accept'] = _header_accept;
39-
}
40-
_header_content_type = [();
41-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
42-
36+
_header_accept = 'application/json, application/xml'
37+
if _header_accept != ''
38+
headerParams['Accept'] = _header_accept
39+
end
40+
_header_content_type = []
41+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
4342

4443

4544

@@ -84,13 +83,12 @@ def self.placeOrder (body, opts={})
8483
# header parameters
8584
headers = {}
8685

87-
_header_accept = 'application/json, application/xml';
88-
if (_header_accept != '') {
89-
headerParams['Accept'] = _header_accept;
90-
}
91-
_header_content_type = [();
92-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
93-
86+
_header_accept = 'application/json, application/xml'
87+
if _header_accept != ''
88+
headerParams['Accept'] = _header_accept
89+
end
90+
_header_content_type = []
91+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
9492

9593

9694

@@ -155,13 +153,12 @@ def self.getOrderById (order_id, opts={})
155153
# header parameters
156154
headers = {}
157155

158-
_header_accept = 'application/json, application/xml';
159-
if (_header_accept != '') {
160-
headerParams['Accept'] = _header_accept;
161-
}
162-
_header_content_type = [();
163-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
164-
156+
_header_accept = 'application/json, application/xml'
157+
if _header_accept != ''
158+
headerParams['Accept'] = _header_accept
159+
end
160+
_header_content_type = []
161+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
165162

166163

167164

@@ -206,13 +203,12 @@ def self.deleteOrder (order_id, opts={})
206203
# header parameters
207204
headers = {}
208205

209-
_header_accept = 'application/json, application/xml';
210-
if (_header_accept != '') {
211-
headerParams['Accept'] = _header_accept;
212-
}
213-
_header_content_type = [();
214-
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json';
215-
206+
_header_accept = 'application/json, application/xml'
207+
if _header_accept != ''
208+
headerParams['Accept'] = _header_accept
209+
end
210+
_header_content_type = []
211+
headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
216212

217213

218214

0 commit comments

Comments
 (0)