forked from loafle/openapi-generator-original
Compare commits
4 Commits
master
...
t0mk-fix_v
Author | SHA1 | Date | |
---|---|---|---|
|
bfcc692689 | ||
|
d1f4f40fc8 | ||
|
e39d2cea9f | ||
|
aed041ac67 |
@ -43,10 +43,16 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
|
||||
{{^required}}
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
{{/required}}
|
||||
{{#isArray}}
|
||||
for i in v:
|
||||
if i not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}):
|
||||
raise ValueError("each list item must be one of ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
|
||||
{{/isArray}}
|
||||
{{^isArray}}
|
||||
if v not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}):
|
||||
raise ValueError("must validate the enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
|
||||
raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
|
||||
{{/isArray}}
|
||||
return v
|
||||
{{/isEnum}}
|
||||
{{/vars}}
|
||||
|
2
pom.xml
2
pom.xml
@ -1236,7 +1236,7 @@
|
||||
<module>samples/openapi3/client/petstore/typescript/builds/default</module>
|
||||
<module>samples/openapi3/client/petstore/typescript/tests/default</module>
|
||||
<module>samples/openapi3/client/petstore/typescript/builds/jquery</module>
|
||||
<module>samples/openapi3/client/petstore/typescript/tests/jquery</module>
|
||||
<!--<module>samples/openapi3/client/petstore/typescript/tests/jquery</module>-->
|
||||
<module>samples/openapi3/client/petstore/typescript/builds/object_params</module>
|
||||
<module>samples/openapi3/client/petstore/typescript/tests/object_params</module>
|
||||
<module>samples/openapi3/client/petstore/typescript/builds/inversify</module>
|
||||
|
@ -42,9 +42,9 @@ class DefaultValue(BaseModel):
|
||||
def array_string_enum_default_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('success', 'failure', 'unclassified'):
|
||||
raise ValueError("must validate the enum values ('success', 'failure', 'unclassified')")
|
||||
for i in v:
|
||||
if i not in ('success', 'failure', 'unclassified'):
|
||||
raise ValueError("each list item must be one of ('success', 'failure', 'unclassified')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -41,9 +41,8 @@ class Pet(BaseModel):
|
||||
def status_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('available', 'pending', 'sold'):
|
||||
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
|
||||
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -35,9 +35,9 @@ class Query(BaseModel):
|
||||
def outcomes_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('SUCCESS', 'FAILURE', 'SKIPPED'):
|
||||
raise ValueError("must validate the enum values ('SUCCESS', 'FAILURE', 'SKIPPED')")
|
||||
for i in v:
|
||||
if i not in ('SUCCESS', 'FAILURE', 'SKIPPED'):
|
||||
raise ValueError("each list item must be one of ('SUCCESS', 'FAILURE', 'SKIPPED')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -34,18 +34,17 @@ class EnumArrays(BaseModel):
|
||||
def just_symbol_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('>=', '$'):
|
||||
raise ValueError("must validate the enum values ('>=', '$')")
|
||||
raise ValueError("must be one of enum values ('>=', '$')")
|
||||
return v
|
||||
|
||||
@validator('array_enum')
|
||||
def array_enum_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('fish', 'crab'):
|
||||
raise ValueError("must validate the enum values ('fish', 'crab')")
|
||||
for i in v:
|
||||
if i not in ('fish', 'crab'):
|
||||
raise ValueError("each list item must be one of ('fish', 'crab')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -45,42 +45,38 @@ class EnumTest(BaseModel):
|
||||
def enum_string_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('UPPER', 'lower', ''):
|
||||
raise ValueError("must validate the enum values ('UPPER', 'lower', '')")
|
||||
raise ValueError("must be one of enum values ('UPPER', 'lower', '')")
|
||||
return v
|
||||
|
||||
@validator('enum_string_required')
|
||||
def enum_string_required_validate_enum(cls, v):
|
||||
if v not in ('UPPER', 'lower', ''):
|
||||
raise ValueError("must validate the enum values ('UPPER', 'lower', '')")
|
||||
raise ValueError("must be one of enum values ('UPPER', 'lower', '')")
|
||||
return v
|
||||
|
||||
@validator('enum_integer_default')
|
||||
def enum_integer_default_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in (1, 5, 14):
|
||||
raise ValueError("must validate the enum values (1, 5, 14)")
|
||||
raise ValueError("must be one of enum values (1, 5, 14)")
|
||||
return v
|
||||
|
||||
@validator('enum_integer')
|
||||
def enum_integer_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in (1, -1):
|
||||
raise ValueError("must validate the enum values (1, -1)")
|
||||
raise ValueError("must be one of enum values (1, -1)")
|
||||
return v
|
||||
|
||||
@validator('enum_number')
|
||||
def enum_number_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in (1.1, -1.2):
|
||||
raise ValueError("must validate the enum values (1.1, -1.2)")
|
||||
raise ValueError("must be one of enum values (1.1, -1.2)")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -36,9 +36,8 @@ class MapTest(BaseModel):
|
||||
def map_of_enum_string_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('UPPER', 'lower'):
|
||||
raise ValueError("must validate the enum values ('UPPER', 'lower')")
|
||||
raise ValueError("must be one of enum values ('UPPER', 'lower')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -38,9 +38,8 @@ class Order(BaseModel):
|
||||
def status_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('placed', 'approved', 'delivered'):
|
||||
raise ValueError("must validate the enum values ('placed', 'approved', 'delivered')")
|
||||
raise ValueError("must be one of enum values ('placed', 'approved', 'delivered')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -40,9 +40,8 @@ class Pet(BaseModel):
|
||||
def status_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('available', 'pending', 'sold'):
|
||||
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
|
||||
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -36,9 +36,8 @@ class SpecialName(BaseModel):
|
||||
def var_schema_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('available', 'pending', 'sold'):
|
||||
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
|
||||
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -235,4 +235,4 @@ class ModelTests(unittest.TestCase):
|
||||
self.pet.status = "error"
|
||||
self.assertTrue(False) # this line shouldn't execute
|
||||
except ValueError as e:
|
||||
self.assertTrue("must validate the enum values ('available', 'pending', 'sold')" in str(e))
|
||||
self.assertTrue("must be one of enum values ('available', 'pending', 'sold')" in str(e))
|
||||
|
@ -35,18 +35,17 @@ class EnumArrays(BaseModel):
|
||||
def just_symbol_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('>=', '$'):
|
||||
raise ValueError("must validate the enum values ('>=', '$')")
|
||||
raise ValueError("must be one of enum values ('>=', '$')")
|
||||
return v
|
||||
|
||||
@validator('array_enum')
|
||||
def array_enum_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('fish', 'crab'):
|
||||
raise ValueError("must validate the enum values ('fish', 'crab')")
|
||||
for i in v:
|
||||
if i not in ('fish', 'crab'):
|
||||
raise ValueError("each list item must be one of ('fish', 'crab')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -46,42 +46,38 @@ class EnumTest(BaseModel):
|
||||
def enum_string_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('UPPER', 'lower', ''):
|
||||
raise ValueError("must validate the enum values ('UPPER', 'lower', '')")
|
||||
raise ValueError("must be one of enum values ('UPPER', 'lower', '')")
|
||||
return v
|
||||
|
||||
@validator('enum_string_required')
|
||||
def enum_string_required_validate_enum(cls, v):
|
||||
if v not in ('UPPER', 'lower', ''):
|
||||
raise ValueError("must validate the enum values ('UPPER', 'lower', '')")
|
||||
raise ValueError("must be one of enum values ('UPPER', 'lower', '')")
|
||||
return v
|
||||
|
||||
@validator('enum_integer_default')
|
||||
def enum_integer_default_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in (1, 5, 14):
|
||||
raise ValueError("must validate the enum values (1, 5, 14)")
|
||||
raise ValueError("must be one of enum values (1, 5, 14)")
|
||||
return v
|
||||
|
||||
@validator('enum_integer')
|
||||
def enum_integer_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in (1, -1):
|
||||
raise ValueError("must validate the enum values (1, -1)")
|
||||
raise ValueError("must be one of enum values (1, -1)")
|
||||
return v
|
||||
|
||||
@validator('enum_number')
|
||||
def enum_number_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in (1.1, -1.2):
|
||||
raise ValueError("must validate the enum values (1.1, -1.2)")
|
||||
raise ValueError("must be one of enum values (1.1, -1.2)")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -37,9 +37,8 @@ class MapTest(BaseModel):
|
||||
def map_of_enum_string_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('UPPER', 'lower'):
|
||||
raise ValueError("must validate the enum values ('UPPER', 'lower')")
|
||||
raise ValueError("must be one of enum values ('UPPER', 'lower')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -39,9 +39,8 @@ class Order(BaseModel):
|
||||
def status_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('placed', 'approved', 'delivered'):
|
||||
raise ValueError("must validate the enum values ('placed', 'approved', 'delivered')")
|
||||
raise ValueError("must be one of enum values ('placed', 'approved', 'delivered')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -41,9 +41,8 @@ class Pet(BaseModel):
|
||||
def status_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('available', 'pending', 'sold'):
|
||||
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
|
||||
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -37,9 +37,8 @@ class SpecialName(BaseModel):
|
||||
def var_schema_validate_enum(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
|
||||
if v not in ('available', 'pending', 'sold'):
|
||||
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
|
||||
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
|
||||
return v
|
||||
|
||||
class Config:
|
||||
|
@ -319,7 +319,7 @@ class ModelTests(unittest.TestCase):
|
||||
self.pet.status = "error"
|
||||
self.assertTrue(False) # this line shouldn't execute
|
||||
except ValueError as e:
|
||||
self.assertTrue("must validate the enum values ('available', 'pending', 'sold')" in str(e))
|
||||
self.assertTrue("must be one of enum values ('available', 'pending', 'sold')" in str(e))
|
||||
|
||||
def test_object_id(self):
|
||||
pet_ap = petstore_api.Pet(name="test name", photo_urls=["string"])
|
||||
|
Loading…
x
Reference in New Issue
Block a user