Merge pull request #349 from p1c2u/refactor/unmarshalling-refactor

Unmarshalling refactor

Author: p1c2u

openapi_core/unmarshalling/schemas/factories.py

@@ -51,27 +51,25 @@ def create(self, schema, type_override=None):
             warnings.warn("The schema is deprecated", DeprecationWarning)
 
         schema_type = type_override or schema.getkey('type', 'any')
+        schema_format = schema.getkey('format')
 
         klass = self.UNMARSHALLERS[schema_type]
-        kwargs = dict(schema=schema)
-
-        if schema_type in self.COMPLEX_UNMARSHALLERS:
-            kwargs.update(
-                unmarshallers_factory=self,
-                context=self.context,
-            )
-
-        schema_format = schema.getkey('format')
-        formatter = self.get_formatter(klass.FORMATTERS, schema_format)
 
+        formatter = self.get_formatter(schema_format, klass.FORMATTERS)
         if formatter is None:
             raise FormatterNotFoundError(schema_format)
 
         validator = self.get_validator(schema)
 
-        return klass(formatter, validator, **kwargs)
+        kwargs = dict()
+        if schema_type in self.COMPLEX_UNMARSHALLERS:
+            kwargs.update(
+                unmarshallers_factory=self,
+                context=self.context,
+            )
+        return klass(schema, formatter, validator, **kwargs)
 
-    def get_formatter(self, default_formatters, type_format=None):
+    def get_formatter(self, type_format, default_formatters):
         try:
             return self.custom_formatters[type_format]
         except KeyError:

openapi_core/unmarshalling/schemas/unmarshallers.py

@@ -27,13 +27,13 @@
 log = logging.getLogger(__name__)
 
 
-class PrimitiveTypeUnmarshaller:
+class BaseSchemaUnmarshaller:
 
-    FORMATTERS = {}
+    FORMATTERS = {
+        None: Formatter(),
+    }
 
-    def __init__(self, formatter, validator, schema):
-        self.formatter = formatter
-        self.validator = validator
+    def __init__(self, schema):
         self.schema = schema
 
     def __call__(self, value):
@@ -44,6 +44,20 @@ def __call__(self, value):
 
         return self.unmarshal(value)
 
+    def validate(self, value):
+        raise NotImplementedError
+
+    def unmarshal(self, value):
+        raise NotImplementedError
+
+
+class PrimitiveTypeUnmarshaller(BaseSchemaUnmarshaller):
+
+    def __init__(self, schema, formatter, validator):
+        super().__init__(schema)
+        self.formatter = formatter
+        self.validator = validator
+
     def _formatter_validate(self, value):
         result = self.formatter.validate(value)
         if not result:
@@ -123,9 +137,9 @@ class BooleanUnmarshaller(PrimitiveTypeUnmarshaller):
 class ComplexUnmarshaller(PrimitiveTypeUnmarshaller):
 
     def __init__(
-            self, formatter, validator, schema, unmarshallers_factory,
+            self, schema, formatter, validator, unmarshallers_factory,
             context=None):
-        super().__init__(formatter, validator, schema)
+        super().__init__(schema, formatter, validator)
         self.unmarshallers_factory = unmarshallers_factory
         self.context = context
 
@@ -242,10 +256,6 @@ def _unmarshal_properties(self, value, one_of_schema=None):
 
 class AnyUnmarshaller(ComplexUnmarshaller):
 
-    FORMATTERS = {
-        None: Formatter(),
-    }
-
     SCHEMA_TYPES_ORDER = [
         'object', 'array', 'boolean',
         'integer', 'number', 'string',