Skip to content

Commit 1841f57

Browse files
ckoegelckoegel
authored
[Ruby] Allow Overriding Accept Header (#19106)
* [Ruby] Allow Overriding Accept Header * generate samples
1 parent 5da4f50 commit 1841f57

50 files changed

Lines changed: 174 additions & 174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/resources/ruby-client/api.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ module {{moduleName}}
188188
header_params = opts[:header_params] || {}
189189
{{#hasProduces}}
190190
# HTTP header 'Accept' (if needed)
191-
header_params['Accept'] = @api_client.select_header_accept([{{#produces}}'{{{mediaType}}}'{{^-last}}, {{/-last}}{{/produces}}])
191+
header_params['Accept'] = @api_client.select_header_accept([{{#produces}}'{{{mediaType}}}'{{^-last}}, {{/-last}}{{/produces}}]) unless header_params['Accept']
192192
{{/hasProduces}}
193193
{{#hasConsumes}}
194194
# HTTP header 'Content-Type'

‎samples/client/echo_api/ruby-faraday/lib/openapi_client/api/auth_api.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_auth_http_basic_with_http_info(opts = {})
4545
# header parameters
4646
header_params = opts[:header_params] || {}
4747
# HTTP header 'Accept' (if needed)
48-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
48+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
4949

5050
# form parameters
5151
form_params = opts[:form_params] || {}
@@ -102,7 +102,7 @@ def test_auth_http_bearer_with_http_info(opts = {})
102102
# header parameters
103103
header_params = opts[:header_params] || {}
104104
# HTTP header 'Accept' (if needed)
105-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
105+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
106106

107107
# form parameters
108108
form_params = opts[:form_params] || {}

‎samples/client/echo_api/ruby-faraday/lib/openapi_client/api/body_api.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_binary_gif_with_http_info(opts = {})
4545
# header parameters
4646
header_params = opts[:header_params] || {}
4747
# HTTP header 'Accept' (if needed)
48-
header_params['Accept'] = @api_client.select_header_accept(['image/gif'])
48+
header_params['Accept'] = @api_client.select_header_accept(['image/gif']) unless header_params['Accept']
4949

5050
# form parameters
5151
form_params = opts[:form_params] || {}
@@ -104,7 +104,7 @@ def test_body_application_octetstream_binary_with_http_info(opts = {})
104104
# header parameters
105105
header_params = opts[:header_params] || {}
106106
# HTTP header 'Accept' (if needed)
107-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
107+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
108108
# HTTP header 'Content-Type'
109109
content_type = @api_client.select_header_content_type(['application/octet-stream'])
110110
if !content_type.nil?
@@ -172,7 +172,7 @@ def test_body_multipart_formdata_array_of_binary_with_http_info(files, opts = {}
172172
# header parameters
173173
header_params = opts[:header_params] || {}
174174
# HTTP header 'Accept' (if needed)
175-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
175+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
176176
# HTTP header 'Content-Type'
177177
content_type = @api_client.select_header_content_type(['multipart/form-data'])
178178
if !content_type.nil?
@@ -237,7 +237,7 @@ def test_body_multipart_formdata_single_binary_with_http_info(opts = {})
237237
# header parameters
238238
header_params = opts[:header_params] || {}
239239
# HTTP header 'Accept' (if needed)
240-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
240+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
241241
# HTTP header 'Content-Type'
242242
content_type = @api_client.select_header_content_type(['multipart/form-data'])
243243
if !content_type.nil?
@@ -302,7 +302,7 @@ def test_echo_body_all_of_pet_with_http_info(opts = {})
302302
# header parameters
303303
header_params = opts[:header_params] || {}
304304
# HTTP header 'Accept' (if needed)
305-
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
305+
header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
306306
# HTTP header 'Content-Type'
307307
content_type = @api_client.select_header_content_type(['application/json'])
308308
if !content_type.nil?
@@ -366,7 +366,7 @@ def test_echo_body_free_form_object_response_string_with_http_info(opts = {})
366366
# header parameters
367367
header_params = opts[:header_params] || {}
368368
# HTTP header 'Accept' (if needed)
369-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
369+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
370370
# HTTP header 'Content-Type'
371371
content_type = @api_client.select_header_content_type(['application/json'])
372372
if !content_type.nil?
@@ -430,7 +430,7 @@ def test_echo_body_pet_with_http_info(opts = {})
430430
# header parameters
431431
header_params = opts[:header_params] || {}
432432
# HTTP header 'Accept' (if needed)
433-
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
433+
header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
434434
# HTTP header 'Content-Type'
435435
content_type = @api_client.select_header_content_type(['application/json'])
436436
if !content_type.nil?
@@ -494,7 +494,7 @@ def test_echo_body_pet_response_string_with_http_info(opts = {})
494494
# header parameters
495495
header_params = opts[:header_params] || {}
496496
# HTTP header 'Accept' (if needed)
497-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
497+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
498498
# HTTP header 'Content-Type'
499499
content_type = @api_client.select_header_content_type(['application/json'])
500500
if !content_type.nil?
@@ -558,7 +558,7 @@ def test_echo_body_string_enum_with_http_info(opts = {})
558558
# header parameters
559559
header_params = opts[:header_params] || {}
560560
# HTTP header 'Accept' (if needed)
561-
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
561+
header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
562562
# HTTP header 'Content-Type'
563563
content_type = @api_client.select_header_content_type(['application/json'])
564564
if !content_type.nil?
@@ -622,7 +622,7 @@ def test_echo_body_tag_response_string_with_http_info(opts = {})
622622
# header parameters
623623
header_params = opts[:header_params] || {}
624624
# HTTP header 'Accept' (if needed)
625-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
625+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
626626
# HTTP header 'Content-Type'
627627
content_type = @api_client.select_header_content_type(['application/json'])
628628
if !content_type.nil?

‎samples/client/echo_api/ruby-faraday/lib/openapi_client/api/form_api.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_form_integer_boolean_string_with_http_info(opts = {})
5151
# header parameters
5252
header_params = opts[:header_params] || {}
5353
# HTTP header 'Accept' (if needed)
54-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
54+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
5555
# HTTP header 'Content-Type'
5656
content_type = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
5757
if !content_type.nil?
@@ -122,7 +122,7 @@ def test_form_object_multipart_with_http_info(marker, opts = {})
122122
# header parameters
123123
header_params = opts[:header_params] || {}
124124
# HTTP header 'Accept' (if needed)
125-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
125+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
126126
# HTTP header 'Content-Type'
127127
content_type = @api_client.select_header_content_type(['multipart/form-data'])
128128
if !content_type.nil?
@@ -197,7 +197,7 @@ def test_form_oneof_with_http_info(opts = {})
197197
# header parameters
198198
header_params = opts[:header_params] || {}
199199
# HTTP header 'Accept' (if needed)
200-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
200+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
201201
# HTTP header 'Content-Type'
202202
content_type = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
203203
if !content_type.nil?

‎samples/client/echo_api/ruby-faraday/lib/openapi_client/api/header_api.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def test_header_integer_boolean_string_enums_with_http_info(opts = {})
5959
# header parameters
6060
header_params = opts[:header_params] || {}
6161
# HTTP header 'Accept' (if needed)
62-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
62+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
6363
header_params['integer_header'] = opts[:'integer_header'] if !opts[:'integer_header'].nil?
6464
header_params['boolean_header'] = opts[:'boolean_header'] if !opts[:'boolean_header'].nil?
6565
header_params['string_header'] = opts[:'string_header'] if !opts[:'string_header'].nil?

‎samples/client/echo_api/ruby-faraday/lib/openapi_client/api/path_api.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def tests_path_string_path_string_integer_path_integer_enum_nonref_string_path_e
7474
# header parameters
7575
header_params = opts[:header_params] || {}
7676
# HTTP header 'Accept' (if needed)
77-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
77+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
7878

7979
# form parameters
8080
form_params = opts[:form_params] || {}

‎samples/client/echo_api/ruby-faraday/lib/openapi_client/api/query_api.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_enum_ref_string_with_http_info(opts = {})
5555
# header parameters
5656
header_params = opts[:header_params] || {}
5757
# HTTP header 'Accept' (if needed)
58-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
58+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
5959

6060
# form parameters
6161
form_params = opts[:form_params] || {}
@@ -121,7 +121,7 @@ def test_query_datetime_date_string_with_http_info(opts = {})
121121
# header parameters
122122
header_params = opts[:header_params] || {}
123123
# HTTP header 'Accept' (if needed)
124-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
124+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
125125

126126
# form parameters
127127
form_params = opts[:form_params] || {}
@@ -187,7 +187,7 @@ def test_query_integer_boolean_string_with_http_info(opts = {})
187187
# header parameters
188188
header_params = opts[:header_params] || {}
189189
# HTTP header 'Accept' (if needed)
190-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
190+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
191191

192192
# form parameters
193193
form_params = opts[:form_params] || {}
@@ -247,7 +247,7 @@ def test_query_style_deep_object_explode_true_object_with_http_info(opts = {})
247247
# header parameters
248248
header_params = opts[:header_params] || {}
249249
# HTTP header 'Accept' (if needed)
250-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
250+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
251251

252252
# form parameters
253253
form_params = opts[:form_params] || {}
@@ -307,7 +307,7 @@ def test_query_style_deep_object_explode_true_object_all_of_with_http_info(opts
307307
# header parameters
308308
header_params = opts[:header_params] || {}
309309
# HTTP header 'Accept' (if needed)
310-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
310+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
311311

312312
# form parameters
313313
form_params = opts[:form_params] || {}
@@ -367,7 +367,7 @@ def test_query_style_form_explode_false_array_integer_with_http_info(opts = {})
367367
# header parameters
368368
header_params = opts[:header_params] || {}
369369
# HTTP header 'Accept' (if needed)
370-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
370+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
371371

372372
# form parameters
373373
form_params = opts[:form_params] || {}
@@ -427,7 +427,7 @@ def test_query_style_form_explode_false_array_string_with_http_info(opts = {})
427427
# header parameters
428428
header_params = opts[:header_params] || {}
429429
# HTTP header 'Accept' (if needed)
430-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
430+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
431431

432432
# form parameters
433433
form_params = opts[:form_params] || {}
@@ -487,7 +487,7 @@ def test_query_style_form_explode_true_array_string_with_http_info(opts = {})
487487
# header parameters
488488
header_params = opts[:header_params] || {}
489489
# HTTP header 'Accept' (if needed)
490-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
490+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
491491

492492
# form parameters
493493
form_params = opts[:form_params] || {}
@@ -547,7 +547,7 @@ def test_query_style_form_explode_true_object_with_http_info(opts = {})
547547
# header parameters
548548
header_params = opts[:header_params] || {}
549549
# HTTP header 'Accept' (if needed)
550-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
550+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
551551

552552
# form parameters
553553
form_params = opts[:form_params] || {}
@@ -607,7 +607,7 @@ def test_query_style_form_explode_true_object_all_of_with_http_info(opts = {})
607607
# header parameters
608608
header_params = opts[:header_params] || {}
609609
# HTTP header 'Accept' (if needed)
610-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
610+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
611611

612612
# form parameters
613613
form_params = opts[:form_params] || {}

‎samples/client/echo_api/ruby-httpx/lib/openapi_client/api/auth_api.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_auth_http_basic_with_http_info(opts = {})
4545
# header parameters
4646
header_params = opts[:header_params] || {}
4747
# HTTP header 'Accept' (if needed)
48-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
48+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
4949

5050
# form parameters
5151
form_params = opts[:form_params] || {}
@@ -102,7 +102,7 @@ def test_auth_http_bearer_with_http_info(opts = {})
102102
# header parameters
103103
header_params = opts[:header_params] || {}
104104
# HTTP header 'Accept' (if needed)
105-
header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
105+
header_params['Accept'] = @api_client.select_header_accept(['text/plain']) unless header_params['Accept']
106106

107107
# form parameters
108108
form_params = opts[:form_params] || {}

0 commit comments

Comments
 (0)