Unmarshaller factory refactor

Author: p1c2u

openapi_core/unmarshalling/schemas/factories.py

@@ -15,18 +15,18 @@
 
 class SchemaUnmarshallersFactory:
 
-    PRIMITIVE_UNMARSHALLERS = {
+    UNMARSHALLERS = {
         'string': StringUnmarshaller,
         'integer': IntegerUnmarshaller,
         'number': NumberUnmarshaller,
         'boolean': BooleanUnmarshaller,
-    }
-    COMPLEX_UNMARSHALLERS = {
         'array': ArrayUnmarshaller,
         'object': ObjectUnmarshaller,
         'any': AnyUnmarshaller,
     }
 
+    COMPLEX_UNMARSHALLERS = ['array', 'object', 'any']
+
     CONTEXT_VALIDATION = {
         UnmarshalContext.REQUEST: 'write',
         UnmarshalContext.RESPONSE: 'read',
@@ -51,14 +51,13 @@ def create(self, schema, type_override=None):
             warnings.warn("The schema is deprecated", DeprecationWarning)
 
         schema_type = type_override or schema.getkey('type', 'any')
-        if schema_type in self.PRIMITIVE_UNMARSHALLERS:
-            klass = self.PRIMITIVE_UNMARSHALLERS[schema_type]
-            kwargs = dict(schema=schema)
-
-        elif schema_type in self.COMPLEX_UNMARSHALLERS:
-            klass = self.COMPLEX_UNMARSHALLERS[schema_type]
-            kwargs = dict(
-                schema=schema, unmarshallers_factory=self,
+
+        klass = self.UNMARSHALLERS[schema_type]
+        kwargs = dict(schema=schema)
+
+        if schema_type in self.COMPLEX_UNMARSHALLERS:
+            kwargs.update(
+                unmarshallers_factory=self,
                 context=self.context,
             )