loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Apply the singleton pattern to ApiClient

Browse Source 
- make the api_client a singleton
- remove it from the configuration namespace
This commit is contained in:
Dave Baird 2015-11-10 09:47:58 +01:00
parent c6cd88b281
commit 521b73b3ef
14 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/resources/perl/ApiClient.mustache
View File

@ -20,7 +20,9 @@ use Module::Runtime qw(use_module);
use WWW::{{moduleName}}::Configuration;
sub new
use base 'Class::Singleton';
sub _new_instance
{
my $class = shift;
my (%args) = (

2
modules/swagger-codegen/src/main/resources/perl/ApiFactory.mustache
View File

@ -65,7 +65,7 @@ my %_apis = map { $_ =~ /^WWW::{{moduleName}}::(.*)$/; $1 => $_ }
sub new {
my ($class, %p) = (shift, @_);
$p{api_client} = WWW::{{moduleName}}::ApiClient->new(%p);
$p{api_client} = WWW::{{moduleName}}::ApiClient->instance(%p);
return bless \%p, $class;
}

1
modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
View File

@ -10,7 +10,6 @@ use Carp;
use constant VERSION => '{{moduleVersion}}';
# class/static variables
our $api_client;
our $http_timeout = 180;
our $http_user_agent = 'Perl-Swagger';

3
modules/swagger-codegen/src/main/resources/perl/api.mustache
View File

@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO
sub new {
my $class = shift;
my $default_api_client = $WWW::{{moduleName}}::Configuration::api_client ? $WWW::{{moduleName}}::Configuration::api_client : WWW::{{moduleName}}::ApiClient->new;
my (%self) = (
'api_client' => $default_api_client,
'api_client' => WWW::{{moduleName}}::ApiClient->instance,
@_
);

2
samples/client/petstore/perl/README.md
View File

@ -10,7 +10,7 @@ WWW::SwaggerClient::ApiFactory for non-Moosey usage.
# SYNOPSIS
The Perl Swagger Codegen project builds a library of Perl modules to interact with
a web service defined by a Swagger specification. See below for how to built the
a web service defined by a Swagger specification. See below for how to build the
library.
This module provides an interface to the generated library. All the classes,

4
samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiClient.pm
View File

@ -20,7 +20,9 @@ use Module::Runtime qw(use_module);
use WWW::SwaggerClient::Configuration;
sub new
use base 'Class::Singleton';
sub _new_instance
{
my $class = shift;
my (%args) = (

2
samples/client/petstore/perl/lib/WWW/SwaggerClient/ApiFactory.pm
View File

@ -65,7 +65,7 @@ my %_apis = map { $_ =~ /^WWW::SwaggerClient::(.*)$/; $1 => $_ }
sub new {
my ($class, %p) = (shift, @_);
$p{api_client} = WWW::SwaggerClient::ApiClient->new(%p);
$p{api_client} = WWW::SwaggerClient::ApiClient->instance(%p);
return bless \%p, $class;
}

1
samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
View File

@ -10,7 +10,6 @@ use Carp;
use constant VERSION => '1.0.0';
# class/static variables
our $api_client;
our $http_timeout = 180;
our $http_user_agent = 'Perl-Swagger';

3
samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
View File

@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO
sub new {
my $class = shift;
my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new;
my (%self) = (
'api_client' => $default_api_client,
'api_client' => WWW::SwaggerClient::ApiClient->instance,
@_
);

3
samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
View File

@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO
sub new {
my $class = shift;
my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new;
my (%self) = (
'api_client' => $default_api_client,
'api_client' => WWW::SwaggerClient::ApiClient->instance,
@_
);

3
samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
View File

@ -38,9 +38,8 @@ __PACKAGE__->mk_classdata('class_documentation' => {}); # TODO
sub new {
my $class = shift;
my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client : WWW::SwaggerClient::ApiClient->new;
my (%self) = (
'api_client' => $default_api_client,
'api_client' => WWW::SwaggerClient::ApiClient->instance,
@_
);

10
samples/client/petstore/perl/t/01_pet_api.t
View File

@ -1,4 +1,4 @@
use Test::More tests => 37;
use Test::More tests => 38;
use Test::Exception;
use lib 'lib';
@ -11,12 +11,18 @@ use_ok('WWW::SwaggerClient::Object::Pet');
use_ok('WWW::SwaggerClient::Object::Tag');
use_ok('WWW::SwaggerClient::Object::Category');
my $api_client = WWW::SwaggerClient::ApiClient->new('base_url' => 'http://testing');
my $api_client = WWW::SwaggerClient::ApiClient->instance('base_url' => 'http://testing');
my $pet_api = WWW::SwaggerClient::PetApi->new('api_client' => $api_client);
is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base URL from api client';
my $api = WWW::SwaggerClient::PetApi->new();
is $api->{api_client}->{base_url}, 'http://testing', 'we still get the original base URL from api client, because it\'s a singleton';
# reset the base_url - no direct access because an application shouldn't be changing
# its base URL halfway through
$api->{api_client}->{base_url} = 'http://petstore.swagger.io/v2';
is $api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client';
# test select_header_content_type

2
samples/client/petstore/perl/t/02_store_api.t
View File

@ -15,7 +15,7 @@ use_ok('WWW::SwaggerClient::Object::Category');
use_ok('WWW::SwaggerClient::Object::User');
my $api_client = WWW::SwaggerClient::ApiClient->new();
my $api_client = WWW::SwaggerClient::ApiClient->instance();
my $store_api = WWW::SwaggerClient::StoreApi->new('api_client' => $api_client);
is $store_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client';

3
samples/client/petstore/perl/t/03_api_factory.t
View File

@ -15,6 +15,9 @@ is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base UR
$api_factory = WWW::SwaggerClient::ApiFactory->new;
$pet_api = $api_factory->get_api('Pet');
# reset the base_url - no direct access because an application shouldn't be changing
# its base URL halfway through
$pet_api->{api_client}->{base_url} = 'http://petstore.swagger.io/v2';
is $pet_api->{api_client}->{base_url}, 'http://petstore.swagger.io/v2', 'get the default base URL from api client';
# test accessor methods