From bc24e5e290303e6c8f5743dbe74464486ccef284 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 1 Apr 2015 17:42:01 +0800 Subject: [PATCH 1/4] update ruby accept header --- .../src/main/resources/ruby/api.mustache | 11 ++- samples/client/petstore/ruby/lib/pet_api.rb | 88 +++++++++++++++++-- samples/client/petstore/ruby/lib/store_api.rb | 44 +++++++++- samples/client/petstore/ruby/lib/user_api.rb | 88 +++++++++++++++++-- 4 files changed, 210 insertions(+), 21 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache index 6514f2c1b75..b7821131e6f 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache @@ -41,8 +41,17 @@ class {{classname}} query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}]; + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + {{#headerParams}}{{#optional}}headers[:'{{{baseName}}}'] = options[:'{{{paramName}}}'] if options[:'{{{paramName}}}']{{/optional}}{{/headerParams}} {{#headerParams}}{{^optional}}headers[:'{{{baseName}}}'] = {{{paramName}}}{{/optional}}{{/headerParams}} # http body (model) diff --git a/samples/client/petstore/ruby/lib/pet_api.rb b/samples/client/petstore/ruby/lib/pet_api.rb index 771536c9248..8df13153115 100644 --- a/samples/client/petstore/ruby/lib/pet_api.rb +++ b/samples/client/petstore/ruby/lib/pet_api.rb @@ -32,8 +32,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [('application/json','application/xml',); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -92,8 +101,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [('application/json','application/xml',); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -152,8 +170,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -194,8 +221,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -237,8 +273,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -283,8 +328,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [('application/x-www-form-urlencoded',); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -328,8 +382,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + headers[:'api_key'] = api_key # http body (model) @@ -373,8 +436,17 @@ class PetApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [('multipart/form-data',); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) diff --git a/samples/client/petstore/ruby/lib/store_api.rb b/samples/client/petstore/ruby/lib/store_api.rb index 0d438576ecd..f33ff754a83 100644 --- a/samples/client/petstore/ruby/lib/store_api.rb +++ b/samples/client/petstore/ruby/lib/store_api.rb @@ -30,8 +30,17 @@ class StoreApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -72,8 +81,17 @@ class StoreApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -134,8 +152,17 @@ class StoreApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -176,8 +203,17 @@ class StoreApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) diff --git a/samples/client/petstore/ruby/lib/user_api.rb b/samples/client/petstore/ruby/lib/user_api.rb index 64aeb210f60..f882f94bd9b 100644 --- a/samples/client/petstore/ruby/lib/user_api.rb +++ b/samples/client/petstore/ruby/lib/user_api.rb @@ -32,8 +32,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -92,8 +101,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -152,8 +170,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -214,8 +241,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -253,8 +289,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -294,8 +339,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -338,8 +392,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) @@ -399,8 +462,17 @@ class UserApi query_param_keys.include? key end - # header parameters, if any + # header parameters headers = {} + + _header_accept = 'application/json, application/xml'; + if (_header_accept != '') { + headerParams['Accept'] = _header_accept; + } + _header_content_type = [(); + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; + + # http body (model) From 1c0cb7f884d313cbd01e43ce2b144ea5f2df4dcf Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 2 Apr 2015 06:12:07 +0800 Subject: [PATCH 2/4] fix syntax --- .../src/main/resources/ruby/api.mustache | 13 +-- samples/client/petstore/ruby/lib/pet_api.rb | 104 ++++++++---------- samples/client/petstore/ruby/lib/store_api.rb | 52 ++++----- samples/client/petstore/ruby/lib/user_api.rb | 104 ++++++++---------- 4 files changed, 126 insertions(+), 147 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache index b7821131e6f..f2564a78898 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache @@ -44,13 +44,12 @@ class {{classname}} # header parameters headers = {} - _header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}]; - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' {{#headerParams}}{{#optional}}headers[:'{{{baseName}}}'] = options[:'{{{paramName}}}'] if options[:'{{{paramName}}}']{{/optional}}{{/headerParams}} {{#headerParams}}{{^optional}}headers[:'{{{baseName}}}'] = {{{paramName}}}{{/optional}}{{/headerParams}} diff --git a/samples/client/petstore/ruby/lib/pet_api.rb b/samples/client/petstore/ruby/lib/pet_api.rb index 8df13153115..28e65cddaf1 100644 --- a/samples/client/petstore/ruby/lib/pet_api.rb +++ b/samples/client/petstore/ruby/lib/pet_api.rb @@ -35,13 +35,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [('application/json','application/xml',); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = ['application/json', 'application/xml', ] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -104,13 +103,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [('application/json','application/xml',); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = ['application/json', 'application/xml', ] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -173,13 +171,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -224,13 +221,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -276,13 +272,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -331,13 +326,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [('application/x-www-form-urlencoded',); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = ['application/x-www-form-urlencoded', ] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -385,13 +379,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' headers[:'api_key'] = api_key @@ -439,13 +432,12 @@ class PetApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [('multipart/form-data',); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = ['multipart/form-data', ] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' diff --git a/samples/client/petstore/ruby/lib/store_api.rb b/samples/client/petstore/ruby/lib/store_api.rb index f33ff754a83..5e66e64f4c5 100644 --- a/samples/client/petstore/ruby/lib/store_api.rb +++ b/samples/client/petstore/ruby/lib/store_api.rb @@ -33,13 +33,12 @@ class StoreApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -84,13 +83,12 @@ class StoreApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -155,13 +153,12 @@ class StoreApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -206,13 +203,12 @@ class StoreApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' diff --git a/samples/client/petstore/ruby/lib/user_api.rb b/samples/client/petstore/ruby/lib/user_api.rb index f882f94bd9b..d7b66049109 100644 --- a/samples/client/petstore/ruby/lib/user_api.rb +++ b/samples/client/petstore/ruby/lib/user_api.rb @@ -35,13 +35,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -104,13 +103,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -173,13 +171,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -244,13 +241,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -292,13 +288,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -342,13 +337,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -395,13 +389,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' @@ -465,13 +458,12 @@ class UserApi # header parameters headers = {} - _header_accept = 'application/json, application/xml'; - if (_header_accept != '') { - headerParams['Accept'] = _header_accept; - } - _header_content_type = [(); - headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'; - + _header_accept = 'application/json, application/xml' + if _header_accept != '' + headerParams['Accept'] = _header_accept + end + _header_content_type = [] + headerParams['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json' From d4ac668cd43c747203a6a71771a844affb666c89 Mon Sep 17 00:00:00 2001 From: geekerzp Date: Fri, 3 Apr 2015 18:04:05 +0800 Subject: [PATCH 3/4] Set default User-Agent for Python client. --- .../src/main/resources/python/swagger.mustache | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/python/swagger.mustache b/modules/swagger-codegen/src/main/resources/python/swagger.mustache index 693c9fa6296..d5e54666e01 100644 --- a/modules/swagger-codegen/src/main/resources/python/swagger.mustache +++ b/modules/swagger-codegen/src/main/resources/python/swagger.mustache @@ -34,6 +34,16 @@ class ApiClient(object): self.host = host self.cookie = None self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30)) + # Set default User-Agent. + self.user_agent = 'Python-Swagger' + + @property + def user_agent(self): + return self.defaultHeaders['User-Agent'] + + @user_agent.setter + def user_agent(self, value): + self.defaultHeaders['User-Agent'] = value def setDefaultHeader(self, headerName, headerValue): self.defaultHeaders[headerName] = headerValue From b4d4fa1a43292e6b841d8d919b689358add2a046 Mon Sep 17 00:00:00 2001 From: geekerzp Date: Fri, 3 Apr 2015 18:21:33 +0800 Subject: [PATCH 4/4] Update python sample code. --- samples/client/petstore/python/client/PetApi.py | 8 ++++---- samples/client/petstore/python/client/swagger.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/python/client/PetApi.py b/samples/client/petstore/python/client/PetApi.py index 519e2ea777b..729431a8110 100644 --- a/samples/client/petstore/python/client/PetApi.py +++ b/samples/client/petstore/python/client/PetApi.py @@ -63,7 +63,7 @@ class PetApi(object): bodyParam = None headerParams['Accept'] = 'application/json,application/xml' - headerParams['Content-Type'] = 'application/json,application/xml' + headerParams['Content-Type'] = 'application/json,application/xml,' @@ -119,7 +119,7 @@ class PetApi(object): bodyParam = None headerParams['Accept'] = 'application/json,application/xml' - headerParams['Content-Type'] = 'application/json,application/xml' + headerParams['Content-Type'] = 'application/json,application/xml,' @@ -370,7 +370,7 @@ class PetApi(object): bodyParam = None headerParams['Accept'] = 'application/json,application/xml' - headerParams['Content-Type'] = 'application/x-www-form-urlencoded' + headerParams['Content-Type'] = 'application/x-www-form-urlencoded,' @@ -506,7 +506,7 @@ class PetApi(object): bodyParam = None headerParams['Accept'] = 'application/json,application/xml' - headerParams['Content-Type'] = 'multipart/form-data' + headerParams['Content-Type'] = 'multipart/form-data,' diff --git a/samples/client/petstore/python/client/swagger.py b/samples/client/petstore/python/client/swagger.py index 693c9fa6296..d5e54666e01 100644 --- a/samples/client/petstore/python/client/swagger.py +++ b/samples/client/petstore/python/client/swagger.py @@ -34,6 +34,16 @@ class ApiClient(object): self.host = host self.cookie = None self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30)) + # Set default User-Agent. + self.user_agent = 'Python-Swagger' + + @property + def user_agent(self): + return self.defaultHeaders['User-Agent'] + + @user_agent.setter + def user_agent(self, value): + self.defaultHeaders['User-Agent'] = value def setDefaultHeader(self, headerName, headerValue): self.defaultHeaders[headerName] = headerValue