Skip to content

Commit f9cd91b

Browse files
committed
fixes default values
1 parent 275280f commit f9cd91b

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

swagger_py_codegen/jsonschema.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _process(self):
106106
yield Schema(build_data(self.swagger))
107107

108108

109-
def merge_default(schema, value):
109+
def merge_default(schema, value, get_first=True):
110110
# TODO: more types support
111111
type_defaults = {
112112
'integer': 9573,
@@ -116,7 +116,10 @@ def merge_default(schema, value):
116116
'boolean': False
117117
}
118118

119-
return normalize(schema, value, type_defaults)[0]
119+
results = normalize(schema, value, type_defaults)
120+
if get_first:
121+
return results[0]
122+
return results
120123

121124

122125
def build_default(schema):

swagger_py_codegen/templates/flask/validators.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class FlaskValidatorAdaptor(object):
6363
def validate(self, value):
6464
value = self.type_convert(value)
6565
errors = list(e.message for e in self.validator.iter_errors(value))
66-
return merge_default(self.validator.schema, value), errors
66+
return normalize(self.validator.schema, value)[0], errors
6767

6868

6969
def request_validate(view):
@@ -122,10 +122,10 @@ def response_filter(view):
122122
# return resp, status, headers
123123
abort(500, message='`%d` is not a defined status code.' % status)
124124

125-
resp, errors = normalize(schemas['schema'], resp)
125+
resp, errors = merge_default(schemas['schema'], resp, get_first=False)
126126
if schemas['headers']:
127-
headers, header_errors = normalize(
128-
{'properties': schemas['headers']}, headers)
127+
headers, header_errors = merge_default(
128+
{'properties': schemas['headers']}, headers, get_first=False)
129129
errors.extend(header_errors)
130130
if errors:
131131
abort(500, message='Expectation Failed', errors=errors)

0 commit comments

Comments
 (0)