Skip to content

Commit

Permalink
Define content type if and only if the body is not empty (#9910)
Browse files Browse the repository at this point in the history 
* rubypatch

* moving change to api.must

* fix content_type to content-type

* added end to if
  • Loading branch information
@romanblack1
romanblack1 authored Sep 25, 2021
1 parent 323065e commit 622a936
Show file tree
Hide file tree
Showing 20 changed files with 232 additions and 67 deletions.
5 changes: 4 additions & 1 deletion modules/openapi-generator/src/main/resources/ruby-client/api.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@ module {{moduleName}}
{{/hasProduces}}
{{#hasConsumes}}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type([{{#consumes}}'{{{mediaType}}}'{{^-last}}, {{/-last}}{{/consumes}}])
content_type = @api_client.select_header_content_type([{{#consumes}}'{{{mediaType}}}'{{^-last}}, {{/-last}}{{/consumes}}])
if !content_type.nil?
header_params['Content-Type'] = content_type
end
{{/hasConsumes}}
{{#headerParams}}
{{#required}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ module {{moduleName}}
# @param [Array] content_types array for Content-Type
# @return [String] the Content-Type header (e.g. application/json)
def select_header_content_type(content_types)
# use application/json by default
return 'application/json' if content_types.nil? || content_types.empty?
# return nil by default
return if content_types.nil? || content_types.empty?
# use JSON when present, otherwise use the first one
json_content_type = content_types.find { |s| json_mime?(s) }
json_content_type || content_types.first
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ def call_123_test_special_tags_with_http_info(client, opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
70 changes: 56 additions & 14 deletions samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ def fake_http_signature_test_with_http_info(pet, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'application/xml'])
content_type = @api_client.select_header_content_type(['application/json', 'application/xml'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end
header_params[:'header_1'] = opts[:'header_1'] if !opts[:'header_1'].nil?

# form parameters
Expand Down Expand Up @@ -169,7 +172,10 @@ def fake_outer_boolean_serialize_with_http_info(opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['*/*'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -228,7 +234,10 @@ def fake_outer_composite_serialize_with_http_info(opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['*/*'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -287,7 +296,10 @@ def fake_outer_number_serialize_with_http_info(opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['*/*'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -346,7 +358,10 @@ def fake_outer_string_serialize_with_http_info(opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['*/*'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -409,7 +424,10 @@ def fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_p
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['*/*'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -466,7 +484,10 @@ def test_body_with_binary_with_http_info(body, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['image/png'])
content_type = @api_client.select_header_content_type(['image/png'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -527,7 +548,10 @@ def test_body_with_file_schema_with_http_info(file_schema_test_class, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -593,7 +617,10 @@ def test_body_with_query_params_with_http_info(query, user, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -658,7 +685,10 @@ def test_client_model_with_http_info(client, opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -813,7 +843,10 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
content_type = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -936,7 +969,10 @@ def test_enum_parameters_with_http_info(opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
content_type = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end
header_params[:'enum_header_string_array'] = @api_client.build_collection_param(opts[:'enum_header_string_array'], :csv) if !opts[:'enum_header_string_array'].nil?
header_params[:'enum_header_string'] = opts[:'enum_header_string'] if !opts[:'enum_header_string'].nil?

Expand Down Expand Up @@ -1086,7 +1122,10 @@ def test_inline_additional_properties_with_http_info(request_body, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -1153,7 +1192,10 @@ def test_json_form_data_with_http_info(param, param2, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
content_type = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ def test_classname_with_http_info(client, opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
25 changes: 20 additions & 5 deletions samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ def add_pet_with_http_info(pet, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'application/xml'])
content_type = @api_client.select_header_content_type(['application/json', 'application/xml'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -363,7 +366,10 @@ def update_pet_with_http_info(pet, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'application/xml'])
content_type = @api_client.select_header_content_type(['application/json', 'application/xml'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -428,7 +434,10 @@ def update_pet_with_form_with_http_info(pet_id, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
content_type = @api_client.select_header_content_type(['application/x-www-form-urlencoded'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -497,7 +506,10 @@ def upload_file_with_http_info(pet_id, opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
content_type = @api_client.select_header_content_type(['multipart/form-data'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -570,7 +582,10 @@ def upload_file_with_required_file_with_http_info(pet_id, required_file, opts =
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
content_type = @api_client.select_header_content_type(['multipart/form-data'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ def place_order_with_http_info(order, opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/xml', 'application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
20 changes: 16 additions & 4 deletions samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ def create_user_with_http_info(user, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -112,7 +115,10 @@ def create_users_with_array_input_with_http_info(user, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -173,7 +179,10 @@ def create_users_with_list_input_with_http_info(user, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down Expand Up @@ -486,7 +495,10 @@ def update_user_with_http_info(username, user, opts = {})
# header parameters
header_params = opts[:header_params] || {}
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ def select_header_accept(accepts)
# @param [Array] content_types array for Content-Type
# @return [String] the Content-Type header (e.g. application/json)
def select_header_content_type(content_types)
# use application/json by default
return 'application/json' if content_types.nil? || content_types.empty?
# return nil by default
return if content_types.nil? || content_types.empty?
# use JSON when present, otherwise use the first one
json_content_type = content_types.find { |s| json_mime?(s) }
json_content_type || content_types.first
Expand Down
5 changes: 4 additions & 1 deletion samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ def call_123_test_special_tags_with_http_info(client, opts = {})
# HTTP header 'Accept' (if needed)
header_params['Accept'] = @api_client.select_header_accept(['application/json'])
# HTTP header 'Content-Type'
header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
content_type = @api_client.select_header_content_type(['application/json'])
if !content_type.nil?
header_params['Content-Type'] = content_type
end

# form parameters
form_params = opts[:form_params] || {}
Expand Down
Loading

0 comments on commit 622a936

Please sign in to comment.