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

add nullable to Ruby client (#1059)

Browse Source
This commit is contained in:
William Cheng 2018-09-20 19:31:47 +08:00 committed by GitHub
parent cc6efe01c7
commit 29e9f5bda0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/ruby-client/api.mustache
View File

@ -43,6 +43,7 @@ module {{moduleName}}
@api_client.config.logger.debug 'Calling API: {{classname}}.{{operationId}} ...' @api_client.config.logger.debug 'Calling API: {{classname}}.{{operationId}} ...'
end end
{{#allParams}} {{#allParams}}
{{^isNullable}}
{{#required}} {{#required}}
# verify the required parameter '{{paramName}}' is set # verify the required parameter '{{paramName}}' is set
if @api_client.config.client_side_validation && {{{paramName}}}.nil? if @api_client.config.client_side_validation && {{{paramName}}}.nil?
@ -57,6 +58,7 @@ module {{moduleName}}
{{/isContainer}} {{/isContainer}}
{{/isEnum}} {{/isEnum}}
{{/required}} {{/required}}
{{/isNullable}}
{{^required}} {{^required}}
{{#isEnum}} {{#isEnum}}
{{#collectionFormat}} {{#collectionFormat}}

6
modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache
View File

@ -87,12 +87,14 @@
def list_invalid_properties def list_invalid_properties
invalid_properties = Array.new invalid_properties = Array.new
{{#vars}} {{#vars}}
{{^isNullable}}
{{#required}} {{#required}}
if @{{{name}}}.nil? if @{{{name}}}.nil?
invalid_properties.push('invalid value for "{{{name}}}", {{{name}}} cannot be nil.') invalid_properties.push('invalid value for "{{{name}}}", {{{name}}} cannot be nil.')
end end
{{/required}} {{/required}}
{{/isNullable}}
{{#hasValidation}} {{#hasValidation}}
{{#maxLength}} {{#maxLength}}
if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}}.to_s.length > {{{maxLength}}} if {{^required}}!@{{{name}}}.nil? && {{/required}}@{{{name}}}.to_s.length > {{{maxLength}}}
@ -145,9 +147,11 @@
# @return true if the model is valid # @return true if the model is valid
def valid? def valid?
{{#vars}} {{#vars}}
{{^isNullable}}
{{#required}} {{#required}}
return false if @{{{name}}}.nil? return false if @{{{name}}}.nil?
{{/required}} {{/required}}
{{/isNullable}}
{{#isEnum}} {{#isEnum}}
{{^isContainer}} {{^isContainer}}
{{{name}}}_validator = EnumAttributeValidator.new('{{{dataType}}}', [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]) {{{name}}}_validator = EnumAttributeValidator.new('{{{dataType}}}', [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
@ -201,12 +205,14 @@
# Custom attribute writer method with validation # Custom attribute writer method with validation
# @param [Object] {{{name}}} Value to be assigned # @param [Object] {{{name}}} Value to be assigned
def {{{name}}}=({{{name}}}) def {{{name}}}=({{{name}}})
{{^isNullable}}
{{#required}} {{#required}}
if {{{name}}}.nil? if {{{name}}}.nil?
fail ArgumentError, '{{{name}}} cannot be nil' fail ArgumentError, '{{{name}}} cannot be nil'
end end
{{/required}} {{/required}}
{{/isNullable}}
{{#maxLength}} {{#maxLength}}
if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}}.to_s.length > {{{maxLength}}} if {{^required}}!{{{name}}}.nil? && {{/required}}{{{name}}}.to_s.length > {{{maxLength}}}
fail ArgumentError, 'invalid value for "{{{name}}}", the character length must be smaller than or equal to {{{maxLength}}}.' fail ArgumentError, 'invalid value for "{{{name}}}", the character length must be smaller than or equal to {{{maxLength}}}.'