From abbea5ec4c1d53884d31e027496138fd3fe393ed Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 18 May 2015 16:23:46 +0800 Subject: [PATCH 1/2] better logic for accept and content-type, added test cases --- .../main/resources/perl/APIClient.mustache | 35 ++++++++ .../src/main/resources/perl/api.mustache | 10 ++- .../perl/lib/WWW/SwaggerClient/APIClient.pm | 35 ++++++++ .../perl/lib/WWW/SwaggerClient/PetApi.pm | 80 +++++++++++-------- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 40 ++++++---- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 80 +++++++++++-------- samples/client/petstore/perl/t/01_pet_api.t | 12 ++- 7 files changed, 207 insertions(+), 85 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache b/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache index b0c3c9b5d39..19079a07922 100644 --- a/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache @@ -253,4 +253,39 @@ sub deserialize } +# return 'Accept' based on an array of accept provided +# @param [Array] header_accept_array Array fo 'Accept' +# @return String Accept (e.g. application/json) +sub select_header_accept +{ + my ($self, @header) = @_; + + if (@header == 0 || (@header == 1 && $header[0] eq '')) { + return undef; + } elsif (grep(/^application\/json$/i, @header)) { + return 'application/json'; + } else { + return join(',', @header); + } + +} + +# return the content type based on an array of content-type provided +# @param [Array] content_type_array Array fo content-type +# @return String Content-Type (e.g. application/json) +sub select_header_content_type +{ + my ($self, @header) = @_; + + if (@header == 0 || (@header == 1 && $header[0] eq '')) { + return 'application/json'; # default to application/json + } elsif (grep(/^application\/json$/i, @header)) { + return 'application/json'; + } else { + return join(',', @header); + } + +} + + 1; diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index 7b7d9d98a4e..c88364ff7d7 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -85,12 +85,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept({{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = ({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = ({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}); {{#queryParams}} # query params if ( exists $args{'{{paramName}}'}) { diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm index 6d0ecc44dc6..0f0fea793e3 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm @@ -253,4 +253,39 @@ sub deserialize } +# return 'Accept' based on an array of accept provided +# @param [Array] header_accept_array Array fo 'Accept' +# @return String Accept (e.g. application/json) +sub select_header_accept +{ + my ($self, @header) = @_; + + if (@header == 0 || (@header == 1 && $header[0] eq '')) { + return undef; + } elsif (grep(/^application\/json$/i, @header)) { + return 'application/json'; + } else { + return join(',', @header); + } + +} + +# return the content type based on an array of content-type provided +# @param [Array] content_type_array Array fo content-type +# @return String Content-Type (e.g. application/json) +sub select_header_content_type +{ + my ($self, @header) = @_; + + if (@header == 0 || (@header == 1 && $header[0] eq '')) { + return 'application/json'; # default to application/json + } elsif (grep(/^application\/json$/i, @header)) { + return 'application/json'; + } else { + return join(',', @header); + } + +} + + 1; diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 930bd52102b..7ee7dfce874 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -86,12 +86,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = ('application/json','application/xml',); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = ('application/json','application/xml',); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml', ); @@ -137,12 +139,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = ('application/json','application/xml',); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = ('application/json','application/xml',); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml', ); @@ -188,12 +192,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # query params if ( exists $args{'status'}) { @@ -242,12 +248,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # query params if ( exists $args{'tags'}) { @@ -301,12 +309,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -364,12 +374,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = ('application/x-www-form-urlencoded',); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = ('application/x-www-form-urlencoded',); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/x-www-form-urlencoded', ); @@ -433,12 +445,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # header params @@ -496,12 +510,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = ('multipart/form-data',); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = ('multipart/form-data',); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('multipart/form-data', ); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index bb361d05a43..0d7a2ca7c37 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -81,12 +81,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -132,12 +134,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -191,12 +195,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -252,12 +258,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index d3869b62555..59a71bdd1ee 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -86,12 +86,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -137,12 +139,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -188,12 +192,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -240,12 +246,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # query params if ( exists $args{'username'}) { @@ -296,12 +304,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -349,12 +359,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -411,12 +423,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -472,12 +486,14 @@ sub new { my $header_params = {}; my $form_params = {}; - my $_header_accept = 'application/json, application/xml'; - if ($_header_accept ne '') { + # 'Accept' and 'Content-Type' header + my $_header_accept = $self->{api_client}->select_header_accept('application/json', 'application/xml'); + if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - my @_header_content_type = (); - $header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + #my @_header_content_type = (); + #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; + $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t index 02a10544c57..7855254e657 100644 --- a/samples/client/petstore/perl/t/01_pet_api.t +++ b/samples/client/petstore/perl/t/01_pet_api.t @@ -1,4 +1,4 @@ -use Test::More tests => 25; +use Test::More tests => 31; use Test::Exception; use lib 'lib'; @@ -12,6 +12,16 @@ use_ok('WWW::SwaggerClient::Object::Tag'); use_ok('WWW::SwaggerClient::Object::Category'); my $api = WWW::SwaggerClient::PetApi->new(); +# test select_header_content_type +is $api->{api_client}->select_header_content_type('application/xml', 'Application/JSON'), 'application/json', 'get the proper content type application/json but not application/xml'; +is $api->{api_client}->select_header_content_type('application/xml'), 'application/xml', 'get the proper content type application/json'; +is $api->{api_client}->select_header_content_type(''), 'application/json', 'get the proper content type application/json (default)'; + +# test select_header_accept +is $api->{api_client}->select_header_accept('application/xml', 'Application/JSON'), 'application/json', 'get the proper accept application/json but not application/xml'; +is $api->{api_client}->select_header_content_type('application/xml'), 'application/xml', 'get the proper accept application/json'; +is $api->{api_client}->select_header_accept(''), undef, 'get the proper accept "undef" (default)'; + my $pet_id = 10008; my $category = WWW::SwaggerClient::Object::Category->new('id' => '22', 'name' => 'perl'); From 7fc2f7485103eccb11bf7ddf3fe449f12b5870ea Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 18 May 2015 16:39:33 +0800 Subject: [PATCH 2/2] remove commented code --- .../src/main/resources/perl/api.mustache | 2 -- .../perl/lib/WWW/SwaggerClient/PetApi.pm | 16 ---------------- .../perl/lib/WWW/SwaggerClient/StoreApi.pm | 8 -------- .../perl/lib/WWW/SwaggerClient/UserApi.pm | 16 ---------------- 4 files changed, 42 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache index c88364ff7d7..131eb3a3934 100644 --- a/modules/swagger-codegen/src/main/resources/perl/api.mustache +++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache @@ -90,8 +90,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = ({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}}); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type({{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}); {{#queryParams}} # query params diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm index 7ee7dfce874..57237a96974 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm @@ -91,8 +91,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = ('application/json','application/xml',); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml', ); @@ -144,8 +142,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = ('application/json','application/xml',); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json', 'application/xml', ); @@ -197,8 +193,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # query params @@ -253,8 +247,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # query params @@ -314,8 +306,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -379,8 +369,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = ('application/x-www-form-urlencoded',); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/x-www-form-urlencoded', ); @@ -450,8 +438,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -515,8 +501,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = ('multipart/form-data',); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('multipart/form-data', ); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm index 0d7a2ca7c37..d4261c6bbec 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm @@ -86,8 +86,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -139,8 +137,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -200,8 +196,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -263,8 +257,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm index 59a71bdd1ee..2e5889ba39e 100644 --- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm +++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm @@ -91,8 +91,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -144,8 +142,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -197,8 +193,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -251,8 +245,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); # query params @@ -309,8 +301,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -364,8 +354,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -428,8 +416,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type(); @@ -491,8 +477,6 @@ sub new { if ($_header_accept) { $header_params->{'Accept'} = $_header_accept; } - #my @_header_content_type = (); - #$header_params->{'Content-Type'} = scalar(@_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type();