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

add methods to validate the ruby object

Browse Source
This commit is contained in:
wing328 2016-04-25 19:18:05 +08:00
parent 3c36f1df37
commit e17a620506
18 changed files with 439 additions and 28 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/CodegenProperty.java
View File

@ -42,7 +42,7 @@ public class CodegenProperty {
public Map<String, Object> allowableValues;
public CodegenProperty items;
public Map<String, Object> vendorExtensions;
public Boolean needValidation; // true if pattern, maximum, etc are set (only used in the mustache template)
public Boolean hasValidation; // true if pattern, maximum, etc are set (only used in the mustache template)
@Override
public int hashCode()

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -1106,7 +1106,7 @@ public class DefaultCodegen {
// check if any validation rule defined
if (property.minimum != null || property.maximum != null || property.exclusiveMinimum != null || property.exclusiveMaximum != null)
property.needValidation = true;
property.hasValidation = true;
// legacy support
Map<String, Object> allowableValues = new HashMap<String, Object>();
@ -1129,7 +1129,7 @@ public class DefaultCodegen {
// check if any validation rule defined
if (property.pattern != null || property.minLength != null || property.maxLength != null)
property.needValidation = true;
property.hasValidation = true;
property.isString = true;
if (sp.getEnum() != null) {

117
modules/swagger-codegen/src/main/resources/ruby/model.mustache
View File

@ -39,12 +39,109 @@ module {{moduleName}}{{#models}}{{#model}}{{#description}}
{{#vars}}
if attributes[:'{{{baseName}}}']
{{#isContainer}}if (value = attributes[:'{{{baseName}}}']).is_a?(Array)
{{#isContainer}}
if (value = attributes[:'{{{baseName}}}']).is_a?(Array)
self.{{{name}}} = value
end{{/isContainer}}{{^isContainer}}self.{{{name}}} = attributes[:'{{{baseName}}}']{{/isContainer}}{{#defaultValue}}
end
{{/isContainer}}
{{^isContainer}}
self.{{{name}}} = attributes[:'{{{baseName}}}']
{{/isContainer}}
{{#defaultValue}}
else
self.{{{name}}} = {{{defaultValue}}}{{/defaultValue}}
self.{{{name}}} = {{{defaultValue}}}
{{/defaultValue}}
end
{{/vars}}
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
{{#isEnum}}
allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
if {{{name}}} && !allowed_values.include?({{{name}}})
invalid_properties.push("invalid value for '{{{name}}}', must be one of #{allowed_values}.")
end
{{/isEnum}}
{{#hasValidation}}
if {{{name}}}.nil?
fail ArgumentError, "{{{name}}} cannot be nil"
end
{{#minLength}}
if {{{name}}}.to_s.length > {{{maxLength}}}
invalid_properties.push("invalid value for '{{{name}}}', the character length must be smaller than or equal to {{{maxLength}}}.")
end
{{/minLength}}
{{#maxLength}}
if {{{name}}}.to_s.length < {{{minLength}}}
invalid_properties.push("invalid value for '{{{name}}}', the character length must be great than or equal to {{{minLength}}}.")
end
{{/maxLength}}
{{#maximum}}
if {{{name}}} > {{{maximum}}}
invalid_properties.push("invalid value for '{{{name}}}', must be smaller than or equal to {{{maximum}}}.")
end
{{/maximum}}
{{#minimum}}
if {{{name}}} < {{{minimum}}}
invalid_properties.push("invalid value for '{{{name}}}', must be greater than or equal to {{{minimum}}}.")
end
{{/minimum}}
{{/hasValidation}}
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
{{#vars}}
{{#required}}
if @{{{name}}}.nil?
return false
end
{{/required}}
{{#isEnum}}
allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
if {{{name}}} && !allowed_values.include?({{{name}}})
return false
end
{{/isEnum}}
{{#hasValidation}}
{{#minLength}}
if {{{name}}}.to_s.length > {{{maxLength}}}
return false
end
{{/minLength}}
{{#maxLength}}
if {{{name}}}.to_s.length < {{{minLength}}}
return false
end
{{/maxLength}}
{{#maximum}}
if {{{name}}} > {{{maximum}}}
return false
end
{{/maximum}}
{{#minimum}}
if {{{name}}} < {{{minimum}}}
return false
end
{{/minimum}}
{{/hasValidation}}
{{/vars}}
end
@ -55,14 +152,14 @@ module {{moduleName}}{{#models}}{{#model}}{{#description}}
def {{{name}}}=({{{name}}})
allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
if {{{name}}} && !allowed_values.include?({{{name}}})
fail ArgumentError, "invalid value for '{{{name}}}', must be one of #{allowed_values}"
fail ArgumentError, "invalid value for '{{{name}}}', must be one of #{allowed_values}."
end
@{{{name}}} = {{{name}}}
end
{{/isEnum}}
{{^isEnum}}
{{#needValidation}}
{{#hasValidation}}
# Custom attribute writer method with validation
# @param [Object] {{{name}}} Value to be assigned
def {{{name}}}=({{{name}}})
@ -72,32 +169,32 @@ module {{moduleName}}{{#models}}{{#model}}{{#description}}
{{#minLength}}
if {{{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}}}."
end
{{/minLength}}
{{#maxLength}}
if {{{name}}}.to_s.length < {{{minLength}}}
fail ArgumentError, "invalid value for '{{{name}}}', the character length must be great than or equal to {{{minLength}}}"
fail ArgumentError, "invalid value for '{{{name}}}', the character length must be great than or equal to {{{minLength}}}."
end
{{/maxLength}}
{{#maximum}}
if {{{name}}} > {{{maximum}}}
fail ArgumentError, "invalid value for '{{{name}}}', must be smaller than or equal to {{{maximum}}}"
fail ArgumentError, "invalid value for '{{{name}}}', must be smaller than or equal to {{{maximum}}}."
end
{{/maximum}}
{{#minimum}}
if {{{name}}} < {{{minimum}}}
fail ArgumentError, "invalid value for '{{{name}}}', must be greater than or equal to {{{minimum}}}"
fail ArgumentError, "invalid value for '{{{name}}}', must be greater than or equal to {{{minimum}}}."
end
{{/minimum}}
@{{{name}}} = {{{name}}}
end
{{/needValidation}}
{{/hasValidation}}
{{/isEnum}}
{{/vars}}
# Checks equality by comparing each attribute.

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

@ -8,7 +8,7 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/
- API version: 1.0.0
- Package version: 1.0.0
- Build date: 2016-04-25T17:38:59.414+08:00
- Build date: 2016-04-25T19:16:37.992+08:00
- Build package: class io.swagger.codegen.languages.RubyClientCodegen
## Installation

17
samples/client/petstore/ruby/lib/petstore/models/animal.rb
View File

@ -45,6 +45,23 @@ module Petstore
if attributes[:'className']
self.class_name = attributes[:'className']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
if @class_name.nil?
return false
end
end
# Checks equality by comparing each attribute.

15
samples/client/petstore/ruby/lib/petstore/models/api_response.rb
View File

@ -53,12 +53,27 @@ module Petstore
if attributes[:'code']
self.code = attributes[:'code']
end
if attributes[:'type']
self.type = attributes[:'type']
end
if attributes[:'message']
self.message = attributes[:'message']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.

18
samples/client/petstore/ruby/lib/petstore/models/cat.rb
View File

@ -49,9 +49,27 @@ module Petstore
if attributes[:'className']
self.class_name = attributes[:'className']
end
if attributes[:'declawed']
self.declawed = attributes[:'declawed']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
if @class_name.nil?
return false
end
end
# Checks equality by comparing each attribute.

14
samples/client/petstore/ruby/lib/petstore/models/category.rb
View File

@ -49,9 +49,23 @@ module Petstore
if attributes[:'id']
self.id = attributes[:'id']
end
if attributes[:'name']
self.name = attributes[:'name']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.

18
samples/client/petstore/ruby/lib/petstore/models/dog.rb
View File

@ -49,9 +49,27 @@ module Petstore
if attributes[:'className']
self.class_name = attributes[:'className']
end
if attributes[:'breed']
self.breed = attributes[:'breed']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
if @class_name.nil?
return false
end
end
# Checks equality by comparing each attribute.

112
samples/client/petstore/ruby/lib/petstore/models/format_test.rb
View File

@ -89,39 +89,127 @@ module Petstore
if attributes[:'integer']
self.integer = attributes[:'integer']
end
if attributes[:'int32']
self.int32 = attributes[:'int32']
end
if attributes[:'int64']
self.int64 = attributes[:'int64']
end
if attributes[:'number']
self.number = attributes[:'number']
end
if attributes[:'float']
self.float = attributes[:'float']
end
if attributes[:'double']
self.double = attributes[:'double']
end
if attributes[:'string']
self.string = attributes[:'string']
end
if attributes[:'byte']
self.byte = attributes[:'byte']
end
if attributes[:'binary']
self.binary = attributes[:'binary']
end
if attributes[:'date']
self.date = attributes[:'date']
end
if attributes[:'dateTime']
self.date_time = attributes[:'dateTime']
end
if attributes[:'password']
self.password = attributes[:'password']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
if integer > 100.0
return false
end
if integer < 10.0
return false
end
if int32 > 200.0
return false
end
if int32 < 20.0
return false
end
if @number.nil?
return false
end
if number > 543.2
return false
end
if number < 32.1
return false
end
if float > 987.6
return false
end
if float < 54.3
return false
end
if double > 123.4
return false
end
if double < 67.8
return false
end
if @byte.nil?
return false
end
if @date.nil?
return false
end
if @password.nil?
return false
end
if password.to_s.length > 64
return false
end
if password.to_s.length < 10
return false
end
end
# Custom attribute writer method with validation
@ -132,11 +220,11 @@ module Petstore
end
if integer > 100.0
fail ArgumentError, "invalid value for 'integer', must be smaller than or equal to 100.0"
fail ArgumentError, "invalid value for 'integer', must be smaller than or equal to 100.0."
end
if integer < 10.0
fail ArgumentError, "invalid value for 'integer', must be greater than or equal to 10.0"
fail ArgumentError, "invalid value for 'integer', must be greater than or equal to 10.0."
end
@integer = integer
@ -150,11 +238,11 @@ module Petstore
end
if int32 > 200.0
fail ArgumentError, "invalid value for 'int32', must be smaller than or equal to 200.0"
fail ArgumentError, "invalid value for 'int32', must be smaller than or equal to 200.0."
end
if int32 < 20.0
fail ArgumentError, "invalid value for 'int32', must be greater than or equal to 20.0"
fail ArgumentError, "invalid value for 'int32', must be greater than or equal to 20.0."
end
@int32 = int32
@ -168,11 +256,11 @@ module Petstore
end
if number > 543.2
fail ArgumentError, "invalid value for 'number', must be smaller than or equal to 543.2"
fail ArgumentError, "invalid value for 'number', must be smaller than or equal to 543.2."
end
if number < 32.1
fail ArgumentError, "invalid value for 'number', must be greater than or equal to 32.1"
fail ArgumentError, "invalid value for 'number', must be greater than or equal to 32.1."
end
@number = number
@ -186,11 +274,11 @@ module Petstore
end
if float > 987.6
fail ArgumentError, "invalid value for 'float', must be smaller than or equal to 987.6"
fail ArgumentError, "invalid value for 'float', must be smaller than or equal to 987.6."
end
if float < 54.3
fail ArgumentError, "invalid value for 'float', must be greater than or equal to 54.3"
fail ArgumentError, "invalid value for 'float', must be greater than or equal to 54.3."
end
@float = float
@ -204,11 +292,11 @@ module Petstore
end
if double > 123.4
fail ArgumentError, "invalid value for 'double', must be smaller than or equal to 123.4"
fail ArgumentError, "invalid value for 'double', must be smaller than or equal to 123.4."
end
if double < 67.8
fail ArgumentError, "invalid value for 'double', must be greater than or equal to 67.8"
fail ArgumentError, "invalid value for 'double', must be greater than or equal to 67.8."
end
@double = double
@ -232,11 +320,11 @@ module Petstore
end
if password.to_s.length > 64
fail ArgumentError, "invalid value for 'password', the character length must be smaller than or equal to 64"
fail ArgumentError, "invalid value for 'password', the character length must be smaller than or equal to 64."
end
if password.to_s.length < 10
fail ArgumentError, "invalid value for 'password', the character length must be great than or equal to 10"
fail ArgumentError, "invalid value for 'password', the character length must be great than or equal to 10."
end
@password = password

13
samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
View File

@ -46,6 +46,19 @@ module Petstore
if attributes[:'name']
self.name = attributes[:'name']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.

13
samples/client/petstore/ruby/lib/petstore/models/model_return.rb
View File

@ -46,6 +46,19 @@ module Petstore
if attributes[:'return']
self._return = attributes[:'return']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.

19
samples/client/petstore/ruby/lib/petstore/models/name.rb
View File

@ -54,12 +54,31 @@ module Petstore
if attributes[:'name']
self.name = attributes[:'name']
end
if attributes[:'snake_case']
self.snake_case = attributes[:'snake_case']
end
if attributes[:'property']
self.property = attributes[:'property']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
if @name.nil?
return false
end
end
# Checks equality by comparing each attribute.

24
samples/client/petstore/ruby/lib/petstore/models/order.rb
View File

@ -66,23 +66,45 @@ module Petstore
if attributes[:'id']
self.id = attributes[:'id']
end
if attributes[:'petId']
self.pet_id = attributes[:'petId']
end
if attributes[:'quantity']
self.quantity = attributes[:'quantity']
end
if attributes[:'shipDate']
self.ship_date = attributes[:'shipDate']
end
if attributes[:'status']
self.status = attributes[:'status']
end
if attributes[:'complete']
self.complete = attributes[:'complete']
else
self.complete = false
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
allowed_values = ["placed", "approved", "delivered"]
if status && !allowed_values.include?(status)
return false
end
end
# Custom attribute writer method checking allowed values (enum).
@ -90,7 +112,7 @@ module Petstore
def status=(status)
allowed_values = ["placed", "approved", "delivered"]
if status && !allowed_values.include?(status)
fail ArgumentError, "invalid value for 'status', must be one of #{allowed_values}"
fail ArgumentError, "invalid value for 'status', must be one of #{allowed_values}."
end
@status = status
end

32
samples/client/petstore/ruby/lib/petstore/models/pet.rb
View File

@ -66,25 +66,55 @@ module Petstore
if attributes[:'id']
self.id = attributes[:'id']
end
if attributes[:'category']
self.category = attributes[:'category']
end
if attributes[:'name']
self.name = attributes[:'name']
end
if attributes[:'photoUrls']
if (value = attributes[:'photoUrls']).is_a?(Array)
self.photo_urls = value
end
end
if attributes[:'tags']
if (value = attributes[:'tags']).is_a?(Array)
self.tags = value
end
end
if attributes[:'status']
self.status = attributes[:'status']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
if @name.nil?
return false
end
if @photo_urls.nil?
return false
end
allowed_values = ["available", "pending", "sold"]
if status && !allowed_values.include?(status)
return false
end
end
# Custom attribute writer method checking allowed values (enum).
@ -92,7 +122,7 @@ module Petstore
def status=(status)
allowed_values = ["available", "pending", "sold"]
if status && !allowed_values.include?(status)
fail ArgumentError, "invalid value for 'status', must be one of #{allowed_values}"
fail ArgumentError, "invalid value for 'status', must be one of #{allowed_values}."
end
@status = status
end

13
samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
View File

@ -45,6 +45,19 @@ module Petstore
if attributes[:'$special[property.name]']
self.special_property_name = attributes[:'$special[property.name]']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.

14
samples/client/petstore/ruby/lib/petstore/models/tag.rb
View File

@ -49,9 +49,23 @@ module Petstore
if attributes[:'id']
self.id = attributes[:'id']
end
if attributes[:'name']
self.name = attributes[:'name']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.

20
samples/client/petstore/ruby/lib/petstore/models/user.rb
View File

@ -74,27 +74,47 @@ module Petstore
if attributes[:'id']
self.id = attributes[:'id']
end
if attributes[:'username']
self.username = attributes[:'username']
end
if attributes[:'firstName']
self.first_name = attributes[:'firstName']
end
if attributes[:'lastName']
self.last_name = attributes[:'lastName']
end
if attributes[:'email']
self.email = attributes[:'email']
end
if attributes[:'password']
self.password = attributes[:'password']
end
if attributes[:'phone']
self.phone = attributes[:'phone']
end
if attributes[:'userStatus']
self.user_status = attributes[:'userStatus']
end
end
# Show invalid properties with the reasons. Usually used together with valid?
# @return Array for valid properies with the reasons
def list_invalid_properties
invalid_properties = Array.new
return invalid_properties
end
# Check to see if the all the properties in the model are valid
# @return true if the model is valid
def valid?
end
# Checks equality by comparing each attribute.