Merge pull request #72 from zrq495/dont_modify_schema

Dont modify schema

Author: jizhouli

swagger_py_codegen/jsonschema.py

@@ -106,7 +106,7 @@ def _process(self):
         yield Schema(build_data(self.swagger))
 
 
-def merge_default(schema, value):
+def merge_default(schema, value, get_first=True):
     # TODO: more types support
     type_defaults = {
         'integer': 9573,
@@ -116,7 +116,10 @@ def merge_default(schema, value):
         'boolean': False
     }
 
-    return normalize(schema, value, type_defaults)[0]
+    results = normalize(schema, value, type_defaults)
+    if get_first:
+        return results[0]
+    return results
 
 
 def build_default(schema):
@@ -172,10 +175,6 @@ def _normalize_dict(schema, data):
         for key, _schema in schema.get('properties', {}).iteritems():
             # set default
             type_ = _schema.get('type', 'object')
-            if ('default' not in _schema
-                    and key in schema.get('required', [])
-                    and type_ in required_defaults):
-                _schema['default'] = required_defaults[type_]
 
             # get value
             value, has_key = data.get_check(key)
@@ -184,8 +183,11 @@ def _normalize_dict(schema, data):
             elif 'default' in _schema:
                 result[key] = _schema['default']
             elif key in schema.get('required', []):
-                errors.append(dict(name='property_missing',
-                                   message='`%s` is required' % key))
+                if type_ in required_defaults:
+                    result[key] = required_defaults[type_]
+                else:
+                    errors.append(dict(name='property_missing',
+                                       message='`%s` is required' % key))
 
         for _schema in schema.get('allOf', []):
             rs_component = _normalize(_schema, data)

swagger_py_codegen/templates/flask/validators.tpl

@@ -63,7 +63,7 @@ class FlaskValidatorAdaptor(object):
     def validate(self, value):
         value = self.type_convert(value)
         errors = list(e.message for e in self.validator.iter_errors(value))
-        return merge_default(self.validator.schema, value), errors
+        return normalize(self.validator.schema, value)[0], errors
 
 
 def request_validate(view):