Request and response data validation process refac

Author: p1c2u

openapi_core/validation/request/validators.py

@@ -114,12 +114,12 @@ def _get_parameters(self, request, params):
                 except OpenAPIParameterError as exc:
                     errors.append(exc)
                     continue
-                else:
-                    try:
-                        casted = self._cast(param, deserialised)
-                    except CastError as exc:
-                        errors.append(exc)
-                        continue
+
+                try:
+                    casted = self._cast(param, deserialised)
+                except CastError as exc:
+                    errors.append(exc)
+                    continue
 
             try:
                 unmarshalled = self._unmarshal(param, casted)
@@ -132,38 +132,35 @@ def _get_parameters(self, request, params):
         return RequestParameters(**locations), errors
 
     def _get_body(self, request, operation):
-        errors = []
-
         if operation.request_body is None:
-            return None, errors
+            return None, []
 
-        body = None
         try:
             media_type = operation.request_body[request.mimetype]
         except InvalidContentType as exc:
-            errors.append(exc)
-        else:
-            try:
-                raw_body = operation.request_body.get_value(request)
-            except MissingRequestBody as exc:
-                errors.append(exc)
-            else:
-                try:
-                    deserialised = self._deserialise(media_type, raw_body)
-                except InvalidMediaTypeValue as exc:
-                    errors.append(exc)
-                else:
-                    try:
-                        casted = self._cast(media_type, deserialised)
-                    except CastError as exc:
-                        errors.append(exc)
-                    else:
-                        try:
-                            body = self._unmarshal(media_type, casted)
-                        except (ValidateError, UnmarshalError) as exc:
-                            errors.append(exc)
-
-        return body, errors
+            return None, [exc, ]
+
+        try:
+            raw_body = operation.request_body.get_value(request)
+        except MissingRequestBody as exc:
+            return None, [exc, ]
+
+        try:
+            deserialised = self._deserialise(media_type, raw_body)
+        except InvalidMediaTypeValue as exc:
+            return None, [exc, ]
+
+        try:
+            casted = self._cast(media_type, deserialised)
+        except CastError as exc:
+            return None, [exc, ]
+
+        try:
+            body = self._unmarshal(media_type, casted)
+        except (ValidateError, UnmarshalError) as exc:
+            return None, [exc, ]
+
+        return body, []
 
     def _deserialise(self, param_or_media_type, value):
         return param_or_media_type.deserialise(value)

openapi_core/validation/response/validators.py

@@ -65,38 +65,35 @@ def _validate_data(self, request, response):
         return ResponseValidationResult(data_errors, data, None)
 
     def _get_data(self, response, operation_response):
-        errors = []
-
         if not operation_response.content:
-            return None, errors
+            return None, []
 
-        data = None
         try:
             media_type = operation_response[response.mimetype]
         except InvalidContentType as exc:
-            errors.append(exc)
-        else:
-            try:
-                raw_data = operation_response.get_value(response)
-            except MissingResponseContent as exc:
-                errors.append(exc)
-            else:
-                try:
-                    deserialised = self._deserialise(media_type, raw_data)
-                except InvalidMediaTypeValue as exc:
-                    errors.append(exc)
-                else:
-                    try:
-                        casted = self._cast(media_type, deserialised)
-                    except CastError as exc:
-                        errors.append(exc)
-                    else:
-                        try:
-                            data = self._unmarshal(media_type, casted)
-                        except (ValidateError, UnmarshalError) as exc:
-                            errors.append(exc)
-
-        return data, errors
+            return None, [exc, ]
+
+        try:
+            raw_data = operation_response.get_value(response)
+        except MissingResponseContent as exc:
+            return None, [exc, ]
+
+        try:
+            deserialised = self._deserialise(media_type, raw_data)
+        except InvalidMediaTypeValue as exc:
+            return None, [exc, ]
+
+        try:
+            casted = self._cast(media_type, deserialised)
+        except CastError as exc:
+            return None, [exc, ]
+
+        try:
+            data = self._unmarshal(media_type, casted)
+        except (ValidateError, UnmarshalError) as exc:
+            return None, [exc, ]
+
+        return data, []
 
     def _get_headers(self, response, operation_response):
         errors = []