|
19 | 19 | from collections.abc import Generator, Iterable |
20 | 20 | from datetime import datetime |
21 | 21 | from enum import Enum |
22 | | -from itertools import chain |
23 | 22 | from typing import TYPE_CHECKING, Optional, Union |
24 | 23 | from uuid import UUID, uuid4 |
25 | | -from warnings import warn |
26 | 24 |
|
27 | 25 | import py_serializable as serializable |
28 | 26 | from sortedcontainers import SortedSet |
29 | 27 |
|
30 | 28 | from .._internal.compare import ComparableTuple as _ComparableTuple |
31 | 29 | from .._internal.time import get_now_utc as _get_now_utc |
32 | | -from ..exception.model import LicenseExpressionAlongWithOthersException, UnknownComponentDependencyException |
33 | 30 | from ..schema.deprecation import SchemaDeprecationWarning1Dot6 |
34 | 31 | from ..schema.schema import ( |
35 | 32 | SchemaVersion1Dot0, |
|
48 | 45 | from .contact import OrganizationalContact, OrganizationalEntity |
49 | 46 | from .definition import Definitions |
50 | 47 | from .dependency import Dependable, Dependency |
51 | | -from .license import License, LicenseExpression, LicenseRepository, _LicenseRepositorySerializationHelper |
| 48 | +from .license import License, LicenseRepository, _LicenseRepositorySerializationHelper |
52 | 49 | from .lifecycle import Lifecycle, LifecycleRepository, _LifecycleRepositoryHelper |
53 | 50 | from .service import Service |
54 | 51 | from .tool import Tool, ToolRepository, _ToolRepositoryHelper |
@@ -804,35 +801,6 @@ def urn(self) -> str: |
804 | 801 | # idea: have 'serial_number' be a string, and use it instead of this method |
805 | 802 | return f'{_BOM_LINK_PREFIX}{self.serial_number}/{self.version}' |
806 | 803 |
|
807 | | - def validate(self) -> bool: |
808 | | - """ |
809 | | - Perform data-model level validations to make sure we have some known data integrity prior to attempting output |
810 | | - of this `Bom` |
811 | | -
|
812 | | - Returns: |
813 | | - `bool` |
814 | | -
|
815 | | - .. deprecated:: next |
816 | | - Use :class:`cyclonedx.validation.model.ModelValidator` instead. |
817 | | - """ |
818 | | - from ..validation.model import ModelValidator |
819 | | - warn('`Bom.validate()` is deprecated. Use `cyclonedx.validation.model.ModelValidator` instead.', |
820 | | - category=DeprecationWarning, stacklevel=2) |
821 | | - |
822 | | - # Maintain backward compatibility: perform side effects (normalization) |
823 | | - if self.metadata.component: |
824 | | - self.register_dependency(target=self.metadata.component) |
825 | | - for _c in self.components: |
826 | | - self.register_dependency(target=_c) |
827 | | - for _s in self.services: |
828 | | - self.register_dependency(target=_s) |
829 | | - |
830 | | - errors = ModelValidator().validate(self) |
831 | | - first_error = next(iter(errors), None) |
832 | | - if first_error: |
833 | | - raise first_error.data |
834 | | - return True |
835 | | - |
836 | 804 | def __comparable_tuple(self) -> _ComparableTuple: |
837 | 805 | return _ComparableTuple(( |
838 | 806 | self.serial_number, self.version, self.metadata, _ComparableTuple( |
|
0 commit comments