loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-07 08:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2169 from xhh/ruby-nested-model-ref

Browse Source 
[Ruby] Fix class name reference of nested model
This commit is contained in:
wing328 2016-02-19 11:29:58 +08:00
commit 84b4af7bfb
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java
View File

@ -316,7 +316,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
if (type == null) { if (type == null) {
return null; return null;
} }
return type; return toModelName(type);
} }
@Override @Override

4
samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
View File

@ -298,7 +298,7 @@ module Petstore
# http body (model) # http body (model)
post_body = nil post_body = nil
auth_names = ['api_key', 'petstore_auth'] auth_names = ['petstore_auth', 'api_key']
data, status_code, headers = @api_client.call_api(:GET, path, data, status_code, headers = @api_client.call_api(:GET, path,
:header_params => header_params, :header_params => header_params,
:query_params => query_params, :query_params => query_params,
@ -550,7 +550,7 @@ module Petstore
# http body (model) # http body (model)
post_body = nil post_body = nil
auth_names = ['api_key', 'petstore_auth'] auth_names = ['petstore_auth', 'api_key']
data, status_code, headers = @api_client.call_api(:GET, path, data, status_code, headers = @api_client.call_api(:GET, path,
:header_params => header_params, :header_params => header_params,
:query_params => query_params, :query_params => query_params,

2
samples/client/petstore/ruby/lib/petstore/api/store_api.rb
View File

@ -182,7 +182,7 @@ module Petstore
# http body (model) # http body (model)
post_body = nil post_body = nil
auth_names = ['test_api_key_header', 'test_api_key_query'] auth_names = ['test_api_key_query', 'test_api_key_header']
data, status_code, headers = @api_client.call_api(:GET, path, data, status_code, headers = @api_client.call_api(:GET, path,
:header_params => header_params, :header_params => header_params,
:query_params => query_params, :query_params => query_params,

44
samples/client/petstore/ruby/lib/petstore/configuration.rb
View File

@ -157,26 +157,12 @@ module Petstore
# Returns Auth Settings hash for api client. # Returns Auth Settings hash for api client.
def auth_settings def auth_settings
{ {
'test_api_key_header' => 'petstore_auth' =>
{ {
type: 'api_key', type: 'oauth2',
in: 'header', in: 'header',
key: 'test_api_key_header', key: 'Authorization',
value: api_key_with_prefix('test_api_key_header') value: "Bearer #{access_token}"
},
'api_key' =>
{
type: 'api_key',
in: 'header',
key: 'api_key',
value: api_key_with_prefix('api_key')
},
'test_api_client_secret' =>
{
type: 'api_key',
in: 'header',
key: 'x-test_api_client_secret',
value: api_key_with_prefix('x-test_api_client_secret')
}, },
'test_api_client_id' => 'test_api_client_id' =>
{ {
@ -185,6 +171,20 @@ module Petstore
key: 'x-test_api_client_id', key: 'x-test_api_client_id',
value: api_key_with_prefix('x-test_api_client_id') value: api_key_with_prefix('x-test_api_client_id')
}, },
'test_api_client_secret' =>
{
type: 'api_key',
in: 'header',
key: 'x-test_api_client_secret',
value: api_key_with_prefix('x-test_api_client_secret')
},
'api_key' =>
{
type: 'api_key',
in: 'header',
key: 'api_key',
value: api_key_with_prefix('api_key')
},
'test_api_key_query' => 'test_api_key_query' =>
{ {
type: 'api_key', type: 'api_key',
@ -192,12 +192,12 @@ module Petstore
key: 'test_api_key_query', key: 'test_api_key_query',
value: api_key_with_prefix('test_api_key_query') value: api_key_with_prefix('test_api_key_query')
}, },
'petstore_auth' => 'test_api_key_header' =>
{ {
type: 'oauth2', type: 'api_key',
in: 'header', in: 'header',
key: 'Authorization', key: 'test_api_key_header',
value: "Bearer #{access_token}" value: api_key_with_prefix('test_api_key_header')
}, },
} }
end end