Validators refactor

Author: p1c2u

openapi_core/__init__.py

@@ -1,7 +1,20 @@
 # -*- coding: utf-8 -*-
 """OpenAPI core module"""
 from openapi_core.shortcuts import (
-    create_spec, validate_parameters, validate_body, validate_data,
+    create_spec, validate_request, validate_response,
+    spec_validate_body, spec_validate_parameters,
+    spec_validate_data, spec_validate_data, spec_validate_headers,
+)
+from openapi_core.validation.request.validators import (
+    RequestValidator,
+    RequestBodyValidator,
+    RequestParametersValidator,
+    RequestSecurityValidator,
+)
+from openapi_core.validation.response.validators import (
+    ResponseValidator,
+    ResponseDataValidator,
+    ResponseHeadersValidator,
 )
 
 __author__ = 'Artur Maciag'
@@ -11,5 +24,10 @@
 __license__ = 'BSD 3-Clause License'
 
 __all__ = [
-    'create_spec', 'validate_parameters', 'validate_body', 'validate_data',
+    'create_spec', 'validate_request', 'validate_response',
+    'spec_validate_body', 'spec_validate_parameters', 'spec_validate_data',
+    'validate_data', 'spec_validate_headers',
+    'RequestValidator', 'ResponseValidator', 'RequestBodyValidator',
+    'RequestParametersValidator', 'RequestSecurityValidator',
+    'ResponseDataValidator', 'ResponseHeadersValidator',
 ]

openapi_core/shortcuts.py

@@ -2,16 +2,17 @@
 # backward compatibility
 from openapi_core.spec.shortcuts import create_spec
 from openapi_core.validation.request.shortcuts import (
-    spec_validate_body as validate_body,
-    spec_validate_parameters as validate_parameters,
+    validate_request,
+    spec_validate_body, spec_validate_parameters, spec_validate_security,
 )
-from openapi_core.validation.request.validators import RequestValidator
 from openapi_core.validation.response.shortcuts import (
-    spec_validate_data as validate_data
+    validate_response,
+    spec_validate_data, spec_validate_headers,
 )
-from openapi_core.validation.response.validators import ResponseValidator
 
 __all__ = [
-    'create_spec', 'validate_body', 'validate_parameters', 'validate_data',
-    'RequestValidator', 'ResponseValidator',
+    'create_spec',
+    'validate_request', 'validate_response',
+    'spec_validate_body', 'spec_validate_parameters', 'spec_validate_security',
+    'validate_data', 'spec_validate_headers',
 ]

openapi_core/validation/request/shortcuts.py

@@ -1,57 +1,47 @@
 """OpenAPI core validation request shortcuts module"""
-import warnings
+from functools import partial
 
-from openapi_core.validation.request.validators import RequestValidator
+from openapi_core.validation.request.validators import (
+    RequestValidator,
+    RequestBodyValidator,
+    RequestParametersValidator,
+    RequestSecurityValidator,
+)
 
 
-def validate_request(validator, request, failsafe=None):
-    if failsafe is None:
-        failsafe = ()
+def validate_request(validator, request):
     result = validator.validate(request)
-    try:
-        result.raise_for_errors()
-    except failsafe:
-        pass
+    result.raise_for_errors()
     return result
 
 
-def validate_parameters(validator, request):
-    warnings.warn(
-        "validate_parameters shortcut is deprecated, "
-        "use validator.validate instead",
-        DeprecationWarning,
-    )
-    result = validator._validate_parameters(request)
-    result.raise_for_errors()
-    return result
+def spec_validate_request(
+    spec, request, request_factory=None, validator_class=RequestValidator,
+    result_attribute=None,
+):
+    if request_factory is not None:
+        request = request_factory(request)
 
+    validator = validator_class(spec)
 
-def validate_body(validator, request):
-    warnings.warn(
-        "validate_body shortcut is deprecated, "
-        "use validator.validate instead",
-        DeprecationWarning,
-    )
-    result = validator._validate_body(request)
+    result = validator.validate(request)
     result.raise_for_errors()
-    return result
-
 
-def spec_validate_parameters(spec, request, request_factory=None):
-    if request_factory is not None:
-        request = request_factory(request)
+    if result_attribute is None:
+        return result
+    return getattr(result, result_attribute)
 
-    validator = RequestValidator(spec)
-    result = validate_parameters(validator, request)
 
-    return result.parameters
+spec_validate_parameters = partial(
+    spec_validate_request,
+    validator_class=RequestParametersValidator, result_attribute='parameters')
 
 
-def spec_validate_body(spec, request, request_factory=None):
-    if request_factory is not None:
-        request = request_factory(request)
+spec_validate_body = partial(
+    spec_validate_request,
+    validator_class=RequestBodyValidator, result_attribute='body')
 
-    validator = RequestValidator(spec)
-    result = validate_body(validator, request)
 
-    return result.body
+spec_validate_security = partial(
+    spec_validate_request,
+    validator_class=RequestSecurityValidator, result_attribute='security')